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

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

15 files changed, 195 insertions, 185 deletions

diff --git a/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml b/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
index 4069cdc9..321e1e98 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
@@ -18,15 +18,50 @@
 	<bean id="STALFactory" class="at.gv.egiz.stal.service.impl.RequestBrokerSTALFactory"

 		scope="singleton" />

 

-	<bean id="accessController" class="at.gv.egiz.bku.online.accesscontroller.SpringSecurityManager"

+	<bean id="accessController"

+		class="at.gv.egiz.bku.online.accesscontroller.SpringSecurityManager"

 		scope="singleton" init-method="init">

-		<property name="config" ref="configurator"/>

-		</bean>

+		<property name="config" ref="configurator" />

+	</bean>

 

 	<bean id="commandInvoker" class="at.gv.egiz.bku.binding.SLCommandInvokerImpl">

 		<property name="securityManager" ref="accessController" />

 	</bean>

 

+	<bean id="slCommandFactory" class="at.gv.egiz.bku.slcommands.SLCommandFactory"

+		factory-method="getInstance">

+		<property name="commandImpl">

+			<map>

+				<entry

+					key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:NullOperationRequest"

+					value="at.gv.egiz.bku.slcommands.impl.NullOperationCommandImpl" />

+				<entry

+					key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:InfoboxReadRequest"

+					value="at.gv.egiz.bku.slcommands.impl.InfoboxReadCommandImpl" />

+				<entry

+					key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:CreateXMLSignatureRequest"

+					value="at.gv.egiz.bku.slcommands.impl.CreateXMLSignatureCommandImpl" />

+			</map>

+		</property>

+	</bean>

+

+  <bean id="infoboxFactory" class="at.gv.egiz.bku.slcommands.impl.InfoboxFactory"

+    factory-method="getInstance">

+    <property name="infoboxImpl">

+      <map>

+        <entry

+          key="Certificates"

+          value="at.gv.egiz.bku.slcommands.impl.CertificatesInfoboxImpl" />

+        <entry

+          key="IdentityLink"

+          value="at.gv.egiz.bku.slcommands.impl.IdentityLinkInfoboxImpl" />

+<!--        <entry-->

+<!--          key="CardChannel"-->

+<!--          value="at.gv.egiz.bku.slcommands.impl.CardChannelInfoboxImpl" />-->

+      </map>

+    </property>

+  </bean>

+

 	<bean id="bindingProcessorManager" class="at.gv.egiz.bku.binding.BindingProcessorManagerImpl"

 		scope="singleton">

 		<constructor-arg ref="STALFactory"></constructor-arg>

@@ -46,16 +81,17 @@
 

 	<!-- Configure Configuration -->

 	<bean id="certValidator" class="at.gv.egiz.bku.conf.CertValidatorImpl"></bean>

-	

-	

+

+

 	<bean id="configurator" class="at.gv.egiz.bku.online.conf.SpringConfigurator"

-		 init-method="configure" scope="singleton">

-		<property name="resource" value="classpath:at/gv/egiz/bku/online/conf/defaultConf.properties"/>

+		init-method="configure" scope="singleton">

+		<property name="resource"

+			value="classpath:at/gv/egiz/bku/online/conf/defaultConf.properties" />

 		<property name="certValidator" ref="certValidator"></property>

 	</bean>

-	

+

 	<!-- Shutdown Event handler -->

-  <bean id="shutdown" class="at.gv.egiz.bku.online.webapp.ShutdownHandler">

-  <property name="bindingProcessorManager" ref="bindingProcessorManager"></property>

-  </bean>

+	<bean id="shutdown" class="at.gv.egiz.bku.online.webapp.ShutdownHandler">

+		<property name="bindingProcessorManager" ref="bindingProcessorManager"></property>

+	</bean>

 </beans>
\ 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 f6fdbefc..cc37b782 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/web.xml
+++ b/BKUOnline/src/main/webapp/WEB-INF/web.xml
@@ -48,10 +48,10 @@
 			<param-value>expired.html</param-value>
 		</init-param>
 	</servlet>
