[maven-release-plugin] copy for tag mocca-1.1.0mocca-1.1.0

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

4 files changed, 38 insertions, 20 deletions

diff --git a/BKUOnline/nbactions.xml b/BKUOnline/nbactions.xml
new file mode 100644
index 00000000..e09cc3da
--- /dev/null
+++ b/BKUOnline/nbactions.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+        <action>
+            <actionName>CUSTOM-Package_skipTest</actionName>
+            <displayName>Package_skipTest</displayName>
+            <goals>
+                <goal>package</goal>
+            </goals>
+            <properties>
+                <maven.test.skip>true</maven.test.skip>
+            </properties>
+        </action>
+    </actions>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index fc5f04fa..98090fcc 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>bku</artifactId>
         <groupId>at.gv.egiz</groupId>
-        <version>1.0.5-SNAPSHOT</version>
+        <version>1.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>at.gv.egiz</groupId>
     <artifactId>BKUOnline</artifactId>
     <packaging>war</packaging>
     <name>BKU Online</name>
-    <version>1.0.5-SNAPSHOT</version>
+    <version>1.1.0</version>
 
     <pluginRepositories>
         <pluginRepository>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>bkucommon</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
+            <version>1.1.0</version>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUViewer</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
+            <version>1.1.0</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
@@ -53,13 +53,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
+            <version>1.1.0</version>
             <scope>compile</scope>
         </dependency>
 		<dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
+            <version>1.1.0</version>
         </dependency>
         <!--
          |   TODO move at.buergerkarte.namespaces.cardchannel.service out from STALXService
@@ -68,7 +68,7 @@
         <dependency>
           <groupId>at.gv.egiz</groupId>
           <artifactId>STALXService</artifactId>
-          <version>1.0.2-SNAPSHOT</version>
+          <version>1.1.0</version>
         </dependency>
 		<!--
          | see https://wsit.dev.java.net/issues/show_bug.cgi?id=970
@@ -105,13 +105,13 @@
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUApplet</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
+            <version>1.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>BKUAppletExt</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -122,9 +122,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.1.0/BKUOnline</developerConnection>
+        <connection>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0/BKUOnline</connection>
+        <url>scm:svn:svn://svn.egovlabs.gv.at/svnroot/mocca/tags/mocca-1.1.0/BKUOnline</url>
     </scm>
     <build>
         <plugins>
diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/AppletDispatcher.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/AppletDispatcher.java
index 26349f7c..24938cd5 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/AppletDispatcher.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/AppletDispatcher.java
@@ -18,8 +18,6 @@
 package at.gv.egiz.bku.online.webapp;
 
 import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
@@ -55,14 +53,18 @@ public class AppletDispatcher extends HttpServlet {
     protected void processRequest(HttpServletRequest request, HttpServletResponse response)
     throws ServletException, IOException {
 
-//      String suffix = (String) request.getSession().getAttribute(RAND_CTX_ATTRIBUTE);
-//      log.trace("expecting random suffix " + suffix);
-      
       String uri = request.getRequestURI();
+//      log.trace("request URI " + uri);
+
+      uri = uri.substring(request.getContextPath().length());
+//      log.trace("removing contextPath " + uri);
+
       uri = ctxPattern.matcher(uri).replaceAll("");
-//      uri = uri.replaceAll(suffix, ""); //only the applet jar requests contains the randCtx
-      uri = archivePattern.matcher(uri).replaceAll(".jar");
+//      log.trace("removing dispatch context " + uri);
 
+      uri = archivePattern.matcher(uri).replaceAll(".jar");
+//      log.trace("removing random suffix " + uri);
+      
       if (log.isTraceEnabled()) {
         log.trace("dispatching request URI " + request.getRequestURI() +
                 " to " + uri);
diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp
index 6af81578..b2e54673 100644
--- a/BKUOnline/src/main/webapp/applet.jsp
+++ b/BKUOnline/src/main/webapp/applet.jsp
@@ -44,7 +44,6 @@
         String extension = (String) session.getAttribute("extension");
         String rand = AppletDispatcher.RAND_PREFIX +
                 RandomStringUtils.randomAlphanumeric(16);
-                //(String) session.getAttribute(AppletDispatcher.RAND_ATTRIBUTE);
 
         String appletClass, appletArchive;
         if ("activation".equals(extension)) {
@@ -64,6 +63,10 @@
                     document
                     .write('<b>Diese Anwendung benötigt die Java Platform Version 1.6.0_04 oder höher.</b>' + '<input type="submit" value="Java Platform 1.6.0_02 installieren" onclick="deployJava.installLatestJRE();">');
                 } else {
+                  // to enable applet caching, remove AppletDispatcher servlet,
+                  // change codebase to 'applet',
+                  // remove random suffix for appletArchive
+                  // and remove '../' for all URL applet parameters
                     var attributes = {
                       codebase :'<%="applet/" + AppletDispatcher.DISPATCH_CTX %>',
                       code : '<%=appletClass%>',