BKU Web Start

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

8 files changed, 185 insertions, 74 deletions

diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 9ac1dac7..bd46041f 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -56,7 +56,7 @@
             <version>1.1.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-		<dependency>
+        <dependency>
             <groupId>at.gv.egiz</groupId>
             <artifactId>STALService</artifactId>
             <version>1.1.2-SNAPSHOT</version>
@@ -146,7 +146,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
                 <version>2.0.2</version>
@@ -164,7 +164,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>maven-buildnumber-plugin</artifactId>
-                <version>0.9.6</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -215,6 +214,49 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+          <id>include-webstart</id>
+          <build>
+            <plugins>
+              <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                  <execution>
+                      <!--
+                          Copy the webstart bundle in as a resource
+                          before packaging starts.
+                      -->
+                      <phase>process-resources</phase>
+                      <goals>
+                          <goal>unpack</goal>
+                      </goals>
+                      <configuration>
+                          <artifactItems>
+                              <artifactItem>
+                                  <groupId>at.gv.egiz</groupId>
+                                  <artifactId>BKUWebStart</artifactId>
+                                  <version>1.0.3-SNAPSHOT</version>
+                                  <type>zip</type>
+                              </artifactItem>
+                          </artifactItems>
+                          <outputDirectory>${project.build.directory}/${project.build.finalName}/webstart</outputDirectory>
+                      </configuration>
+                  </execution>
+                </executions>
+              </plugin>
+            </plugins>
+          </build>
+
+          <dependencies>
+            <!-- not yet available in IBIBLIO, install locally -->
+            <dependency>
+              <groupId>com.sun.java.jnlp</groupId>
+              <artifactId>jnlp-servlet</artifactId>
+              <version>1.6.0.10</version>
+            </dependency>
+          </dependencies>
+          
+        </profile>
     </profiles>
     <properties>
         <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
diff --git a/BKUOnline/src/main/jnlp/resources/logo.png b/BKUOnline/src/main/jnlp/resources/logo.png
new file mode 100644
index 00000000..2c622d88
--- /dev/null
+++ b/BKUOnline/src/main/jnlp/resources/logo.png
diff --git a/BKUOnline/src/main/jnlp/resources/logo_64x64.png b/BKUOnline/src/main/jnlp/resources/logo_64x64.png
new file mode 100644
index 00000000..fa6d7f96
--- /dev/null
+++ b/BKUOnline/src/main/jnlp/resources/logo_64x64.png
diff --git a/BKUOnline/src/main/jnlp/resources/logo_90x90.png b/BKUOnline/src/main/jnlp/resources/logo_90x90.png
new file mode 100644
index 00000000..d7f8bbd0
--- /dev/null
+++ b/BKUOnline/src/main/jnlp/resources/logo_90x90.png
diff --git a/BKUOnline/src/main/jnlp/resources/splash.png b/BKUOnline/src/main/jnlp/resources/splash.png
new file mode 100644
index 00000000..72c1d868
--- /dev/null
+++ b/BKUOnline/src/main/jnlp/resources/splash.png
diff --git a/BKUOnline/src/main/jnlp/template.xml b/BKUOnline/src/main/jnlp/template.xml
new file mode 100644
index 00000000..c8291f61
--- /dev/null
+++ b/BKUOnline/src/main/jnlp/template.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<jnlp spec="$jnlpspec" codebase="$$codebase" context="$$context" href="$$name">
+  <information>
+    <title>$project.Name</title>
+    <vendor>$project.Organization.Name</vendor>
+    <homepage href="$project.Url"/>
+    <description>$project.Description</description>
+    <description kind="short">$project.Description</description>
+    <icon href="lib/logo.png" kind="default"/>
+    <icon href="lib/splash.png" kind="splash"/>
+    <shortcut online="false">
+      <desktop/>
+      <menu submenu="Bürgerkarte"/>
+    </shortcut>
+
+#if($offlineAllowed)
+    <offline-allowed/>
+#end
+
+  </information>
+
+
+#if($allPermissions)
+  <security>
+    <all-permissions/>
+  </security>
+#end
+
+  <resources>
+    <!-- initial-heap-size="32m" max-heap-size="128m" -->
+    <j2se version="$j2seVersion"/>
+    <property name="jnlp.versionEnabled" value="true"/>
+
+     $dependencies
+
+  </resources>
+  <application-desc main-class="$mainClass"/>
+</jnlp>
\ No newline at end of file
diff --git a/BKUOnline/src/main/webapp/WEB-INF/web.xml b/BKUOnline/src/main/webapp/WEB-INF/web.xml
index 46e69c4a..eda18378 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/web.xml
+++ b/BKUOnline/src/main/webapp/WEB-INF/web.xml
@@ -13,63 +13,63 @@
 		License.
 	-->
 <web-app id="bkuonline" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-	<display-name>http-security-layer-request</display-name>
+  <display-name>http-security-layer-request</display-name>
 
 	<!--  Begin Spring Config -->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/applicationContext.xml</param-value>
-	</context-param>
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
+  <context-param>
+    <param-name>contextConfigLocation</param-name>
+    <param-value>/WEB-INF/applicationContext.xml</param-value>
+  </context-param>
+  <listener>
+    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+  </listener>
 	<!--  End Spring Config -->
 
 	<!--  Begin BKU Config -->
