diff options
| author | rudolf <rudolf@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2004-03-15 16:07:52 +0000 |
|---|---|---|
| committer | rudolf <rudolf@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2004-03-15 16:07:52 +0000 |
| commit | 56ed4518d7978c064af5f240494bf587136c93b0 (patch) | |
| tree | f7d9a57b7915d3b269d2550c9282138b624efa57 /id.server/html | |
| parent | 747a8963ec0ffde4c6883dd1c42ad758a88b084c (diff) | |
| download | moa-id-spss-56ed4518d7978c064af5f240494bf587136c93b0.tar.gz moa-id-spss-56ed4518d7978c064af5f240494bf587136c93b0.tar.bz2 moa-id-spss-56ed4518d7978c064af5f240494bf587136c93b0.zip | |
RSCH
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@99 d688527b-c9ab-4aba-bd8d-4036d912da1d
Diffstat (limited to 'id.server/html')
| -rw-r--r-- | id.server/html/auth/WEB-INF/web.xml | 19 | ||||
| -rw-r--r-- | id.server/html/auth/errorpage-auth.jsp (renamed from id.server/html/auth/errorpage.jsp) | 2 | ||||
| -rw-r--r-- | id.server/html/auth/index.jsp | 6 | ||||
| -rw-r--r-- | id.server/html/auth/message-auth.jsp | 20 | ||||
| -rw-r--r-- | id.server/html/proxy/WEB-INF/web.xml | 23 | ||||
| -rw-r--r-- | id.server/html/proxy/errorpage-proxy.jsp | 41 | ||||
| -rw-r--r-- | id.server/html/proxy/message-proxy.jsp | 20 |
7 files changed, 127 insertions, 4 deletions
diff --git a/id.server/html/auth/WEB-INF/web.xml b/id.server/html/auth/WEB-INF/web.xml index 9f713408c..85fc3d87a 100644 --- a/id.server/html/auth/WEB-INF/web.xml +++ b/id.server/html/auth/WEB-INF/web.xml @@ -41,6 +41,25 @@ org.apache.axis.transport.http.AxisServlet </servlet-class> </servlet> + + <!-- JSP servlet --> + <servlet> + <servlet-name>jspservlet</servlet-name> + <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class> + </servlet> + + <!-- servlet mapping for jsp pages --> + <!-- errorpage.jsp (customizeable) --> + <servlet-mapping> + <servlet-name>jspservlet</servlet-name> + <url-pattern>/errorpage-auth.jsp</url-pattern> + </servlet-mapping> + <!-- message.jsp (customizeable) used for non error messages (e.g. ConfigurationUpdate) --> + <servlet-mapping> + <servlet-name>jspservlet</servlet-name> + <url-pattern>/message-auth.jsp</url-pattern> + </servlet-mapping> + <servlet-mapping> <servlet-name>SelectBKU</servlet-name> <url-pattern>/SelectBKU</url-pattern> diff --git a/id.server/html/auth/errorpage.jsp b/id.server/html/auth/errorpage-auth.jsp index ee8c88028..afb4b2281 100644 --- a/id.server/html/auth/errorpage.jsp +++ b/id.server/html/auth/errorpage-auth.jsp @@ -2,7 +2,7 @@ <%@ page contentType="text/html; charset=UTF-8" %>
<html>
<head>
-<title>Fehler</title>
+<title>Ein Fehler ist aufgetreten</title>
</head>
<% Throwable exceptionThrown = (Throwable)request.getAttribute("ExceptionThrown");
String errorMessage = (String)request.getAttribute("ErrorMessage");
diff --git a/id.server/html/auth/index.jsp b/id.server/html/auth/index.jsp index cb9dde3d9..733ba317f 100644 --- a/id.server/html/auth/index.jsp +++ b/id.server/html/auth/index.jsp @@ -10,13 +10,13 @@ + request.getContextPath() + "/";
String params =
"Target=gb&" +
- "OA=https://10.16.126.28:9443/moa-id-proxy/index.jsp";
+ "OA=https://localhost:8443/moa-id-proxy/index.jsp";
String urlStartAuth =
urlPath +
"StartAuthentication?" +
params;
String templateParam =
- "&Template=http://10.16.46.108:18080/oa/AuthTemplate.jsp";
+ "&Template=http://localhost:18080/oa/AuthTemplate.jsp";
String urlStartAuthCustom =
urlStartAuth +
templateParam;
@@ -27,7 +27,7 @@ String urlSelectBKUCustom =
urlSelectBKU +
templateParam +
- "&BKUSelectionTemplate=http://10.16.46.108:18080/oa/BKUSelectionTemplate.jsp";
+ "&BKUSelectionTemplate=http://localhost:18080/oa/BKUSelectionTemplate.jsp";
%>
<a href="<%=urlStartAuth%>">Log in to sample application</a>
<br>
diff --git a/id.server/html/auth/message-auth.jsp b/id.server/html/auth/message-auth.jsp new file mode 100644 index 000000000..0c28c1ba7 --- /dev/null +++ b/id.server/html/auth/message-auth.jsp @@ -0,0 +1,20 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<%@ page contentType="text/html; charset=UTF-8" %>
+<html>
+<head>
+<title>MOA-ID AUTH</title>
+</head>
+<% String message = (String)request.getAttribute("Message");
+%>
+
+<body>
+<h1>MOA-ID AUTH</h1>
+
+<% if (message != null) { %>
+<p>
+<%= message%><br>
+</p>
+<% } %>
+
+</body>
+</html>
\ No newline at end of file diff --git a/id.server/html/proxy/WEB-INF/web.xml b/id.server/html/proxy/WEB-INF/web.xml index 9145a48d6..ab67855c2 100644 --- a/id.server/html/proxy/WEB-INF/web.xml +++ b/id.server/html/proxy/WEB-INF/web.xml @@ -16,6 +16,25 @@ <description>Update MOA-ID Proxy configuration from the configuration file</description> <servlet-class>at.gv.egovernment.moa.id.proxy.servlet.ConfigurationServlet</servlet-class> </servlet> + + <!-- JSP servlet --> + <servlet> + <servlet-name>jspservlet</servlet-name> + <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class> + </servlet> + + <!-- servlet mapping for jsp pages --> + <!-- errorpage.jsp (customizeable) --> + <servlet-mapping> + <servlet-name>jspservlet</servlet-name> + <url-pattern>/errorpage-proxy.jsp</url-pattern> + </servlet-mapping> + <!-- message-proxy.jsp (customizeable) used for non error messages (e.g. ConfigurationUpdate) --> + <servlet-mapping> + <servlet-name>jspservlet</servlet-name> + <url-pattern>/message-proxy.jsp</url-pattern> + </servlet-mapping> + <servlet-mapping> <servlet-name>ConfigurationUpdate</servlet-name> <url-pattern>/ConfigurationUpdate</url-pattern> @@ -27,6 +46,10 @@ <session-config> <session-timeout>30</session-timeout> </session-config> + <error-page> + <error-code>500</error-code> + <location>/errorpage.jsp</location> + </error-page> <security-constraint> <web-resource-collection> <web-resource-name>ConfigurationUpdate</web-resource-name> diff --git a/id.server/html/proxy/errorpage-proxy.jsp b/id.server/html/proxy/errorpage-proxy.jsp new file mode 100644 index 000000000..afb4b2281 --- /dev/null +++ b/id.server/html/proxy/errorpage-proxy.jsp @@ -0,0 +1,41 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<%@ page contentType="text/html; charset=UTF-8" %>
+<html>
+<head>
+<title>Ein Fehler ist aufgetreten</title>
+</head>
+<% Throwable exceptionThrown = (Throwable)request.getAttribute("ExceptionThrown");
+ String errorMessage = (String)request.getAttribute("ErrorMessage");
+ String wrongParameters = (String)request.getAttribute("WrongParameters");
+%>
+
+<body>
+<h1>Fehler bei der Anmeldung</h1>
+<p>Bei der Anmeldung ist ein Fehler aufgetreten.</p>
+
+<% if (errorMessage != null) { %>
+<p>
+<%= errorMessage%><br>
+</p>
+<% } %>
+<% if (exceptionThrown != null) { %>
+<p>
+<%= exceptionThrown.getMessage()%>
+</p>
+<% } %>
+<% if (wrongParameters != null) { %>
+<p>Die Angabe der Parameter ist unvollständig.<br></p>
+<b> <%= wrongParameters %> </b><br>
+<p>
+ Beispiele für korrekte Links zur MOA-ID Authentisierung sind:
+</p>
+<p>
+<tt><a href="https://<MOA-URL>/StartAuthentication?Target=<Geschäftsbereich>&OA=<OA-URL>&Template=<Template-URL>"></tt>
+</p>
+<p>
+<tt><a href="https://<MOA-URL>/SelectBKU?Target=<Geschäftsbereich>&OA=<OA-URL>&Template=<Template-URL>&BKUSelectionTemplate=<BKU-Template-URL>"></tt>
+</p>
+<p>Die Angabe der Parameter <tt>"Template"</tt> und <tt>"BKUSelectionTemplate"</tt> ist optional.</p>
+<% } %>
+</body>
+</html>
\ No newline at end of file diff --git a/id.server/html/proxy/message-proxy.jsp b/id.server/html/proxy/message-proxy.jsp new file mode 100644 index 000000000..0d970898a --- /dev/null +++ b/id.server/html/proxy/message-proxy.jsp @@ -0,0 +1,20 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<%@ page contentType="text/html; charset=UTF-8" %>
+<html>
+<head>
+<title>MOA-ID Proxy</title>
+</head>
+<% String message = (String)request.getAttribute("Message");
+%>
+
+<body>
+<h1>MOA-ID Proxy</h1>
+
+<% if (message != null) { %>
+<p>
+<%= message%><br>
+</p>
+<% } %>
+
+</body>
+</html>
\ No newline at end of file |