April 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r6716 - framework/trunk/testsuite/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-28 06:08:20 -0400 (Mon, 28 Apr 2008) New Revision: 6716 Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml Log: Move all test inititialization to the prepare target Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-04-28 08:03:34 UTC (rev 6715) +++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-04-28 10:08:20 UTC (rev 6716) @@ -10,82 +10,78 @@ <project> -  - <condition property="jboss.home" value="${jboss421.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> - </condition> - <condition property="jboss.home" value="${jboss422.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> - </condition> - <condition property="jboss.home" value="${jboss423.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> - </condition> - <condition property="jboss.home" value="${jboss500.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> - </condition> - <condition property="jboss.home" value="${jboss501.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> - </condition> -  -  +   -  - <fail message="Tests output dir not set." unless="tests.output.dir"/> - -  - <condition property="tools.jar" value="${java.home}/lib/tools.jar"> - <available file="${java.home}/lib/tools.jar"/> - </condition> - <condition property="tools.jar" value="${java.home}/../lib/tools.jar"> - <available file="${java.home}/../lib/tools.jar"/> - </condition> -  - <condition property="tools.jar" value="${java.home}/../Classes/classes.jar"> - <available file="${java.home}/../Classes/classes.jar"/> - </condition> - <fail message="Not available: ${java.home}/lib/tools.jar, ${java.home}/../lib/tools.jar" unless="tools.jar"/> - -  - <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"> - <isset property="debug"/> - </condition> - <condition property="remote.debug.line" value=""> - <not> + <target name="tests-prepare" depends="prepare"> + +  + <condition property="jboss.home" value="${jboss421.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> + </condition> + <condition property="jboss.home" value="${jboss422.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + </condition> + <condition property="jboss.home" value="${jboss423.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> + </condition> + <condition property="jboss.home" value="${jboss500.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + </condition> + <condition property="jboss.home" value="${jboss501.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> + </condition> + +  + <fail message="Tests output dir not set." unless="tests.output.dir"/> + +  + <condition property="tools.jar" value="${java.home}/lib/tools.jar"> + <available file="${java.home}/lib/tools.jar"/> + </condition> + <condition property="tools.jar" value="${java.home}/../lib/tools.jar"> + <available file="${java.home}/../lib/tools.jar"/> + </condition> +  + <condition property="tools.jar" value="${java.home}/../Classes/classes.jar"> + <available file="${java.home}/../Classes/classes.jar"/> + </condition> + <fail message="Not available: ${java.home}/lib/tools.jar, ${java.home}/../lib/tools.jar" unless="tools.jar"/> + +  + <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"> <isset property="debug"/> - </not> - </condition> - -  - <property environment="env"/> - <condition property="hostname" value="${env.COMPUTERNAME}"> - <os family="windows"/> - </condition> - <condition property="hostname" value="${env.HOSTNAME}"> - <not> + </condition> + <condition property="remote.debug.line" value=""> + <not> + <isset property="debug"/> + </not> + </condition> + +  + <property environment="env"/> + <condition property="hostname" value="${env.COMPUTERNAME}"> <os family="windows"/> - </not> - </condition> - -  - <property name="node0" value="${jboss.bind.address}"/> - <property name="node0.http.url" value="http://${node0}:8080"/> - <property name="node0.jndi.url" value="jnp://${node0}:1099"/> - <property name="node0.hajndi.url" value="jnp://${node0}:1100"/> - -  -  -  - - <target name="tests-prepare"> + </condition> + <condition property="hostname" value="${env.HOSTNAME}"> + <not> + <os family="windows"/> + </not> + </condition> +  + <property name="node0" value="${jboss.bind.address}"/> + <property name="node0.http.url" value="http://${node0}:8080"/> + <property name="node0.jndi.url" value="jnp://${node0}:1099"/> + <property name="node0.hajndi.url" value="jnp://${node0}:1100"/> + <mkdir dir="${tests.output.dir}/test-log"/> <delete file="${tests.output.dir}/test-log/test.log"/> @@ -172,9 +168,8 @@ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> <pathelement location="${jboss.client}/jboss-remoting.jar"/> <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> + <pathelement location="${jboss.client}/jbossws-jboss42.jar"/> <pathelement location="${jboss.client}/jbossws-jboss421.jar"/> - <pathelement location="${jboss.client}/jbossws-jboss422.jar"/> - <pathelement location="${jboss.client}/jbossws-jboss423.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/mail.jar"/> @@ -234,8 +229,7 @@ <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> - <pathelement location="${jboss.client}/jbossws-jboss500.jar"/> - <pathelement location="${jboss.client}/jbossws-jboss501.jar"/> + <pathelement location="${jboss.client}/jbossws-jboss50.jar"/> <pathelement location="${jboss.client}/jaxws-tools.jar"/> <pathelement location="${jboss.client}/jboss-wsit-tools.jar"/> <pathelement location="${jboss.client}/log4j.jar"/>

18 years

1
0
0 / 0

JBossWS SVN: r6715 - stack/native/trunk/src/test/resources.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-28 04:03:34 -0400 (Mon, 28 Apr 2008) New Revision: 6715 Modified: stack/native/trunk/src/test/resources/test-excludes-jboss501.txt Log: [JBAS-5490] enable EJB3 endpoints to show errors Modified: stack/native/trunk/src/test/resources/test-excludes-jboss501.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-25 16:38:54 UTC (rev 6714) +++ stack/native/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-28 08:03:34 UTC (rev 6715) @@ -55,10 +55,3 @@ # [JBAS-5388] JBossXBRuntimeException: Missing value for the required attribute org/jboss/test/ws/jaxrpc/jbws720/** -# [EJBTHREE-1323] ClassNotFoundException: org.jboss.ejb3.tx.TxInterceptorFactory -org/jboss/test/ws/jaxws/samples/advanced/retail/** -org/jboss/test/ws/jaxws/samples/context/** -org/jboss/test/ws/jaxws/samples/eardeployment/** -org/jboss/test/ws/jaxws/samples/swaref/** -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/samples/webservice/**

18 years

1
0
0 / 0

JBossWS SVN: r6714 - stack/metro/trunk/src/test/resources.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-04-25 12:38:54 -0400 (Fri, 25 Apr 2008) New Revision: 6714 Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt Log: [JBWS-2098] Excluding tests Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt =================================================================== --- stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt 2008-04-25 16:24:39 UTC (rev 6713) +++ stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt 2008-04-25 16:38:54 UTC (rev 6714) @@ -71,6 +71,11 @@ # [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl org/jboss/test/ws/jaxws/namespace/** +# [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars +org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.* +org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.* +# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration +org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt =================================================================== --- stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt 2008-04-25 16:24:39 UTC (rev 6713) +++ stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt 2008-04-25 16:38:54 UTC (rev 6714) @@ -71,6 +71,11 @@ # [JBWS-2136] ClassCastException: com.sun.xml.ws.server.EndpointMessageContextImpl org/jboss/test/ws/jaxws/namespace/** +# [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars +org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.* +org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.* +# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration +org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt =================================================================== --- stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-25 16:24:39 UTC (rev 6713) +++ stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-25 16:38:54 UTC (rev 6714) @@ -77,6 +77,11 @@ # [JBWS-2137] @WebWservice does not work with class isolation org/jboss/test/ws/jaxws/jbws1556/** +# [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars +org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.* +org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.* +# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration +org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt =================================================================== --- stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-25 16:24:39 UTC (rev 6713) +++ stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-25 16:38:54 UTC (rev 6714) @@ -92,3 +92,10 @@ org/jboss/test/ws/jaxws/samples/webserviceref/** org/jboss/test/ws/jaxws/samples/webservice/** +# [JBWS-2158] Use more recent Metro sources: metro_release1.1 doesn't read keystore/trustore provided in the client and server jars +org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.* +org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.* + +# UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration +org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* +

18 years

1
0
0 / 0

JBossWS SVN: r6713 - in stack/metro/trunk: src/test/java/org/jboss/test/ws/jaxws/samples and 19 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-04-25 12:24:39 -0400 (Fri, 25 Apr 2008) New Revision: 6713 Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.java stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHello.java stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHelloResponse.java stack/metro/trunk/src/test/resources/jaxws/samples/wsse/ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/client-keystore.jks stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/client-truststore.jks stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/server-keystore.jks stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/server-truststore.jks stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/services/ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/services/com.sun.xml.xwss.RealmAuthenticator stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/wsit-client.xml stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/client-keystore.jks stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/client-truststore.jks stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/server-keystore.jks stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/server-truststore.jks stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/services/ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/services/com.sun.xml.xwss.RealmAuthenticator stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/wsit-client.xml stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/web.xml stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService.wsdl stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService_schema1.xsd stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/META-INF/ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/META-INF/services/ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/META-INF/services/com.sun.xml.xwss.RealmAuthenticator stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/META-INF/wsit-client.xml stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/web.xml stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService.wsdl stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService_schema1.xsd stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml Modified: stack/metro/trunk/ant-import-tests/build-samples-jaxws.xml Log: [JBWS-2098] Unlock WS-Security Modified: stack/metro/trunk/ant-import-tests/build-samples-jaxws.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-samples-jaxws.xml 2008-04-25 16:16:32 UTC (rev 6712) +++ stack/metro/trunk/ant-import-tests/build-samples-jaxws.xml 2008-04-25 16:24:39 UTC (rev 6713) @@ -45,6 +45,86 @@ dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" prefix="WEB-INF/wsdl"/> </war> + +  + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF"> + <include name="wsit-*.xml"/> + </webinf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF"> + <include name="server-*.jks"/> + <include name="services/**"/> + </metainf> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/WEB-INF/wsdl" + prefix="WEB-INF/wsdl"/> + </war> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign/META-INF"> + <include name="client-*.jks"/> + <include name="wsit-client.xml"/> + </metainf> + </jar> + +  + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF"> + <include name="wsit-*.xml"/> + </webinf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF"> + <include name="server-*.jks"/> + <include name="services/**"/> + </metainf> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl" + prefix="WEB-INF/wsdl"/> + </war> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-sign-encrypt-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/sign-encrypt/META-INF"> + <include name="client-*.jks"/> + <include name="wsit-client.xml"/> + </metainf> + </jar> + +  + <war + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/samples/wsse/Service*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/jaxws/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF"> + <include name="wsit-*.xml"/> + </webinf> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/META-INF"> + <include name="services/**"/> + </metainf> + <zipfileset + dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/WEB-INF/wsdl" + prefix="WEB-INF/wsdl"/> + </war> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-client.jar"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username/META-INF"> + <include name="wsit-client.xml"/> + </metainf> + </jar> +  Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.java =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.java 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsse; + +import javax.security.auth.Subject; + +import com.sun.xml.wss.RealmAuthenticationAdapter; +import com.sun.xml.wss.XWSSecurityException; + +/** + * A simple realm authenticator showing how to override the WSIT default + * (which is based on tomcat-users.xml when not running on Glassfish) + * + * @author alessio.soldano(a)jboss.com + * @since 25-Apr-2008 + * + */ +public class RealmAuthenticator extends RealmAuthenticationAdapter +{ + @Override + public boolean authenticate(Subject callerSubject, String username, String password) throws XWSSecurityException + { + System.out.println("Custom realm authenticator called: username=" + username + ", password=" + password); + return (username.equals("kermit") && password.equals("thefrog")); + } +} Property changes on: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/RealmAuthenticator.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsse; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +@WebService +( + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity" +) +public interface ServiceIface +{ + @WebMethod + String sayHello(); +} Property changes on: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceIface.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsse; + +import javax.jws.WebService; + +@WebService +( + portName = "SecurityServicePort", + serviceName = "SecurityService", + wsdlLocation = "WEB-INF/wsdl/SecurityService.wsdl", + targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity", + endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.ServiceIface" +) +public class ServiceImpl implements ServiceIface +{ + public String sayHello() + { + return "Secure Hello World!"; + } +} Property changes on: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/ServiceImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsse; + +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * WS-Security sign + encrypt test case + * + * @author alessio.soldano(a)jboss.com + * @since 23-Apr-2008 + */ +public final class SignEncryptTestCase extends JBossWSTest +{ + private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-sign-encrypt/SecurityService"; + + public static Test suite() + { + addClientConfToClasspath("jaxws-samples-wsse-sign-encrypt-client.jar"); + return new JBossWSTestSetup(SignEncryptTestCase.class, "jaxws-samples-wsse-sign-encrypt.war"); + } + + public void test() throws Exception + { + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService"); + URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class); +// BindingProvider bp = (BindingProvider)proxy; +// bp.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit"); +// bp.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "thefrog"); + + assertEquals("Secure Hello World!", proxy.sayHello()); + } + + protected static void addClientConfToClasspath(String s) + { + try + { + // wrap the classloader upfront to allow inclusion of the client.jar + JBossWSTestHelper helper = new JBossWSTestHelper(); + ClassLoader parent = Thread.currentThread().getContextClassLoader(); + URLClassLoader replacement = new URLClassLoader(new URL[] { helper.getArchiveFile(s).toURL() }, parent); + Thread.currentThread().setContextClassLoader(replacement); + } + catch (MalformedURLException e) + { + throw new IllegalStateException(e); + } + } +} Property changes on: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignEncryptTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,77 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsse; + +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * WS-Security sign test case + * + * @author alessio.soldano(a)jboss.com + * @since 23-Apr-2008 + */ +public final class SignTestCase extends JBossWSTest +{ + private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsse-sign/SecurityService"; + + public static Test suite() + { + addClientConfToClasspath("jaxws-samples-wsse-sign-client.jar"); + return new JBossWSTestSetup(SignTestCase.class, "jaxws-samples-wsse-sign.war"); + } + + public void test() throws Exception + { + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService"); + URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class); + assertEquals("Secure Hello World!", proxy.sayHello()); + } + + protected static void addClientConfToClasspath(String s) + { + try + { + // wrap the classloader upfront to allow inclusion of the client.jar + JBossWSTestHelper helper = new JBossWSTestHelper(); + ClassLoader parent = Thread.currentThread().getContextClassLoader(); + URLClassLoader replacement = new URLClassLoader(new URL[] { helper.getArchiveFile(s).toURL() }, parent); + Thread.currentThread().setContextClassLoader(replacement); + } + catch (MalformedURLException e) + { + throw new IllegalStateException(e); + } + } +} Property changes on: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/SignTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wsse; + +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * WS-Security username token profile test case + * + * @author alessio.soldano(a)jboss.com + * @since 23-Apr-2008 + */ +public final class UsernameTestCase extends JBossWSTest +{ + private final String serviceURL = "https://" + getServerHost() + ":8443/jaxws-samples-wsse-username/SecurityService"; + + public static Test suite() + { + addClientConfToClasspath("jaxws-samples-wsse-username-client.jar"); + return new JBossWSTestSetup(UsernameTestCase.class, "jaxws-samples-wsse-username.war"); + } + + public void test() throws Exception + { + System.setProperty("javax.net.ssl.trustStore", "/dati/jboss-4.2.2.GA/server/default/truststore_abc"); + System.setProperty("javax.net.ssl.trustStorePassword", "changeit"); + System.setProperty("javax.net.ssl.trustStoreType", "jks"); + + QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wssecurity", "SecurityService"); + URL wsdlURL = new URL(serviceURL + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class); + + assertEquals("Secure Hello World!", proxy.sayHello()); + } + + protected static void addClientConfToClasspath(String s) + { + try + { + // wrap the classloader upfront to allow inclusion of the client.jar + JBossWSTestHelper helper = new JBossWSTestHelper(); + ClassLoader parent = Thread.currentThread().getContextClassLoader(); + URLClassLoader replacement = new URLClassLoader(new URL[] { helper.getArchiveFile(s).toURL() }, parent); + Thread.currentThread().setContextClassLoader(replacement); + } + catch (MalformedURLException e) + { + throw new IllegalStateException(e); + } + } +} Property changes on: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHello.java =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHello.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHello.java 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,15 @@ + +package org.jboss.test.ws.jaxws.samples.wsse.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity") +public class SayHello { + + +} Property changes on: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHello.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHelloResponse.java =================================================================== --- stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHelloResponse.java (rev 0) +++ stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHelloResponse.java 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,36 @@ + +package org.jboss.test.ws.jaxws.samples.wsse.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wssecurity") +public class SayHelloResponse { + + @XmlElement(name = "return", namespace = "") + private String _return; + + /** + * + * @return + * returns String + */ + public String getReturn() { + return this._return; + } + + /** + * + * @param _return + * the value for the _return property + */ + public void setReturn(String _return) { + this._return = _return; + } + +} Property changes on: stack/metro/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/jaxws/SayHelloResponse.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/client-keystore.jks =================================================================== (Binary files differ) Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/client-keystore.jks ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/client-truststore.jks =================================================================== (Binary files differ) Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/client-truststore.jks ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/server-keystore.jks =================================================================== (Binary files differ) Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/server-keystore.jks ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/server-truststore.jks =================================================================== (Binary files differ) Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/server-truststore.jks ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/services/com.sun.xml.xwss.RealmAuthenticator =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/services/com.sun.xml.xwss.RealmAuthenticator (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/services/com.sun.xml.xwss.RealmAuthenticator 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1 @@ +org.jboss.test.ws.jaxws.samples.wsse.RealmAuthenticator \ No newline at end of file Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/wsit-client.xml =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/wsit-client.xml (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/wsit-client.xml 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService" + xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." + xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy" + xmlns:sc="http://schemas.sun.com/2006/03/wss/server" + xmlns="http://schemas.xmlsoap.org/wsdl/"> + <portType name="ServiceIface"/> + <binding name="SecurityServicePortBinding" type="tns:ServiceIface"> + <wsp:PolicyReference URI="#ClientKeystorePolicy"/> + </binding> + <service name="SecurityService"> + <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"/> + </service> + <wsp:Policy wsu:Id="ClientKeystorePolicy" + xmlns:sc="http://schemas.sun.com/2006/03/wss/client" + xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"> + <wsp:ExactlyOne> + <wsp:All> + <sc:KeyStore wspp:visibility="private" + location="client-keystore.jks" + type="JKS" + alias="xws-security-client" + storepass="changeit"> + </sc:KeyStore> + <sc:TrustStore wspp:visibility="private" + location="client-truststore.jks" + type="JKS" + peeralias="xws-security-server" + storepass="changeit"> + </sc:TrustStore> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> +</definitions> \ No newline at end of file Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/META-INF/wsit-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/web.xml =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/web.xml (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/web.xml 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app + version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + <servlet> + <servlet-name>SecurityService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>SecurityService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService.wsdl (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService.wsdl 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> + +<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService" + xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." + xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" + xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy" + xmlns:sc="http://schemas.sun.com/2006/03/wss/server" + xmlns="http://schemas.xmlsoap.org/wsdl/"> + <types> + <xsd:schema> + <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" schemaLocation="SecurityService_schema1.xsd"/> + </xsd:schema> + </types> + <message name="sayHello"> + <part name="parameters" element="tns:sayHello"/> + </message> + <message name="sayHelloResponse"> + <part name="parameters" element="tns:sayHelloResponse"/> + </message> + <portType name="ServiceIface"> + <operation name="sayHello"> + <input message="tns:sayHello"/> + <output message="tns:sayHelloResponse"/> + </operation> + </portType> + <binding name="SecurityServicePortBinding" type="tns:ServiceIface"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> + <wsp:PolicyReference URI="#SecurityServicePortBindingPolicy"/> + <operation name="sayHello"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/> + </input> + <output> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/> + </output> + </operation> + </binding> + <service name="SecurityService"> + <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </port> + </service> + +  + <wsp:Policy wsu:Id="SecurityServicePortBindingPolicy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:SymmetricBinding> + <wsp:Policy> + <sp:ProtectionToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never"> + <wsp:Policy> + <sp:WssX509V3Token10/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:ProtectionToken> + <sp:Layout> + <wsp:Policy> + <sp:Strict/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:OnlySignEntireHeadersAndBody/> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp:Basic128/> + </wsp:Policy> + </sp:AlgorithmSuite> + </wsp:Policy> + </sp:SymmetricBinding> + <sp:Wss11> + <wsp:Policy> + <sp:MustSupportRefKeyIdentifier/> + <sp:MustSupportRefIssuerSerial/> + <sp:MustSupportRefThumbprint/> + <sp:MustSupportRefEncryptedKey/> + </wsp:Policy> + </sp:Wss11> + <sc:KeyStore wspp:visibility="private" alias="xws-security-server" location="server-keystore.jks" storepass="changeit"/> + <sc:TrustStore wspp:visibility="private" location="server-truststore.jks" storepass="changeit"/> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id="SecurityServicePortBinding_sayHello_Policy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:SignedParts> + <sp:Body/> + </sp:SignedParts> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> +</definitions> Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService_schema1.xsd =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService_schema1.xsd (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService_schema1.xsd 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:element name="sayHello" type="tns:sayHello"/> + + <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/> + + <xs:complexType name="sayHello"> + <xs:sequence/> + </xs:complexType> + + <xs:complexType name="sayHelloResponse"> + <xs:sequence> + <xs:element name="return" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> +</xs:schema> + Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsdl/SecurityService_schema1.xsd ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> + +<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService" + xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." + xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" + xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy" + xmlns:sc="http://schemas.sun.com/2006/03/wss/server" + xmlns="http://schemas.xmlsoap.org/wsdl/"> + <message name="sayHello"/> + <message name="sayHelloResponse"/> + <portType name="ServiceIface"> + <operation name="sayHello"> + <input message="tns:sayHello"/> + <output message="tns:sayHelloResponse"/> + </operation> + </portType> + <binding name="SecurityServicePortBinding" type="tns:ServiceIface"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> + <wsp:PolicyReference URI="#SecurityServicePortBindingPolicy"/> + <operation name="sayHello"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/> + </input> + <output> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/> + </output> + </operation> + </binding> + <service name="SecurityService"> + <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </port> + </service> + +  + <wsp:Policy wsu:Id="SecurityServicePortBindingPolicy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:SymmetricBinding> + <wsp:Policy> + <sp:ProtectionToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never"> + <wsp:Policy> + <sp:WssX509V3Token10/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:ProtectionToken> + <sp:Layout> + <wsp:Policy> + <sp:Strict/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:OnlySignEntireHeadersAndBody/> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp:Basic128/> + </wsp:Policy> + </sp:AlgorithmSuite> + </wsp:Policy> + </sp:SymmetricBinding> + <sp:Wss11> + <wsp:Policy> + <sp:MustSupportRefKeyIdentifier/> + <sp:MustSupportRefIssuerSerial/> + <sp:MustSupportRefThumbprint/> + <sp:MustSupportRefEncryptedKey/> + </wsp:Policy> + </sp:Wss11> + <sc:KeyStore wspp:visibility="private" alias="xws-security-server" location="server-keystore.jks" storepass="changeit"/> + <sc:TrustStore wspp:visibility="private" location="server-truststore.jks" storepass="changeit"/> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id="SecurityServicePortBinding_sayHello_Policy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:SignedParts> + <sp:Body/> + </sp:SignedParts> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> +</definitions> Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/client-keystore.jks =================================================================== (Binary files differ) Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/client-keystore.jks ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/client-truststore.jks =================================================================== (Binary files differ) Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/client-truststore.jks ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/server-keystore.jks =================================================================== (Binary files differ) Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/server-keystore.jks ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/server-truststore.jks =================================================================== (Binary files differ) Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/server-truststore.jks ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/services/com.sun.xml.xwss.RealmAuthenticator =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/services/com.sun.xml.xwss.RealmAuthenticator (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/services/com.sun.xml.xwss.RealmAuthenticator 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1 @@ +org.jboss.test.ws.jaxws.samples.wsse.RealmAuthenticator \ No newline at end of file Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/wsit-client.xml =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/wsit-client.xml (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/wsit-client.xml 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService" + xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." + xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy" + xmlns:sc="http://schemas.sun.com/2006/03/wss/server" + xmlns="http://schemas.xmlsoap.org/wsdl/"> + <portType name="ServiceIface"/> + <binding name="SecurityServicePortBinding" type="tns:ServiceIface"> + <wsp:PolicyReference URI="#ClientKeystorePolicy"/> + </binding> + <service name="SecurityService"> + <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"/> + </service> + <wsp:Policy wsu:Id="ClientKeystorePolicy" + xmlns:sc="http://schemas.sun.com/2006/03/wss/client" + xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"> + <wsp:ExactlyOne> + <wsp:All> + <sc:KeyStore wspp:visibility="private" + location="client-keystore.jks" + type="JKS" + alias="xws-security-client" + storepass="changeit"> + </sc:KeyStore> + <sc:TrustStore wspp:visibility="private" + location="client-truststore.jks" + type="JKS" + peeralias="xws-security-server" + storepass="changeit"> + </sc:TrustStore> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> +</definitions> \ No newline at end of file Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/META-INF/wsit-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app + version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + <servlet> + <servlet-name>SecurityService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>SecurityService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> + +<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService" + xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." + xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" + xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy" + xmlns:sc="http://schemas.sun.com/2006/03/wss/server" + xmlns="http://schemas.xmlsoap.org/wsdl/"> + <types> + <xsd:schema> + <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" schemaLocation="SecurityService_schema1.xsd"/> + </xsd:schema> + </types> + <message name="sayHello"> + <part name="parameters" element="tns:sayHello"/> + </message> + <message name="sayHelloResponse"> + <part name="parameters" element="tns:sayHelloResponse"/> + </message> + <portType name="ServiceIface"> + <operation name="sayHello"> + <input message="tns:sayHello"/> + <output message="tns:sayHelloResponse"/> + </operation> + </portType> + <binding name="SecurityServicePortBinding" type="tns:ServiceIface"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> + <wsp:PolicyReference URI="#SecurityServicePortBindingPolicy"/> + <operation name="sayHello"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/> + </input> + <output> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/> + </output> + </operation> + </binding> + <service name="SecurityService"> + <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </port> + </service> + +  + <wsp:Policy wsu:Id="SecurityServicePortBindingPolicy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:SymmetricBinding> + <wsp:Policy> + <sp:ProtectionToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never"> + <wsp:Policy> + <sp:WssX509V3Token10/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:ProtectionToken> + <sp:Layout> + <wsp:Policy> + <sp:Strict/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:OnlySignEntireHeadersAndBody/> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp:Basic128/> + </wsp:Policy> + </sp:AlgorithmSuite> + </wsp:Policy> + </sp:SymmetricBinding> + <sp:Wss11> + <wsp:Policy> + <sp:MustSupportRefKeyIdentifier/> + <sp:MustSupportRefIssuerSerial/> + <sp:MustSupportRefThumbprint/> + <sp:MustSupportRefEncryptedKey/> + </wsp:Policy> + </sp:Wss11> + <sc:KeyStore wspp:visibility="private" alias="xws-security-server" location="server-keystore.jks" storepass="changeit"/> + <sc:TrustStore wspp:visibility="private" location="server-truststore.jks" storepass="changeit"/> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id="SecurityServicePortBinding_sayHello_Policy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:EncryptedParts> + <sp:Body/> + </sp:EncryptedParts> + <sp:SignedParts> + <sp:Body/> + </sp:SignedParts> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> +</definitions> Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:element name="sayHello" type="tns:sayHello"/> + + <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/> + + <xs:complexType name="sayHello"> + <xs:sequence/> + </xs:complexType> + + <xs:complexType name="sayHelloResponse"> + <xs:sequence> + <xs:element name="return" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> +</xs:schema> + Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsdl/SecurityService_schema1.xsd ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> + +<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService" + xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." + xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" + xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy" + xmlns:sc="http://schemas.sun.com/2006/03/wss/server" + xmlns="http://schemas.xmlsoap.org/wsdl/"> + <message name="sayHello"/> + <message name="sayHelloResponse"/> + <portType name="ServiceIface"> + <operation name="sayHello"> + <input message="tns:sayHello"/> + <output message="tns:sayHelloResponse"/> + </operation> + </portType> + <binding name="SecurityServicePortBinding" type="tns:ServiceIface"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> + <wsp:PolicyReference URI="#SecurityServicePortBindingPolicy"/> + <operation name="sayHello"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/> + </input> + <output> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/> + </output> + </operation> + </binding> + <service name="SecurityService"> + <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </port> + </service> + +  + <wsp:Policy wsu:Id="SecurityServicePortBindingPolicy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:SymmetricBinding> + <wsp:Policy> + <sp:ProtectionToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never"> + <wsp:Policy> + <sp:WssX509V3Token10/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:ProtectionToken> + <sp:Layout> + <wsp:Policy> + <sp:Strict/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:OnlySignEntireHeadersAndBody/> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp:Basic128/> + </wsp:Policy> + </sp:AlgorithmSuite> + </wsp:Policy> + </sp:SymmetricBinding> + <sp:Wss11> + <wsp:Policy> + <sp:MustSupportRefKeyIdentifier/> + <sp:MustSupportRefIssuerSerial/> + <sp:MustSupportRefThumbprint/> + <sp:MustSupportRefEncryptedKey/> + </wsp:Policy> + </sp:Wss11> + <sc:KeyStore wspp:visibility="private" alias="xws-security-server" location="server-keystore.jks" storepass="changeit"/> + <sc:TrustStore wspp:visibility="private" location="server-truststore.jks" storepass="changeit"/> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id="SecurityServicePortBinding_sayHello_Policy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:EncryptedParts> + <sp:Body/> + </sp:EncryptedParts> + <sp:SignedParts> + <sp:Body/> + </sp:SignedParts> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> +</definitions> Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/sign-encrypt/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/META-INF/services/com.sun.xml.xwss.RealmAuthenticator =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/META-INF/services/com.sun.xml.xwss.RealmAuthenticator (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/META-INF/services/com.sun.xml.xwss.RealmAuthenticator 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1 @@ +org.jboss.test.ws.jaxws.samples.wsse.RealmAuthenticator \ No newline at end of file Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/META-INF/wsit-client.xml =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/META-INF/wsit-client.xml (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/META-INF/wsit-client.xml 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService" + xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." + xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy" + xmlns:sc="http://schemas.sun.com/2006/03/wss/server" + xmlns="http://schemas.xmlsoap.org/wsdl/"> + <portType name="ServiceIface"/> + <binding name="SecurityServicePortBinding" type="tns:ServiceIface"> + <wsp:PolicyReference URI="#ClientKeystorePolicy"/> + </binding> + <service name="SecurityService"> + <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"/> + </service> + <wsp:Policy wsu:Id="ClientKeystorePolicy" + xmlns:sc="http://schemas.sun.com/2006/03/wss/client" + xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"> + <wsp:ExactlyOne> + <wsp:All> + <sc:CallbackHandlerConfiguration> + <sc:CallbackHandler name="usernameHandler" default="kermit"/> + <sc:CallbackHandler name="passwordHandler" default="thefrog"/> + </sc:CallbackHandlerConfiguration> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> +</definitions> \ No newline at end of file Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/META-INF/wsit-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/web.xml =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/web.xml (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/web.xml 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app + version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + <servlet> + <servlet-name>SecurityService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>SecurityService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService.wsdl (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService.wsdl 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> + +<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService" + xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." + xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" + xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy" + xmlns:sc="http://schemas.sun.com/2006/03/wss/server" + xmlns="http://schemas.xmlsoap.org/wsdl/"> + <types> + <xsd:schema> + <xsd:import namespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" schemaLocation="SecurityService_schema1.xsd"/> + </xsd:schema> + </types> + <message name="sayHello"> + <part name="parameters" element="tns:sayHello"/> + </message> + <message name="sayHelloResponse"> + <part name="parameters" element="tns:sayHelloResponse"/> + </message> + <portType name="ServiceIface"> + <operation name="sayHello"> + <input message="tns:sayHello"/> + <output message="tns:sayHelloResponse"/> + </operation> + </portType> + <binding name="SecurityServicePortBinding" type="tns:ServiceIface"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> + <wsp:PolicyReference URI="#SecurityServicePortBindingPolicy"/> + <operation name="sayHello"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/> + </input> + <output> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/> + </output> + </operation> + </binding> + <service name="SecurityService"> + <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </port> + </service> + +  + <wsp:Policy wsu:Id="SecurityServicePortBindingPolicy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:Wss10> + <wsp:Policy> + <sp:MustSupportRefKeyIdentifier/> + <sp:MustSupportRefIssuerSerial/> + </wsp:Policy> + </sp:Wss10> + <sp:TransportBinding> + <wsp:Policy> + <sp:TransportToken> + <wsp:Policy> + <sp:HttpsToken RequireClientCertificate="false"/> + </wsp:Policy> + </sp:TransportToken> + <sp:Layout> + <wsp:Policy> + <sp:Lax/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp:Basic128/> + </wsp:Policy> + </sp:AlgorithmSuite> + </wsp:Policy> + </sp:TransportBinding> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id="SecurityServicePortBinding_sayHello_Policy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:SignedSupportingTokens> + <wsp:Policy> + <sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysT..."> + <wsp:Policy> + <sp:WssUsernameToken10/> + </wsp:Policy> + </sp:UsernameToken> + </wsp:Policy> + </sp:SignedSupportingTokens> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> +</definitions> Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService_schema1.xsd =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService_schema1.xsd (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService_schema1.xsd 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<xs:schema version="1.0" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:element name="sayHello" type="tns:sayHello"/> + + <xs:element name="sayHelloResponse" type="tns:sayHelloResponse"/> + + <xs:complexType name="sayHello"> + <xs:sequence/> + </xs:complexType> + + <xs:complexType name="sayHelloResponse"> + <xs:sequence> + <xs:element name="return" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> +</xs:schema> + Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsdl/SecurityService_schema1.xsd ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml =================================================================== --- stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml (rev 0) +++ stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml 2008-04-25 16:24:39 UTC (rev 6713) @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> + +<definitions targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wssecurity" name="SecurityService" + xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wssecurity" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." + xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" + xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy" + xmlns:sc="http://schemas.sun.com/2006/03/wss/server" + xmlns="http://schemas.xmlsoap.org/wsdl/"> + <message name="sayHello"/> + <message name="sayHelloResponse"/> + <portType name="ServiceIface"> + <operation name="sayHello"> + <input message="tns:sayHello"/> + <output message="tns:sayHelloResponse"/> + </operation> + </portType> + <binding name="SecurityServicePortBinding" type="tns:ServiceIface"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/> + <wsp:PolicyReference URI="#SecurityServicePortBindingPolicy"/> + <operation name="sayHello"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/> + </input> + <output> + <soap:body use="literal"/> + <wsp:PolicyReference URI="#SecurityServicePortBinding_sayHello_Policy"/> + </output> + </operation> + </binding> + <service name="SecurityService"> + <port name="SecurityServicePort" binding="tns:SecurityServicePortBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </port> + </service> + +  + <wsp:Policy wsu:Id="SecurityServicePortBindingPolicy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:Wss10> + <wsp:Policy> + <sp:MustSupportRefKeyIdentifier/> + <sp:MustSupportRefIssuerSerial/> + </wsp:Policy> + </sp:Wss10> + <sp:TransportBinding> + <wsp:Policy> + <sp:TransportToken> + <wsp:Policy> + <sp:HttpsToken RequireClientCertificate="false"/> + </wsp:Policy> + </sp:TransportToken> + <sp:Layout> + <wsp:Policy> + <sp:Lax/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp:Basic128/> + </wsp:Policy> + </sp:AlgorithmSuite> + </wsp:Policy> + </sp:TransportBinding> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> + <wsp:Policy wsu:Id="SecurityServicePortBinding_sayHello_Policy"> + <wsp:ExactlyOne> + <wsp:All> + <sp:SignedSupportingTokens> + <wsp:Policy> + <sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysT..."> + <wsp:Policy> + <sp:WssUsernameToken10/> + </wsp:Policy> + </sp:UsernameToken> + </wsp:Policy> + </sp:SignedSupportingTokens> + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> +</definitions> Property changes on: stack/metro/trunk/src/test/resources/jaxws/samples/wsse/username/WEB-INF/wsit-org.jboss.test.ws.jaxws.samples.wsse.ServiceImpl.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

18 years

1
0
0 / 0

JBossWS SVN: r6712 - container/jboss50/branches/jbossws-jboss500.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-25 12:16:32 -0400 (Fri, 25 Apr 2008) New Revision: 6712 Modified: container/jboss50/branches/jbossws-jboss500/pom.xml Log: use provided fo as dependencies Modified: container/jboss50/branches/jbossws-jboss500/pom.xml =================================================================== --- container/jboss50/branches/jbossws-jboss500/pom.xml 2008-04-25 16:09:18 UTC (rev 6711) +++ container/jboss50/branches/jbossws-jboss500/pom.xml 2008-04-25 16:16:32 UTC (rev 6712) @@ -59,40 +59,44 @@ <version>${jbossws.spi.version}</version> </dependency> -  - -  - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-server</artifactId> - <version>${jboss.version}</version> - </dependency> - -  +  <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <version>${jboss.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-structure-spi</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.metadata</groupId> <artifactId>jboss-metadata</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-core</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-ext-api</artifactId> + <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.security</groupId> - <artifactId>jboss-security-spi</artifactId> - </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jboss-security-spi</artifactId> + <scope>provided</scope> + </dependency> + +  + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + </dependency> </dependencies>

18 years

1
0
0 / 0

JBossWS SVN: r6711 - in framework/trunk/hudson/hudson-home/jobs: CXF-Core-AS-5.0.1 and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-25 12:09:18 -0400 (Fri, 25 Apr 2008) New Revision: 6711 Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml Log: jboss50x cxf integration Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml 2008-04-25 15:58:45 UTC (rev 6710) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.0/config.xml 2008-04-25 16:09:18 UTC (rev 6711) @@ -11,9 +11,10 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework STACKCXF=$WORKSPACE/stack-cxf +JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss500.home=$JBOSS_INSTANCE" # # stop jbossas @@ -25,7 +26,7 @@ # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500 +ant $ENVIRONMENT clean deploy-jboss500 # # start jbossas @@ -39,11 +40,11 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi - + # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # @@ -57,7 +58,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-cxf/output/tests/test-reports/TEST-*.xml</testResults> + <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml 2008-04-25 15:58:45 UTC (rev 6710) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Core-AS-5.0.1/config.xml 2008-04-25 16:09:18 UTC (rev 6711) @@ -11,9 +11,10 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework STACKCXF=$WORKSPACE/stack-cxf +JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE" # # stop jbossas @@ -25,7 +26,7 @@ # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss501 +ant $ENVIRONMENT clean deploy-jboss501 # # start jbossas @@ -39,11 +40,11 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi - + # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,$JBOSS_TARGET test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # @@ -57,7 +58,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-cxf/output/tests/test-reports/TEST-*.xml</testResults> + <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml 2008-04-25 15:58:45 UTC (rev 6710) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml 2008-04-25 16:09:18 UTC (rev 6711) @@ -11,9 +11,10 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework STACKCXF=$WORKSPACE/stack-cxf +JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss500.home=$JBOSS_INSTANCE" # # stop jbossas @@ -25,14 +26,13 @@ # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist +ant $ENVIRONMENT clean build-bin-dist # # Deploy distro # -cd output/jbossws-cxf-dist -cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT deploy-jboss500 +cd target/jbossws-cxf-dist +ant $ENVIRONMENT deploy-jboss500 # # start jbossas @@ -46,11 +46,11 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi - + # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log +ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # @@ -64,7 +64,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-cxf/output/jbossws-cxf-dist/output/test-reports/TEST-*.xml</testResults> + <testResults>stack-cxf/target/jbossws-cxf-dist/output/test-reports/TEST-*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml 2008-04-25 15:58:45 UTC (rev 6710) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml 2008-04-25 16:09:18 UTC (rev 6711) @@ -11,9 +11,10 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework STACKCXF=$WORKSPACE/stack-cxf +JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE" # # stop jbossas @@ -25,14 +26,13 @@ # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean build-bin-dist +ant $ENVIRONMENT clean build-bin-dist # # Deploy distro # -cd output/jbossws-cxf-dist -cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT deploy-jboss501 +cd target/jbossws-cxf-dist +ant $ENVIRONMENT deploy-jboss501 # # start jbossas @@ -46,11 +46,11 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop $JBOSS_BINDADDR exit 1 fi - + # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log +ant $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # @@ -64,7 +64,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-cxf/output/jbossws-cxf-dist/output/test-reports/TEST-*.xml</testResults> + <testResults>stack-cxf/target/jbossws-cxf-dist/output/test-reports/TEST-*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml 2008-04-25 15:58:45 UTC (rev 6710) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.0/config.xml 2008-04-25 16:09:18 UTC (rev 6711) @@ -11,9 +11,10 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework STACKCXF=$WORKSPACE/stack-cxf +JBOSS_TARGET=jboss500 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.0/workspace/JBossAS-5.0.0/build/output/(a)hudson.jboss500.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss500.home=$JBOSS_INSTANCE" # # stop jbossas @@ -21,11 +22,11 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # -# build and deploy +# build and deploy # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss500 +ant $ENVIRONMENT clean deploy-jboss500 # # start jbossas @@ -43,7 +44,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests-integration 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,$JBOSS_TARGET -Dtest=jaxws/samples/**/*TestCase test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # @@ -57,7 +58,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-cxf/output/tests/test-reports/TEST-*.xml</testResults> + <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml 2008-04-25 15:58:45 UTC (rev 6710) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Integration-AS-5.0.1/config.xml 2008-04-25 16:09:18 UTC (rev 6711) @@ -11,9 +11,10 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework STACKCXF=$WORKSPACE/stack-cxf +JBOSS_TARGET=jboss501 JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0.1/workspace/JBossAS-5.0.1/build/output/(a)hudson.jboss501.build@ -ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE" +ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss501.home=$JBOSS_INSTANCE" # # stop jbossas @@ -21,11 +22,11 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # -# build and deploy +# build and deploy # cd $STACKCXF cp ant.properties.example ant.properties -./build.sh $ENVIRONMENT -Dforce.thirdparty.get=true clean deploy-jboss501 +ant $ENVIRONMENT clean deploy-jboss501 # # start jbossas @@ -43,7 +44,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests-integration 2>&1 | tee $WORKSPACE/tests.log +mvn $ENVIRONMENT -Ptestsuite,$JBOSS_TARGET -Dtest=jaxws/samples/**/*TestCase test 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u # @@ -57,7 +58,7 @@ </builders> <publishers class="vector"> <hudson.tasks.junit.JUnitResultArchiver> - <testResults>stack-cxf/output/tests/test-reports/TEST-*.xml</testResults> + <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> <recipients>@hudson.mail.recipients@</recipients>

18 years

1
0
0 / 0

JBossWS SVN: r6710 - container/jboss50/branches/jbossws-jboss501.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-25 11:58:45 -0400 (Fri, 25 Apr 2008) New Revision: 6710 Modified: container/jboss50/branches/jbossws-jboss501/pom.xml Log: use provided fo as dependencies Modified: container/jboss50/branches/jbossws-jboss501/pom.xml =================================================================== --- container/jboss50/branches/jbossws-jboss501/pom.xml 2008-04-25 15:58:26 UTC (rev 6709) +++ container/jboss50/branches/jbossws-jboss501/pom.xml 2008-04-25 15:58:45 UTC (rev 6710) @@ -57,40 +57,44 @@ <version>${jbossws.spi.version}</version> </dependency> -  - -  - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-server</artifactId> - <version>${jboss.version}</version> - </dependency> - -  +  <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossxb</artifactId> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <version>${jboss.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.deployers</groupId> <artifactId>jboss-deployers-structure-spi</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.metadata</groupId> <artifactId>jboss-metadata</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-core</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-ext-api</artifactId> + <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.security</groupId> - <artifactId>jboss-security-spi</artifactId> - </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jboss-security-spi</artifactId> + <scope>provided</scope> + </dependency> + +  + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + </dependency> </dependencies>

18 years

1
0
0 / 0

JBossWS SVN: r6709 - in stack/cxf/trunk: modules/server and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-25 11:58:26 -0400 (Fri, 25 Apr 2008) New Revision: 6709 Removed: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt Modified: stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/distro/build-deploy.xml stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: jboss501 integration (wip) Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/modules/server/pom.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -155,6 +155,22 @@ <type>zip</type> <outputDirectory>${project.build.directory}/resources/jbossws-jboss423</outputDirectory> </artifactItem> + <artifactItem> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500</artifactId> + <version>${jbossws.jboss500.version}</version> + <classifier>resources</classifier> + <type>zip</type> + <outputDirectory>${project.build.directory}/resources/jbossws-jboss500</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501</artifactId> + <version>${jbossws.jboss501.version}</version> + <classifier>resources</classifier> + <type>zip</type> + <outputDirectory>${project.build.directory}/resources/jbossws-jboss501</outputDirectory> + </artifactItem> </artifactItems> </configuration> </execution> Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -53,16 +53,26 @@ </deployment> </footer> </concat> -  + <echo message="Concat jbossws-jboss500/jbossws.beans"/> + <concat destfile="${project.build.resources.directory}/jbossws-jboss500/jbossws.beans/META-INF/jboss-beans.xml"> <header trimleading="yes"> <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header> <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> <footer trimleading="yes"> </deployment> </footer> - </concat--> + </concat> +  + <echo message="Concat jbossws-jboss501/jbossws.beans"/> + <concat destfile="${project.build.resources.directory}/jbossws-jboss501/jbossws.beans/META-INF/jboss-beans.xml"> + <header trimleading="yes"> + <deployment xmlns="urn:jboss:bean-deployer:2.0"> </header> + <fileset file="${project.resources.directory}/jbossws-cxf-config.xml"/> + <footer trimleading="yes"> + </deployment> </footer> + </concat> + </target> </project> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/pom.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -13,6 +13,7 @@ <version>3.0.2-SNAPSHOT</version> </parent> +  <build> <plugins> <plugin> @@ -80,6 +81,48 @@ </plugins> </build> </profile> + +  + <profile> + <id>jboss500</id> + <activation> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <testExcludes> + </testExcludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>jboss501</id> + <activation> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <testExcludes> + </testExcludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/log4j.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -22,7 +22,7 @@  <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> - <param name="File" value="${jbossws.test.log}/test.log"/> + <param name="File" value="${build.testlog}/test.log"/> <param name="Append" value="true"/>  Modified: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -13,6 +13,7 @@ <version>3.0.2-SNAPSHOT</version> </parent> +  <build> <plugins> <plugin> @@ -87,6 +88,10 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> +  <testExcludes>  <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> @@ -196,6 +201,10 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> +  <testExcludes>  <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> @@ -287,14 +296,266 @@  <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude> + </testExcludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>jboss500</id> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> +  + <testExcludes> +  + <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> -  +  + <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/complex/**</exclude> + <exclude>org/jboss/test/ws/jaxws/holder/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/httpbinding/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/webserviceref/Secure**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1840/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/anonymous/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/binding/**</exclude> + <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1556/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude> + </testExcludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  + <profile> + <id>jboss501</id> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> +  + <testExcludes> + +  + <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1178/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/complex/**</exclude> + <exclude>org/jboss/test/ws/jaxws/holder/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/smoke/tools/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/httpbinding/**</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*</exclude> + <exclude>org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.*</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1840/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/anonymous/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/binding/**</exclude> + <exclude>org/jboss/test/ws/jaxws/namespace/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/endpoint/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/handlerscope/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1190/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1733/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1762/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1807/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/webfault/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude> + +  + <exclude>org/jboss/test/ws/console/**</exclude> + <exclude>org/jboss/test/ws/jaxws/jbws1611/**</exclude> + +  + <exclude>org/jboss/test/ws/jaxws/wsrm/**</exclude> + +  </testExcludes> </configuration> </plugin> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -251,7 +251,7 @@ <profile> <id>jboss501</id> <properties> - <jboss.version>5.0.1-SNAPSHOT</jboss.version> + <jboss.version>5.0.0-SNAPSHOT</jboss.version> <jbossws.integration.target>jboss501</jbossws.integration.target> </properties> <dependencies> Deleted: stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-04-25 15:58:26 UTC (rev 6709) @@ -1,97 +0,0 @@ -# -# $Id$ -# - -# Won't Fix: [CXF-1261] Handler does not see XOP message properly -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# EJB3/Injection excludes -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/webserviceref/** - -# [JBWS-1178] Multiple virtual host and soap:address problem -org/jboss/test/ws/jaxws/jbws1178/** - -# [JBWS-1774] Provide tools implementation for CXF -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** - -# [JBWS-1683] Fix JAXR samples for CXF -org/jboss/test/ws/jaxws/samples/jaxr/** - -# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -org/jboss/test/ws/jaxws/smoke/tools/** - -# [CXF-1244] Application Exception not initialized properly -org/jboss/test/ws/jaxws/samples/exception/** - -# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -org/jboss/test/ws/jaxws/samples/httpbinding/** -org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* - -# [CXF-1253] CXF does not respect @HandlerChain on client SEI -org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* - -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - -# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/namespace/** - -# [JBWS-2112] Cannot use CXF with endpoint API -org/jboss/test/ws/jaxws/endpoint/** - -# [CXF-1513] NPE in JaxWsServiceConfiguration -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1797/** - -# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2114] IllegalArgumentException: Wrong target. class -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1822/** - -# [CXF-1515] Bad Enumeration value 'extension restriction' -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1845/** - -# [JBWS-2115] EJB client vehicle not sufficiently isolated -org/jboss/test/ws/jaxws/jbws1581/** - -# [CXF-1516] Type inheritance with document/literal/wrapped -org/jboss/test/ws/jaxws/jbws1702/** -org/jboss/test/ws/jaxws/jbws1733/** - -# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** - -# [CXF-1517] HTTP bindings for Provider -org/jboss/test/ws/jaxws/jbws1807/** - -# [JBWS-2118] context-root in jboss.xml is ignored -org/jboss/test/ws/jaxws/jbws1813/** - -# [CXF-1518] Missing fault detail in messages from SLSB Provider -org/jboss/test/ws/jaxws/jbws1815/** - -# [JBWS-2119] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-1520] MTOM chunked encoding transfer -org/jboss/test/ws/jaxws/jbws2000/** - -# [CXF-1521] Exception handling with @WebFault annotation -org/jboss/test/ws/jaxws/webfault/** - -# [CXF-1522] NPE in ServiceUtils -org/jboss/test/ws/jaxws/jbws1566/** - -# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -org/jboss/test/ws/jaxws/wsrm/** Deleted: stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-04-25 15:58:26 UTC (rev 6709) @@ -1,103 +0,0 @@ -# -# $Id$ -# - -# Won't Fix: [CXF-1261] Handler does not see XOP message properly -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# [JBWS-1178] Multiple virtual host and soap:address problem -org/jboss/test/ws/jaxws/jbws1178/** - -# [JBWS-1774] Provide tools implementation for CXF -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** - -# [JBWS-1683] Fix JAXR samples for CXF -org/jboss/test/ws/jaxws/samples/jaxr/** - -# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -org/jboss/test/ws/jaxws/smoke/tools/** - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [CXF-1244] Application Exception not initialized properly -org/jboss/test/ws/jaxws/samples/exception/** - -# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -org/jboss/test/ws/jaxws/samples/httpbinding/** -org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* - -# [CXF-1253] CXF does not respect @HandlerChain on client SEI -org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* - -# [JBWS-2107] Resolve dependency on @SecurityDomain -org/jboss/test/ws/jaxws/webserviceref/Secure** -org/jboss/test/ws/jaxws/jbws1840/** - -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - -# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/namespace/** - -# [JBWS-2112] Cannot use CXF with endpoint API -org/jboss/test/ws/jaxws/endpoint/** - -# [CXF-1513] NPE in JaxWsServiceConfiguration -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1797/** - -# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2114] IllegalArgumentException: Wrong target. class -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1822/** - -# [CXF-1515] Bad Enumeration value 'extension restriction' -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1845/** - -# [JBWS-2115] EJB client vehicle not sufficiently isolated -org/jboss/test/ws/jaxws/jbws1581/** - -# [CXF-1516] Type inheritance with document/literal/wrapped -org/jboss/test/ws/jaxws/jbws1702/** -org/jboss/test/ws/jaxws/jbws1733/** - -# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** - -# [CXF-1517] HTTP bindings for Provider -org/jboss/test/ws/jaxws/jbws1807/** - -# [JBWS-2118] context-root in jboss.xml is ignored -org/jboss/test/ws/jaxws/jbws1813/** - -# [CXF-1518] Missing fault detail in messages from SLSB Provider -org/jboss/test/ws/jaxws/jbws1815/** - -# [JBWS-2119] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-1520] MTOM chunked encoding transfer -org/jboss/test/ws/jaxws/jbws2000/** - -# [CXF-1521] Exception handling with @WebFault annotation -org/jboss/test/ws/jaxws/webfault/** - -# [CXF-1522] NPE in ServiceUtils -org/jboss/test/ws/jaxws/jbws1566/** - -# [JBWS-2120] @WebWservice does not work with class isolation -org/jboss/test/ws/jaxws/jbws1556/** - -# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -org/jboss/test/ws/jaxws/wsrm/** Deleted: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-04-25 15:58:26 UTC (rev 6709) @@ -1,110 +0,0 @@ -# -# $Id$ -# - -# Won't Fix: [CXF-1261] Handler does not see XOP message properly -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# [JBWS-1178] Multiple virtual host and soap:address problem -org/jboss/test/ws/jaxws/jbws1178/** - -# [JBWS-1774] Provide tools implementation for CXF -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** - -# [JBWS-1683] Fix JAXR samples for CXF -org/jboss/test/ws/jaxws/samples/jaxr/** - -# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer) -org/jboss/test/ws/jaxws/smoke/tools/** - -# [EJBTHREE-1150] WebServiceContext injection requires mapped-name -org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.* - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefServletTestCase.* - -# [CXF-1244] Application Exception not initialized properly -org/jboss/test/ws/jaxws/samples/exception/** - -# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope -org/jboss/test/ws/jaxws/samples/httpbinding/** -org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.* -org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.* - -# [CXF-1253] CXF does not respect @HandlerChain on client SEI -org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalHandlerSourceTestCase.* - -# TODO: Fix classpath to ClientLauncher -org/jboss/test/ws/jaxws/samples/webserviceref/** - -# [JBWS-2107] Resolve dependency on @SecurityDomain -org/jboss/test/ws/jaxws/jbws1840/** - -# [CXF-1510] Cannot handle anonymous bare requests -org/jboss/test/ws/jaxws/anonymous/** - -# [CXF-1511] WrappedMessageContext does not implement SOAPMessageContext -org/jboss/test/ws/jaxws/binding/** -org/jboss/test/ws/jaxws/namespace/** - -# [JBWS-2112] Cannot use CXF with endpoint API -org/jboss/test/ws/jaxws/endpoint/** - -# [CXF-1513] NPE in JaxWsServiceConfiguration -org/jboss/test/ws/jaxws/handlerscope/** -org/jboss/test/ws/jaxws/jbws1694/** -org/jboss/test/ws/jaxws/jbws1797/** - -# [CXF-1514] Generated WSDL does not take 'transport-guarantee' in web.xml into account -org/jboss/test/ws/jaxws/jbws1190/** - -# [JBWS-2114] IllegalArgumentException: Wrong target. class -org/jboss/test/ws/jaxws/jbws1283/** -org/jboss/test/ws/jaxws/jbws1822/** - -# [CXF-1515] Bad Enumeration value 'extension restriction' -org/jboss/test/ws/jaxws/jbws1505/** -org/jboss/test/ws/jaxws/jbws1845/** - -# [JBWS-2115] EJB client vehicle not sufficiently isolated -org/jboss/test/ws/jaxws/jbws1581/** - -# [CXF-1516] Type inheritance with document/literal/wrapped -org/jboss/test/ws/jaxws/jbws1702/** -org/jboss/test/ws/jaxws/jbws1733/** - -# [JBWS-2117] web.xml modified to web.xml.org - Subsequent runs fail -org/jboss/test/ws/jaxws/jbws1762/** - -# [CXF-1517] HTTP bindings for Provider -org/jboss/test/ws/jaxws/jbws1807/** - -# [JBWS-2118] context-root in jboss.xml is ignored -org/jboss/test/ws/jaxws/jbws1813/** - -# [CXF-1518] Missing fault detail in messages from SLSB Provider -org/jboss/test/ws/jaxws/jbws1815/** - -# [JBWS-2119] WebServiceRef injection from DD doesn't work -org/jboss/test/ws/jaxws/jbws1841/** - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-1520] MTOM chunked encoding transfer -org/jboss/test/ws/jaxws/jbws2000/** - -# [CXF-1521] Exception handling with @WebFault annotation -org/jboss/test/ws/jaxws/webfault/** - -# [CXF-1522] NPE in ServiceUtils -org/jboss/test/ws/jaxws/jbws1566/** - -# [JBAS-5359] mapped-name is required for context of deployment -org/jboss/test/ws/console/** -org/jboss/test/ws/jaxws/jbws1611/** - -# [JBWS-2097] Unlock WS-ReliableMessaging in all stacks -org/jboss/test/ws/jaxws/wsrm/** Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/pom.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -43,35 +43,22 @@ Here we explain first the manual procedure. Further down you find instruction on how to do this using our automated Hudson QA environment. - Working with JBossWS-Native - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Working with JBossWS + ~~~~~~~~~~~~~~~~~~~~ - To run the general JAXWS samples against our native WS stack on JBoss-5.0 you would run the sequence below. + To run the general JAXWS samples against our web service stack on JBoss-5.0 you would run the sequence below. This is also the required sequence before any SVN commit. If one of the tests fails, please complain loudly. - cd stack/native/trunk ant deploy-jboss500 - ant tests-smoke + mvn -Ptestsuite,jboss500 test - To run the collection of provider sample tests, you would run - - ant -Dtest=jaxws/samples/provider test - - To run a single specific test, you would run - - ant -Dtest=org.jboss.test.ws.jaxws.samples.provider.ProviderPayloadTestCase one-test - - This can be done in debug mode as well - - ant -Ddebug=true -Dtest=org.jboss.test.ws.jaxws.samples.provider.ProviderPayloadTestCase one-test - Working with the Hudson QA environment ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The Hudson QA environment helps you to test any supported stack against any supported target container. To setup Hudson on your local box, you would run - cd framework/trunk + cd framework/trunk/hudson ant hudson-setup ant hudson-start @@ -116,10 +103,12 @@ <cxf.version>2.0.5-incubator</cxf.version> <cxf.stax.version>1.0.1</cxf.stax.version> <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version> - <jbossws.framework.version>${version}</jbossws.framework.version> + <jbossws.framework.version>3.0.2-SNAPSHOT</jbossws.framework.version> <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> <jbossws.jboss422.version>3.0.0-SNAPSHOT</jbossws.jboss422.version> <jbossws.jboss423.version>3.0.0-SNAPSHOT</jbossws.jboss423.version> + <jbossws.jboss500.version>3.0.0-SNAPSHOT</jbossws.jboss500.version> + <jbossws.jboss501.version>3.0.0-SNAPSHOT</jbossws.jboss501.version> <jboss.common.version>1.2.1.GA</jboss.common.version> <jaxb.api.version>2.1</jaxb.api.version> <jaxb.impl.version>2.1.6</jaxb.impl.version> @@ -187,6 +176,42 @@ <classifier>resources</classifier> <type>zip</type> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500</artifactId> + <version>${jbossws.jboss500.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500</artifactId> + <version>${jbossws.jboss500.version}</version> + <classifier>container</classifier> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500</artifactId> + <version>${jbossws.jboss500.version}</version> + <classifier>resources</classifier> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501</artifactId> + <version>${jbossws.jboss501.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501</artifactId> + <version>${jbossws.jboss501.version}</version> + <classifier>container</classifier> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501</artifactId> + <version>${jbossws.jboss501.version}</version> + <classifier>resources</classifier> + <type>zip</type> + </dependency>  <dependency> @@ -303,34 +328,76 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> <classifier>scripts</classifier> + <scope>provided</scope> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> <classifier>testsuite</classifier> + <scope>provided</scope> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss422</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss422</artifactId> <classifier>resources</classifier> + <scope>provided</scope> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss423</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss423</artifactId> <classifier>resources</classifier> + <scope>provided</scope> <type>zip</type> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500</artifactId> + <classifier>container</classifier> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss500</artifactId> + <classifier>resources</classifier> + <scope>provided</scope> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501</artifactId> + <classifier>container</classifier> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss501</artifactId> + <classifier>resources</classifier> + <scope>provided</scope> + <type>zip</type> + </dependency> </dependencies>  Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -102,6 +102,7 @@ <target name="undeploy-jboss500" depends="target-jboss500,init" description="Remove jbossws from jboss500"> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-deployer targetdir="${jboss500.server.deploy}/jbossws.sar"/> </target>  @@ -123,6 +124,7 @@ <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501"> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <macro-undeploy-deployer targetdir="${jboss501.server.deploy}/jbossws.sar"/> </target>  Modified: stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -162,11 +162,13 @@ <macrodef name="macro-deploy-jbossws-client"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> + <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> + <include name="**/jbossws-(a){jbossid}.jar"/> </fileset> </copy> </sequential> @@ -176,7 +178,7 @@   - <macrodef name="macro-deploy-jbossws-server-lib"> + <macrodef name="macro-deploy-jbossws-server-lib42"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> <attribute name="jbossid"/> @@ -191,6 +193,20 @@ </sequential> </macrodef> + <macrodef name="macro-deploy-jbossws-server-lib50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.server.lib.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> +    @@ -230,33 +246,72 @@ </macrodef> <macrodef name="macro-deploy-jbossws-cxf50-sar"> - <attribute name="thirdpartydir"/> + <attribute name="artifactsdir"/> <attribute name="targetdir"/> + <attribute name="jbossid"/> <sequential> <mkdir dir="@{targetdir}"/> <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> + <fileset dir="@{artifactsdir}/lib"> <patternset refid="jbossws.service.lib.patternset"/> - <include name="**/jbossws-deploy.conf"/> </fileset> </copy> - <unzip dest="@{targetdir}/jbossws-context.war" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-cxf-context*.war"/> + <unzip dest="@{targetdir}/jbossws-management.war"> + <fileset dir="@{artifactsdir}/lib"> + <include name="**/jbossws-cxf-management.war"/> </fileset> </unzip> - <copy todir="@{targetdir}/jbossws.beans/META-INF"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-cxf50-beans.xml"/> + <copy todir="@{targetdir}"> + <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans"> + <include name="META-INF/**"/> </fileset> </copy> - <move file="@{targetdir}/jbossws.beans/META-INF/jbossws-cxf50-beans.xml" tofile="@{targetdir}/jbossws.beans/META-INF/jboss-beans.xml"/> - <copy todir="@{targetdir}/META-INF"> - <fileset dir="@{thirdpartydir}/resources/jbossws-cxf.sar/META-INF"/> - </copy> </sequential> </macrodef> +  +  +  + + <macrodef name="macro-deploy-jbossws-deployers50"> + <attribute name="artifactsdir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{artifactsdir}/lib"> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-(a){jbossid}.jar"/> + </fileset> + </copy> + <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> + <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> + <include name="**/jbossws-deployer-beans.xml"/> + </fileset> + </copy> + </sequential> + </macrodef> + +  +  +  + + <macrodef name="macro-deploy-jbossws-deploy50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-(a){jbossid}-container.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> +    @@ -266,18 +321,20 @@ <target name="deploy-jbossws-cxf42" depends="deploy-jbossws-endorsed"> <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib"/> - <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> </target> <target name="deploy-jbossws-cxf50" depends="deploy-jbossws-endorsed"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> </target> <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> @@ -295,15 +352,42 @@ <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/> <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> - <property name="jboss.undeploy.home" value="@{targetdir}/../../../.."/> - <available property="jboss.undeploy.client" file="${jboss.undeploy.home}/client"/> - <fail message="Cannot find ${jboss.undeploy.home}/client" unless="jboss.undeploy.client"/> + <property name="jboss.server.home" value="@{targetdir}/../.."/> + <property name="jboss.home" value="${jboss.server.home}/../.."/> + <available property="jboss.undeploy.client" file="${jboss.home}/client"/> + <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> +  <delete> - <fileset dir="${jboss.undeploy.home}" includes="${jbossws.deploy.conf}"/> + <fileset dir="${jboss.server.home}/lib"> + <include name="jbossws-jboss*.jar"/> + </fileset> + <fileset dir="${jboss.home}/client"> + <include name="jbossws-jboss*.jar"/> + </fileset> </delete> + +  + <delete> + <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> + </delete> + +  <delete dir="@{targetdir}"/> + </sequential> </macrodef> + <macrodef name="macro-undeploy-deployer"> + <attribute name="targetdir"/> + <sequential> + <property name="jboss.server.home" value="@{targetdir}/../.."/> + <delete> + <fileset dir="${jboss.server.home}/deployers/jbossws.deployer"> + <include name="jbossws-jboss*.jar"/> + </fileset> + </delete> + </sequential> + </macrodef> + </project> \ No newline at end of file Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-25 15:37:10 UTC (rev 6708) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-04-25 15:58:26 UTC (rev 6709) @@ -13,6 +13,7 @@ <dependencySet> <outputDirectory>bin</outputDirectory> <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> <unpack>true</unpack> <includes> <include>*:jbossws-framework:zip:scripts</include> @@ -24,12 +25,26 @@ <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> <unpack>false</unpack> <includes> <include>*:jbossws-jboss422:jar:*</include> <include>*:jbossws-jboss423:jar:*</include> + <include>*:jbossws-jboss500:jar:*</include> + <include>*:jbossws-jboss501:jar:*</include> </includes> </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + <includes> + <include>*:jbossws-jboss500:jar:container</include> + <include>*:jbossws-jboss501:jar:container</include> + </includes> + </dependencySet> </dependencySets>

18 years

1
0
0 / 0

JBossWS SVN: r6708 - stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-809/src/main/java/org/jboss/wsf/stack/jbws.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-04-25 11:37:10 -0400 (Fri, 25 Apr 2008) New Revision: 6708 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-809/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java Log: [JBPAPP-809] Log IOException when closing ServletOutputStream. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-809/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-809/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2008-04-25 15:35:48 UTC (rev 6707) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-809/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2008-04-25 15:37:10 UTC (rev 6708) @@ -155,7 +155,7 @@ } catch (IOException ioex) { - log.error("Cannot close output stream"); + log.error("Cannot close output stream", ioex); } } } @@ -203,7 +203,7 @@ } catch (IOException ioex) { - log.error("Cannot close output stream"); + log.error("Cannot close output stream", ioex); } } }

18 years

1
0
0 / 0

JBossWS SVN: r6707 - stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-809.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2008-04-25 11:35:48 -0400 (Fri, 25 Apr 2008) New Revision: 6707 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-809/version.properties Log: [JBPAPP-809] Set patch version. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-809/version.properties =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-809/version.properties 2008-04-25 15:15:27 UTC (rev 6706) +++ stack/native/branches/jbossws-native-2.0.1.SP2_JBPAPP-809/version.properties 2008-04-25 15:35:48 UTC (rev 6707) @@ -5,8 +5,8 @@ specification.vendor=JBoss (http://www.jboss.org) specification.version=jbossws-2.0 -version.id=2.0.1.SP2 -repository.id=2.0.1.SP2 +version.id=2.0.1.SP2_JBPAPP-809 +repository.id=2.0.1.SP2_JBPAPP-809 implementation.title=JBoss Web Services - Native implementation.url=http://www.jboss.org/products/jbossws

18 years

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits April 2008