backport to JAXWS2.0

STALService initial connect()

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

2 files changed, 136 insertions, 106 deletions

diff --git a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.wsdl b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.wsdl
index a9f16a12..344e5ce2 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.wsdl
+++ b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.wsdl
@@ -24,6 +24,9 @@
             <xsd:import namespace="http://www.egiz.gv.at/stal" schemaLocation="stal.xsd"/>
         </xsd:schema>
     </types>
+    <message name="ConnectRequest">
+        <part name="part1" element="ns:SessionId"/>
+    </message>
     <message name="NextRequestRequest">
         <part name="part1" element="ns:GetNextRequest"/>
     </message>
@@ -40,6 +43,10 @@
         <part name="part1" element="ns:GetHashDataInputFault"/>
     </message>
     <portType name="STALPortType">
+        <operation name="connect">
+            <input name="input3" message="tns:ConnectRequest"/>
+            <output name="output3" message="tns:NextRequestResponse"/>
+        </operation>
         <operation name="nextRequest">
             <input name="input1" message="tns:NextRequestRequest"/>
             <output name="output1" message="tns:NextRequestResponse"/>
@@ -52,6 +59,14 @@
     </portType>
     <binding name="STALBinding" type="tns:STALPortType">
         <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <operation name="connect">
+            <input name="input3">
+              <soap:body use="literal"/>
+            </input>
+            <output name="output3">
+              <soap:body use="literal"/>
+            </output>
+        </operation>
         <operation name="nextRequest">
             <soap:operation/>
             <input name="input1">
diff --git a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
index b3c4841a..6f3946dc 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
+++ b/BKUOnline/src/main/webapp/WEB-INF/wsdl/stal.xsd
@@ -18,121 +18,136 @@
 <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.egiz.gv.at/stal"
     xmlns:tns="http://www.egiz.gv.at/stal"
     elementFormDefault="qualified">
-    <element name="GetNextRequest" type="tns:GetNextRequestType"/>
-    <element name="GetNextRequestResponse" type="tns:GetNextRequestResponseType"/>
-    <element name="GetHashDataInput" type="tns:GetHashDataInputType"/>
-    <element name="GetHashDataInputResponse" type="tns:GetHashDataInputResponseType"/>
-    <element name="GetHashDataInputFault" type="tns:GetHashDataInputFaultType"/>
-    <complexType name="GetNextRequestType">
+  <element name="SessionId" type="string"/>
+  <element name="GetNextRequest" type="tns:GetNextRequestType"/>
+  <element name="GetNextRequestResponse" type="tns:GetNextRequestResponseType"/>
+  <element name="GetHashDataInput" type="tns:GetHashDataInputType"/>
+  <element name="GetHashDataInputResponse" type="tns:GetHashDataInputResponseType"/>
+  <element name="GetHashDataInputFault" type="tns:GetHashDataInputFaultType"/>
+  <complexType name="GetNextRequestType">
+        <!-- abstract Request/Response type not supported by JAX-WS 2.0 (jdk < 1.6.0_04)  
         <sequence>
             <element name="Response" type="tns:ResponseType"  minOccurs="0"  maxOccurs="unbounded"/>
+        </sequence-->
+    <choice maxOccurs="unbounded">
+      <element name="InfoboxReadResponse" type="tns:InfoboxReadResponseType"/>
+      <element name="SignResponse" type="tns:SignResponseType"/>
+      <element name="ErrorResponse" type="tns:ErrorResponseType"/>
+    </choice>
+    <attribute name="SessionId" type="string"/>
+  </complexType>
+  <complexType name="ResponseType" abstract="true" />
+  <complexType name="InfoboxReadResponseType">
+    <complexContent>
+      <extension base="tns:ResponseType">
+        <sequence>
+          <element name="InfoboxValue" type="base64Binary"/>
         </sequence>
-        <attribute name="sessionId" type="string"/>
-        <!--choice maxOccurs="unbounded">
-            <element name="InfoboxReadResponse" type="tns:InfoboxReadResponseType"/>
-            <element name="SignResponse" type="tns:SignResponseType"/>
-            <element name="ErrorResponse" type="tns:ErrorResponseType"/>
-        </choice-->
-    </complexType>
-    <complexType name="ResponseType" abstract="true">
-        <attribute name="Id" type="ID"/>
-    </complexType>
-    <complexType name="InfoboxReadResponseType">
-        <complexContent>
-            <extension base="tns:ResponseType">
-                <sequence>
-                    <element name="InfoboxValue" type="base64Binary"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <complexType name="SignResponseType">
-        <complexContent>
-            <extension base="tns:ResponseType">
-                <sequence>
-                    <element name="SignatureValue" type="base64Binary"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <complexType name="ErrorResponseType">
-        <complexContent>
-            <extension base="tns:ResponseType">
-                <sequence>
-                    <element name="ErrorCode" type="int"/>
-                    <element name="ErrorMessage" type="string"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <complexType name="GetNextRequestResponseType">
+      </extension>
+    </complexContent>
+  </complexType>
+  <complexType name="SignResponseType">
+    <complexContent>
+      <extension base="tns:ResponseType">
         <sequence>
-            <element name="Request" type="tns:RequestType" minOccurs="0" maxOccurs="unbounded"/>
+          <element name="SignatureValue" type="base64Binary"/>
         </sequence>
