summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-10-02 17:56:32 +0000
committerclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-10-02 17:56:32 +0000
commit52dae23ee6fdc41b90def85deba27c53532991b1 (patch)
treea0acb54a9ab882cc3891e876dcc26221670850e5
parentad0efd4d9fa524d34620c95feb571d8a1d2cc622 (diff)
downloadmocca-52dae23ee6fdc41b90def85deba27c53532991b1.tar.gz
mocca-52dae23ee6fdc41b90def85deba27c53532991b1.tar.bz2
mocca-52dae23ee6fdc41b90def85deba27c53532991b1.zip
[maven-release-plugin] copy for tag mocca-1.2.7mocca-1.2.7
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/tags/mocca-1.2.7@520 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
-rw-r--r--BKUApplet/pom.xml14
-rw-r--r--BKUAppletExt/pom.xml16
-rw-r--r--BKUCertificates/pom.xml2
-rw-r--r--BKUCommonGUI/pom.xml8
-rw-r--r--BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java9
-rw-r--r--BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpViewer.java1
-rw-r--r--BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/SecureViewerDialog.java1
-rw-r--r--BKUGuiExt/pom.xml8
-rw-r--r--BKUHelp/pom.xml2
-rw-r--r--BKULocal/pom.xml24
-rw-r--r--BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSTALFactory.java47
-rw-r--r--BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip128.pngbin0 -> 7775 bytes
-rw-r--r--BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip16.pngbin0 -> 787 bytes
-rw-r--r--BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip24.pngbin0 -> 1227 bytes
-rw-r--r--BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip32.pngbin0 -> 1753 bytes
-rw-r--r--BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip48.pngbin0 -> 2771 bytes
-rw-r--r--BKUOnline/pom.xml50
-rw-r--r--BKUOnline/src/main/webapp/WEB-INF/web.xml22
-rw-r--r--BKUViewer/pom.xml6
-rw-r--r--BKUWebStart/pom.xml54
-rw-r--r--BKUWebStart/src/main/jnlp/template-local.xml4
-rw-r--r--BKUWebStart/src/main/jnlp/template-unstable.xml49
-rw-r--r--BKUWebStart/src/main/jnlp/template.xml49
-rw-r--r--STAL/pom.xml4
-rw-r--r--STALExt/pom.xml6
-rw-r--r--STALService/pom.xml6
-rw-r--r--STALXService/pom.xml8
-rw-r--r--bkucommon/pom.xml8
-rw-r--r--pom.xml12
-rw-r--r--smcc/pom.xml4
-rw-r--r--smcc/src/main/java/at/gv/egiz/smcc/STARCOSCard.java2
-rw-r--r--smcc/src/main/java/at/gv/egiz/smcc/ccid/ReaderFactory.java2
-rw-r--r--smccSTAL/pom.xml10
-rw-r--r--smccSTALExt/pom.xml4
-rw-r--r--src/main/site/apt/index.apt104
-rw-r--r--src/main/site/apt/notes.apt4
-rw-r--r--src/main/site/site.xml30
-rw-r--r--utils/pom.xml4
38 files changed, 456 insertions, 118 deletions
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 @@
<parent>
<artifactId>bku</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUApplet</artifactId>
<name>BKU Applet</name>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<build>
<plugins>
<plugin>
@@ -98,27 +98,27 @@
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>smcc</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>STAL</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>STALService</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>smccSTAL</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUCommonGUI</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
</dependencies>
</project> \ 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 @@
<parent>
<artifactId>bku</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUAppletExt</artifactId>
<name>BKU Applet Extension</name>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<description />
<dependencies>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>STALExt</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>STALXService</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>smccSTAL</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUApplet</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUGuiExt</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>smccSTALExt</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
</dependencies>
<build>
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 @@
<parent>
<artifactId>bku</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</parent>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUCertificates</artifactId>
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 @@
<parent>
<artifactId>bku</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUCommonGUI</artifactId>
<name>BKU GUI</name>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<dependencies>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>smcc</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>STAL</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<scope>compile</scope>
</dependency>
</dependencies>
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 @@
<parent>
<artifactId>bku</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</parent>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUGuiExt</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<name>BKU GUI Extension</name>
<dependencies>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>STALXService</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>smccSTAL</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
</dependencies>
</project> \ 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 @@
<parent>
<artifactId>bku</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</parent>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUHelp</artifactId>
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 @@
<parent>
<artifactId>bku</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>at.gv.egiz</groupId>
<artifactId>BKULocal</artifactId>
<packaging>war</packaging>
<name>BKU Local</name>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<scm>
- <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</developerConnection>
- <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</connection>
- <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKULocal</url>
+ <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKULocal</developerConnection>
+ <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKULocal</connection>
+ <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKULocal</url>
</scm>
<build>
<plugins>
@@ -72,37 +72,37 @@
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>STAL</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>bkucommon</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>smcc</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>smccSTAL</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUGuiExt</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>smccSTALExt</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUViewer</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<artifactId>BKUHelp</artifactId>
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<Image> icons = new ArrayList<Image>();
+ 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
--- /dev/null
+++ b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip128.png
Binary files 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
--- /dev/null
+++ b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip16.png
Binary files 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
--- /dev/null
+++ b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip24.png
Binary files 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
--- /dev/null
+++ b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip32.png
Binary files 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
--- /dev/null
+++ b/BKULocal/src/main/resources/at/gv/egiz/bku/gui/chip48.png
Binary files 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 @@
<parent>
<artifactId>bku</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUOnline</artifactId>
<packaging>war</packaging>
<name>BKU Online</name>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<pluginRepositories>
<pluginRepository>
@@ -22,14 +22,18 @@
<dependencies>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>bkucommon</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUViewer</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<artifactId>BKUCertificates</artifactId>
@@ -63,13 +67,13 @@
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>STALService</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>STALService</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<!--
| TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -78,7 +82,7 @@
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>STALXService</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<!--
| see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -115,13 +119,13 @@
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUApplet</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUAppletExt</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -132,9 +136,9 @@
</dependencies>
<scm>
- <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</developerConnection>
- <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</connection>
- <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk/BKUOnline</url>
+ <developerConnection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKUOnline</developerConnection>
+ <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKUOnline</connection>
+ <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7/BKUOnline</url>
</scm>
<build>
<plugins>
@@ -255,21 +259,17 @@
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
<executions>
<execution>
- <phase>process-resources</phase>
+ <id>copy-webstart</id>
<goals>
- <goal>unpack</goal>
+ <goal>unpack-dependencies</goal>
</goals>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>at.gv.egiz</groupId>
- <artifactId>BKUWebStartPackage</artifactId>
- <type>zip</type>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
+ <includeGroupIds>at.gv.egiz</includeGroupIds>
+ <includeArtifactIds>BKUWebStart</includeArtifactIds>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}/webstart</outputDirectory>
</configuration>
</execution>
</executions>
@@ -279,19 +279,19 @@
<dependencies>
<!-- not yet available in IBIBLIO, install locally
| NOT REQUIRED FOR BASIC DOWNLOAD PROTOCOL
- |-->
+ |
<dependency>
<groupId>org.codehaus.mojo.webstart</groupId>
<artifactId>webstart-jnlp-servlet</artifactId>
<version>1.0-6.0.02_ea_b02.1-SNAPSHOT</version>
- </dependency>
+ </dependency-->
<!-- dependency to ensure BKUWebStart is build prior to BKUOnline;
| transitive dependencies shall not be included in WEB-INF/lib
| and are provided in the BKUWebStart zip
| (version defined in super-pom dependencyManagement, version won't be adjusted by release:prepare) -->
<dependency>
<groupId>at.gv.egiz</groupId>
- <artifactId>BKUWebStartPackage</artifactId>
+ <artifactId>BKUWebStart</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<type>zip</type>
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 @@
<servlet-name>BKUApplet</servlet-name>
<jsp-file>/applet.jsp</jsp-file>
</servlet>
- <servlet>
- <servlet-name>STALService</servlet-name>
- <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
+ <servlet>
+ <servlet-name>STALService</servlet-name>
+ <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
<servlet-mapping>
<servlet-name>BKUServlet</servlet-name>
<url-pattern>/http-security-layer-request</url-pattern>
@@ -112,14 +112,14 @@
<servlet-name>JnlpDownloadServlet</servlet-name>
<url-pattern>/webstart/*</url-pattern>
</servlet-mapping>
- -->
+ -->
<!-- End BKU Web Start Config -->
- <servlet-mapping>
- <servlet-name>STALService</servlet-name>
- <url-pattern>/stal</url-pattern>
- </servlet-mapping>
- <session-config>
+ <servlet-mapping>
+ <servlet-name>STALService</servlet-name>
+ <url-pattern>/stal</url-pattern>
+ </servlet-mapping>
+ <session-config>
<session-timeout>5</session-timeout>
</session-config>
<welcome-file-list>
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 @@
<parent>
<artifactId>bku</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUViewer</artifactId>
<name>BKU Viewer</name>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<description />
<dependencies>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>bkucommon</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
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 @@
<parent>
<artifactId>bku</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUWebStart</artifactId>
<packaging>jar</packaging>
<name>BKU Web Start</name>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<url>http://mocca.egovlabs.gv.at/</url>
<description>Bürgerkartenumgebung</description>
@@ -122,7 +122,55 @@
</plugins>
</build>
</profile>
-
+
+ <profile>
+ <id>pkcs11-sign</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>webstart-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo.webstart</groupId>
+ <!-- use pkcs11-patched webstart-maven-plugin-->
+ <version>1.0-beta-1-mocca</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jnlp-inline</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludeTransitive>false</excludeTransitive>
+ <jnlp>
+ <inputTemplateResourcePath>${project.basedir}/src/main/jnlp</inputTemplateResourcePath>
+ <inputTemplate>template-unstable.xml</inputTemplate>
+ <outputFile>mocca.jnlp</outputFile>
+ <mainClass>at.gv.egiz.bku.webstart.Launcher</mainClass>
+ </jnlp>
+ <sign>
+ <keystore>NONE</keystore>
+ <storetype>PKCS11</storetype>
+ <providerClass>iaik.pkcs.pkcs11.provider.IAIKPkcs11</providerClass>
+ <alias>a-sit</alias>
+ <storepass>${pkcs11-pass}</storepass>
+ <verify>true</verify>
+ <keystoreConfig>
+ <delete>false</delete>
+ <gen>false</gen>
+ </keystoreConfig>
+ </sign>
+ <pack200>false</pack200>
+ <gzip>false</gzip>
+ <outputJarVersions>false</outputJarVersions>
+ <unsignAlreadySignedJars>true</unsignAlreadySignedJars>
+ <verbose>true</verbose>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<profile>
<id>non-webstart</id>
<build>
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 @@
<jnlp spec="$jnlpspec" codebase="file:${project.build.directory}/jnlp" href="$outputFile">
<information>
- <title>${project.Description}</title>
+ <title>MOCCA Developement</title>
<vendor>E-Government Innovationszentrum (EGIZ)</vendor>
<homepage href="${project.Url}"/>
- <description>${project.Description} (BKU) MOCCA Web Start</description>
+ <description>${project.Description} (BKU) MOCCA Web Start - Developement Version</description>
<description kind="short">${project.Description}</description>
<icon kind="shortcut" href="img/chip16.png" width="16" height="16"/>
<icon kind="shortcut" href="img/chip24.png" width="24" height="24"/>
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ | To strip versions from jar filenames do
+ | for JAR in *jar; do mv JAR {JAR/-[0-9]*/.jar}; done
+ |-->
+<jnlp spec="$jnlpspec" codebase="http://localhost/webstart/" context="http://localhost/" href="$outputFile">
+
+ <information>
+ <title>MOCCA Unstable</title>
+ <vendor>E-Government Innovationszentrum (EGIZ)</vendor>
+ <homepage href="${project.Url}"/>
+ <description>${project.Description} (BKU) MOCCA Web Start - Unstable Build</description>
+ <description kind="short">${project.Description}</description>
+ <icon kind="shortcut" href="img/chip16.png" width="16" height="16"/>
+ <icon kind="shortcut" href="img/chip24.png" width="24" height="24"/>
+ <icon kind="shortcut" href="img/chip32.png" width="32" height="32"/>
+ <icon kind="shortcut" href="img/chip48.png" width="48" height="48"/>
+ <icon kind="default" href="img/chip16.png" width="16" height="16"/>
+ <icon kind="default" href="img/chip24.png" width="24" height="24"/>
+ <icon kind="default" href="img/chip32.png" width="32" height="32"/>
+ <icon kind="default" href="img/chip48.png" width="48" height="48"/>
+ <icon kind="splash" href="img/splash.png"/>
+ <shortcut online="true">
+ <desktop/>
+ <menu submenu="e-Government"/>
+ </shortcut>
+
+ <offline-allowed/>
+
+ </information>
+
+ <security>
+ <all-permissions/>
+ </security>
+
+ <update check="timeout" policy="prompt-update"/>
+
+ <resources os="Mac OS X">
+ <java version="1.6+" java-vm-args="-d32"/>
+ $dependencies
+ </resources>
+
+ <resources>
+ <java version="1.6+"/>
+ $dependencies
+ </resources>
+
+ <application-desc main-class="$mainClass"/>
+</jnlp> \ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ | To strip versions from jar filenames do
+ | for JAR in *jar; do mv JAR {JAR/-[0-9]*/.jar}; done
+ |-->
+<jnlp spec="$jnlpspec" codebase="http://localhost/webstart/" context="http://localhost/" href="$outputFile">
+
+ <information>
+ <title>${project.Description}</title>
+ <vendor>E-Government Innovationszentrum (EGIZ)</vendor>
+ <homepage href="${project.Url}"/>
+ <description>${project.Description} (BKU) MOCCA Web Start</description>
+ <description kind="short">${project.Description}</description>
+ <icon kind="shortcut" href="img/chip16.png" width="16" height="16"/>
+ <icon kind="shortcut" href="img/chip24.png" width="24" height="24"/>
+ <icon kind="shortcut" href="img/chip32.png" width="32" height="32"/>
+ <icon kind="shortcut" href="img/chip48.png" width="48" height="48"/>
+ <icon kind="default" href="img/chip16.png" width="16" height="16"/>
+ <icon kind="default" href="img/chip24.png" width="24" height="24"/>
+ <icon kind="default" href="img/chip32.png" width="32" height="32"/>
+ <icon kind="default" href="img/chip48.png" width="48" height="48"/>
+ <icon kind="splash" href="img/splash.png"/>
+ <shortcut online="true">
+ <desktop/>
+ <menu submenu="e-Government"/>
+ </shortcut>
+
+ <offline-allowed/>
+
+ </information>
+
+ <security>
+ <all-permissions/>
+ </security>
+
+ <update check="timeout" policy="prompt-update"/>
+
+ <resources os="Mac OS X">
+ <java version="1.6+" java-vm-args="-d32"/>
+ $dependencies
+ </resources>
+
+ <resources>
+ <java version="1.6+"/>
+ $dependencies
+ </resources>
+
+ <application-desc main-class="$mainClass"/>
+</jnlp> \ 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 @@
<parent>
<artifactId>bku</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>at.gv.egiz</groupId>
<artifactId>STAL</artifactId>
<name>STAL</name>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<dependencies>
<dependency>
<groupId>commons-logging</groupId>
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 @@
<parent>
<artifactId>bku</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>at.gv.egiz</groupId>
<artifactId>STALExt</artifactId>
<name>STAL Extension</name>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<description />
<dependencies>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>STAL</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
</dependencies>
</project> \ 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 @@
<parent>
<artifactId>bku</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>at.gv.egiz</groupId>
<artifactId>STALService</artifactId>
<name>STAL Service</name>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<description />
<dependencies>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>STAL</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<!--dependency>
<groupId>at.gv.egiz</groupId>
diff --git a/STALXService/pom.xml b/STALXService/pom.xml
index 90d5e048..7a9b0891 100644
--- a/STALXService/pom.xml
+++ b/STALXService/pom.xml
@@ -2,24 +2,24 @@
<parent>
<artifactId>bku</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>at.gv.egiz</groupId>
<artifactId>STALXService</artifactId>
<name>STAL-X Service</name>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<artifactId>STALService</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<artifactId>STALExt</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
</dependencies>
</project> \ No newline at end of file
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 240d0a42..76d6339a 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>bku</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>at.gv.egiz</groupId>
<artifactId>bkucommon</artifactId>
<name>BKU Common</name>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<build>
<plugins>
@@ -49,12 +49,12 @@
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>utils</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>STALExt</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
diff --git a/pom.xml b/pom.xml
index cb34ed41..012cbcb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<groupId>at.gv.egiz</groupId>
<artifactId>bku</artifactId>
<packaging>pom</packaging>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<name>BKU</name>
<url>http://bku.egiz.gv.at</url>
<modules>
@@ -27,7 +27,7 @@
<module>BKUHelp</module>
<module>BKUGuiExt</module>
<module>smccSTALExt</module>
-<!-- <module>BKUWebStartPackage</module>-->
+ <!--module>BKUWebStartPackage</module-->
</modules>
<developers>
<developer>
@@ -47,9 +47,9 @@
</developer>
</developers>
<scm>
- <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</connection>
- <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/trunk</developerConnection>
- <url>svn://svn.egovlabs.gv.at/svnroot/mocca/trunk</url>
+ <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7</connection>
+ <developerConnection>scm:svn:svn+ssh://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7</developerConnection>
+ <url>svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.2.7</url>
</scm>
<organization>
<name>E-Government Innovation Center (EGIZ)</name>
@@ -244,7 +244,7 @@
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUWebStart</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<type>zip</type>
</dependency>
</dependencies>
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 @@
<parent>
<artifactId>bku</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>at.gv.egiz</groupId>
<artifactId>smcc</artifactId>
<name>smcc</name>
<packaging>jar</packaging>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<url>http://bku.egiz.gv.at</url>
<build>
<plugins>
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 @@
<parent>
<artifactId>bku</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>at.gv.egiz</groupId>
<artifactId>smccSTAL</artifactId>
<name>smcc STAL</name>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<build>
<plugins>
<plugin>
@@ -24,17 +24,17 @@
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>STAL</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>smcc</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUCommonGUI</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>iaik</groupId>
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 @@
<parent>
<artifactId>bku</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</parent>
<groupId>at.gv.egiz</groupId>
<artifactId>smccSTALExt</artifactId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<name>smcc STAL Extension</name>
<dependencies>
<dependency>
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.
+
+ <Italic> font. <<Bold>> font. <<<Monospaced>>> 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="MOCCA">
+ <publishDate position="right"/>
+ <bannerLeft>
+ <name>MOCCA</name>
+ <src>http://mocca.egovlabs.gv.at/mocca-t_s.png</src>
+ <href>http://mocca.egovlabs.gv.at/</href>
+ </bannerLeft>
+
+ <body>
+ <links>
+ <item name="Apache" href="http://www.apache.org/" />
+ <item name="Maven 1.x" href="http://maven.apache.org/maven-1.x/"/>
+ <item name="Maven 2" href="http://maven.apache.org/"/>
+ </links>
+
+ <menu name="MOCCA">
+ <item name="Introduction" href="index.html"/>
+ <item name="Download" href="download.html"/>
+ <item name="Release Notes" href="release-notes.html" />
+ <item name="General Information" href="about.html"/>
+ <item name="Road Map" href="roadmap.html" />
+ </menu>
+
+ <menu ref="reports"/>
+
+ </body>
+
+</project> \ 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 @@
<parent>
<artifactId>bku</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>at.gv.egiz</groupId>
<artifactId>utils</artifactId>
<name>BKU Utils</name>
<packaging>jar</packaging>
- <version>1.2.7-SNAPSHOT</version>
+ <version>1.2.7</version>
<url>http://bku.egiz.gv.at</url>
<build>
<plugins>