-	<servlet>
-		<servlet-name>HashDataInputServlet</servlet-name>
-		<servlet-class>at.gv.egiz.bku.online.webapp.HashDataInputServlet</servlet-class>
-	</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>
@@ -68,10 +68,6 @@
 		<servlet-name>ResultServlet</servlet-name>
 		<url-pattern>/bkuResult</url-pattern>
 	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>HashDataInputServlet</servlet-name>
-		<url-pattern>/hashDataInput</url-pattern>
-	</servlet-mapping>
     <servlet-mapping>
       <servlet-name>help</servlet-name>
       <url-pattern>/help/*</url-pattern>
diff --git a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.wsdl b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.wsdl
index 344e5ce2..9ef43f39 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.wsdl
+++ b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.wsdl
@@ -18,29 +18,37 @@
 <definitions name="stal" targetNamespace="http://www.egiz.gv.at/wsdl/stal"
     xmlns="http://schemas.xmlsoap.org/wsdl/"
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.egiz.gv.at/wsdl/stal" xmlns:ns="http://www.egiz.gv.at/stal" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:tns="http://www.egiz.gv.at/wsdl/stal"
+    xmlns:stal="http://www.egiz.gv.at/stal"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
     <types>
         <xsd:schema targetNamespace="http://www.egiz.gv.at/wsdl/stal">
-            <xsd:import namespace="http://www.egiz.gv.at/stal" schemaLocation="stal.xsd"/>
+            <xsd:import namespace="http://www.egiz.gv.at/stal" schemaLocation="stal-service.xsd"/>
+            <!--xsd:import namespace="http://www.egiz.gv.at/stal" schemaLocation="stal-extended.xsd"/-->
         </xsd:schema>
+        <!-- test 
+        <xsd:schema targetNamespace="http://www.egiz.gv.at/wsdl/stal-extended">
+            <xsd:import namespace="http://www.buergerkarte.at/cardchannel" schemaLocation="CardChannel.xsd"/>
+        </xsd:schema-->
     </types>
     <message name="ConnectRequest">
-        <part name="part1" element="ns:SessionId"/>
+        <part name="part1" element="stal:SessionId"/>
     </message>
     <message name="NextRequestRequest">
-        <part name="part1" element="ns:GetNextRequest"/>
+        <part name="part1" element="stal:GetNextRequest"/>
     </message>
     <message name="NextRequestResponse">
-        <part name="part1" element="ns:GetNextRequestResponse"/>
+        <part name="part1" element="stal:GetNextRequestResponse"/>
     </message>
     <message name="GetHashDataInputRequest">
-        <part name="part1" element="ns:GetHashDataInput"/>
+        <part name="part1" element="stal:GetHashDataInput"/>
     </message>
     <message name="GetHashDataInputResponse">
-        <part name="part1" element="ns:GetHashDataInputResponse"/>
+        <part name="part1" element="stal:GetHashDataInputResponse"/>
     </message>
     <message name="GetHashDataInputFault">
-        <part name="part1" element="ns:GetHashDataInputFault"/>
+        <part name="part1" element="stal:GetHashDataInputFault"/>
     </message>
     <portType name="STALPortType">
         <operation name="connect">
diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp
new file mode 100644
index 00000000..44d9347c
--- /dev/null
+++ b/BKUOnline/src/main/webapp/applet.jsp
@@ -0,0 +1,70 @@
+<!--
+  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.
+-->
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+         pageEncoding="UTF-8"%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>MOCCA Applet</title>
+        <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
+        <script type="text/javascript" src="js/deployJava.js"></script>
+        <style type="text/css" media="all">@import "css/login.css";</style>
+
+        <META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">
+        <META HTTP-EQUIV="EXPIRES" CONTENT="Mon, 22 Jul 2002 11:12:01 GMT">
+        <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">
+    </head>
+    <%
+        int width = session.getAttribute("appletWidth") == null ? 190
+                : (Integer) session.getAttribute("appletWidth"); //230 for workshop demo integration
+        int height = session.getAttribute("appletHeight") == null ? 130
+                : (Integer) session.getAttribute("appletHeight");
+        String backgroundImg = (String) session.getAttribute("appletBackground");
+        String guiStyle = (String) session.getAttribute("appletGuiStyle");
+        String locale = (String) session.getAttribute("locale");
+    %>
+    <body id="appletpage" style="width:<%=width%>">
+            <script>
+                if (!deployJava.versionCheck('1.6.0_04+')) {
+                    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 {
+                    var attributes = {
+                        codebase :'applet',
+                        code :'at.gv.egiz.bku.online.applet.BKUApplet.class',
+                        archive :'BKUApplet.jar, commons-logging-1.1.1.jar, iaik_jce_me4se-3.04.jar',
+                        width : <%=width%>,
+                        height :<%=height%>
+                    };
+                    var parameters = {
+                        GuiStyle : '<%=guiStyle%>',
+                        Locale : '<%=locale%>',
+                        Background : '<%=backgroundImg%>',
+                        WSDL_URL :'../stal;jsessionid=<%=session.getId()%>?wsdl',
+                        HelpURL : '../help/',
+                        SessionID : '<%=session.getId()%>',
+                        RedirectURL : '../bkuResult',
+                        RedirectTarget: '_parent'
+                    };
+                    var version = '1.6.0_04';
+                    deployJava.runApplet(attributes, parameters, version);
+                }
+            </script>
+    </body>
+</html>
diff --git a/BKUOnline/src/main/webapp/appletPage.jsp b/BKUOnline/src/main/webapp/appletPage.jsp
deleted file mode 100644
index b2fcf4a4..00000000
--- a/BKUOnline/src/main/webapp/appletPage.jsp
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--
-  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.
--->
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-	pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>MOCCA Applet</title>
-<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
-<script type="text/javascript" src="js/deployJava.js"></script>
-<META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">
-<META HTTP-EQUIV="EXPIRES" CONTENT="Mon, 22 Jul 2002 11:12:01 GMT">
-<META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">
-</head>
-<body>
-<%
-  int width = session.getAttribute("appletWidth") == null ? 190
-      : (Integer) session.getAttribute("appletWidth");
-  int height = session.getAttribute("appletHeight") == null ? 130
-      : (Integer) session.getAttribute("appletHeight");
-  String backgroundImg = (String) session.getAttribute("appletBackground");
-  String guiStyle = (String) session.getAttribute("appletGuiStyle");
-  String hashDataDisplay = (String) session.getAttribute("appletHashDataDisplay");
-%>
-<script>
-	if (!deployJava.versionCheck('1.6.0_04+')) {
-		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 {
-		var attributes = {
-			codebase :'applet',
-			code :'at.gv.egiz.bku.online.applet.BKUApplet.class',
-			archive :'BKUApplet-1.0.2, commons-logging-1.1.1.jar, iaik_jce_me4se-3.04.jar',
-			width : <%=width%>,
-			height :<%=height%>
-		};
-		var parameters = {
-                        GuiStyle : '<%=guiStyle%>',
-			Background : '<%=backgroundImg%>',
-			WSDL_URL :'../stal?wsdl',
-                        HelpURL : '../help/',
-                        HashDataDisplay : '<%=hashDataDisplay%>',
-                        HashDataURL : '../hashDataInput',
-			SessionID : '<%=session.getId()%>',
-			RedirectURL : '../bkuResult',
-            RedirectTarget: '_parent'
-		};
-		var version = '1.6.0_04';
-		deployJava.runApplet(attributes, parameters, version);
-	}
-</script>
-<!--br />
-<hr/>
-Powered by <img src="img/mocca-t_s.png" alt="mocca-logo" width="100"-->
-</body>
-</html>
diff --git a/BKUOnline/src/main/webapp/css/login.css b/BKUOnline/src/main/webapp/css/login.css
new file mode 100644
index 00000000..4bfbd77d
--- /dev/null
+++ b/BKUOnline/src/main/webapp/css/login.css
@@ -0,0 +1,16 @@
+
+root { 
+    display: block;
+}
+
+body {
+    background: #ffffff;
+    /*background-image: url(../img/mocca-t_s.png);*/
+    padding: 0;
+    margin: 0;
+    border-style: none;
+    /*
+    width:<%=width%>
+    */
+}
+
diff --git a/BKUOnline/src/main/webapp/help.jsp b/BKUOnline/src/main/webapp/help.jsp
index 72781e38..d7dbf0ef 100644
--- a/BKUOnline/src/main/webapp/help.jsp
+++ b/BKUOnline/src/main/webapp/help.jsp
@@ -16,14 +16,20 @@
 -->
 <%@ page language="java" contentType="text/html; charset=UTF-8"
 	pageEncoding="UTF-8"%>