-        <attribute name="sessionId" type="string"/>
-        <!--choice maxOccurs="unbounded">
-            <element name="InfoboxReadRequest" type="tns:InfoboxReadRequestType"/>
-            <element name="SignRequest" type="tns:SignRequestType"/>
-            <element name="QuitRequest" type="tns:QuitRequestType"/>
-        </choice-->
-    </complexType>
-    <complexType name="RequestType" abstract="true"/>
-    <complexType name="InfoboxReadRequestType">
-        <complexContent>
-            <extension base="tns:RequestType">
-                <sequence>
-                    <!-- enumeration IdentityLink, CertifiedKeyPair -->
-                    <element name="InfoboxIdentifier" type="string"/>
-                    <element name="DomainIdentifier" type="string" minOccurs="0"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <complexType name="SignRequestType">
-        <complexContent>
-            <extension base="tns:RequestType">
-                <sequence>
-                    <element name="KeyIdentifier" type="string"/>
-                    <element name="SignedInfo" type="base64Binary"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <complexType name="QuitRequestType">
-        <complexContent>
-            <extension base="tns:RequestType"/>
-        </complexContent>
-    </complexType>
-    <complexType name="GetHashDataInputType">
+      </extension>
+    </complexContent>
+  </complexType>
+  <complexType name="ErrorResponseType">
+    <complexContent>
+      <extension base="tns:ResponseType">
         <sequence>
-            <element name="Reference" maxOccurs="unbounded">
-                <complexType>
-                    <attribute name="ID" type="string"/>
-                </complexType>
-            </element>
+          <element name="ErrorCode" type="int"/>
+          <element name="ErrorMessage" type="string"/>
         </sequence>
-        <attribute name="sessionId" type="string"/>
-    </complexType>
-    <complexType name="GetHashDataInputResponseType">
+      </extension>
+    </complexContent>
+  </complexType>
+  <complexType name="GetNextRequestResponseType">
+        <!-- abstract Request/Response type not supported by JAX-WS 2.0 (jdk < 1.6.0_04) 
         <sequence>
-            <element name="Reference" maxOccurs="unbounded">
-                <complexType>
-                    <simpleContent>
-                        <extension base="base64Binary">
-                            <attribute name="ID" type="string"/>
-                            <attribute name="MimeType" type="string" use="optional"/>
-                            <attribute name="Encoding" type="string" use="optional"/>
-                        </extension>
-                    </simpleContent>
-                </complexType>
-            </element>
+            <element name="Request" type="tns:RequestType" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence-->
+    <choice maxOccurs="unbounded">
+      <element name="InfoboxReadRequest" type="tns:InfoboxReadRequestType"/>
+      <element name="SignRequest" type="tns:SignRequestType"/>
+      <element name="QuitRequest" type="tns:QuitRequestType"/>
+    </choice>
+    <attribute name="SessionId" type="string"/>
+  </complexType>
+  <complexType name="RequestType" abstract="true"/>
+  <complexType name="InfoboxReadRequestType">
+    <complexContent>
+      <extension base="tns:RequestType">
+        <sequence>
+          <element name="InfoboxIdentifier">
+            <simpleType>
+              <restriction base="string">
+                <enumeration value="Certificates"/>
+                <enumeration value="IdentityLink"/>
+                <enumeration value="Mandates"/>
+              </restriction>
+            </simpleType>
+          </element>
+          <element name="DomainIdentifier" type="anyURI" minOccurs="0"/>
         </sequence>
-        <attribute name="sessionId" type="string"/>
-    </complexType>
-    <complexType name="GetHashDataInputFaultType">
+      </extension>
+    </complexContent>
+  </complexType>
+  <complexType name="SignRequestType">
+    <complexContent>
+      <extension base="tns:RequestType">
         <sequence>
-            <element name="ErrorCode" type="int"/>
-            <element name="ErrorMessage" type="string"/>
+          <element name="KeyIdentifier">
+            <simpleType>
+              <restriction base="string">
+                <enumeration value="SecureSignatureKeypair"/>
+                <enumeration value="CertifiedKeypair"/>
+              </restriction>
+            </simpleType>
+          </element>
+          <element name="SignedInfo" type="base64Binary"/>
         </sequence>
-    </complexType>
+      </extension>
+    </complexContent>
+  </complexType>
+  <complexType name="QuitRequestType">
+    <complexContent>
+      <extension base="tns:RequestType"/>
+    </complexContent>
+  </complexType>
+  <complexType name="GetHashDataInputType">
+    <sequence>
+      <element name="Reference" maxOccurs="unbounded">
+        <complexType>
+          <attribute name="ID" type="string"/>
+        </complexType>
+      </element>
+    </sequence>
+    <attribute name="SessionId" type="string"/>
+  </complexType>
+  <complexType name="GetHashDataInputResponseType">
+    <sequence>
+      <element name="Reference" maxOccurs="unbounded">
+        <complexType>
+          <simpleContent>
+            <extension base="base64Binary">
+              <attribute name="ID" type="string"/>
+              <attribute name="MimeType" type="string" use="optional"/>
+              <attribute name="Encoding" type="string" use="optional"/>
+            </extension>
+          </simpleContent>
+        </complexType>
+      </element>
+    </sequence>
+    <attribute name="SessionId" type="string"/>
+  </complexType>
+  <complexType name="GetHashDataInputFaultType">
+    <sequence>
+      <element name="ErrorCode" type="int"/>
+      <element name="ErrorMessage" type="string"/>
+    </sequence>
+  </complexType>
 </schema>