summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BKUOnline/pom.xml26
-rw-r--r--BKUOnline/src/main/webapp/WEB-INF/web.xml22
-rw-r--r--BKUWebStart/pom.xml50
-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--pom.xml2
7 files changed, 174 insertions, 28 deletions
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index ed7f7d50..c42ae981 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -22,6 +22,10 @@
<dependencies>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>bkucommon</artifactId>
<version>1.2.7-SNAPSHOT</version>
@@ -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/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index f51f1332..b4f910f9 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -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/pom.xml b/pom.xml
index 0b650a8e..19818054 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<module>BKUHelp</module>
<module>BKUGuiExt</module>
<module>smccSTALExt</module>
- <module>BKUWebStartPackage</module>
+ <!--module>BKUWebStartPackage</module-->
</modules>
<developers>
<developer>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 21:47:59 +0000