-<%@ page import="java.util.Locale"%>
+<%@ page import="java.io.File"%>
 <%
-  String pathInfo[] = (request.getPathInfo() != null) ? request
+    String pathInfo[] = (request.getPathInfo() != null) ? request
       .getPathInfo().split("/") : new String[] {};
-  String language = pathInfo[1].split("_")[0];
-  String filename = pathInfo[2];
-  String path = "/helpfiles/" + language.toLowerCase() + "/" + filename;
-  System.out.println(path);
+    String language = pathInfo[1].split("_")[0];
+    String filename = pathInfo[2];
+    String helpDir = "/helpfiles";
+    String path;
+    if ((new File(helpDir + "/"  + language.toLowerCase())).isDirectory()) {
+        path = helpDir + "/"  + language.toLowerCase() + "/" + filename;
+    } else {
+        path = helpDir + "/de/" + filename;
+    }
+    System.out.println(path);
 %>
 
 <jsp:include page="<%=path%>" flush="true"/>
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/error.pcsc.html b/BKUOnline/src/main/webapp/helpfiles/de/error.pcsc.html
index 209ae6fa..d38e77ca 100644
--- a/BKUOnline/src/main/webapp/helpfiles/de/error.pcsc.html
+++ b/BKUOnline/src/main/webapp/helpfiles/de/error.pcsc.html
@@ -26,8 +26,18 @@
     <!-- end #sidebar1 --></div>
   <div id="mainContent">
     <h1> Fehler: Es konnte keine PC/SC-Schnittstelle gefunden werden</h1>
