From 52dae23ee6fdc41b90def85deba27c53532991b1 Mon Sep 17 00:00:00 2001 From: clemenso Date: Fri, 2 Oct 2009 17:56:32 +0000 Subject: [maven-release-plugin] copy for tag mocca-1.2.7 git-svn-id: https://joinup.ec.europa.eu/svn/mocca/tags/mocca-1.2.7@520 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- BKUApplet/pom.xml | 14 +-- BKUAppletExt/pom.xml | 16 ++-- BKUCertificates/pom.xml | 2 +- BKUCommonGUI/pom.xml | 8 +- .../main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java | 9 ++ .../main/java/at/gv/egiz/bku/gui/HelpViewer.java | 1 + .../at/gv/egiz/bku/gui/SecureViewerDialog.java | 1 + BKUGuiExt/pom.xml | 8 +- BKUHelp/pom.xml | 2 +- BKULocal/pom.xml | 24 ++--- .../gv/egiz/bku/local/stal/LocalSTALFactory.java | 47 +++++++++- .../main/resources/at/gv/egiz/bku/gui/chip128.png | Bin 0 -> 7775 bytes .../main/resources/at/gv/egiz/bku/gui/chip16.png | Bin 0 -> 787 bytes .../main/resources/at/gv/egiz/bku/gui/chip24.png | Bin 0 -> 1227 bytes .../main/resources/at/gv/egiz/bku/gui/chip32.png | Bin 0 -> 1753 bytes .../main/resources/at/gv/egiz/bku/gui/chip48.png | Bin 0 -> 2771 bytes BKUOnline/pom.xml | 50 +++++----- BKUOnline/src/main/webapp/WEB-INF/web.xml | 22 ++--- BKUViewer/pom.xml | 6 +- BKUWebStart/pom.xml | 54 ++++++++++- BKUWebStart/src/main/jnlp/template-local.xml | 4 +- BKUWebStart/src/main/jnlp/template-unstable.xml | 49 ++++++++++ BKUWebStart/src/main/jnlp/template.xml | 49 ++++++++++ STAL/pom.xml | 4 +- STALExt/pom.xml | 6 +- STALService/pom.xml | 6 +- STALXService/pom.xml | 8 +- bkucommon/pom.xml | 8 +- pom.xml | 12 +-- smcc/pom.xml | 4 +- .../src/main/java/at/gv/egiz/smcc/STARCOSCard.java | 2 +- .../java/at/gv/egiz/smcc/ccid/ReaderFactory.java | 2 +- smccSTAL/pom.xml | 10 +- smccSTALExt/pom.xml | 4 +- src/main/site/apt/index.apt | 104 +++++++++++++++++++++ src/main/site/apt/notes.apt | 4 + src/main/site/site.xml | 30 ++++++ utils/pom.xml | 4 +- 38 files changed, 456 insertions(+), 118 deletions(-) create mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip128.png create mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip16.png create mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip24.png create mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip32.png create mode 100644 BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip48.png create mode 100644 BKUWebStart/src/main/jnlp/template-unstable.xml create mode 100644 BKUWebStart/src/main/jnlp/template.xml create mode 100644 src/main/site/apt/index.apt create mode 100644 src/main/site/apt/notes.apt create mode 100644 src/main/site/site.xml diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml index 547c4098..c30d451c 100644 --- a/BKUApplet/pom.xml +++ b/BKUApplet/pom.xml @@ -2,13 +2,13 @@ bku at.gv.egiz - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 at.gv.egiz BKUApplet BKU Applet - 1.2.7-SNAPSHOT + 1.2.7 @@ -98,27 +98,27 @@ at.gv.egiz smcc - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz STAL - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz STALService - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz smccSTAL - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz BKUCommonGUI - 1.2.7-SNAPSHOT + 1.2.7 \ No newline at end of file diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml index 832ed03b..5f19e8f2 100644 --- a/BKUAppletExt/pom.xml +++ b/BKUAppletExt/pom.xml @@ -2,44 +2,44 @@ bku at.gv.egiz - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 at.gv.egiz BKUAppletExt BKU Applet Extension - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz STALExt - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz STALXService - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz smccSTAL - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz BKUApplet - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz BKUGuiExt - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz smccSTALExt - 1.2.7-SNAPSHOT + 1.2.7 diff --git a/BKUCertificates/pom.xml b/BKUCertificates/pom.xml index e72f42cb..183a5701 100644 --- a/BKUCertificates/pom.xml +++ b/BKUCertificates/pom.xml @@ -3,7 +3,7 @@ bku at.gv.egiz - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz BKUCertificates diff --git a/BKUCommonGUI/pom.xml b/BKUCommonGUI/pom.xml index b6e779fc..5f0b5a1b 100644 --- a/BKUCommonGUI/pom.xml +++ b/BKUCommonGUI/pom.xml @@ -2,23 +2,23 @@ bku at.gv.egiz - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 at.gv.egiz BKUCommonGUI BKU GUI - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz smcc - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz STAL - 1.2.7-SNAPSHOT + 1.2.7 compile diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java index 35a53ff7..b84a2164 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java @@ -23,6 +23,7 @@ import java.awt.Color; import java.awt.Container; import java.awt.Cursor; import java.awt.Font; +import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; @@ -1243,6 +1244,14 @@ public class BKUGUIImpl implements BKUGUIFacade { if (secureViewer == null) { secureViewer = new SecureViewerDialog(null, messages, helpListener.getActionListener()); + + // workaround for [#439] + // avoid AlwaysOnTop at least in applet, otherwise make secureViewer AlwaysOnTop since MOCCA Dialog (JFrame created in LocalSTALFactory) is always on top. + Window window = SwingUtilities.getWindowAncestor(contentPane); + if (window != null && window.isAlwaysOnTop()) { + log.debug("make secureViewer alwaysOnTop"); + secureViewer.setAlwaysOnTop(true); + } } secureViewer.setContent(dataToBeSigned); log.trace("show secure viewer returned"); diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java index 364da6ec..48393101 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java @@ -86,6 +86,7 @@ public class HelpViewer extends JDialog } dialog = new HelpViewer(frame, messages, ctx, helpURL); //, helpTopic); dialog.setVisible(true); + dialog.toFront(); } private HelpViewer(Frame frame, diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java index 6a16306b..84c2a5ff 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java @@ -239,6 +239,7 @@ public class SecureViewerDialog extends JDialog implements ActionListener { } setVisible(true); + toFront(); } private JPanel createButtonPanel() { //ActionListener saveListener, String saveCommand) { diff --git a/BKUGuiExt/pom.xml b/BKUGuiExt/pom.xml index b3220ede..7510706f 100644 --- a/BKUGuiExt/pom.xml +++ b/BKUGuiExt/pom.xml @@ -3,22 +3,22 @@ bku at.gv.egiz - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz BKUGuiExt - 1.2.7-SNAPSHOT + 1.2.7 BKU GUI Extension at.gv.egiz STALXService - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz smccSTAL - 1.2.7-SNAPSHOT + 1.2.7 \ No newline at end of file diff --git a/BKUHelp/pom.xml b/BKUHelp/pom.xml index 366ed202..331317e7 100644 --- a/BKUHelp/pom.xml +++ b/BKUHelp/pom.xml @@ -3,7 +3,7 @@ bku at.gv.egiz - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz BKUHelp diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml index 63ecfc34..4b451c86 100644 --- a/BKULocal/pom.xml +++ b/BKULocal/pom.xml @@ -2,19 +2,19 @@ bku at.gv.egiz - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 at.gv.egiz BKULocal war BKU Local - 1.2.7-SNAPSHOT + 1.2.7 - scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal - scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal - scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal + scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKULocal + scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKULocal + scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKULocal @@ -72,37 +72,37 @@ at.gv.egiz STAL - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz bkucommon - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz smcc - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz smccSTAL - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz BKUGuiExt - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz smccSTALExt - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz BKUViewer - 1.2.7-SNAPSHOT + 1.2.7 BKUHelp diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java index 712fb969..d961b56f 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java @@ -18,6 +18,8 @@ package at.gv.egiz.bku.local.stal; import java.awt.Dimension; import java.awt.Toolkit; +import java.awt.event.WindowEvent; +import java.io.IOException; import java.net.MalformedURLException; import java.util.Locale; @@ -30,7 +32,15 @@ import at.gv.egiz.bku.local.gui.GUIProxy; import at.gv.egiz.bku.local.gui.LocalHelpListener; import at.gv.egiz.stal.STAL; import at.gv.egiz.stal.STALFactory; +import java.awt.Image; +import java.awt.Window; +import java.awt.event.WindowAdapter; import java.net.URL; +import java.util.ArrayList; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.imageio.ImageIO; +import javax.swing.ImageIcon; import javax.swing.JFrame; import javax.swing.JRootPane; import org.apache.commons.logging.Log; @@ -46,6 +56,25 @@ public class LocalSTALFactory implements STALFactory { protected static final Log log = LogFactory.getLog(LocalSTALFactory.class); protected static final Dimension PREFERRED_SIZE = new Dimension(318, 200); + protected static ArrayList icons = new ArrayList(); + static { + String[] iconResources = new String[] { + "/at/gv/egiz/bku/gui/chip16.png", + "/at/gv/egiz/bku/gui/chip24.png", + "/at/gv/egiz/bku/gui/chip32.png", + "/at/gv/egiz/bku/gui/chip48.png", + "/at/gv/egiz/bku/gui/chip128.png" }; + for (String ir : iconResources) { + URL resource = LocalSTALFactory.class.getResource(ir); + if (ir != null) { + try { + icons.add(ImageIO.read(resource)); + } catch (IOException ex) { + log.warn("failed to set ui dialog icon", ex); + } + } + } + } protected String helpURL; protected Locale locale; @@ -57,9 +86,23 @@ public class LocalSTALFactory implements STALFactory { // use undecorated JFrame instead of JWindow, // which creates an invisible owning frame and therefore cannot getFocusInWindow() JFrame dialog = new JFrame("Bürgerkarte"); + if (log.isTraceEnabled()) { + log.debug("alwaysOnTop supported: " + dialog.isAlwaysOnTopSupported()); + } + // [#439] make mocca dialog alwaysOnTop + dialog.setAlwaysOnTop(true); + dialog.setIconImages(icons); dialog.setUndecorated(true); - dialog.getRootPane().setWindowDecorationStyle(JRootPane.NONE); - +// dialog.getRootPane().setWindowDecorationStyle(JRootPane.NONE); +// dialog.addWindowListener(new WindowAdapter() { +// +// @Override +// public void windowClosing(WindowEvent e) { +// super.windowClosing(e); +// log.debug("closing window ********************"); +// } +// +// }); if (locale != null) { dialog.setLocale(locale); } diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip128.png b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip128.png new file mode 100644 index 00000000..c36d8079 Binary files /dev/null and b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip128.png differ diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip16.png b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip16.png new file mode 100644 index 00000000..96b580e9 Binary files /dev/null and b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip16.png differ diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip24.png b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip24.png new file mode 100644 index 00000000..efd6dbeb Binary files /dev/null and b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip24.png differ diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip32.png b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip32.png new file mode 100644 index 00000000..e7efb020 Binary files /dev/null and b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip32.png differ diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip48.png b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip48.png new file mode 100644 index 00000000..491fbcac Binary files /dev/null and b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip48.png differ diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml index ed7f7d50..3c622bae 100644 --- a/BKUOnline/pom.xml +++ b/BKUOnline/pom.xml @@ -3,14 +3,14 @@ bku at.gv.egiz - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 at.gv.egiz BKUOnline war BKU Online - 1.2.7-SNAPSHOT + 1.2.7 @@ -21,15 +21,19 @@ + + log4j + log4j + at.gv.egiz bkucommon - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz BKUViewer - 1.2.7-SNAPSHOT + 1.2.7 BKUCertificates @@ -63,13 +67,13 @@ at.gv.egiz STALService - 1.2.7-SNAPSHOT + 1.2.7 compile at.gv.egiz STALService - 1.2.7-SNAPSHOT + 1.2.7 + | org.codehaus.mojo.webstart webstart-jnlp-servlet 1.0-6.0.02_ea_b02.1-SNAPSHOT - + at.gv.egiz - BKUWebStartPackage + BKUWebStart ${project.version} provided zip diff --git a/BKUOnline/src/main/webapp/WEB-INF/web.xml b/BKUOnline/src/main/webapp/WEB-INF/web.xml index 3a459302..41cd400f 100644 --- a/BKUOnline/src/main/webapp/WEB-INF/web.xml +++ b/BKUOnline/src/main/webapp/WEB-INF/web.xml @@ -53,11 +53,11 @@ BKUApplet /applet.jsp - - STALService - com.sun.xml.ws.transport.http.servlet.WSServlet - 1 - + + STALService + com.sun.xml.ws.transport.http.servlet.WSServlet + 1 + BKUServlet /http-security-layer-request @@ -112,14 +112,14 @@ JnlpDownloadServlet /webstart/* - --> + --> - - STALService - /stal - - + + STALService + /stal + + 5 diff --git a/BKUViewer/pom.xml b/BKUViewer/pom.xml index 4069374c..8ec857eb 100644 --- a/BKUViewer/pom.xml +++ b/BKUViewer/pom.xml @@ -2,19 +2,19 @@ bku at.gv.egiz - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 at.gv.egiz BKUViewer BKU Viewer - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz bkucommon - 1.2.7-SNAPSHOT + 1.2.7 commons-logging diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml index f51f1332..d66f8194 100644 --- a/BKUWebStart/pom.xml +++ b/BKUWebStart/pom.xml @@ -2,14 +2,14 @@ bku at.gv.egiz - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 at.gv.egiz BKUWebStart jar BKU Web Start - 1.2.7-SNAPSHOT + 1.2.7 http://mocca.egovlabs.gv.at/ Bürgerkartenumgebung @@ -122,7 +122,55 @@ - + + + pkcs11-sign + + + + webstart-maven-plugin + org.codehaus.mojo.webstart + + 1.0-beta-1-mocca + + + package + + jnlp-inline + + + + + false + + ${project.basedir}/src/main/jnlp + template-unstable.xml + mocca.jnlp + at.gv.egiz.bku.webstart.Launcher + + + NONE + PKCS11 + iaik.pkcs.pkcs11.provider.IAIKPkcs11 + a-sit + ${pkcs11-pass} + true + + false + false + + + false + false + false + true + true + + + + + + non-webstart diff --git a/BKUWebStart/src/main/jnlp/template-local.xml b/BKUWebStart/src/main/jnlp/template-local.xml index 12ff9d8c..f9a7d917 100644 --- a/BKUWebStart/src/main/jnlp/template-local.xml +++ b/BKUWebStart/src/main/jnlp/template-local.xml @@ -2,10 +2,10 @@ - ${project.Description} + MOCCA Developement E-Government Innovationszentrum (EGIZ) - ${project.Description} (BKU) MOCCA Web Start + ${project.Description} (BKU) MOCCA Web Start - Developement Version ${project.Description} diff --git a/BKUWebStart/src/main/jnlp/template-unstable.xml b/BKUWebStart/src/main/jnlp/template-unstable.xml new file mode 100644 index 00000000..b473f492 --- /dev/null +++ b/BKUWebStart/src/main/jnlp/template-unstable.xml @@ -0,0 +1,49 @@ + + + + + + MOCCA Unstable + E-Government Innovationszentrum (EGIZ) + + ${project.Description} (BKU) MOCCA Web Start - Unstable Build + ${project.Description} + + + + + + + + + + + + + + + + + + + + + + + + + + + $dependencies + + + + + $dependencies + + + + \ No newline at end of file diff --git a/BKUWebStart/src/main/jnlp/template.xml b/BKUWebStart/src/main/jnlp/template.xml new file mode 100644 index 00000000..887e2f10 --- /dev/null +++ b/BKUWebStart/src/main/jnlp/template.xml @@ -0,0 +1,49 @@ + + + + + + ${project.Description} + E-Government Innovationszentrum (EGIZ) + + ${project.Description} (BKU) MOCCA Web Start + ${project.Description} + + + + + + + + + + + + + + + + + + + + + + + + + + + $dependencies + + + + + $dependencies + + + + \ No newline at end of file diff --git a/STAL/pom.xml b/STAL/pom.xml index 3e04a917..23f14e69 100644 --- a/STAL/pom.xml +++ b/STAL/pom.xml @@ -3,13 +3,13 @@ bku at.gv.egiz - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 at.gv.egiz STAL STAL - 1.2.7-SNAPSHOT + 1.2.7 commons-logging diff --git a/STALExt/pom.xml b/STALExt/pom.xml index 553b8804..46e5816a 100644 --- a/STALExt/pom.xml +++ b/STALExt/pom.xml @@ -2,19 +2,19 @@ bku at.gv.egiz - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 at.gv.egiz STALExt STAL Extension - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz STAL - 1.2.7-SNAPSHOT + 1.2.7 \ No newline at end of file diff --git a/STALService/pom.xml b/STALService/pom.xml index 68bcb875..512ea24c 100644 --- a/STALService/pom.xml +++ b/STALService/pom.xml @@ -3,19 +3,19 @@ bku at.gv.egiz - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 at.gv.egiz STALService STAL Service - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz STAL - 1.2.7-SNAPSHOT + 1.2.7 + @@ -47,9 +47,9 @@ - scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk - scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk - svn://svn.egovlabs.gv.at/svnroot/mocca/trunk + scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7 + scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7 + svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7 E-Government Innovation Center (EGIZ) @@ -244,7 +244,7 @@ at.gv.egiz BKUWebStart - 1.2.7-SNAPSHOT + 1.2.7 zip diff --git a/smcc/pom.xml b/smcc/pom.xml index 7bb547a3..7ac2e852 100644 --- a/smcc/pom.xml +++ b/smcc/pom.xml @@ -2,14 +2,14 @@ bku at.gv.egiz - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 at.gv.egiz smcc smcc jar - 1.2.7-SNAPSHOT + 1.2.7 http://bku.egiz.gv.at diff --git a/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java b/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java index 2e6dd5d6..a0c2391d 100644 --- a/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java +++ b/smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java @@ -596,7 +596,7 @@ public class STARCOSCard extends AbstractSignatureCard implements PINMgmtSignatu NewReferenceDataAPDUSpec apduSpec = new NewReferenceDataAPDUSpec( new byte[] { - (byte) 0x00, (byte) 0x20, (byte) 0x01, pinSpec.getKID(), (byte) 0x08, + (byte) 0x00, (byte) 0x24, (byte) 0x01, pinSpec.getKID(), (byte) 0x08, (byte) 0x20, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff }, 1, VerifyAPDUSpec.PIN_FORMAT_BCD, 7, 4, 4); diff --git a/smcc/src/main/java/at/gv/egiz/smcc/ccid/ReaderFactory.java b/smcc/src/main/java/at/gv/egiz/smcc/ccid/ReaderFactory.java index 32a9ce9f..43949f42 100644 --- a/smcc/src/main/java/at/gv/egiz/smcc/ccid/ReaderFactory.java +++ b/smcc/src/main/java/at/gv/egiz/smcc/ccid/ReaderFactory.java @@ -67,7 +67,7 @@ public class ReaderFactory { reader = new GemplusGemPCPinpad(icc, ct); } else if (name.startsWith("omnikey cardman 3621")) { reader = new OMNIKEYCardMan3621(icc, ct); - } else if (name.startsWith("scm microsystems inc. sprx32 usb smart card reader")) { + } else if (name.startsWith("scm spr 532") || name.startsWith("scm microsystems inc. sprx32 usb smart card reader")) { reader = new SCMMicrosystemsSPRx32(icc, ct); } else if (name.startsWith("cherry smartboard xx44")) { reader = new CherrySmartBoardXX44(icc, ct); diff --git a/smccSTAL/pom.xml b/smccSTAL/pom.xml index a46cb87f..78e903a1 100644 --- a/smccSTAL/pom.xml +++ b/smccSTAL/pom.xml @@ -2,13 +2,13 @@ bku at.gv.egiz - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 at.gv.egiz smccSTAL smcc STAL - 1.2.7-SNAPSHOT + 1.2.7 @@ -24,17 +24,17 @@ at.gv.egiz STAL - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz smcc - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz BKUCommonGUI - 1.2.7-SNAPSHOT + 1.2.7 iaik diff --git a/smccSTALExt/pom.xml b/smccSTALExt/pom.xml index d0b96076..50a53167 100644 --- a/smccSTALExt/pom.xml +++ b/smccSTALExt/pom.xml @@ -3,11 +3,11 @@ bku at.gv.egiz - 1.2.7-SNAPSHOT + 1.2.7 at.gv.egiz smccSTALExt - 1.2.7-SNAPSHOT + 1.2.7 smcc STAL Extension diff --git a/src/main/site/apt/index.apt b/src/main/site/apt/index.apt new file mode 100644 index 00000000..026d7bb0 --- /dev/null +++ b/src/main/site/apt/index.apt @@ -0,0 +1,104 @@ + ------ + MOCCA + ------ + Egiz + ------ + Date + + Paragraph 1, line 1. + Paragraph 1, line 2. + + Paragraph 2, line 1. + Paragraph 2, line 2. + +Section title + +* Sub-section title + +** Sub-sub-section title + +*** Sub-sub-sub-section title + +**** Sub-sub-sub-sub-section title + + * List item 1. + + * List item 2. + + Paragraph contained in list item 2. + + * Sub-list item 1. + + * Sub-list item 2. + + * List item 3. + Force end of list: + + [] + ++------------------------------------------+ +Verbatim text not contained in list item 3 ++------------------------------------------+ + + [[1]] Numbered item 1. + + [[A]] Numbered item A. + + [[B]] Numbered item B. + + [[2]] Numbered item 2. + + List numbering schemes: [[1]], [[a]], [[A]], [[i]], [[I]]. + + [Defined term 1] of definition list. + + [Defined term 2] of definition list. + ++-------------------------------+ +Verbatim text + in a box ++-------------------------------+ + + --- instead of +-- suppresses the box around verbatim text. + +[Figure name] Figure caption + +*----------*--------------+----------------: +| Centered | Left-aligned | Right-aligned | +| cell 1,1 | cell 1,2 | cell 1,3 | +*----------*--------------+----------------: +| cell 2,1 | cell 2,2 | cell 2,3 | +*----------*--------------+----------------: +Table caption + + No grid, no caption: + +*-----*------* + cell | cell +*-----*------* + cell | cell +*-----*------* + + Horizontal line: + +======================================================================= + +^L + New page. + + font. <> font. <<>> font. + + {Anchor}. Link to {{anchor}}. Link to {{http://www.pixware.fr}}. + Link to {{{anchor}showing alternate text}}. + Link to {{{http://www.pixware.fr}Pixware home page}}. + + Force line\ + break. + + Non\ breaking\ space. + + Escaped special characters: \~, \=, \-, \+, \*, \[, \], \<, \>, \{, \}, \\. + + Copyright symbol: \251, \xA9, \u00a9. + +~~Commented out. \ No newline at end of file diff --git a/src/main/site/apt/notes.apt b/src/main/site/apt/notes.apt new file mode 100644 index 00000000..f224de43 --- /dev/null +++ b/src/main/site/apt/notes.apt @@ -0,0 +1,4 @@ + + make include-webstart profile active via settings.xml, + otherwise reactor fails to calculate the correct build + order (BKUWebStart prior to BKUOnline) \ No newline at end of file diff --git a/src/main/site/site.xml b/src/main/site/site.xml new file mode 100644 index 00000000..f72f52bf --- /dev/null +++ b/src/main/site/site.xml @@ -0,0 +1,30 @@ + + + + + + MOCCA + http://mocca.egovlabs.gv.at/mocca-t_s.png + http://mocca.egovlabs.gv.at/ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/utils/pom.xml b/utils/pom.xml index 7e29c7ac..ff9917cb 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -2,14 +2,14 @@ bku at.gv.egiz - 1.2.7-SNAPSHOT + 1.2.7 4.0.0 at.gv.egiz utils BKU Utils jar - 1.2.7-SNAPSHOT + 1.2.7 http://bku.egiz.gv.at -- cgit v1.2.3