March 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r15830 - in stack/native/branches/jbossws-native-4.0.x: modules/core/src/main/java/org/jboss/ws/extensions/security and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-02 11:34:12 -0500 (Fri, 02 Mar 2012) New Revision: 15830 Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java stack/native/branches/jbossws-native-4.0.x/pom.xml Log: Merged revisions 15829 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r15829 | alessio.soldano(a)jboss.com | 2012-03-02 17:29:42 +0100 (Fri, 02 Mar 2012) | 2 lines [JBWS-3439] Move JBossWS-Native stack too to Santuario 1.5.1 ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829 Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java 2012-03-02 16:29:42 UTC (rev 15829) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java 2012-03-02 16:34:12 UTC (rev 15830) @@ -22,6 +22,7 @@ package org.jboss.ws.extensions.security; import java.io.IOException; +import java.io.OutputStream; import java.util.ResourceBundle; import javax.xml.parsers.ParserConfigurationException; @@ -91,9 +92,15 @@ return STR_URI; } + @Override + protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform transformObject) throws IOException, CanonicalizationException, + InvalidCanonicalizerException, TransformationException, ParserConfigurationException, SAXException + { + return enginePerformTransform(input, null, transformObject); + } @Override - protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input) throws IOException, CanonicalizationException, + protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, OutputStream os, Transform transformObject) throws IOException, CanonicalizationException, InvalidCanonicalizerException, TransformationException, ParserConfigurationException, SAXException { @@ -117,7 +124,7 @@ element = token.getSTRTransformElement(); // Obtain the canonicalizer specified in the transformation parameters - Element parameters = XMLUtils.selectNode(this._transformObject.getElement().getFirstChild(), Constants.WSSE_NS, + Element parameters = XMLUtils.selectNode(transformObject.getElement().getFirstChild(), Constants.WSSE_NS, "TransformationParameters", 0); if (parameters == null) throw new TransformationException(BundleUtils.getMessage(bundle, "TRANSFORMATIONPARAMETERS_EXPECTED")); Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-02 16:29:42 UTC (rev 15829) +++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-02 16:34:12 UTC (rev 15830) @@ -94,7 +94,7 @@ <woodstox.version>3.2.6</woodstox.version> <wscommons.policy.version>1.0</wscommons.policy.version> <wsdl4j.version>1.6.2</wsdl4j.version> - <xmlsec.version>1.4.6</xmlsec.version> + <xmlsec.version>1.5.1</xmlsec.version> <xerces.version>2.9.1</xerces.version> <jbossxb.version>2.0.3.GA</jbossxb.version> <junit.version>3.8.1</junit.version>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15829 - in stack/native/trunk: modules/core/src/main/java/org/jboss/ws/extensions/security and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-02 11:29:42 -0500 (Fri, 02 Mar 2012) New Revision: 15829 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java stack/native/trunk/pom.xml Log: [JBWS-3439] Move JBossWS-Native stack too to Santuario 1.5.1 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java 2012-03-02 10:54:49 UTC (rev 15828) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/STRTransform.java 2012-03-02 16:29:42 UTC (rev 15829) @@ -22,6 +22,7 @@ package org.jboss.ws.extensions.security; import java.io.IOException; +import java.io.OutputStream; import java.util.ResourceBundle; import javax.xml.parsers.ParserConfigurationException; @@ -91,9 +92,15 @@ return STR_URI; } + @Override + protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, Transform transformObject) throws IOException, CanonicalizationException, + InvalidCanonicalizerException, TransformationException, ParserConfigurationException, SAXException + { + return enginePerformTransform(input, null, transformObject); + } @Override - protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input) throws IOException, CanonicalizationException, + protected XMLSignatureInput enginePerformTransform(XMLSignatureInput input, OutputStream os, Transform transformObject) throws IOException, CanonicalizationException, InvalidCanonicalizerException, TransformationException, ParserConfigurationException, SAXException { @@ -117,7 +124,7 @@ element = token.getSTRTransformElement(); // Obtain the canonicalizer specified in the transformation parameters - Element parameters = XMLUtils.selectNode(this._transformObject.getElement().getFirstChild(), Constants.WSSE_NS, + Element parameters = XMLUtils.selectNode(transformObject.getElement().getFirstChild(), Constants.WSSE_NS, "TransformationParameters", 0); if (parameters == null) throw new TransformationException(BundleUtils.getMessage(bundle, "TRANSFORMATIONPARAMETERS_EXPECTED")); Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2012-03-02 10:54:49 UTC (rev 15828) +++ stack/native/trunk/pom.xml 2012-03-02 16:29:42 UTC (rev 15829) @@ -94,7 +94,7 @@ <woodstox.version>3.2.6</woodstox.version> <wscommons.policy.version>1.0</wscommons.policy.version> <wsdl4j.version>1.6.2</wsdl4j.version> - <xmlsec.version>1.4.6</xmlsec.version> + <xmlsec.version>1.5.1</xmlsec.version> <xerces.version>2.9.1</xerces.version> <jbossxb.version>2.0.3.GA</jbossxb.version> <junit.version>3.8.1</junit.version>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15828 - in stack/native/branches/jbossws-native-4.0.x: modules/testsuite and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-02 05:54:49 -0500 (Fri, 02 Mar 2012) New Revision: 15828 Added: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-ejb3.xml Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml Log: Merged revisions 15823,15826-15827 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r15823 | ropalka | 2012-03-02 09:46:58 +0100 (Fri, 02 Mar 2012) | 1 line ServiceRefEJBTestCase is working against AS7 ....... r15826 | ropalka | 2012-03-02 11:04:32 +0100 (Fri, 02 Mar 2012) | 1 line [AS7-3444] enabling appclient tests - FINAL COMMIT ....... r15827 | ropalka | 2012-03-02 11:49:23 +0100 (Fri, 02 Mar 2012) | 1 line [AS7-3444] enabling appclient tests ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827 Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-02 10:49:23 UTC (rev 15827) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-02 10:54:49 UTC (rev 15828) @@ -3363,7 +3363,7 @@ </war> <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-marshall-doclit-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/> + <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes*.class"/> <include name="org/jboss/test/ws/jaxrpc/marshall/types/**"/> <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> @@ -3547,13 +3547,18 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-account-signup-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-account-signup-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup_*.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/account-signup/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -3564,6 +3569,11 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-account-signup-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-wsse-account-signup-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> @@ -3586,12 +3596,16 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -3602,12 +3616,21 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-none-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-wsse-rpc-appclient.jar"/> + </fileset> + </jar> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-none-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF"> <include name="application-client.xml"/> </metainf> @@ -3619,6 +3642,11 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-none-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-wsse-rpc-none-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-simple-sign-encrypt.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> @@ -3643,12 +3671,16 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-simple-sign-encrypt-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-simple-sign-encrypt-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -3661,6 +3693,11 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-simple-sign-encrypt-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-wsse-simple-sign-encrypt-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-fault.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> @@ -3685,12 +3722,16 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-fault-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-fault-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -3703,6 +3744,11 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-fault-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-wsse-sign-fault-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-encrypt-fault.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> @@ -3727,12 +3773,16 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-encrypt-fault-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-encrypt-fault-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -3745,6 +3795,11 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-encrypt-fault-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-wsse-sign-encrypt-fault-appclient.jar"/> + </fileset> + </jar>  <replace file="${tests.output.dir}/test-resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/> @@ -3830,6 +3885,7 @@ <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/username/META-INF"> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> + <include name="jboss-ejb3.xml"/> <include name="jboss-webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="jboss-wsse-server.xml"/> @@ -3841,12 +3897,18 @@ <include name="wsse.truststore"/> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-username-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-username-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Type.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Struct.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Service.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/JaxRpcTestService*.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/SimpleUserType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/username/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -3855,6 +3917,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-username-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-wsse-username-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2012-03-02 10:49:23 UTC (rev 15827) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2012-03-02 10:54:49 UTC (rev 15828) @@ -44,7 +44,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(NotEncodedTestCase.class, "jaxrpc-wsse-rpc.war, jaxrpc-wsse-rpc-none-client.jar"); + return new JBossWSTestSetup(NotEncodedTestCase.class, "jaxrpc-wsse-rpc.war, jaxrpc-wsse-rpc-none-appclient.ear#jaxrpc-wsse-rpc-none-appclient.jar"); } /** @@ -52,20 +52,31 @@ */ public void testEndpoint() throws Exception { - InitialContext iniCtx = getAppclientInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - Hello hello = (Hello)service.getPort(Hello.class); - + InitialContext iniCtx = null; try { - UserType in0 = new UserType("Kermit"); - hello.echoUserType(in0); - fail("RemoteException expected"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); + Hello hello = (Hello)service.getPort(Hello.class); + + try + { + UserType in0 = new UserType("Kermit"); + hello.echoUserType(in0); + fail("RemoteException expected"); + } + catch (RemoteException ex) + { + String message = ex.getMessage(); + assertTrue("Unexpected message: " + message, message.indexOf("requires <wsse:Security>") >= 0); + } } - catch (RemoteException ex) + finally { - String message = ex.getMessage(); - assertTrue("Unexpected message: " + message, message.indexOf("requires <wsse:Security>") >= 0); + if (iniCtx != null) + { + iniCtx.close(); + } } } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2012-03-02 10:49:23 UTC (rev 15827) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2012-03-02 10:54:49 UTC (rev 15828) @@ -36,19 +36,32 @@ */ public class RpcTestCase extends JBossWSTest { - /** Construct the test case with a given name - */ - /** Deploy the test */ + private static InitialContext iniCtx = null; + public static Test suite() throws Exception { - return new JBossWSTestSetup(RpcTestCase.class, "jaxrpc-wsse-rpc.war, jaxrpc-wsse-rpc-client.jar"); + return new JBossWSTestSetup(RpcTestCase.class, "jaxrpc-wsse-rpc.war, jaxrpc-wsse-rpc-appclient.ear#jaxrpc-wsse-rpc-appclient.jar"); } + protected void setUp() throws Exception + { + iniCtx = getAppclientInitialContext(); + } + + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testEndpoint() throws Exception { - InitialContext iniCtx = getAppclientInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); UserType in0 = new UserType("Kermit"); @@ -58,8 +71,7 @@ public void testFault() throws Exception { - InitialContext iniCtx = getAppclientInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); HelloException exception = null; Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java 2012-03-02 10:49:23 UTC (rev 15827) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java 2012-03-02 10:54:49 UTC (rev 15828) @@ -37,6 +37,6 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(SignEncryptFaultTestCase.class, "jaxrpc-wsse-sign-encrypt-fault.war, jaxrpc-wsse-sign-encrypt-fault-client.jar"); + return new JBossWSTestSetup(SignEncryptFaultTestCase.class, "jaxrpc-wsse-sign-encrypt-fault.war, jaxrpc-wsse-sign-encrypt-fault-appclient.ear#jaxrpc-wsse-sign-encrypt-fault-appclient.jar"); } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java 2012-03-02 10:49:23 UTC (rev 15827) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java 2012-03-02 10:54:49 UTC (rev 15828) @@ -37,6 +37,6 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(SignFaultTestCase.class, "jaxrpc-wsse-sign-fault.war, jaxrpc-wsse-sign-fault-client.jar"); + return new JBossWSTestSetup(SignFaultTestCase.class, "jaxrpc-wsse-sign-fault.war, jaxrpc-wsse-sign-fault-appclient.ear#jaxrpc-wsse-sign-fault-appclient.jar"); } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2012-03-02 10:49:23 UTC (rev 15827) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2012-03-02 10:54:49 UTC (rev 15828) @@ -45,6 +45,7 @@ private String trustStorePassword; private String keyStoreType; private String trustStoreType; + private static InitialContext iniCtx; /** Construct the test case with a given name */ @@ -52,13 +53,28 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(SimpleSignEncryptTestCase.class, "jaxrpc-wsse-simple-sign-encrypt.war, jaxrpc-wsse-simple-sign-encrypt-client.jar"); + return new JBossWSTestSetup(SimpleSignEncryptTestCase.class, "jaxrpc-wsse-simple-sign-encrypt.war, jaxrpc-wsse-simple-sign-encrypt-appclient.ear#jaxrpc-wsse-simple-sign-encrypt-appclient.jar"); } + protected void setUp() throws Exception + { + super.setUp(); + iniCtx = getAppclientInitialContext(); + } + + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testEndpoint() throws Exception { - InitialContext iniCtx = getAppclientInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); UserType in0 = new UserType("Kermit"); @@ -71,8 +87,7 @@ clearEnvironment(); try { - InitialContext iniCtx = getAppclientInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); UserType in0 = new UserType("Kermit"); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2012-03-02 10:49:23 UTC (rev 15827) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2012-03-02 10:54:49 UTC (rev 15828) @@ -50,7 +50,7 @@ public static Test suite() { - return new JBossWSTestSetup(UsernameTestCase.class, "jaxrpc-wsse-username.jar, jaxrpc-wsse-username-client.jar"); + return new JBossWSTestSetup(UsernameTestCase.class, "jaxrpc-wsse-username.jar, jaxrpc-wsse-username-appclient.ear#jaxrpc-wsse-username-appclient.jar", true); } protected void setUp() throws Exception @@ -60,8 +60,9 @@ if (port == null) { InitialContext iniCtx = getAppclientInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB"); + Service service = (Service)iniCtx.lookup("java:service/TestServiceEJB"); port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class); + iniCtx.close(); } //Backup values Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2012-03-02 10:49:23 UTC (rev 15827) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2012-03-02 10:54:49 UTC (rev 15828) @@ -38,35 +38,46 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(AccountSignupTestCase.class, "jaxrpc-wsse-account-signup.war, jaxrpc-wsse-account-signup-client.jar"); + return new JBossWSTestSetup(AccountSignupTestCase.class, "jaxrpc-wsse-account-signup.war, jaxrpc-wsse-account-signup-appclient.ear#jaxrpc-wsse-account-signup-appclient.jar"); } public void testEndpoint() throws Exception { - InitialContext iniCtx = getAppclientInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/AccountSignupService"); - AccountSignup signup = (AccountSignup)service.getPort(AccountSignup.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/AccountSignupService"); + AccountSignup signup = (AccountSignup)service.getPort(AccountSignup.class); - AccountInfo account = new AccountInfo(); - account.setFirstName("Jason"); - account.setLastName("Greene"); - Address address = new Address(); - address.setCity("Madison"); - address.setStreet("Some street"); - address.setZip("53717"); - account.setAddress(address); + AccountInfo account = new AccountInfo(); + account.setFirstName("Jason"); + account.setLastName("Greene"); + Address address = new Address(); + address.setCity("Madison"); + address.setStreet("Some street"); + address.setZip("53717"); + account.setAddress(address); - CreditCardInfo credit = new CreditCardInfo(); - credit.setCreditCardNumber("1234-1234-1234-1234"); - Calendar cal = Calendar.getInstance(); - cal.clear(); - cal.set(2005, 11, 1, 0, 0); + CreditCardInfo credit = new CreditCardInfo(); + credit.setCreditCardNumber("1234-1234-1234-1234"); + Calendar cal = Calendar.getInstance(); + cal.clear(); + cal.set(2005, 11, 1, 0, 0); - credit.setExpiration(cal.getTime()); - credit.setSecurityCode("123"); - account.setCreditCardInfo(credit); + credit.setExpiration(cal.getTime()); + credit.setSecurityCode("123"); + account.setCreditCardInfo(credit); - int result = signup.signup(account, 0.0f, new Date()); - assertTrue(result == 345); + int result = signup.signup(account, 0.0f, new Date()); + assertTrue(result == 345); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/application-client.xml 2012-03-02 10:49:23 UTC (rev 15827) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/application-client.xml 2012-03-02 10:54:49 UTC (rev 15828) @@ -8,7 +8,7 @@ <display-name>AccountSignupService</display-name> <service-ref> - <service-ref-name>service/AccountSignupService</service-ref-name> + <service-ref-name>java:jboss/exported/service/AccountSignupService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/AccountSignupService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/jboss-client.xml 2012-03-02 10:49:23 UTC (rev 15827) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/jboss-client.xml 2012-03-02 10:54:49 UTC (rev 15828) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/AccountSignupService</service-ref-name> + <service-ref-name>java:jboss/exported/service/AccountSignupService</service-ref-name> <config-name>Standard WSSecurity Client</config-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-wsse-account-signup?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/application-client.xml 2012-03-02 10:49:23 UTC (rev 15827) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/application-client.xml 2012-03-02 10:54:49 UTC (rev 15828) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/jboss-client.xml 2012-03-02 10:49:23 UTC (rev 15827) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/jboss-client.xml 2012-03-02 10:54:49 UTC (rev 15828) @@ -3,11 +3,10 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> - <config-name>Standard WSSecurity Client</config-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> + <config-name>Standard WSSecurity Client</config-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-wsse-rpc?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/jboss-client.xml 2012-03-02 10:49:23 UTC (rev 15827) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/jboss-client.xml 2012-03-02 10:54:49 UTC (rev 15828) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-wsse-rpc?wsdl</wsdl-override> </service-ref> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/application-client.xml 2012-03-02 10:49:23 UTC (rev 15827) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/application-client.xml 2012-03-02 10:54:49 UTC (rev 15828) @@ -8,7 +8,7 @@ <display-name>JAXRPC simple tests</display-name> <service-ref> - <service-ref-name>service/TestServiceEJB</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestServiceEJB</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml 2012-03-02 10:49:23 UTC (rev 15827) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml 2012-03-02 10:54:49 UTC (rev 15828) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestServiceEJB</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestServiceEJB</service-ref-name> <config-name>Standard WSSecurity Client</config-name> <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxrpc.wsse.JaxRpcTestService</service-endpoint-interface> Copied: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-ejb3.xml (from rev 15827, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-ejb3.xml) =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-ejb3.xml (rev 0) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-ejb3.xml 2012-03-02 10:54:49 UTC (rev 15828) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> + +<jboss:jboss + xmlns:jboss="http://www.jboss.com/xml/ns/javaee" + xmlns:spec="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd + http://java.sun.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-ejb3-spec-2_0.xsd" + version="3.1" + impl-version="2.0"> + + <spec:assembly-descriptor> + <security xmlns="urn:security"> + <spec:ejb-name>TestService</spec:ejb-name> + <security-domain>JBossWS</security-domain> + </security> + <spec:security-role> + <spec:role-name>friend</spec:role-name> + </spec:security-role> + </spec:assembly-descriptor> + +</jboss:jboss> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-02 10:49:23 UTC (rev 15827) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-02 10:54:49 UTC (rev 15828) @@ -1136,9 +1136,6 @@  <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude> -  <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> @@ -1167,25 +1164,19 @@ <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude> -  - <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/RpcTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/RpcTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude> </excludes> </configuration>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15827 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-02 05:49:23 -0500 (Fri, 02 Mar 2012) New Revision: 15827 Modified: stack/native/trunk/modules/testsuite/pom.xml Log: [AS7-3444] enabling appclient tests Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-03-02 10:04:32 UTC (rev 15826) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-02 10:49:23 UTC (rev 15827) @@ -1175,6 +1175,7 @@ <exclude>org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude> </excludes>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15826 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-02 05:04:32 -0500 (Fri, 02 Mar 2012) New Revision: 15826 Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-ejb3.xml Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/application-client.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml stack/native/trunk/modules/testsuite/pom.xml Log: [AS7-3444] enabling appclient tests - FINAL COMMIT Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-02 09:19:05 UTC (rev 15825) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-02 10:04:32 UTC (rev 15826) @@ -3363,7 +3363,7 @@ </war> <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-marshall-doclit-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/> + <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes*.class"/> <include name="org/jboss/test/ws/jaxrpc/marshall/types/**"/> <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> @@ -3547,13 +3547,18 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-account-signup-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-account-signup-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup_*.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/account-signup/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -3564,6 +3569,11 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-account-signup-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-wsse-account-signup-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> @@ -3586,12 +3596,16 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -3602,12 +3616,21 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-none-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-wsse-rpc-appclient.jar"/> + </fileset> + </jar> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-none-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF"> <include name="application-client.xml"/> </metainf> @@ -3619,6 +3642,11 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-rpc-none-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-wsse-rpc-none-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-simple-sign-encrypt.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> @@ -3643,12 +3671,16 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-simple-sign-encrypt-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-simple-sign-encrypt-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -3661,6 +3693,11 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-simple-sign-encrypt-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-wsse-simple-sign-encrypt-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-fault.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> @@ -3685,12 +3722,16 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-fault-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-fault-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -3703,6 +3744,11 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-fault-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-wsse-sign-fault-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-encrypt-fault.war" webxml="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> @@ -3727,12 +3773,16 @@ <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-encrypt-fault-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-encrypt-fault-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/rpc/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -3745,6 +3795,11 @@ <include name="jaxrpc-mapping.xml"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-sign-encrypt-fault-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-wsse-sign-encrypt-fault-appclient.jar"/> + </fileset> + </jar>  <replace file="${tests.output.dir}/test-resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/> @@ -3830,6 +3885,7 @@ <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/username/META-INF"> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> + <include name="jboss-ejb3.xml"/> <include name="jboss-webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="jboss-wsse-server.xml"/> @@ -3841,12 +3897,18 @@ <include name="wsse.truststore"/> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-username-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-wsse-username-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Type.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Struct.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Service.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/JaxRpcTestService*.class"/> + <include name="org/jboss/test/ws/jaxrpc/wsse/SimpleUserType.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/wsse/username/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -3855,6 +3917,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-wsse-username-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-wsse-username-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2012-03-02 09:19:05 UTC (rev 15825) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2012-03-02 10:04:32 UTC (rev 15826) @@ -44,7 +44,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(NotEncodedTestCase.class, "jaxrpc-wsse-rpc.war, jaxrpc-wsse-rpc-none-client.jar"); + return new JBossWSTestSetup(NotEncodedTestCase.class, "jaxrpc-wsse-rpc.war, jaxrpc-wsse-rpc-none-appclient.ear#jaxrpc-wsse-rpc-none-appclient.jar"); } /** @@ -52,20 +52,31 @@ */ public void testEndpoint() throws Exception { - InitialContext iniCtx = getAppclientInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); - Hello hello = (Hello)service.getPort(Hello.class); - + InitialContext iniCtx = null; try { - UserType in0 = new UserType("Kermit"); - hello.echoUserType(in0); - fail("RemoteException expected"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); + Hello hello = (Hello)service.getPort(Hello.class); + + try + { + UserType in0 = new UserType("Kermit"); + hello.echoUserType(in0); + fail("RemoteException expected"); + } + catch (RemoteException ex) + { + String message = ex.getMessage(); + assertTrue("Unexpected message: " + message, message.indexOf("requires <wsse:Security>") >= 0); + } } - catch (RemoteException ex) + finally { - String message = ex.getMessage(); - assertTrue("Unexpected message: " + message, message.indexOf("requires <wsse:Security>") >= 0); + if (iniCtx != null) + { + iniCtx.close(); + } } } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2012-03-02 09:19:05 UTC (rev 15825) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2012-03-02 10:04:32 UTC (rev 15826) @@ -36,19 +36,32 @@ */ public class RpcTestCase extends JBossWSTest { - /** Construct the test case with a given name - */ - /** Deploy the test */ + private static InitialContext iniCtx = null; + public static Test suite() throws Exception { - return new JBossWSTestSetup(RpcTestCase.class, "jaxrpc-wsse-rpc.war, jaxrpc-wsse-rpc-client.jar"); + return new JBossWSTestSetup(RpcTestCase.class, "jaxrpc-wsse-rpc.war, jaxrpc-wsse-rpc-appclient.ear#jaxrpc-wsse-rpc-appclient.jar"); } + protected void setUp() throws Exception + { + iniCtx = getAppclientInitialContext(); + } + + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testEndpoint() throws Exception { - InitialContext iniCtx = getAppclientInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); UserType in0 = new UserType("Kermit"); @@ -58,8 +71,7 @@ public void testFault() throws Exception { - InitialContext iniCtx = getAppclientInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); HelloException exception = null; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java 2012-03-02 09:19:05 UTC (rev 15825) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase.java 2012-03-02 10:04:32 UTC (rev 15826) @@ -37,6 +37,6 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(SignEncryptFaultTestCase.class, "jaxrpc-wsse-sign-encrypt-fault.war, jaxrpc-wsse-sign-encrypt-fault-client.jar"); + return new JBossWSTestSetup(SignEncryptFaultTestCase.class, "jaxrpc-wsse-sign-encrypt-fault.war, jaxrpc-wsse-sign-encrypt-fault-appclient.ear#jaxrpc-wsse-sign-encrypt-fault-appclient.jar"); } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java 2012-03-02 09:19:05 UTC (rev 15825) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase.java 2012-03-02 10:04:32 UTC (rev 15826) @@ -37,6 +37,6 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(SignFaultTestCase.class, "jaxrpc-wsse-sign-fault.war, jaxrpc-wsse-sign-fault-client.jar"); + return new JBossWSTestSetup(SignFaultTestCase.class, "jaxrpc-wsse-sign-fault.war, jaxrpc-wsse-sign-fault-appclient.ear#jaxrpc-wsse-sign-fault-appclient.jar"); } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2012-03-02 09:19:05 UTC (rev 15825) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2012-03-02 10:04:32 UTC (rev 15826) @@ -45,6 +45,7 @@ private String trustStorePassword; private String keyStoreType; private String trustStoreType; + private static InitialContext iniCtx; /** Construct the test case with a given name */ @@ -52,13 +53,28 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(SimpleSignEncryptTestCase.class, "jaxrpc-wsse-simple-sign-encrypt.war, jaxrpc-wsse-simple-sign-encrypt-client.jar"); + return new JBossWSTestSetup(SimpleSignEncryptTestCase.class, "jaxrpc-wsse-simple-sign-encrypt.war, jaxrpc-wsse-simple-sign-encrypt-appclient.ear#jaxrpc-wsse-simple-sign-encrypt-appclient.jar"); } + protected void setUp() throws Exception + { + super.setUp(); + iniCtx = getAppclientInitialContext(); + } + + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testEndpoint() throws Exception { - InitialContext iniCtx = getAppclientInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); UserType in0 = new UserType("Kermit"); @@ -71,8 +87,7 @@ clearEnvironment(); try { - InitialContext iniCtx = getAppclientInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); + Service service = (Service)iniCtx.lookup("java:service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); UserType in0 = new UserType("Kermit"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2012-03-02 09:19:05 UTC (rev 15825) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2012-03-02 10:04:32 UTC (rev 15826) @@ -50,7 +50,7 @@ public static Test suite() { - return new JBossWSTestSetup(UsernameTestCase.class, "jaxrpc-wsse-username.jar, jaxrpc-wsse-username-client.jar"); + return new JBossWSTestSetup(UsernameTestCase.class, "jaxrpc-wsse-username.jar, jaxrpc-wsse-username-appclient.ear#jaxrpc-wsse-username-appclient.jar", true); } protected void setUp() throws Exception @@ -60,8 +60,9 @@ if (port == null) { InitialContext iniCtx = getAppclientInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB"); + Service service = (Service)iniCtx.lookup("java:service/TestServiceEJB"); port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class); + iniCtx.close(); } //Backup values Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2012-03-02 09:19:05 UTC (rev 15825) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2012-03-02 10:04:32 UTC (rev 15826) @@ -38,35 +38,46 @@ /** Deploy the test */ public static Test suite() throws Exception { - return new JBossWSTestSetup(AccountSignupTestCase.class, "jaxrpc-wsse-account-signup.war, jaxrpc-wsse-account-signup-client.jar"); + return new JBossWSTestSetup(AccountSignupTestCase.class, "jaxrpc-wsse-account-signup.war, jaxrpc-wsse-account-signup-appclient.ear#jaxrpc-wsse-account-signup-appclient.jar"); } public void testEndpoint() throws Exception { - InitialContext iniCtx = getAppclientInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/AccountSignupService"); - AccountSignup signup = (AccountSignup)service.getPort(AccountSignup.class); + InitialContext iniCtx = null; + try + { + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/AccountSignupService"); + AccountSignup signup = (AccountSignup)service.getPort(AccountSignup.class); - AccountInfo account = new AccountInfo(); - account.setFirstName("Jason"); - account.setLastName("Greene"); - Address address = new Address(); - address.setCity("Madison"); - address.setStreet("Some street"); - address.setZip("53717"); - account.setAddress(address); + AccountInfo account = new AccountInfo(); + account.setFirstName("Jason"); + account.setLastName("Greene"); + Address address = new Address(); + address.setCity("Madison"); + address.setStreet("Some street"); + address.setZip("53717"); + account.setAddress(address); - CreditCardInfo credit = new CreditCardInfo(); - credit.setCreditCardNumber("1234-1234-1234-1234"); - Calendar cal = Calendar.getInstance(); - cal.clear(); - cal.set(2005, 11, 1, 0, 0); + CreditCardInfo credit = new CreditCardInfo(); + credit.setCreditCardNumber("1234-1234-1234-1234"); + Calendar cal = Calendar.getInstance(); + cal.clear(); + cal.set(2005, 11, 1, 0, 0); - credit.setExpiration(cal.getTime()); - credit.setSecurityCode("123"); - account.setCreditCardInfo(credit); + credit.setExpiration(cal.getTime()); + credit.setSecurityCode("123"); + account.setCreditCardInfo(credit); - int result = signup.signup(account, 0.0f, new Date()); - assertTrue(result == 345); + int result = signup.signup(account, 0.0f, new Date()); + assertTrue(result == 345); + } + finally + { + if (iniCtx != null) + { + iniCtx.close(); + } + } } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/application-client.xml 2012-03-02 09:19:05 UTC (rev 15825) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/application-client.xml 2012-03-02 10:04:32 UTC (rev 15826) @@ -8,7 +8,7 @@ <display-name>AccountSignupService</display-name> <service-ref> - <service-ref-name>service/AccountSignupService</service-ref-name> + <service-ref-name>java:jboss/exported/service/AccountSignupService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/AccountSignupService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/jboss-client.xml 2012-03-02 09:19:05 UTC (rev 15825) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/account-signup/META-INF/jboss-client.xml 2012-03-02 10:04:32 UTC (rev 15826) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/AccountSignupService</service-ref-name> + <service-ref-name>java:jboss/exported/service/AccountSignupService</service-ref-name> <config-name>Standard WSSecurity Client</config-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-wsse-account-signup?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/application-client.xml 2012-03-02 09:19:05 UTC (rev 15825) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/application-client.xml 2012-03-02 10:04:32 UTC (rev 15826) @@ -8,7 +8,7 @@ <display-name>HelloService</display-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/jboss-client.xml 2012-03-02 09:19:05 UTC (rev 15825) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF/jboss-client.xml 2012-03-02 10:04:32 UTC (rev 15826) @@ -3,11 +3,10 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> - <config-name>Standard WSSecurity Client</config-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> + <config-name>Standard WSSecurity Client</config-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-wsse-rpc?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/jboss-client.xml 2012-03-02 09:19:05 UTC (rev 15825) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/rpc/META-INF-no-wsse/jboss-client.xml 2012-03-02 10:04:32 UTC (rev 15826) @@ -5,10 +5,9 @@ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/HelloService</service-ref-name> + <service-ref-name>java:jboss/exported/service/HelloService</service-ref-name> <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-wsse-rpc?wsdl</wsdl-override> </service-ref> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/application-client.xml 2012-03-02 09:19:05 UTC (rev 15825) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/application-client.xml 2012-03-02 10:04:32 UTC (rev 15826) @@ -8,7 +8,7 @@ <display-name>JAXRPC simple tests</display-name> <service-ref> - <service-ref-name>service/TestServiceEJB</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestServiceEJB</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml 2012-03-02 09:19:05 UTC (rev 15825) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-client.xml 2012-03-02 10:04:32 UTC (rev 15826) @@ -3,10 +3,9 @@ <!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd"> <jboss-client> - <jndi-name>jbossws-client</jndi-name> <service-ref> - <service-ref-name>service/TestServiceEJB</service-ref-name> + <service-ref-name>java:jboss/exported/service/TestServiceEJB</service-ref-name> <config-name>Standard WSSecurity Client</config-name> <port-component-ref> <service-endpoint-interface>org.jboss.test.ws.jaxrpc.wsse.JaxRpcTestService</service-endpoint-interface> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-ejb3.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-ejb3.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/wsse/username/META-INF/jboss-ejb3.xml 2012-03-02 10:04:32 UTC (rev 15826) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> + +<jboss:jboss + xmlns:jboss="http://www.jboss.com/xml/ns/javaee" + xmlns:spec="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd + http://java.sun.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-ejb3-spec-2_0.xsd" + version="3.1" + impl-version="2.0"> + + <spec:assembly-descriptor> + <security xmlns="urn:security"> + <spec:ejb-name>TestService</spec:ejb-name> + <security-domain>JBossWS</security-domain> + </security> + <spec:security-role> + <spec:role-name>friend</spec:role-name> + </spec:security-role> + </spec:assembly-descriptor> + +</jboss:jboss> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-03-02 09:19:05 UTC (rev 15825) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-02 10:04:32 UTC (rev 15826) @@ -1164,25 +1164,18 @@ <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude> -  - <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/RpcTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/RpcTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude> </excludes> </configuration>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15825 - stack/cxf/branches/jbossws-cxf-4.0.x.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-02 04:19:05 -0500 (Fri, 02 Mar 2012) New Revision: 15825 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml Log: Merged revisions 15824 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15824 | alessio.soldano(a)jboss.com | 2012-03-02 09:55:40 +0100 (Fri, 02 Mar 2012) | 2 lines [JBWS-3439] Move to Santuario 1.5.1 ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-02 08:55:40 UTC (rev 15824) +++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-03-02 09:19:05 UTC (rev 15825) @@ -103,7 +103,7 @@ <jms.api.version>1.0.0.Final</jms.api.version> <velocity.version>1.6.3</velocity.version> <xerces.version>2.9.1</xerces.version> - <xmlsec.version>1.5.0</xmlsec.version> + <xmlsec.version>1.5.1</xmlsec.version> <wss4j.version>1.6.5-SNAPSHOT</wss4j.version> <wstx.version>3.2.9</wstx.version> <spring.version>3.0.6.RELEASE</spring.version>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15824 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-02 03:55:40 -0500 (Fri, 02 Mar 2012) New Revision: 15824 Modified: stack/cxf/trunk/pom.xml Log: [JBWS-3439] Move to Santuario 1.5.1 Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-03-02 08:46:58 UTC (rev 15823) +++ stack/cxf/trunk/pom.xml 2012-03-02 08:55:40 UTC (rev 15824) @@ -104,7 +104,7 @@ <jms.api.version>1.0.0.Final</jms.api.version> <velocity.version>1.6.3</velocity.version> <xerces.version>2.9.1</xerces.version> - <xmlsec.version>1.5.0</xmlsec.version> + <xmlsec.version>1.5.1</xmlsec.version> <wss4j.version>1.6.5-SNAPSHOT</wss4j.version> <wstx.version>3.2.9</wstx.version> <spring.version>3.0.6.RELEASE</spring.version>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15823 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-02 03:46:58 -0500 (Fri, 02 Mar 2012) New Revision: 15823 Modified: stack/native/trunk/modules/testsuite/pom.xml Log: ServiceRefEJBTestCase is working against AS7 Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-03-02 08:43:17 UTC (rev 15822) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-02 08:46:58 UTC (rev 15823) @@ -1136,9 +1136,6 @@  <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude> -  <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15822 - in stack/native/branches/jbossws-native-4.0.x: modules/testsuite and 9 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-02 03:43:17 -0500 (Fri, 02 Mar 2012) New Revision: 15822 Added: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-ejb3.xml Removed: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-client.xml Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/application-client.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml Log: Merged revisions 15821 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r15821 | ropalka | 2012-03-02 09:34:56 +0100 (Fri, 02 Mar 2012) | 1 line [AS7-3444] enabling appclient tests (WIP) ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821 Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-02 08:34:56 UTC (rev 15821) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-02 08:43:17 UTC (rev 15822) @@ -2211,17 +2211,22 @@ <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="ejb-jar.xml"/> + <include name="jboss-ejb3.xml"/> <include name="jboss.xml"/> <include name="jboss-webservices.xml"/> <include name="wsdl/**"/> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws723-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws723-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws723/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2229,6 +2234,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws723-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws723-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws732.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws732/WEB-INF/web.xml"> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2012-03-02 08:34:56 UTC (rev 15821) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2012-03-02 08:43:17 UTC (rev 15822) @@ -54,7 +54,7 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java 2012-03-02 08:34:56 UTC (rev 15821) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java 2012-03-02 08:43:17 UTC (rev 15822) @@ -48,7 +48,7 @@ public void testEndpointAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Hello endpoint = (Hello)service.getPort(Hello.class); @@ -58,7 +58,7 @@ public void testRemoteAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); HelloHome home = (HelloHome)iniCtx.lookup("java:comp/env/ejb/Hello"); HelloRemote slsb = home.create(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2012-03-02 08:34:56 UTC (rev 15821) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2012-03-02 08:43:17 UTC (rev 15822) @@ -49,12 +49,29 @@ { public static final String USERNAME = "kermit"; public static final String PASSWORD = "thefrog"; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS723TestCase.class, "jaxrpc-jbws723.jar, jaxrpc-jbws723-client.jar"); + return new JBossWSTestSetup(JBWS723TestCase.class, "jaxrpc-jbws723.jar, jaxrpc-jbws723-appclient.ear#jaxrpc-jbws723-appclient.jar", true); } + protected void setUp() throws Exception + { + super.setUp(); + iniCtx = getAppclientInitialContext(); + } + + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testRoleSecuredWSDLAccess() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws723/RoleSecured?wsdl"); @@ -65,8 +82,8 @@ public void testRoleSecuredServiceAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/RoleSecured"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/RoleSecured"); QName portName = new QName("http://org.jboss.ws/jbws723", "RoleSecuredPort"); OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); @@ -88,18 +105,6 @@ assertEquals("The 'mafia' boss is currently out of office, please call again.", info); } - /** Test that the remote access to this bean is unchecked - */ - public void testBasicSecuredSLSB() throws Exception - { - InitialContext iniCtx = getInitialContext(); - OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/JBWS723BasicSecuredSLSB"); - - OrganizationRemote bean = home.create(); - String info = bean.getContactInfo("mafia"); - assertEquals("The 'mafia' boss is currently out of office, please call again.", info); - } - public void testBasicSecuredWSDLAccess() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws723/BasicSecured?wsdl"); @@ -118,8 +123,8 @@ public void testBasicSecuredServiceAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/BasicSecured"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/BasicSecured"); QName portName = new QName("http://org.jboss.ws/jbws723", "BasicSecuredPort"); OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); @@ -151,8 +156,8 @@ public void testConfidentialServiceAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/ConfidentialSecured"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/ConfidentialSecured"); QName portName = new QName("http://org.jboss.ws/jbws723", "ConfidentialPort"); OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); @@ -171,10 +176,5 @@ { // ignore expected exception } - - // test confidential access - //stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "https://" + getServerHost() + ":8443/jaxrpc-jbws723/ConfidentialSecured"); - //String info = port.getContactInfo("mafia"); - //assertEquals("The 'mafia' boss is currently out of office, please call again.", info); } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java 2012-03-02 08:34:56 UTC (rev 15821) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java 2012-03-02 08:43:17 UTC (rev 15822) @@ -46,7 +46,7 @@ if (port == null) { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); port = (ITranHistory)service.getPort(ITranHistory.class); } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java 2012-03-02 08:34:56 UTC (rev 15821) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java 2012-03-02 08:43:17 UTC (rev 15822) @@ -47,7 +47,7 @@ public void testEndpointAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); Hello port = (Hello)service.getPort(Hello.class); @@ -57,7 +57,7 @@ public void testRemoteAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); HelloHome home = (HelloHome)iniCtx.lookup("java:comp/env/ejb/HelloEJBTwo"); HelloRemote remote = home.create(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2012-03-02 08:34:56 UTC (rev 15821) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2012-03-02 08:43:17 UTC (rev 15822) @@ -52,7 +52,7 @@ */ public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2012-03-02 08:34:56 UTC (rev 15821) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2012-03-02 08:43:17 UTC (rev 15822) @@ -47,7 +47,7 @@ public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); @@ -58,7 +58,7 @@ public void testFault() throws Exception { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2012-03-02 08:34:56 UTC (rev 15821) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2012-03-02 08:43:17 UTC (rev 15822) @@ -57,7 +57,7 @@ public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); @@ -71,7 +71,7 @@ clearEnvironment(); try { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2012-03-02 08:34:56 UTC (rev 15821) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2012-03-02 08:43:17 UTC (rev 15822) @@ -59,7 +59,7 @@ if (port == null) { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB"); port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class); } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2012-03-02 08:34:56 UTC (rev 15821) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2012-03-02 08:43:17 UTC (rev 15822) @@ -43,7 +43,7 @@ public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/AccountSignupService"); AccountSignup signup = (AccountSignup)service.getPort(AccountSignup.class); Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/application-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/application-client.xml 2012-03-02 08:34:56 UTC (rev 15821) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/application-client.xml 2012-03-02 08:43:17 UTC (rev 15822) @@ -8,19 +8,19 @@ <display-name>webservice client app</display-name> <service-ref> - <service-ref-name>service/BasicSecured</service-ref-name> + <service-ref-name>java:jboss/exported/service/BasicSecured</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> </service-ref> <service-ref> - <service-ref-name>service/RoleSecured</service-ref-name> + <service-ref-name>java:jboss/exported/service/RoleSecured</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> </service-ref> <service-ref> - <service-ref-name>service/ConfidentialSecured</service-ref-name> + <service-ref-name>java:jboss/exported/service/ConfidentialSecured</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-client.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-client.xml 2012-03-02 08:34:56 UTC (rev 15821) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-client.xml 2012-03-02 08:43:17 UTC (rev 15822) @@ -1,7 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> -</jboss-client> Copied: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-ejb3.xml (from rev 15821, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-ejb3.xml) =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-ejb3.xml (rev 0) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-ejb3.xml 2012-03-02 08:43:17 UTC (rev 15822) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> + +<jboss:jboss + xmlns:jboss="http://www.jboss.com/xml/ns/javaee" + xmlns:spec="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd + http://java.sun.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-ejb3-spec-2_0.xsd" + version="3.1" + impl-version="2.0"> + + <spec:assembly-descriptor> + <security xmlns="urn:security"> + <spec:ejb-name>JBWS723RoleSecuredSLSB</spec:ejb-name> + <security-domain>JBossWS</security-domain> + </security> + <security xmlns="urn:security"> + <spec:ejb-name>JBWS723BasicSecuredSLSB</spec:ejb-name> + <security-domain>JBossWS</security-domain> + </security> + <security xmlns="urn:security"> + <spec:ejb-name>JBWS723ConfidentialSLSB</spec:ejb-name> + <security-domain>JBossWS</security-domain> + </security> + <spec:security-role> + <spec:role-name>friend</spec:role-name> + </spec:security-role> + </spec:assembly-descriptor> + +</jboss:jboss> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-02 08:34:56 UTC (rev 15821) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-02 08:43:17 UTC (rev 15822) @@ -1162,13 +1162,14 @@  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> -  - <exclude>org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase*</exclude> +  <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15821 - in stack/native/trunk/modules/testsuite: native-tests/scripts and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-02 03:34:56 -0500 (Fri, 02 Mar 2012) New Revision: 15821 Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-ejb3.xml Removed: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-client.xml Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/application-client.xml stack/native/trunk/modules/testsuite/pom.xml Log: [AS7-3444] enabling appclient tests (WIP) Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-02 08:29:11 UTC (rev 15820) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-02 08:34:56 UTC (rev 15821) @@ -2211,17 +2211,22 @@ <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="ejb-jar.xml"/> + <include name="jboss-ejb3.xml"/> <include name="jboss.xml"/> <include name="jboss-webservices.xml"/> <include name="wsdl/**"/> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws723-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-jbws723-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationService.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationHome.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws723/OrganizationRemote.class"/> + <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/jbws723/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -2229,6 +2234,11 @@ <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-jbws723-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-jbws723-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-jbws732.war" webxml="${tests.output.dir}/test-resources/jaxrpc/jbws732/WEB-INF/web.xml"> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2012-03-02 08:29:11 UTC (rev 15820) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2012-03-02 08:34:56 UTC (rev 15821) @@ -54,7 +54,7 @@ super.setUp(); if (port == null) { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); port = (TestEndpoint)service.getPort(TestEndpoint.class); } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java 2012-03-02 08:29:11 UTC (rev 15820) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java 2012-03-02 08:34:56 UTC (rev 15821) @@ -48,7 +48,7 @@ public void testEndpointAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Hello endpoint = (Hello)service.getPort(Hello.class); @@ -58,7 +58,7 @@ public void testRemoteAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); HelloHome home = (HelloHome)iniCtx.lookup("java:comp/env/ejb/Hello"); HelloRemote slsb = home.create(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2012-03-02 08:29:11 UTC (rev 15820) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase.java 2012-03-02 08:34:56 UTC (rev 15821) @@ -49,12 +49,29 @@ { public static final String USERNAME = "kermit"; public static final String PASSWORD = "thefrog"; + private static InitialContext iniCtx; public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS723TestCase.class, "jaxrpc-jbws723.jar, jaxrpc-jbws723-client.jar"); + return new JBossWSTestSetup(JBWS723TestCase.class, "jaxrpc-jbws723.jar, jaxrpc-jbws723-appclient.ear#jaxrpc-jbws723-appclient.jar", true); } + protected void setUp() throws Exception + { + super.setUp(); + iniCtx = getAppclientInitialContext(); + } + + protected void tearDown() throws Exception + { + if (iniCtx != null) + { + iniCtx.close(); + iniCtx = null; + } + super.tearDown(); + } + public void testRoleSecuredWSDLAccess() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws723/RoleSecured?wsdl"); @@ -65,8 +82,8 @@ public void testRoleSecuredServiceAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/RoleSecured"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/RoleSecured"); QName portName = new QName("http://org.jboss.ws/jbws723", "RoleSecuredPort"); OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); @@ -88,18 +105,6 @@ assertEquals("The 'mafia' boss is currently out of office, please call again.", info); } - /** Test that the remote access to this bean is unchecked - */ - public void testBasicSecuredSLSB() throws Exception - { - InitialContext iniCtx = getInitialContext(); - OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/JBWS723BasicSecuredSLSB"); - - OrganizationRemote bean = home.create(); - String info = bean.getContactInfo("mafia"); - assertEquals("The 'mafia' boss is currently out of office, please call again.", info); - } - public void testBasicSecuredWSDLAccess() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbws723/BasicSecured?wsdl"); @@ -118,8 +123,8 @@ public void testBasicSecuredServiceAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/BasicSecured"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/BasicSecured"); QName portName = new QName("http://org.jboss.ws/jbws723", "BasicSecuredPort"); OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); @@ -151,8 +156,8 @@ public void testConfidentialServiceAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/ConfidentialSecured"); + iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/ConfidentialSecured"); QName portName = new QName("http://org.jboss.ws/jbws723", "ConfidentialPort"); OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); @@ -171,10 +176,5 @@ { // ignore expected exception } - - // test confidential access - //stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "https://" + getServerHost() + ":8443/jaxrpc-jbws723/ConfidentialSecured"); - //String info = port.getContactInfo("mafia"); - //assertEquals("The 'mafia' boss is currently out of office, please call again.", info); } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java 2012-03-02 08:29:11 UTC (rev 15820) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws751/JBWS751TestCase.java 2012-03-02 08:34:56 UTC (rev 15821) @@ -46,7 +46,7 @@ if (port == null) { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); port = (ITranHistory)service.getPort(ITranHistory.class); } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java 2012-03-02 08:29:11 UTC (rev 15820) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.java 2012-03-02 08:34:56 UTC (rev 15821) @@ -47,7 +47,7 @@ public void testEndpointAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); Hello port = (Hello)service.getPort(Hello.class); @@ -57,7 +57,7 @@ public void testRemoteAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); HelloHome home = (HelloHome)iniCtx.lookup("java:comp/env/ejb/HelloEJBTwo"); HelloRemote remote = home.create(); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2012-03-02 08:29:11 UTC (rev 15820) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/NotEncodedTestCase.java 2012-03-02 08:34:56 UTC (rev 15821) @@ -52,7 +52,7 @@ */ public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2012-03-02 08:29:11 UTC (rev 15820) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/RpcTestCase.java 2012-03-02 08:34:56 UTC (rev 15821) @@ -47,7 +47,7 @@ public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); @@ -58,7 +58,7 @@ public void testFault() throws Exception { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2012-03-02 08:29:11 UTC (rev 15820) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase.java 2012-03-02 08:34:56 UTC (rev 15821) @@ -57,7 +57,7 @@ public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); @@ -71,7 +71,7 @@ clearEnvironment(); try { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService"); Hello hello = (Hello)service.getPort(Hello.class); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2012-03-02 08:29:11 UTC (rev 15820) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase.java 2012-03-02 08:34:56 UTC (rev 15821) @@ -59,7 +59,7 @@ if (port == null) { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/TestServiceEJB"); port = (JaxRpcTestService)service.getPort(JaxRpcTestService.class); } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2012-03-02 08:29:11 UTC (rev 15820) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase.java 2012-03-02 08:34:56 UTC (rev 15821) @@ -43,7 +43,7 @@ public void testEndpoint() throws Exception { - InitialContext iniCtx = getInitialContext(); + InitialContext iniCtx = getAppclientInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/AccountSignupService"); AccountSignup signup = (AccountSignup)service.getPort(AccountSignup.class); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/application-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/application-client.xml 2012-03-02 08:29:11 UTC (rev 15820) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/application-client.xml 2012-03-02 08:34:56 UTC (rev 15821) @@ -8,19 +8,19 @@ <display-name>webservice client app</display-name> <service-ref> - <service-ref-name>service/BasicSecured</service-ref-name> + <service-ref-name>java:jboss/exported/service/BasicSecured</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> </service-ref> <service-ref> - <service-ref-name>service/RoleSecured</service-ref-name> + <service-ref-name>java:jboss/exported/service/RoleSecured</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> </service-ref> <service-ref> - <service-ref-name>service/ConfidentialSecured</service-ref-name> + <service-ref-name>java:jboss/exported/service/ConfidentialSecured</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-client.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-client.xml 2012-03-02 08:29:11 UTC (rev 15820) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-client.xml 2012-03-02 08:34:56 UTC (rev 15821) @@ -1,7 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> -</jboss-client> Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-ejb3.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-ejb3.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/jbws723/META-INF/jboss-ejb3.xml 2012-03-02 08:34:56 UTC (rev 15821) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> + +<jboss:jboss + xmlns:jboss="http://www.jboss.com/xml/ns/javaee" + xmlns:spec="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd + http://java.sun.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-ejb3-spec-2_0.xsd" + version="3.1" + impl-version="2.0"> + + <spec:assembly-descriptor> + <security xmlns="urn:security"> + <spec:ejb-name>JBWS723RoleSecuredSLSB</spec:ejb-name> + <security-domain>JBossWS</security-domain> + </security> + <security xmlns="urn:security"> + <spec:ejb-name>JBWS723BasicSecuredSLSB</spec:ejb-name> + <security-domain>JBossWS</security-domain> + </security> + <security xmlns="urn:security"> + <spec:ejb-name>JBWS723ConfidentialSLSB</spec:ejb-name> + <security-domain>JBossWS</security-domain> + </security> + <spec:security-role> + <spec:role-name>friend</spec:role-name> + </spec:security-role> + </spec:assembly-descriptor> + +</jboss:jboss> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-03-02 08:29:11 UTC (rev 15820) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-02 08:34:56 UTC (rev 15821) @@ -1162,13 +1162,14 @@  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> -  - <exclude>org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws723/JBWS723TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude> + <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase*</exclude> +  <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude>

12 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits March 2012