-    <p>Die Software für den Zugriff auf die Bürgerkarte konnte keine PC/SC-Schnittstelle für den Zugriff auf Kartenleser erkennen. Das Betriebssystem scheint keine PC/SC-Schnittstelle zur Verfügung zu stellen.</p>
-    <p>Unter Betriebssystemen die PCSC-Lite verwenden (Linux u.a.) tritt dieses Problem auch auf, wenn kein Kartenleser angeschlossen ist und daher der entsprechende Dienst nicht gestartet wurde oder wenn die entsprechende Bibliothek nicht zur Verfügung steht (<a href="http://java.sun.com/javase/6/docs/technotes/guides/security/SunProviders.html#SunPCSCProvider">weitere Informationen</a>).<br class="clearfloat" />
+    <p>Die Software für den Zugriff auf die Bürgerkarte konnte keine PC/SC-Schnittstelle für den Zugriff auf Kartenleser erkennen. 
+       Das Betriebssystem scheint keine PC/SC-Schnittstelle zur Verfügung zu stellen.</p>
+    <p>Häufige Ursachen für dieses Problem sind
+    <ul>
+        <li>Der PC/SC Dienst läuft nicht</li>
+        <li>Die entsprechende PC/SC Bibliothek kann von Java nicht gefunden werden
+        (<a href="http://java.sun.com/javase/6/docs/technotes/guides/security/SunProviders.html#SunPCSCProvider">weitere Informationen</a>).</li>
+    </ul>
+    </p>
+    <p>Unter Betriebssystemen die PCSC-Lite verwenden (Linux u.a.) tritt dieses Problem auch auf, 
+       wenn kein Kartenleser angeschlossen ist und daher der entsprechende Dienst nicht gestartet wurde.
+       <br class="clearfloat" />
     </p>
     <p><br class="clearfloat" /></p>    
   </div>
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.html b/BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.html
index f7cf15df..eb1a35d6 100644
--- a/BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.html
+++ b/BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.html
@@ -28,6 +28,7 @@
     <h1> Anzeige der Signaturdaten </h1>

     <p>Dieses Fenster zeigt die zu signierenden Daten an. Dies k&ouml;nnen entweder reine Textdaten oder XHTML sein. Im Falle von XHML erhalten Sie den Hinweis, dass es sich bei den dargestellten Daten nur um eine Voransicht handelt. Um die Daten standardkonform darzustellen, m&uuml;ssen diese abgespeichert und mit einem geeigneten XHTML Betrachter ge&ouml;ffnen werden.</p>

     <p>In jedem Fall k&ouml;nnen die zu signierenden abgespeichert werden.</p>

