BKU Web Start

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

2 files changed, 102 insertions, 71 deletions

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>