Merged feature branch mocca-1.2.13-id@r724 back to trunk.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@725 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

14 files changed, 0 insertions, 350 deletions

diff --git a/BKUWebStartPackage/nbactions.xml b/BKUWebStartPackage/nbactions.xml
deleted file mode 100644
index b3a586c0..00000000
--- a/BKUWebStartPackage/nbactions.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actions>
-        <action>
-            <actionName>CUSTOM-assembly</actionName>
-            <displayName>assembly</displayName>
-            <goals>
-                <goal>assembly:assembly</goal>
-            </goals>
-        </action>
-    </actions>
diff --git a/BKUWebStartPackage/pom.xml b/BKUWebStartPackage/pom.xml
deleted file mode 100644
index 0b226785..00000000
--- a/BKUWebStartPackage/pom.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>bku</artifactId>
-    <groupId>at.gv.egiz</groupId>
-    <version>1.2.7-SNAPSHOT</version>
-  </parent>
-  <groupId>at.gv.egiz</groupId>
-  <artifactId>BKUWebStartPackage</artifactId>
-  <version>1.2.7-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>BKU Web Start Package</name>
-  <description>Bürgerkartenumgebung</description>
-  <url>http://mocca.egovlabs.gv.at/</url>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>webstart-maven-plugin</artifactId>
-        <groupId>org.codehaus.mojo.webstart</groupId>
-        <executions>
-          <execution>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>jnlp-single</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <outputDirectoryName>webstart</outputDirectoryName>
-
-          <excludeTransitive>false</excludeTransitive>
-
-          <jnlpFiles>
-            <jnlpFile>
-              <templateFilename>template.xml</templateFilename>
-              <outputFilename>mocca.jnlp</outputFilename>
-              <jarResources>
-                <jarResource>
-                  <groupId>at.gv.egiz</groupId>
-                  <artifactId>BKUWebStart</artifactId>
-                  <version>${project.version}</version>
-                  <mainClass>at.gv.egiz.bku.webstart.Launcher</mainClass>
-                </jarResource>
-              </jarResources>
-            </jnlpFile>
-          </jnlpFiles>
-
-          <sign>
-            <alias>test-applet signer</alias>
-            <keystore>${project.basedir}/src/main/jnlp/keystore.ks</keystore>
-            <storepass>storepass</storepass>
-            <keypass>keypass</keypass>
-            <verify>true</verify>
-            <keystoreConfig>
-              <delete>false</delete>
-              <gen>false</gen>
-            </keystoreConfig>
-          </sign>
-
-          <unsign>true</unsign>
-          <verifyjar>false</verifyjar>
-
-          <pack200>false</pack200>
-          <gzip>false</gzip>
-          <outputJarVersions>false</outputJarVersions>
-          <verbose>true</verbose>
-
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <descriptors>
-            <descriptor>${basedir}/src/main/assemblies/zip-webstart.xml</descriptor>
-          </descriptors>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <artifactId>BKUWebStart</artifactId>
-      <groupId>at.gv.egiz</groupId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-
-  <profiles>
-    <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>
-            <configuration>
-              <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>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <!-- development profile -->
-      <id>local-webstart</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>webstart-maven-plugin</artifactId>
-            <groupId>org.codehaus.mojo.webstart</groupId>
-            <configuration>
-              <jnlpFiles>
-                <jnlpFile>
-                  <templateFilename>template-local.xml</templateFilename>
-                  <outputFilename>mocca-local.jnlp</outputFilename>
-                  <jarResources>
-                    <jarResource>
-                      <groupId>at.gv.egiz</groupId>
-                      <artifactId>BKUWebStart</artifactId>
-                      <version>${project.version}</version>
-                      <mainClass>at.gv.egiz.bku.webstart.Launcher</mainClass>
-                    </jarResource>
-                  </jarResources>
-                </jnlpFile>
-              </jnlpFiles>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    
-  </profiles>
-</project>
\ No newline at end of file
diff --git a/BKUWebStartPackage/src/main/assemblies/zip-webstart.xml b/BKUWebStartPackage/src/main/assemblies/zip-webstart.xml
deleted file mode 100644
index fa39bdf0..00000000
--- a/BKUWebStartPackage/src/main/assemblies/zip-webstart.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2008 Federal Chancellery Austria and
-  Graz University of Technology
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<assembly>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/${project.build.finalName}/</directory>
-      <includes>
-        <include>webstart/**</include>
-      </includes>
-      <outputDirectory>/</outputDirectory>
-    </fileSet>
-  </fileSets>
-</assembly>
-
-
diff --git a/BKUWebStartPackage/src/main/jnlp/keystore.ks b/BKUWebStartPackage/src/main/jnlp/keystore.ks
deleted file mode 100644
index 824c3a40..00000000
--- a/BKUWebStartPackage/src/main/jnlp/keystore.ks
+++ /dev/null
diff --git a/BKUWebStartPackage/src/main/jnlp/resources/img/chip128.png b/BKUWebStartPackage/src/main/jnlp/resources/img/chip128.png
deleted file mode 100644
index c36d8079..00000000
--- a/BKUWebStartPackage/src/main/jnlp/resources/img/chip128.png
+++ /dev/null
diff --git a/BKUWebStartPackage/src/main/jnlp/resources/img/chip16.png b/BKUWebStartPackage/src/main/jnlp/resources/img/chip16.png
deleted file mode 100644
index 96b580e9..00000000
--- a/BKUWebStartPackage/src/main/jnlp/resources/img/chip16.png
+++ /dev/null
diff --git a/BKUWebStartPackage/src/main/jnlp/resources/img/chip24.png b/BKUWebStartPackage/src/main/jnlp/resources/img/chip24.png
deleted file mode 100644
index efd6dbeb..00000000
--- a/BKUWebStartPackage/src/main/jnlp/resources/img/chip24.png
+++ /dev/null
diff --git a/BKUWebStartPackage/src/main/jnlp/resources/img/chip32.png b/BKUWebStartPackage/src/main/jnlp/resources/img/chip32.png
deleted file mode 100644
index e7efb020..00000000
--- a/BKUWebStartPackage/src/main/jnlp/resources/img/chip32.png
+++ /dev/null
diff --git a/BKUWebStartPackage/src/main/jnlp/resources/img/chip48.png b/BKUWebStartPackage/src/main/jnlp/resources/img/chip48.png
deleted file mode 100644
index 491fbcac..00000000
--- a/BKUWebStartPackage/src/main/jnlp/resources/img/chip48.png
+++ /dev/null
diff --git a/BKUWebStartPackage/src/main/jnlp/resources/img/splash.png b/BKUWebStartPackage/src/main/jnlp/resources/img/splash.png
deleted file mode 100644
index 597fbc60..00000000
--- a/BKUWebStartPackage/src/main/jnlp/resources/img/splash.png
+++ /dev/null
diff --git a/BKUWebStartPackage/src/main/jnlp/resources/img/version.xml b/BKUWebStartPackage/src/main/jnlp/resources/img/version.xml
deleted file mode 100644
index 5e160beb..00000000
--- a/BKUWebStartPackage/src/main/jnlp/resources/img/version.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jnlp-versions>
-  <resource>
-    <pattern>
-      <name>chip16.png</name>
-      <version-id>2.0</version-id>
-    </pattern>
-    <file>chip16.png</file>
-  </resource>
-  <resource>
-    <pattern>
-      <name>chip24.png</name>
-      <version-id>2.0</version-id>
-    </pattern>
-    <file>chip24.png</file>
-  </resource>
-  <resource>
-    <pattern>
-      <name>chip32.png</name>
-      <version-id>2.0</version-id>
-    </pattern>
-    <file>chip32.png</file>
-  </resource>
-  <resource>
-    <pattern>
-      <name>chip48.png</name>
-      <version-id>2.0</version-id>
-    </pattern>
-    <file>chip48.png</file>
-  </resource>
-  <resource>
-    <pattern>
-      <name>chip64.png</name>
-      <version-id>2.0</version-id>
-    </pattern>
-    <file>chip64.png</file>
-  </resource>
-  <resource>
-    <pattern>
-      <name>chip128.png</name>
-      <version-id>2.0</version-id>
-    </pattern>
-    <file>chip128.png</file>
-  </resource>
-  <resource>
-    <pattern>
-      <name>splash.png</name>
-      <version-id>2.0</version-id>
-    </pattern>
-    <file>splash.png</file>
-  </resource>
-</jnlp-versions>
diff --git a/BKUWebStartPackage/src/main/jnlp/resources/player.jnlp b/BKUWebStartPackage/src/main/jnlp/resources/player.jnlp
deleted file mode 100644
index da08ebc2..00000000
--- a/BKUWebStartPackage/src/main/jnlp/resources/player.jnlp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Jump specific JNL file for launching the player -->
-<player/>
\ No newline at end of file
diff --git a/BKUWebStartPackage/src/main/jnlp/template-local.xml b/BKUWebStartPackage/src/main/jnlp/template-local.xml
deleted file mode 100644
index d17c2782..00000000
--- a/BKUWebStartPackage/src/main/jnlp/template-local.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp spec="$jnlpspec" codebase="file:/home/clemens/workspace/bku/BKUWebStart/target/jnlp" 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>
-    <java version="1.6+" java-vm-args="-Djava.security.debug=access,failure"/>
-    <property name="jnlp.versionEnabled" value="false"/>
-     $dependencies
-  </resources>
-
-  <application-desc main-class="$mainClass"/>
-</jnlp>
\ No newline at end of file
diff --git a/BKUWebStartPackage/src/main/jnlp/template.xml b/BKUWebStartPackage/src/main/jnlp/template.xml
deleted file mode 100644
index 06b024ec..00000000
--- a/BKUWebStartPackage/src/main/jnlp/template.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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="$$codebase" context="$$context" href="$$name">
-
-  <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