+     <p><br class="clearfloat" /></p>

   </div>

   <div id="footer">

   	<p>

diff --git a/BKUOnline/src/main/webapp/ieView.html b/BKUOnline/src/main/webapp/ieView.html
deleted file mode 100644
index 71f76eec..00000000
--- a/BKUOnline/src/main/webapp/ieView.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">

-<html>

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">

-<title>Anzeige</title>

-<style type="text/css">

-body {

-	font-size: 15px;

-	font-weight: 500;

-	font-family: Helvetica, Arial, sans-serif;

-	background-color: DarkOrange;

-	padding:1em 2em 0em 2em;

-}

-

-h1 {

-	font-size: 20px;

-}

-</style>

-</head>

-<body>

-<h1>Achtung: Ihr Browser unterstützt dieses Anzeigeformat (XHTML) nicht.</h1> Die unten

-dargestellten Daten können von den tatsächlichen Signaturdaten abweichen.

-<a href="hashDataInput?ieCType=application%2Fxhtml%2Bxml">Hier</a>

-können Sie die Signaturdaten herunterladen.

-<br>

-<div style="height:700px; margin: 2em 0em 1em 0em">

-<iframe src="hashDataInput?ieCType=text/html" width="100%" height="100%" marginwidth="0"

-marginheight="0" frameborder="1" scrolling="auto">Ihr Browser unterstütz leider keine Iframes</iframe>

-</div>

-</body>

-</html>
\ No newline at end of file
diff --git a/BKUOnline/src/main/webapp/img/BackgroundEcard.png b/BKUOnline/src/main/webapp/img/BackgroundEcard.png
new file mode 100644
index 00000000..11ba891e
--- /dev/null
+++ b/BKUOnline/src/main/webapp/img/BackgroundEcard.png
diff --git a/BKUOnline/src/main/webapp/index.html b/BKUOnline/src/main/webapp/index.html
index 8f1a338e..94e2890f 100644
--- a/BKUOnline/src/main/webapp/index.html
+++ b/BKUOnline/src/main/webapp/index.html
@@ -48,7 +48,7 @@
 <div id="animDiv" class="box">
 <p>
 <h1>TestRequest</h1>
-<a href="HTTP-ohne.html">Security Layer Request</a>
+<a href="slRequestForm.html">Security Layer Request</a>
 <h1>STAL Service</h1>
 <a href="stal">STAL Service Endpoint Information</a>
 </p>
diff --git a/BKUOnline/src/main/webapp/js/deployJava.js b/BKUOnline/src/main/webapp/js/deployJava.js
index 4d8a0ca3..5466cbdd 100644
--- a/BKUOnline/src/main/webapp/js/deployJava.js
+++ b/BKUOnline/src/main/webapp/js/deployJava.js
@@ -40,7 +40,7 @@
  * http://java.com/js/deployJava.js.  
  * You are encouraged to link directly to the live copy of the file.
  *
