summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BKUApplet/pom.xml18
-rw-r--r--BKUAppletExt/pom.xml290
-rw-r--r--BKUOnline/pom.xml2
-rw-r--r--BKUOnline/src/main/webapp/PINManagement.jsp2
-rw-r--r--BKUOnline/src/main/webapp/applet.jsp6
5 files changed, 204 insertions, 114 deletions
diff --git a/BKUApplet/pom.xml b/BKUApplet/pom.xml
index 7ef41053..35044a2b 100644
--- a/BKUApplet/pom.xml
+++ b/BKUApplet/pom.xml
@@ -30,6 +30,7 @@
<option>-keep public class * extends java.applet.Applet { *; }</option>
<option>-keep @javax.xml.bind.annotation.** class * { *; }</option>
<option>-ignorewarnings</option>
+ <option>-printusage ${project.build.directory}/proguard_usage.txt</option>
<option>-dontoptimize</option>
<option>-dontpreverify</option>
<option>-target 1.6</option>
@@ -39,8 +40,15 @@
<lib>${java.home}/lib/jce.jar</lib>
<lib>${java.home}/lib/jsse.jar</lib>
</libs>
+ <attach>true</attach>
+ <appendClassifier>true</appendClassifier>
+ <attachArtifactClassifier>single</attachArtifactClassifier>
<assembly>
<inclusions>
+ <inclusion>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_jce_me4se</artifactId>
+ </inclusion>
<inclusion>
<groupId>at.gv.egiz</groupId>
<artifactId>smcc</artifactId>
@@ -97,6 +105,9 @@
<goals>
<goal>sign</goal>
</goals>
+ <configuration>
+ <jarPath>${project.build.directory}/${project.build.finalName}-single.${project.packaging}</jarPath>
+ </configuration>
</execution>
</executions>
<configuration>
@@ -113,19 +124,12 @@
</archive>
<alias>test-applet signer</alias>
<keystore>./keystore.ks</keystore>
- <!-- attention: configuration inherited by pkcs11-sign, uncomment!
- (removed in maven-jar-pluging-2.2-mocca) -->
<storepass>storepass</storepass>
<keypass>keypass</keypass>
<verify>true</verify>
</configuration>
</plugin>
-
</plugins>
- <pluginManagement>
- <plugins>
- </plugins>
- </pluginManagement>
</build>
<profiles>
<profile>
diff --git a/BKUAppletExt/pom.xml b/BKUAppletExt/pom.xml
index a5faf88e..8b20e518 100644
--- a/BKUAppletExt/pom.xml
+++ b/BKUAppletExt/pom.xml
@@ -10,6 +10,192 @@
<name>BKU Applet Ext</name>
<version>1.3.0-RC2-SNAPSHOT</version>
<description>Card management extension for Java Applet used by MOCCA Online</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.pyx4me</groupId>
+ <artifactId>proguard-maven-plugin</artifactId>
+ <version>2.0.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>proguard</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <obfuscate>false</obfuscate>
+ <options>
+ <option>-keep public class * extends at.gv.egiz.smcc.SignatureCard { *; }</option>
+ <option>-keep public class * extends java.applet.Applet { *; }</option>
+ <option>-keep @javax.xml.bind.annotation.** class * { *; }</option>
+ <option>-ignorewarnings</option>
+ <option>-printusage ${project.build.directory}/proguard_usage.txt</option>
+ <option>-dontoptimize</option>
+ <option>-dontpreverify</option>
+ <option>-target 1.6</option>
+ </options>
+ <libs>
+ <lib>${java.home}/lib/rt.jar</lib>
+ <lib>${java.home}/lib/jce.jar</lib>
+ <lib>${java.home}/lib/jsse.jar</lib>
+ </libs>
+ <attach>true</attach>
+ <appendClassifier>true</appendClassifier>
+ <attachArtifactClassifier>single</attachArtifactClassifier>
+ <assembly>
+ <inclusions>
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>BKUApplet</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>iaik</groupId>
+ <artifactId>iaik_jce_me4se</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>smcc</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STAL</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STALService</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>smccSTAL</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>BKUCommonGUI</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </inclusion>
+ <!-- card management extensions -->
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STALExt</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>STALXService</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>smccSTALExt</artifactId>
+ </inclusion>
+ <inclusion>
+ <groupId>at.gv.egiz</groupId>
+ <artifactId>BKUGuiExt</artifactId>
+ </inclusion>
+ </inclusions>
+ </assembly>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>maven-buildnumber-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <configuration>
+ <jarPath>${project.build.directory}/${project.build.finalName}-single.${project.packaging}</jarPath>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ <index>false</index>
+ <manifest>
+ <addClasspath>false</addClasspath>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-Build>${project.version}-r${buildNumber}</Implementation-Build>
+ </manifestEntries>
+ </archive>
+ <alias>test-applet signer</alias>
+ <keystore>./keystore.ks</keystore>
+ <storepass>storepass</storepass>
+ <keypass>keypass</keypass>
+ <verify>true</verify>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>proguard-osx</id>
+ <activation>
+ <os>
+ <family>mac</family>
+ </os>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.pyx4me</groupId>
+ <artifactId>proguard-maven-plugin</artifactId>
+ <configuration>
+ <libs>
+ <lib>${java.home}/../Classes/classes.jar</lib>
+ <lib>${java.home}/lib/jce.jar</lib>
+ <lib>${java.home}/../Classes/jsse.jar</lib>
+ </libs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>pkcs11-sign</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <version>2.2-mocca</version>
+ <configuration>
+ <keystore>NONE</keystore>
+ <type>PKCS11</type>
+ <providerClass>iaik.pkcs.pkcs11.provider.IAIKPkcs11</providerClass>
+ <alias>a-sit</alias>
+ <storepass>${pkcs11-pass}</storepass>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<dependencies>
<dependency>
<groupId>at.gv.egiz</groupId>
@@ -55,110 +241,8 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
- <scope>runtime</scope>
+ <scope>compile</scope>
<optional>true</optional>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>maven-buildnumber-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>create</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
- <executions>
- <execution>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <archive>
- <addMavenDescriptor>false</addMavenDescriptor>
- <index>false</index>
- <manifest>
- <addClasspath>false</addClasspath>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-Build>${project.version}-r${buildNumber}</Implementation-Build>
- </manifestEntries>
- </archive>
- <alias>test-applet signer</alias>
- <keystore>./keystore.ks</keystore>
- <storepass>storepass</storepass>
- <keypass>keypass</keypass>
- <verify>true</verify>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
- <includeScope>runtime</includeScope>
- <excludeTransitive>false</excludeTransitive>
- <outputDirectory>${project.build.outputDirectory}</outputDirectory>
- <excludes>META-INF\/</excludes>
- </configuration>
- </execution>
- <execution>
- <!-- appletviewer target/test-classes/appletTest.html
- | commons-logging and iaik_jce_me4se are transitive dependencies
- |-->
- <id>copy_testapplet</id>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
- <includeGroupIds>commons-logging,iaik</includeGroupIds>
- <includeArtifactIds>commons-logging,iaik_jce_me4se</includeArtifactIds>
- <stripVersion>true</stripVersion>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>pkcs11-sign</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <groupId>org.apache.maven.plugins</groupId>
- <version>2.2-mocca</version>
- <configuration>
- <keystore>NONE</keystore>
- <type>PKCS11</type>
- <providerClass>iaik.pkcs.pkcs11.provider.IAIKPkcs11</providerClass>
- <alias>a-sit</alias>
- <storepass>${pkcs11-pass}</storepass>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project> \ No newline at end of file
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 9c2677ab..bd2cb67b 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -137,12 +137,14 @@
<groupId>at.gv.egiz</groupId>
<artifactId>BKUApplet</artifactId>
<version>${project.parent.version}</version>
+ <classifier>single</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>at.gv.egiz</groupId>
<artifactId>BKUAppletExt</artifactId>
<version>${project.parent.version}</version>
+ <classifier>single</classifier>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/BKUOnline/src/main/webapp/PINManagement.jsp b/BKUOnline/src/main/webapp/PINManagement.jsp
index d5f71862..cfb43db2 100644
--- a/BKUOnline/src/main/webapp/PINManagement.jsp
+++ b/BKUOnline/src/main/webapp/PINManagement.jsp
@@ -94,7 +94,7 @@
var attributes = {
codebase :'applet',
code : 'at.gv.egiz.bku.online.applet.PINManagementApplet.class',
- archive : 'BKUAppletExt.jar, commons-logging.jar, iaik_jce_me4se.jar',
+ archive : 'BKUAppletExt-single.jar',
width : <%=width%>,
height :<%=height%>,
name : 'moccaapplet',
diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp
index 3b284496..c1624cdf 100644
--- a/BKUOnline/src/main/webapp/applet.jsp
+++ b/BKUOnline/src/main/webapp/applet.jsp
@@ -53,13 +53,13 @@
String extension = (String) session.getAttribute("appletExtension");
String appletClass, appletArchive;
if ("activation".equalsIgnoreCase(extension)) {
- appletArchive = "BKUAppletExt";
+ appletArchive = "BKUAppletExt-single";
appletClass = "at.gv.egiz.bku.online.applet.ActivationApplet.class";
} else if ("pin".equalsIgnoreCase(extension)) {
- appletArchive = "BKUAppletExt";
+ appletArchive = "BKUAppletExt-single";
appletClass = "at.gv.egiz.bku.online.applet.PINManagementApplet.class";
} else {
- appletArchive = "BKUApplet";
+ appletArchive = "BKUApplet-single";
appletClass = "at.gv.egiz.bku.online.applet.BKUApplet.class";
}