[jboss-svn-commits] JBossWS SVN: r818 - in branches/jbossws-1.0/src/test: java/org/jboss/test/ws/interop/microsoft/security/wsse10Encrypt resources/interop/microsoft/security/wsse10Encrypt/META-INF resources/interop/microsoft/security/wsse10Encrypt/WEB-INF resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/wsdl
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 23 15:02:39 EDT 2006
Author: heiko.braun at jboss.com
Date: 2006-08-23 15:02:30 -0400 (Wed, 23 Aug 2006)
New Revision: 818
Modified:
branches/jbossws-1.0/src/test/java/org/jboss/test/ws/interop/microsoft/security/wsse10Encrypt/EncryptTestCase.java
branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/META-INF/jboss-wsse-client.xml
branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/META-INF/scenarios.xml
branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/jboss-wsse-server.xml
branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/wsdl/wsdl0.wsdl
branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/wsdl/xsd0.xsd
Log:
wsse 1.0 encryption updates
Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/interop/microsoft/security/wsse10Encrypt/EncryptTestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/interop/microsoft/security/wsse10Encrypt/EncryptTestCase.java 2006-08-23 15:38:37 UTC (rev 817)
+++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/interop/microsoft/security/wsse10Encrypt/EncryptTestCase.java 2006-08-23 19:02:30 UTC (rev 818)
@@ -80,7 +80,8 @@
}
}
- public void testSignEncrpyt() throws Exception
+ // Scenario 3.3. X509 Mutual Authentication, Sign Then Encrypt
+ public void testSignEncrypt() throws Exception
{
PingResponseType pingResponse = port.ping(
new PingType("signEncrypt", "JBossWS", "Hello World")
Modified: branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/META-INF/jboss-wsse-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/META-INF/jboss-wsse-client.xml 2006-08-23 15:38:37 UTC (rev 817)
+++ branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/META-INF/jboss-wsse-client.xml 2006-08-23 19:02:30 UTC (rev 818)
@@ -4,6 +4,7 @@
xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
<config>
<sign type="x509v3" alias="1"/>
+ <encrypt type="x509v3" alias="1"/>
<requires>
<signature/>
<encryption/>
Modified: branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/META-INF/scenarios.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/META-INF/scenarios.xml 2006-08-23 15:38:37 UTC (rev 817)
+++ branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/META-INF/scenarios.xml 2006-08-23 19:02:30 UTC (rev 818)
@@ -2,6 +2,9 @@
<scenario name="default" description="Testing local WSSE endpoints">
<target-endpoint>http://localhost:8080/wsse10Encrypt/endpoint</target-endpoint>
</scenario>
+ <scenario name="debug-local" decsription="Testing local WSSE endpoints through packet logger">
+ <target-endpoint>http://localhost:8081/wsse10Encrypt/endpoint</target-endpoint>
+ </scenario>
<scenario name="msft-public" decsription="Testing MSFT public interop endpoints">
<target-endpoint>http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity10.svc/MutualCertificate10SignEncrypt</target-endpoint>
</scenario>
Modified: branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/jboss-wsse-server.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/jboss-wsse-server.xml 2006-08-23 15:38:37 UTC (rev 817)
+++ branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/jboss-wsse-server.xml 2006-08-23 19:02:30 UTC (rev 818)
@@ -6,10 +6,14 @@
<key-store-password>password</key-store-password>
<trust-store-file>WEB-INF/wsse10.truststore</trust-store-file>
<trust-store-password>password</trust-store-password>
+
<config>
<sign type="x509v3" alias="1"/>
+ <encrypt type="x509v3" alias="1"/>
<requires>
<signature/>
+ <encryption/>
</requires>
</config>
+
</jboss-ws-security>
Modified: branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/wsdl/wsdl0.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/wsdl/wsdl0.wsdl 2006-08-23 15:38:37 UTC (rev 817)
+++ branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/wsdl/wsdl0.wsdl 2006-08-23 19:02:30 UTC (rev 818)
@@ -19,8 +19,8 @@
</xsd:schema>
</wsdl:types>
- <wsdl:message name="PingRequest"><wsdl:part name="parameters" element="q1:PingMsg" xmlns:q1="http://xmlsoap.org/Ping"/></wsdl:message>
- <wsdl:message name="PingResponse"><wsdl:part name="parameters" element="q2:PingResponseMsg" xmlns:q2="http://xmlsoap.org/Ping"/></wsdl:message>
+ <wsdl:message name="PingRequest"><wsdl:part name="parameters" element="q1:Ping" xmlns:q1="http://xmlsoap.org/Ping"/></wsdl:message>
+ <wsdl:message name="PingResponse"><wsdl:part name="parameters" element="q2:PingResponse" xmlns:q2="http://xmlsoap.org/Ping"/></wsdl:message>
<wsdl:message name="IPingService_echo_InputMessage"><wsdl:part name="parameters" element="tns:echo"/></wsdl:message>
<wsdl:message name="IPingService_echo_OutputMessage"><wsdl:part name="parameters" element="tns:echoResponse"/></wsdl:message>
Modified: branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/wsdl/xsd0.xsd
===================================================================
--- branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/wsdl/xsd0.xsd 2006-08-23 15:38:37 UTC (rev 817)
+++ branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10Encrypt/WEB-INF/wsdl/xsd0.xsd 2006-08-23 19:02:30 UTC (rev 818)
@@ -2,7 +2,7 @@
<xs:schema elementFormDefault="qualified" targetNamespace="http://xmlsoap.org/Ping"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://xmlsoap.org/Ping">
- <xs:element name="PingMsg" type="tns:pingType"/>
+ <xs:element name="Ping" type="tns:pingType"/>
<xs:complexType name="pingType">
<xs:sequence>
@@ -12,7 +12,7 @@
</xs:sequence>
</xs:complexType>
- <xs:element name="PingResponseMsg" type="tns:pingResponseType"/>
+ <xs:element name="PingResponse" type="tns:pingResponseType"/>
<xs:complexType name="pingResponseType">
<xs:sequence>
More information about the jboss-svn-commits
mailing list