- * @version @(#)deployJava.js	1.11 08/07/11
+ * @version @(#)deployJava.js	1.13 08/10/28
  */
 
 var deployJava = {
@@ -88,7 +88,7 @@ var deployJava = {
             }
         } else {
             var browser = deployJava.getBrowser();
-        
+
             if (browser == 'MSIE') {
                 if (deployJava.testUsingActiveX('1.8.0')) {
                     list[0] = '1.8.0';
@@ -319,11 +319,18 @@ var deployJava = {
         document.write(s);
     
         if (parameters != 'undefined' && parameters != null) {
+            var codebaseParam = false;
             for (var parameter in parameters) {
+                if (parameter == 'codebase_lookup') {
+                    codebaseParam = true;
+                }
                 s = '<param name="' + parameter + '" value="' + 
                     parameters[parameter] + '">';
                 document.write(s);
             }
+            if (!codebaseParam) {
+              document.write('<param name="codebase_lookup" value="false">');
+            }
         }
         document.write('<' + '/' + 'applet' + '>');
     },
@@ -630,6 +637,10 @@ var deployJava = {
                 alert('We claim to have detected "IE".');
             }
             return 'MSIE';
+//        } else if ((browser.indexOf('konqueror') != -1)) {
+//            if  (deployJava.debug) {
+//                alert('We claim to have detected "Konqueror".');
+//            }
         } else if ((browser.indexOf('mozilla') != -1) || 
                    (browser.indexOf('firefox') != -1)) {
             if (deployJava.debug) {
diff --git a/BKUOnline/src/main/webapp/multiHashDataInput.html b/BKUOnline/src/main/webapp/multiHashDataInput.html
deleted file mode 100644
index bb03f8ce..00000000
--- a/BKUOnline/src/main/webapp/multiHashDataInput.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--

-  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.

--->

-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">

-<title>Mehrere Signaturedaten</title>

-<style type="text/css">

-h1 {

-	color: red;

-	font-size: 15px;

-	font-weight: 500;

-	font-family: Helvetica, Arial, sans-serif;

-}

-</style>

-</head>

-<body>

-<div style="width:300px; padding:20px; border:5px solid #ff0000;text-align: center">

-<h1>Diese Signatur enthält mehrere Datenobjekte. <br>

-Die Anzeige dieser wird derzeit nicht unterstützt !</h1>

-</div>

-</body>

-</html>
\ No newline at end of file
diff --git a/BKUOnline/src/main/webapp/HTTP-ohne.html b/BKUOnline/src/main/webapp/slRequestForm.html
index 607fa5d4..9a96e9be 100644
--- a/BKUOnline/src/main/webapp/HTTP-ohne.html
+++ b/BKUOnline/src/main/webapp/slRequestForm.html
@@ -17,11 +17,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<title>Infobox Requests</title>
+<title>Security-Layer v1.2 Request Formular</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
 <body>
-<h1>Securitykapsel - HTTP-Bindung</h1>
+<h1>Security-Layer v1.2 Request Formular</h1>
 <style type="text/css">
 fieldset {
 	padding: 1em;
@@ -59,6 +59,7 @@ legend {
 <p>
 <form action="./http-security-layer-request" method="Post"
 	enctype="application/x-www-form-urlencoded">
+        <!--input name="locale" value="es_MX" type="hidden" /-->
 <fieldset><legend>Enter XML Request</legend>
 <p><label for="XMLRequest">XML Request</label> <textarea
 	name="XMLRequest" rows=15 cols="60" id="XMLRequest">
@@ -97,12 +98,6 @@ legend {
 	<input type="radio" name="appletGuiStyle" value="simple" checked="checked">simple
 	<input type="radio" name="appletGuiStyle" value="advanced">advanced
 </p>
-<p>
-	<label for="appletHashDataDisplay">HashData Display</label> 
-    <input type="radio" name="appletHashDataDisplay" value="frame" checked="checked">Frame
-    <input type="radio" name="appletHashDataDisplay" value="browser">Browser
-	<!--input type="radio" name="appletHashDataDisplay" value="internal">Applet-->
-</p>
 
 <!-- 
 <p><label for="RedirectURL">RedirectURL</label> <input