-	<listener>
-		<listener-class>at.gv.egiz.bku.online.webapp.SessionTimeout</listener-class>
-	</listener>
-	<servlet>
-		<servlet-name>BKUServlet</servlet-name>
-		<servlet-class>at.gv.egiz.bku.online.webapp.BKURequestHandler</servlet-class>
-	</servlet>
-	<servlet>
-		<servlet-name>ResultServlet</servlet-name>
-		<servlet-class>at.gv.egiz.bku.online.webapp.ResultServlet</servlet-class>
-		<init-param>
-			<param-name>responseEncoding</param-name>
-			<param-value>UTF-8</param-value>
-		</init-param>
-		<init-param>
-			<param-name>expiredPage</param-name>
+  <listener>
+    <listener-class>at.gv.egiz.bku.online.webapp.SessionTimeout</listener-class>
+  </listener>
+  <servlet>
+    <servlet-name>BKUServlet</servlet-name>
+    <servlet-class>at.gv.egiz.bku.online.webapp.BKURequestHandler</servlet-class>
+  </servlet>
+  <servlet>
+    <servlet-name>ResultServlet</servlet-name>
+    <servlet-class>at.gv.egiz.bku.online.webapp.ResultServlet</servlet-class>
+    <init-param>
+      <param-name>responseEncoding</param-name>
+      <param-value>UTF-8</param-value>
+    </init-param>
+    <init-param>
+      <param-name>expiredPage</param-name>
 			<!-- FIXME -->
-			<param-value>expired.html</param-value>
-		</init-param>
-	</servlet>
-    <servlet>
-        <servlet-name>BKUApplet</servlet-name>
-        <jsp-file>/applet.jsp</jsp-file>
-    </servlet>
-    <servlet>
-      <servlet-name>help</servlet-name>
-      <jsp-file>/help.jsp</jsp-file>
-    </servlet>
-    <servlet-mapping>
-		<servlet-name>BKUServlet</servlet-name>
-		<url-pattern>/http-security-layer-request</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>BKUServlet</servlet-name>
-		<url-pattern>/https-security-layer-request</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>ResultServlet</servlet-name>
-		<url-pattern>/bkuResult</url-pattern>
-	</servlet-mapping>
-    <servlet-mapping>
-      <servlet-name>help</servlet-name>
-      <url-pattern>/help/*</url-pattern>
-    </servlet-mapping>
+      <param-value>expired.html</param-value>
+    </init-param>
+  </servlet>
+  <servlet>
+    <servlet-name>BKUApplet</servlet-name>
+    <jsp-file>/applet.jsp</jsp-file>
+  </servlet>
+  <servlet>
+    <servlet-name>help</servlet-name>
+    <jsp-file>/help.jsp</jsp-file>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>BKUServlet</servlet-name>
+    <url-pattern>/http-security-layer-request</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>BKUServlet</servlet-name>
+    <url-pattern>/https-security-layer-request</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>ResultServlet</servlet-name>
+    <url-pattern>/bkuResult</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>help</servlet-name>
+    <url-pattern>/help/*</url-pattern>
+  </servlet-mapping>
 
     <!--
      |  Configure alternative applet pages that may be requested
@@ -94,26 +94,48 @@
 	<!--  End BKU Config -->
 
 	<!--  Begin STAL Config -->
-	<listener>
-		<listener-class>
-			com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>
-	</listener>
-	<servlet>
-		<servlet-name>STALPort</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>STALPort</servlet-name>
-		<url-pattern>/stal</url-pattern>
-	</servlet-mapping>
+  <listener>
+    <listener-class>
+			com.sun.xml.ws.transport.http.servlet.WSServletContextListener
+    </listener-class>
+  </listener>
+  <servlet>
+    <servlet-name>STALPort</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>STALPort</servlet-name>
+    <url-pattern>/stal</url-pattern>
+  </servlet-mapping>
 	<!--  End STAL Config -->
 
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-	</welcome-file-list>
+  <!-- Begin BKU Web Start Config
+   |   (activate 'include-webstart' profile) -->
+  <!--servlet>
+    <servlet-name>JnlpDownloadServlet</servlet-name>
+    <servlet-class>jnlp.sample.servlet.JnlpDownloadServlet</servlet-class>
+    <init-param>
+      <param-name>logLevel</param-name>
+      <param-value>DEBUG</param-value>
+    </init-param>
+    <init-param>
+      <param-name>logPath</param-name>
+      <param-value>logs/jnlpdownloadservlet.log</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>JnlpDownloadServlet</servlet-name>
+    <url-pattern>/webstart/*</url-pattern>
+  </servlet-mapping-->
+  <!-- End BKU Web Start Config -->
+
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+    <welcome-file>index.jsp</welcome-file>
+  </welcome-file-list>
   <session-config>
-		<session-timeout>5</session-timeout>
-	</session-config>
+    <session-timeout>5</session-timeout>
+  </session-config>
 </web-app>
diff --git a/BKUOnline/src/main/webapp/index.html b/BKUOnline/src/main/webapp/index.html
index 653da5b1..b0e519a5 100644
--- a/BKUOnline/src/main/webapp/index.html
+++ b/BKUOnline/src/main/webapp/index.html
@@ -17,9 +17,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
     <head>
-        <title>BKU Online</title>
+        <title>MOCCA Online</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
         <style type="text/css" media="all">@import "css/main.css";</style>
+        <script src="http://java.com/js/deployJava.js"></script>
     </head>
     <body>
         <div id="animDiv" class="box">
@@ -30,6 +31,14 @@
                 <a href="PINManagement.jsp">PIN Management Applet</a>
                 <h1>STAL Service</h1>
                 <a href="stal">STAL Service Endpoint</a>
+                <!-- MOCCA Web Start 
+                 |   (activate 'include-webstart' profile)
+                <h1>MOCCA Web Start</h1>
+                <script>
+                    var url="webstart/mocca.jnlp"
+                    deployJava.createWebStartLaunchButton(url, "1.6")
+                </script>
+                 |-->
             </p>
         </div>
     </body>