diff options
author | clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2009-02-11 20:06:57 +0000 |
---|---|---|
committer | clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2009-02-11 20:06:57 +0000 |
commit | 26fd7c97a6cc333d00800c4c98a4f58a3dc7c2c5 (patch) | |
tree | cb72a55262cecd5d0560f3a9b52190078ba5e1d7 /BKUOnline/src/main/webapp | |
parent | 942b845ba651d2acf269fabdbcc1eedf25f27dd7 (diff) | |
download | mocca-26fd7c97a6cc333d00800c4c98a4f58a3dc7c2c5.tar.gz mocca-26fd7c97a6cc333d00800c4c98a4f58a3dc7c2c5.tar.bz2 mocca-26fd7c97a6cc333d00800c4c98a4f58a3dc7c2c5.zip |
activation support, GetStatusRequest in stal schema
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@299 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'BKUOnline/src/main/webapp')
-rw-r--r-- | BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml | 21 | ||||
-rw-r--r-- | BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd | 14 | ||||
-rw-r--r-- | BKUOnline/src/main/webapp/applet.jsp | 14 | ||||
-rw-r--r-- | BKUOnline/src/main/webapp/css/applet.css (renamed from BKUOnline/src/main/webapp/css/login.css) | 0 | ||||
-rw-r--r-- | BKUOnline/src/main/webapp/slRequestForm.html | 183 |
5 files changed, 148 insertions, 84 deletions
diff --git a/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml b/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml index 321e1e98..6a234b73 100644 --- a/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml +++ b/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml @@ -10,9 +10,9 @@ CONDITIONS OF ANY KIND, either express or implied. See the License for
the specific language governing permissions and limitations under the
License.
- --> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" + -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
<bean id="STALFactory" class="at.gv.egiz.stal.service.impl.RequestBrokerSTALFactory"
@@ -39,8 +39,14 @@ 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#:InfoboxUpdateRequest"
+ value="at.gv.egiz.bku.slcommands.impl.InfoboxUpdateCommandImpl" />
+ <entry
key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:CreateXMLSignatureRequest"
value="at.gv.egiz.bku.slcommands.impl.CreateXMLSignatureCommandImpl" />
+ <entry
+ key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:GetStatusRequest"
+ value="at.gv.egiz.bku.slcommands.impl.GetStatusCommandImpl" />
</map>
</property>
</bean>
@@ -55,9 +61,12 @@ <entry
key="IdentityLink"
value="at.gv.egiz.bku.slcommands.impl.IdentityLinkInfoboxImpl" />
-<!-- <entry-->
-<!-- key="CardChannel"-->
-<!-- value="at.gv.egiz.bku.slcommands.impl.CardChannelInfoboxImpl" />-->
+ <entry
+ key="CardChannel"
+ value="at.gv.egiz.bku.slcommands.impl.CardChannelInfoboxImpl" />
+ <entry
+ key="SV-Personendaten"
+ value="at.gv.egiz.bku.slcommands.impl.SVPersonendatenInfoboxImpl" />
</map>
</property>
</bean>
diff --git a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd index 6f3946dc..2389e043 100644 --- a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd +++ b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd @@ -33,6 +33,7 @@ <element name="InfoboxReadResponse" type="tns:InfoboxReadResponseType"/> <element name="SignResponse" type="tns:SignResponseType"/> <element name="ErrorResponse" type="tns:ErrorResponseType"/> + <element name="StatusResponse" type="tns:StatusResponseType"/> </choice> <attribute name="SessionId" type="string"/> </complexType> @@ -65,6 +66,13 @@ </extension> </complexContent> </complexType> + <complexType name="StatusResponseType"> + <complexContent> + <extension base="tns:ResponseType"> + <attribute name="cardReady" type="boolean" /> + </extension> + </complexContent> + </complexType> <complexType name="GetNextRequestResponseType"> <!-- abstract Request/Response type not supported by JAX-WS 2.0 (jdk < 1.6.0_04) <sequence> @@ -74,6 +82,7 @@ <element name="InfoboxReadRequest" type="tns:InfoboxReadRequestType"/> <element name="SignRequest" type="tns:SignRequestType"/> <element name="QuitRequest" type="tns:QuitRequestType"/> + <element name="StatusRequest" type="tns:StatusRequestType"/> </choice> <attribute name="SessionId" type="string"/> </complexType> @@ -118,6 +127,11 @@ <extension base="tns:RequestType"/> </complexContent> </complexType> + <complexType name="StatusRequestType"> + <complexContent> + <extension base="tns:RequestType"/> + </complexContent> + </complexType> <complexType name="GetHashDataInputType"> <sequence> <element name="Reference" maxOccurs="unbounded"> diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp index ada48f22..591ed1bf 100644 --- a/BKUOnline/src/main/webapp/applet.jsp +++ b/BKUOnline/src/main/webapp/applet.jsp @@ -24,14 +24,15 @@ <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> + <style type="text/css" media="all">@import "css/applet.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): 152px/145px with gui style 'tiny' + // 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 @@ -39,12 +40,15 @@ 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 (Boolean.parseBoolean((String) session.getAttribute("appletExtension"))) { - if ("activation".equals(guiStyle)) { + if ("activation".equals(extension)) { appletArchive = "BKUAppletExt.jar"; - appletClass = "at.gv.egiz.bku.online.applet.ext.BKUAppletExt.class"; + 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"; diff --git a/BKUOnline/src/main/webapp/css/login.css b/BKUOnline/src/main/webapp/css/applet.css index 4bfbd77d..4bfbd77d 100644 --- a/BKUOnline/src/main/webapp/css/login.css +++ b/BKUOnline/src/main/webapp/css/applet.css diff --git a/BKUOnline/src/main/webapp/slRequestForm.html b/BKUOnline/src/main/webapp/slRequestForm.html index ff96a6fa..76cd1be9 100644 --- a/BKUOnline/src/main/webapp/slRequestForm.html +++ b/BKUOnline/src/main/webapp/slRequestForm.html @@ -16,53 +16,67 @@ --> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> -<head> -<title>Security-Layer v1.2 Request Formular</title> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -</head> -<body> -<h1>Security-Layer v1.2 Request Formular</h1> -<style type="text/css"> -fieldset { - padding: 1em; - font: 80%/ 1 sans-serif; - background-color: #F2EFE9; - padding-left: 5em; -} + <head> + <title>Security-Layer v1.2 Request Formular</title> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <script language="JavaScript"> + <!-- + function setAppletDimension(width, height) + { + document.forms.slform.appletWidth.value=width; + document.forms.slform.appletHeight.value=height; + } + function setNOPRequest() { + document.forms.slform.XMLRequest.value='<?xml version="1.0" encoding="UTF-8"?><NullOperationRequest xmlns="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"/>'; + } + + //--> + </script> -fieldset.submit { - float: none; - width: auto; - border: 0 none #FFF; - padding-left: 14em; - border-style: none; - background-color: transparent; -} + </head> + <body> + <h1>Security-Layer v1.2 Request Formular</h1> + <style type="text/css"> + fieldset { + padding: 1em; + font: 80%/ 1 sans-serif; + background-color: #F2EFE9; + padding-left: 5em; + } -label { - float: left; - width: 8em; - margin-right: 0.5em; - padding-top: 0.2em; - text-align: right; - font-weight: bold; - color: #000; - padding-top: 0.2em; -} + fieldset.submit { + float: none; + width: auto; + border: 0 none #FFF; + padding-left: 14em; + border-style: none; + background-color: transparent; + } -legend { - border: 1px solid; - padding: 2px 6px -} -</style> + label { + float: left; + width: 8em; + margin-right: 0.5em; + padding-top: 0.2em; + text-align: right; + font-weight: bold; + color: #000; + padding-top: 0.2em; + } -<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"> + legend { + border: 1px solid; + padding: 2px 6px + } + </style> + + <p> + <form action="./http-security-layer-request" method="Post" + enctype="application/x-www-form-urlencoded" name="slform"> + <!--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"> <?xml version="1.0" encoding="UTF-8"?> <sl:CreateXMLSignatureRequest xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"> @@ -78,40 +92,63 @@ legend { </sl:TransformsInfo> </sl:DataObjectInfo> </sl:CreateXMLSignatureRequest> -</textarea></p> -<!-- + </textarea></p> + <!-- <?xml version="1.0" encoding="UTF-8" ?> <sl:InfoboxReadRequest - xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"> -<sl:InfoboxIdentifier>IdentityLink</sl:InfoboxIdentifier> -<sl:BinaryFileParameters ContentIsXMLEntity="true" /> + xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#"> + <sl:InfoboxIdentifier>IdentityLink</sl:InfoboxIdentifier> + <sl:BinaryFileParameters ContentIsXMLEntity="true" /> </sl:InfoboxReadRequest> --> -<p><label for="appletWidth">Applet Width</label> <input - name="appletWidth" value="190" id="appletWidth"> -<p><label for="appletHeight">Applet Height</label> <input - name="appletHeight" value="130" id="appletHeight"> -<p><label for="appletBackground">Applet Background</label> <input - name="appletBackground" value="" id="appletBackground"> -<p> - <label for="appletGuiStyle">GUI Style</label> - <input type="radio" name="appletGuiStyle" value="tiny">tiny - <input type="radio" name="appletGuiStyle" value="simple" checked="checked">simple - <input type="radio" name="appletGuiStyle" value="advanced">advanced - <input type="radio" name="appletGuiStyle" value="activation">activation -</p> +<!-- +<?xml version='1.0' encoding='UTF-8'?> +<sl10:InfoboxUpdateRequest xmlns:sl10='http://www.buergerkarte.at/namespaces/securitylayer/1.2#'> + <sl10:InfoboxIdentifier>CardChannel</sl10:InfoboxIdentifier> + <sl10:BinaryFileParameters> + <sl10:XMLContent> + <Script> + <Reset cold='true' /> + <CommandAPDU sequence='1' of='2' expectedSW='9000'>00A4000C023F00</CommandAPDU> + <CommandAPDU sequence='2' of='2' expectedSW='9000'>00B0820000</CommandAPDU> + </Script> + </sl10:XMLContent> + </sl10:BinaryFileParameters> +</sl10:InfoboxUpdateRequest> +--> + + <p> + <label for="appletGuiStyle">GUI Style</label> + <input type="radio" name="appletGuiStyle" value="tiny" onclick="setAppletDimension(152, 145)">tiny + <input type="radio" name="appletGuiStyle" value="simple" checked="checked" onclick="setAppletDimension(190,130)">simple + <input type="radio" name="appletGuiStyle" value="advanced" onclick="setAppletDimension(300, 180)">advanced + </p> + <p><label for="appletWidth">Applet Width</label> <input + name="appletWidth" value="190" id="appletWidth"> + <p><label for="appletHeight">Applet Height</label> <input + name="appletHeight" value="130" id="appletHeight"> + <p><label for="appletBackground">Applet Background</label> <input + name="appletBackground" value="" id="appletBackground"> -<!-- -<p><label for="RedirectURL">RedirectURL</label> <input - name="RedirectURL" value="" id="RedirectURL"></p> -<p><label for="DataURL">DataURL</label> <input name="DataURL" - value="" id="DataURL"></p> -<p><label for="StyleSheetURL">StyleSheetURL</label> <input - name="StyleSheetURL" value="" id="StyleSheetURL"></p> -<p> - --></fieldset> -<fieldset class="submit"><input type="submit" class="submit"></fieldset> -</form> -</body> + <p> + <label for="appletExtension">Extension</label> + <input type="radio" name="appletExtension" value="activation" onclick="setInfoboxUpdateRequest()">Activation + <input type="radio" name="appletExtension" value="pin" onclick="setAppletDimension(400, 200)">PIN Management + </p> + +<!-- + <p><label for="RedirectURL">RedirectURL</label> <input + name="RedirectURL" value="" id="RedirectURL"></p> + <p><label for="DataURL">DataURL</label> <input name="DataURL" + value="" id="DataURL"></p> + <p><label for="StyleSheetURL">StyleSheetURL</label> <input + name="StyleSheetURL" value="" id="StyleSheetURL"></p> + <p> +--> + </fieldset> + <fieldset class="submit"><input type="submit" class="submit"></fieldset> + </form> + + </body> </html> |