[jboss-svn-commits] JBossWS SVN: r977 - in branches/jbossws-1.0/src/test: ant resources/interop/microsoft/addressing/wsa10/META-INF resources/interop/microsoft/security/wsse10/META-INF
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 18 09:56:30 EDT 2006
Author: heiko.braun at jboss.com
Date: 2006-09-18 09:56:24 -0400 (Mon, 18 Sep 2006)
New Revision: 977
Modified:
branches/jbossws-1.0/src/test/ant/build-interop-artifacts.xml
branches/jbossws-1.0/src/test/resources/interop/microsoft/addressing/wsa10/META-INF/scenarios.xml
branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10/META-INF/scenarios.xml
Log:
Added new scenarios, fixed some EPR's
Modified: branches/jbossws-1.0/src/test/ant/build-interop-artifacts.xml
===================================================================
--- branches/jbossws-1.0/src/test/ant/build-interop-artifacts.xml 2006-09-18 13:56:04 UTC (rev 976)
+++ branches/jbossws-1.0/src/test/ant/build-interop-artifacts.xml 2006-09-18 13:56:24 UTC (rev 977)
@@ -33,7 +33,7 @@
</path>
<path id="build.classpath">
- <path refid="javac.classpath"/>
+ <path refid="javac.classpath"/>
</path>
<taskdef name="wscompile" classname="com.sun.xml.rpc.tools.ant.Wscompile">
@@ -59,18 +59,18 @@
<mkdir dir="${test.resources.dir}/interop/@{company}/@{module}/META-INF"/>
<wscompile
- keep="true"
- client="true"
- base="${build.test.dir}/classes"
- sourceBase="${test.java.dir}"
- nonClassDir="${test.java.dir}/org/jboss/test/ws/interop/@{company}/@{module}"
- mapping="${test.resources.dir}/interop/@{company}/@{module}/WEB-INF/jaxrpc-mapping.xml"
- features="@{features}"
- xPrintStackTrace="true"
- fork="true"
- verbose="@{verbose}"
- debug="true"
- config="${test.resources.dir}/interop/@{company}/@{module}/@{config}">
+ keep="true"
+ client="true"
+ base="${build.test.dir}/classes"
+ sourceBase="${test.java.dir}"
+ nonClassDir="${test.java.dir}/org/jboss/test/ws/interop/@{company}/@{module}"
+ mapping="${test.resources.dir}/interop/@{company}/@{module}/WEB-INF/jaxrpc-mapping.xml"
+ features="@{features}"
+ xPrintStackTrace="true"
+ fork="true"
+ verbose="@{verbose}"
+ debug="true"
+ config="${test.resources.dir}/interop/@{company}/@{module}/@{config}">
<classpath>
<path refid="wscompile.tools.classpath"/>
@@ -97,19 +97,19 @@
<echo>Generating interop/@{company}/@{module}</echo>
<wscompile
- keep="true"
- import="@{import}"
- server="@{server}"
- base="${build.test.dir}/classes"
- sourceBase="${test.java.dir}"
- nonClassDir="${test.java.dir}/org/jboss/test/ws/interop/@{company}/@{module}"
- mapping="${test.resources.dir}/interop/@{company}/@{module}/WEB-INF/jaxrpc-mapping.xml"
- features="@{features}"
- xPrintStackTrace="true"
- fork="true"
- verbose="@{verbose}"
- debug="true"
- config="${test.resources.dir}/interop/@{company}/@{module}/@{config}">
+ keep="true"
+ import="@{import}"
+ server="@{server}"
+ base="${build.test.dir}/classes"
+ sourceBase="${test.java.dir}"
+ nonClassDir="${test.java.dir}/org/jboss/test/ws/interop/@{company}/@{module}"
+ mapping="${test.resources.dir}/interop/@{company}/@{module}/WEB-INF/jaxrpc-mapping.xml"
+ features="@{features}"
+ xPrintStackTrace="true"
+ fork="true"
+ verbose="@{verbose}"
+ debug="true"
+ config="${test.resources.dir}/interop/@{company}/@{module}/@{config}">
<classpath>
<path refid="wscompile.tools.classpath"/>
@@ -154,34 +154,34 @@
<target name="sync-wsdl-files" description="sync the local WSDL copies">
<fetch-wsdl
- source="http://131.107.72.15/SoapWsdl_BaseDataTypes_XmlFormatter_Service_Indigo/BaseDataTypesDocLitB.svc?wsdl"
- module="soapwsdl/BaseDataTypesDocLitB"
- company="microsoft"/>
+ source="http://131.107.72.15/SoapWsdl_BaseDataTypes_XmlFormatter_Service_Indigo/BaseDataTypesDocLitB.svc?wsdl"
+ module="soapwsdl/BaseDataTypesDocLitB"
+ company="microsoft"/>
<fetch-wsdl
- source="http://131.107.72.15/SoapWsdl_BaseDataTypes_XmlFormatter_Service_Indigo/BaseDataTypesDocLitW.svc?wsdl"
- module="soapwsdl/BaseDataTypesDocLitW"
- company="microsoft"/>
+ source="http://131.107.72.15/SoapWsdl_BaseDataTypes_XmlFormatter_Service_Indigo/BaseDataTypesDocLitW.svc?wsdl"
+ module="soapwsdl/BaseDataTypesDocLitW"
+ company="microsoft"/>
<fetch-wsdl
- source="http://131.107.72.15/SoapWsdl_BaseDataTypes_XmlFormatter_Service_Indigo/BaseDataTypesRpcLit.svc?wsdl"
- module="soapwsdl/BaseDataTypesRPCLit"
- company="microsoft"/>
+ source="http://131.107.72.15/SoapWsdl_BaseDataTypes_XmlFormatter_Service_Indigo/BaseDataTypesRpcLit.svc?wsdl"
+ module="soapwsdl/BaseDataTypesRPCLit"
+ company="microsoft"/>
<fetch-wsdl
- source="http://131.107.72.15/SoapWsdl_ComplexDataTypes_XmlFormatter_Service_Indigo/ComplexDataTypesDocLitB.svc?wsdl"
- module="soapwsdl/ComplexDataTypesDocLitB"
- company="microsoft"/>
+ source="http://131.107.72.15/SoapWsdl_ComplexDataTypes_XmlFormatter_Service_Indigo/ComplexDataTypesDocLitB.svc?wsdl"
+ module="soapwsdl/ComplexDataTypesDocLitB"
+ company="microsoft"/>
<fetch-wsdl
- source="http://131.107.72.15/SoapWsdl_ComplexDataTypes_XmlFormatter_Service_Indigo/ComplexDataTypesDocLitW.svc?wsdl"
- module="soapwsdl/ComplexDataTypesDocLitW"
- company="microsoft"/>
+ source="http://131.107.72.15/SoapWsdl_ComplexDataTypes_XmlFormatter_Service_Indigo/ComplexDataTypesDocLitW.svc?wsdl"
+ module="soapwsdl/ComplexDataTypesDocLitW"
+ company="microsoft"/>
<fetch-wsdl
- source="http://131.107.72.15/SoapWsdl_ComplexDataTypes_XmlFormatter_Service_Indigo/ComplexDataTypesRpcLit.svc?wsdl"
- module="soapwsdl/ComplexDataTypesRpcLit"
- company="microsoft"/>
+ source="http://131.107.72.15/SoapWsdl_ComplexDataTypes_XmlFormatter_Service_Indigo/ComplexDataTypesRpcLit.svc?wsdl"
+ module="soapwsdl/ComplexDataTypesRpcLit"
+ company="microsoft"/>
<!-- OneWay.svc -->
<fetch-wsdl source="http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc?wsdl"
@@ -303,6 +303,7 @@
<target name="deploy" depends="prepare-interop">
<antcall target="deploy-soapwsdl"/>
<antcall target="deploy-addressing"/>
+ <antcall target="deploy-security"/>
</target>
<target name="deploy-soapwsdl">
@@ -321,6 +322,14 @@
</copy>
</target>
+ <target name="deploy-security">
+ <copy todir="${jboss.home}/server/default/deploy/">
+ <fileset dir="${build.test.dir}/libs">
+ <include name="*interop-wsse*.war"/>
+ </fileset>
+ </copy>
+ </target>
+
<target name="clean">
<delete>
<fileset dir="${build.test.dir}/classes">
Modified: branches/jbossws-1.0/src/test/resources/interop/microsoft/addressing/wsa10/META-INF/scenarios.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/interop/microsoft/addressing/wsa10/META-INF/scenarios.xml 2006-09-18 13:56:04 UTC (rev 976)
+++ branches/jbossws-1.0/src/test/resources/interop/microsoft/addressing/wsa10/META-INF/scenarios.xml 2006-09-18 13:56:24 UTC (rev 977)
@@ -3,9 +3,16 @@
<target-endpoint>http://localhost:8080/wsa10/wsaTestService</target-endpoint>
<detour/>
</scenario>
+ <scenario name="debug-local" description="Testing local WSA endpoints">
+ <target-endpoint>http://localhost:8081/wsa10/wsaTestService</target-endpoint>
+ <detour/>
+ </scenario>
<scenario name="msft-public" decsription="Testing MSFT public interop endpoints">
- <target-endpoint>http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc</target-endpoint>
+ <target-endpoint>http://131.107.72.15/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11</target-endpoint>
</scenario>
+ <scenario name="msft-public-debug" decsription="Testing MSFT public interop endpoints">
+ <target-endpoint>http://localhost:8081/WSAddressingCR_Service_WCF/WSAddressing10.svc/Soap11</target-endpoint>
+ </scenario>
<scenario name="apache-axis">
<target-endpoint>http://webservices.sonicsw.com:8080/interop/services/wsaTest</target-endpoint>
</scenario>
Modified: branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10/META-INF/scenarios.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10/META-INF/scenarios.xml 2006-09-18 13:56:04 UTC (rev 976)
+++ branches/jbossws-1.0/src/test/resources/interop/microsoft/security/wsse10/META-INF/scenarios.xml 2006-09-18 13:56:24 UTC (rev 977)
@@ -2,7 +2,13 @@
<scenario name="default" description="Testing local WSA endpoints">
<target-endpoint>http://localhost:8080/wsse10Sign/endpoint</target-endpoint>
</scenario>
+ <scenario name="debug-local" description="Testing local WSA endpoints">
+ <target-endpoint>http://localhost:8081/wsse10Sign/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/WsSecurity10Sign.svc/MutualCertificate10Sign</target-endpoint>
</scenario>
+ <scenario name="msft-public-debug" decsription="Testing MSFT public interop endpoints">
+ <target-endpoint>http://localhost:8081/Security_WsSecurity_Service_Indigo/WsSecurity10Sign.svc/MutualCertificate10Sign</target-endpoint>
+ </scenario>
</client-scenarios>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list