summaryrefslogtreecommitdiff
path: root/BKUOnline/src/main/webapp
diff options
context:
space:
mode:
Diffstat (limited to 'BKUOnline/src/main/webapp')
-rw-r--r--BKUOnline/src/main/webapp/WEB-INF/web.xml30
-rw-r--r--BKUOnline/src/main/webapp/applet.jsp33
-rw-r--r--BKUOnline/src/main/webapp/appletAlternative.jsp87
3 files changed, 39 insertions, 111 deletions
diff --git a/BKUOnline/src/main/webapp/WEB-INF/web.xml b/BKUOnline/src/main/webapp/WEB-INF/web.xml
index 2987ac57..7697885e 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/web.xml
+++ b/BKUOnline/src/main/webapp/WEB-INF/web.xml
@@ -51,14 +51,6 @@
<jsp-file>/applet.jsp</jsp-file>
</servlet>
<servlet>
- <servlet-name>AppletDispatcher</servlet-name>
- <servlet-class>at.gv.egiz.bku.online.webapp.AppletDispatcher</servlet-class>
- </servlet>
- <servlet>
- <servlet-name>BKUAppletAlternative</servlet-name>
- <jsp-file>/appletAlternative.jsp</jsp-file>
- </servlet>
- <servlet>
<servlet-name>help</servlet-name>
<jsp-file>/help.jsp</jsp-file>
</servlet>
@@ -78,10 +70,26 @@
<servlet-name>help</servlet-name>
<url-pattern>/help/*</url-pattern>
</servlet-mapping>
+
+ <!--
+ | Configure alternative applet pages that may be requested
+ | via the 'appletPage' form parameter (cf. SLRequestForm.html)
+ <servlet>
+ <servlet-name>BKUAppletAlternative</servlet-name>
+ <jsp-file>/appletAlternative.jsp</jsp-file>
+ </servlet-->
+
+ <!--
+ | To disable applet caching load the applet via the AppletDispatcher
+ | (cf. applet.jsp)
+ <servlet>
+ <servlet-name>AppletDispatcher</servlet-name>
+ <servlet-class>at.gv.egiz.bku.online.webapp.AppletDispatcher</servlet-class>
+ </servlet>
<servlet-mapping>
<servlet-name>AppletDispatcher</servlet-name>
<url-pattern>/applet/dispatch/*</url-pattern>
- </servlet-mapping>
+ </servlet-mapping-->
<!-- End BKU Config -->
@@ -103,11 +111,7 @@
<welcome-file-list>
<welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
<welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
</welcome-file-list>
<session-config>
<session-timeout>5</session-timeout>
diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp
index 51f23bbc..3da17066 100644
--- a/BKUOnline/src/main/webapp/applet.jsp
+++ b/BKUOnline/src/main/webapp/applet.jsp
@@ -32,19 +32,15 @@
<META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">
</head>
<%
- // min W/H (for de locale): 145px/145px with gui style 'tiny'
- // (vs. 152px on linux)
int width = session.getAttribute("appletWidth") == null ? 190
- : (Integer) session.getAttribute("appletWidth"); //230 for workshop demo integration
+ : (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 locale = (String) session.getAttribute("locale");
String extension = (String) session.getAttribute("extension");
- String rand = AppletDispatcher.RAND_PREFIX +
- RandomStringUtils.randomAlphanumeric(16);
-
+
String appletClass, appletArchive;
if ("activation".equals(extension)) {
appletArchive = "BKUAppletExt";
@@ -56,6 +52,21 @@
appletArchive = "BKUApplet";
appletClass = "at.gv.egiz.bku.online.applet.BKUApplet.class";
}
+
+ // disable applet caching
+ boolean disableAppletCaching = false;
+ String codebase = "applet";
+
+ if (disableAppletCaching) {
+ // run in AppletDispatcher context and
+ // append random alphanumeric string to avoid applet caching
+ // TODO prepend ../ to all xxxURL applet paramaters
+ codebase += "/" + AppletDispatcher.DISPATCH_CTX;
+ String rand = AppletDispatcher.RAND_PREFIX +
+ RandomStringUtils.randomAlphanumeric(16);
+ appletArchive += rand;
+ }
+
%>
<body id="appletpage" style="width:<%=width%>">
<script>
@@ -68,9 +79,9 @@
// remove random suffix for appletArchive
// and remove '../' for all URL applet parameters
var attributes = {
- codebase :'<%="applet/" + AppletDispatcher.DISPATCH_CTX %>',
+ codebase :'<%=codebase %>',
code : '<%=appletClass%>',
- archive : '<%=appletArchive + rand +".jar, commons-logging.jar, iaik_jce_me4se.jar"%>',
+ archive : '<%=appletArchive +".jar, commons-logging.jar, iaik_jce_me4se.jar"%>',
width : <%=width%>,
height :<%=height%>
};
@@ -78,10 +89,10 @@
GuiStyle : '<%=guiStyle%>',
Locale : '<%=locale%>',
Background : '<%=backgroundImg%>',
- WSDL_URL :'../../stal;jsessionid=<%=session.getId()%>?wsdl',
- HelpURL : '../../help/',
+ WSDL_URL :'../stal;jsessionid=<%=session.getId()%>?wsdl',
+ HelpURL : '../help/',
SessionID : '<%=session.getId()%>',
- RedirectURL : '../../bkuResult',
+ RedirectURL : '../bkuResult',
RedirectTarget: '_parent'
};
var version = '1.6.0_04';
diff --git a/BKUOnline/src/main/webapp/appletAlternative.jsp b/BKUOnline/src/main/webapp/appletAlternative.jsp
deleted file mode 100644
index 65c13392..00000000
--- a/BKUOnline/src/main/webapp/appletAlternative.jsp
+++ /dev/null
@@ -1,87 +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>
- <style type="text/css" media="all">@import "css/appletAlternative.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>
- <%
- // min W/H (for de locale): 145px/145px with gui style 'tiny'
- // (vs. 152px on linux)
- 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");
- String extension = (String) session.getAttribute("extension");
-
- String appletClass, appletArchive;
- if ("activation".equals(extension)) {
- appletArchive = "BKUAppletExt.jar";
- appletClass = "at.gv.egiz.bku.online.applet.ActivationApplet.class";
- } else if ("pin".equals(extension)) {
- appletArchive = "BKUAppletExt.jar";
- appletClass = "at.gv.egiz.bku.online.applet.PINManagementApplet.class";
- } else {
- appletArchive = "BKUApplet.jar";
- appletClass = "at.gv.egiz.bku.online.applet.BKUApplet.class";
- }
- appletArchive = "BKUAppletExt.jar";
- appletClass = "at.gv.egiz.bku.online.applet.ActivationApplet.class";
- %>
- <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 : '<%=appletClass%>',
- archive : '<%=appletArchive + ", commons-logging.jar, iaik_jce_me4se.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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 02:32:56 +0000