February 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r15691 - hudson/trunk/scripts.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-20 10:17:04 -0500 (Mon, 20 Feb 2012) New Revision: 15691 Modified: hudson/trunk/scripts/jboss.sh Log: - Prevent jboss console logs from going into Hudson console logs - Properly term/kill the process associated to the script that started AS before trying to term/kill the actual AS process (prevents process leaking in Hudson) Modified: hudson/trunk/scripts/jboss.sh =================================================================== --- hudson/trunk/scripts/jboss.sh 2012-02-20 13:35:40 UTC (rev 15690) +++ hudson/trunk/scripts/jboss.sh 2012-02-20 15:17:04 UTC (rev 15691) @@ -35,22 +35,27 @@ start) # This version of run.sh obtains the pid of the JVM and saves it as jboss.pid # It relies on bash specific features - /bin/bash $RUN_CMD & + /bin/bash $RUN_CMD >/dev/null 2>/dev/null & ;; stop) if [ -f "$PIDFILE" ]; then pid=`cat "$PIDFILE"` - echo "kill pid: $pid" - kill $pid + #find out the pid of the shell script that started AS and which should be in background now + shell_pid=$(ps -ef | awk '$2 ~ /\<'$pid'\>/ { print $3; }') + echo "kill pid: $shell_pid" + kill $shell_pid if [ "$?" -eq 0 ]; then - # process exists, wait for it to die, and force if not - sleep 20 - kill -9 $pid &> /dev/null + sleep 10 + kill -9 $shell_pid &> /dev/null fi + #try killing the AS process just in case it's still there + kill -9 $pid &> /dev/null rm "$PIDFILE" else warn "No pid found!" fi + echo "exiting stop method" + date ;; restart) $0 stop

12 years, 5 months

1
0
0 / 0

JBossWS SVN: r15690 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws/samples/serviceref and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-20 08:35:40 -0500 (Mon, 20 Feb 2012) New Revision: 15690 Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java Log: rename ejb client jar to don't be detected as appclient Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml 2012-02-20 13:16:55 UTC (rev 15689) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml 2012-02-20 13:35:40 UTC (rev 15690) @@ -306,7 +306,7 @@ <include name="jboss-web.xml"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref-ejb-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-serviceref-ejbclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/serviceref/EJBClient.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/EJBRemote.class"/> Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2012-02-20 13:16:55 UTC (rev 15689) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2012-02-20 13:35:40 UTC (rev 15690) @@ -46,7 +46,7 @@ public static Test suite() { - final String archives = "jaxws-samples-serviceref.war,jaxws-samples-serviceref-ejb-client.jar"; + final String archives = "jaxws-samples-serviceref.war,jaxws-samples-serviceref-ejbclient.jar"; return new JBossWSTestSetup(ServiceRefEJBTestCase.class, archives); } @@ -73,7 +73,7 @@ public void testEJBClient() throws Exception { InitialContext iniCtx = getInitialContext(); - EJBRemote ejbRemote = (EJBRemote)iniCtx.lookup("ejb:/jaxws-samples-serviceref-ejb-client//EJBClient!" + EJBRemote.class.getName()); + EJBRemote ejbRemote = (EJBRemote)iniCtx.lookup("ejb:/jaxws-samples-serviceref-ejbclient//EJBClient!" + EJBRemote.class.getName()); String helloWorld = "Hello World!"; Object retObj = ejbRemote.echo(helloWorld);

12 years, 5 months

1
0
0 / 0

JBossWS SVN: r15689 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-20 08:16:55 -0500 (Mon, 20 Feb 2012) New Revision: 15689 Removed: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as2961/ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/as2961/ Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml Log: [AS7-3823] removing unsupported use case Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2012-02-17 16:35:03 UTC (rev 15688) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2012-02-20 13:16:55 UTC (rev 15689) @@ -1114,14 +1114,6 @@ </webinf> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-as2961.war" webxml="${tests.output.dir}/test-resources/jaxws/as2961/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/as2961/EndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/as2961/EndpointIface.class"/> - </classes> - </war> -  <war warfile="${tests.output.dir}/test-libs/jaxws-as3581.war" webxml="${tests.output.dir}/test-resources/jaxws/as3581/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes">

12 years, 5 months

1
0
0 / 0

JBossWS SVN: r15688 - in stack/cxf/trunk: modules/dist and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-17 11:35:03 -0500 (Fri, 17 Feb 2012) New Revision: 15688 Modified: stack/cxf/trunk/modules/dist/pom.xml stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/security/main/module.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf stack/cxf/trunk/pom.xml Log: [JBWS-3434] Making OpenSAML maven dependency provided and keeping it just for creating the AS module. Only keep an optional dependency to org.opensaml module in org.apache.ws.security (wss4j) module, as OpenSAML is not going to be shipped in AS7 and is required for WSS4J SAML/WS-Trust functionalities only. Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2012-02-17 14:48:07 UTC (rev 15687) +++ stack/cxf/trunk/modules/dist/pom.xml 2012-02-17 16:35:03 UTC (rev 15688) @@ -129,7 +129,14 @@ <scope>provided</scope> </dependency> +  <dependency> + <groupId>org.opensaml</groupId> + <artifactId>opensaml</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss700</artifactId> <scope>provided</scope> Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-17 14:48:07 UTC (rev 15687) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-17 16:35:03 UTC (rev 15688) @@ -47,9 +47,6 @@ <include>com.sun.xml.fastinfoset:FastInfoset:jar</include> <include>org.apache.ws.security:wss4j:jar</include> <include>org.apache.santuario:xmlsec:jar</include> - <include>org.opensaml:open*:jar</include> - <include>org.opensaml:xmltooling:jar</include> - <include>joda-time:joda-time:jar</include> <include>asm:asm:jar</include> <include>apache-velocity:velocity:jar</include> <include>commons-collections:commons-collections:jar</include> @@ -78,6 +75,9 @@ <include>org.jboss.jaxr:juddi-service:sar</include> <include>apache-scout:scout:jar</include> <include>juddi:juddi:jar</include> + <include>org.opensaml:open*:jar</include> + <include>org.opensaml:xmltooling:jar</include> + <include>joda-time:joda-time:jar</include> <include>org.jboss.ws:jbossws-common-tools:jar</include> <include>org.jboss.ws:jbossws-jboss700:jar</include> <include>org.jboss.ws:jbossws-jboss701:jar</include> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2012-02-17 14:48:07 UTC (rev 15687) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2012-02-17 16:35:03 UTC (rev 15688) @@ -49,7 +49,6 @@ <module name="org.apache.ws.xmlschema" /> <module name="org.apache.ws.security" /> <module name="org.apache.santuario.xmlsec" /> - <module name="org.opensaml" /> <module name="org.springframework.spring" optional="true"/> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/security/main/module.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/security/main/module.xml 2012-02-17 14:48:07 UTC (rev 15687) +++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/ws/security/main/module.xml 2012-02-17 16:35:03 UTC (rev 15688) @@ -2,7 +2,7 @@  + <module name="org.opensaml" optional="true" export="true" /> </dependencies> </module> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2012-02-17 14:48:07 UTC (rev 15687) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/modules-deploy.conf 2012-02-17 16:35:03 UTC (rev 15688) @@ -1 +1 @@ -org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**, org/jboss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**, org/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**, org/springframework/spring/** \ No newline at end of file +org/apache/cxf/**, org/apache/neethi/**, org/apache/ws/commons/xmlschema/**, org/jboss/ws/cxf/**, org/jboss/ws/api/**, org/jboss/ws/common/**, org/jboss/ws/jaxws-client/**, org/jboss/ws/jaxws-jboss-httpserver-httpspi/**, org/jboss/ws/saaj-impl/**, org/jboss/ws/spi/**, org/jboss/ws/tools/**, org/opensaml/**, org/springframework/spring/** \ No newline at end of file Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-02-17 14:48:07 UTC (rev 15687) +++ stack/cxf/trunk/pom.xml 2012-02-17 16:35:03 UTC (rev 15688) @@ -98,6 +98,7 @@ <log4j.version>1.2.14</log4j.version> <mail.version>1.4.2</mail.version> <neethi.version>3.0.1</neethi.version> + <opensaml.version>2.5.1-1</opensaml.version> <saaj.api.version>1.0.0.Final</saaj.api.version> <stax.api.version>1.0-2</stax.api.version> <jms.api.version>1.0.0.Final</jms.api.version> @@ -966,6 +967,12 @@ <groupId>org.apache.ws.security</groupId> <artifactId>wss4j</artifactId> <version>${wss4j.version}</version> + <exclusions> + <exclusion> + <groupId>org.opensaml</groupId> + <artifactId>opensaml</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.woodstox</groupId> @@ -982,6 +989,82 @@ <artifactId>httpserver</artifactId> <version>${httpserver.version}</version> </dependency> + <dependency> + <groupId>org.opensaml</groupId> + <artifactId>opensaml</artifactId> + <version>${opensaml.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> + <exclusion> + <groupId>org.owasp.esapi</groupId> + <artifactId>esapi</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jul-to-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-ext-jdk15</artifactId> + </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15</artifactId> + </exclusion> + <exclusion> + <groupId>ca.juliusdavies</groupId> + <artifactId>not-yet-commons-ssl</artifactId> + </exclusion> + <exclusion> + <groupId>net.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + </exclusion> + <exclusion> + <groupId>xml-resolver</groupId> + <artifactId>xml-resolver</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </exclusion> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> + </dependency>  <dependency> <groupId>org.springframework</groupId>

12 years, 5 months

1
0
0 / 0

JBossWS SVN: r15687 - in stack/native/branches/jbossws-native-4.0.x: modules/testsuite/native-tests/scripts and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-17 09:48:07 -0500 (Fri, 17 Feb 2012) New Revision: 15687 Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java Log: Merged revisions 15686 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r15686 | ropalka | 2012-02-17 15:44:26 +0100 (Fri, 17 Feb 2012) | 1 line rename ejb archive to don't be detected as appclient jar ....... 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-15678 + 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 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686 Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-02-17 14:44:26 UTC (rev 15686) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-02-17 14:48:07 UTC (rev 15687) @@ -504,7 +504,7 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-ejb-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-ejbclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.class"/> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2012-02-17 14:44:26 UTC (rev 15686) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2012-02-17 14:48:07 UTC (rev 15687) @@ -45,10 +45,10 @@ public class ServiceRefEJBTestCase extends JBossWSTest { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-samples-serviceref"; - + public static Test suite() { - return new JBossWSTestSetup(ServiceRefEJBTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-ejb-client.jar"); + return new JBossWSTestSetup(ServiceRefEJBTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-ejbclient.jar"); } public void testWSDLAccess() throws MalformedURLException @@ -58,7 +58,7 @@ WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); assertNotNull(wsdlDefinitions); } - + public void testDynamicProxy() throws Exception { URL wsdlURL = getResourceURL("jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"); @@ -75,12 +75,11 @@ public void testEJBClient() throws Exception { InitialContext iniCtx = getInitialContext(); - EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("ejb:/jaxrpc-samples-serviceref-ejb-client//EJBClient!" + EJBRemoteHome.class.getName()); + EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("ejb:/jaxrpc-samples-serviceref-ejbclient//EJBClient!" + EJBRemoteHome.class.getName()); EJBRemote ejbRemote = ejbHome.create(); String helloWorld = "Hello World!"; Object retObj = ejbRemote.echo(helloWorld); assertEquals(helloWorld, retObj); - } }

12 years, 5 months

1
0
0 / 0

JBossWS SVN: r15686 - in stack/native/trunk/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-17 09:44:26 -0500 (Fri, 17 Feb 2012) New Revision: 15686 Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java Log: rename ejb archive to don't be detected as appclient jar Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-02-17 14:42:33 UTC (rev 15685) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-02-17 14:44:26 UTC (rev 15686) @@ -504,7 +504,7 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-ejb-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-ejbclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.class"/> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2012-02-17 14:42:33 UTC (rev 15685) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2012-02-17 14:44:26 UTC (rev 15686) @@ -45,10 +45,10 @@ public class ServiceRefEJBTestCase extends JBossWSTest { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-samples-serviceref"; - + public static Test suite() { - return new JBossWSTestSetup(ServiceRefEJBTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-ejb-client.jar"); + return new JBossWSTestSetup(ServiceRefEJBTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-ejbclient.jar"); } public void testWSDLAccess() throws MalformedURLException @@ -58,7 +58,7 @@ WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); assertNotNull(wsdlDefinitions); } - + public void testDynamicProxy() throws Exception { URL wsdlURL = getResourceURL("jaxrpc/samples/serviceref/META-INF/wsdl/TestEndpoint.wsdl"); @@ -75,12 +75,11 @@ public void testEJBClient() throws Exception { InitialContext iniCtx = getInitialContext(); - EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("ejb:/jaxrpc-samples-serviceref-ejb-client//EJBClient!" + EJBRemoteHome.class.getName()); + EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("ejb:/jaxrpc-samples-serviceref-ejbclient//EJBClient!" + EJBRemoteHome.class.getName()); EJBRemote ejbRemote = ejbHome.create(); String helloWorld = "Hello World!"; Object retObj = ejbRemote.echo(helloWorld); assertEquals(helloWorld, retObj); - } }

12 years, 5 months

1
0
0 / 0

JBossWS SVN: r15685 - in shared-testsuite/trunk: testsuite/src/test/ant-import and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-17 09:42:33 -0500 (Fri, 17 Feb 2012) New Revision: 15685 Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java Log: rename ejb archive to don't be detected as appclient jar Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2012-02-17 13:51:17 UTC (rev 15684) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2012-02-17 14:42:33 UTC (rev 15685) @@ -167,7 +167,8 @@ clientJars.add(archiveURL); if (archive.contains("jaxrpc") || archive.contains("serviceref")) { - performDeploy(archive); + // TODO: deploy to appclient + //performDeploy(archive); } } else Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml 2012-02-17 13:51:17 UTC (rev 15684) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml 2012-02-17 14:42:33 UTC (rev 15685) @@ -475,7 +475,7 @@ <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-ejb-client.jar"> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref-ejbclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBClient.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/serviceref/EJBRemote.class"/> Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2012-02-17 13:51:17 UTC (rev 15684) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2012-02-17 14:42:33 UTC (rev 15685) @@ -43,16 +43,16 @@ public class ServiceRefEJBTestCase extends JBossWSTest { public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxrpc-samples-serviceref"; - + public static Test suite() { - return new JBossWSTestSetup(ServiceRefEJBTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-ejb-client.jar"); + return new JBossWSTestSetup(ServiceRefEJBTestCase.class, "jaxrpc-samples-serviceref.war, jaxrpc-samples-serviceref-ejbclient.jar"); } public void testEJBClient() throws Exception { InitialContext iniCtx = getInitialContext(); - EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("ejb:/jaxrpc-samples-serviceref-ejb-client//EJBClient!" + EJBRemoteHome.class.getName()); + EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("ejb:/jaxrpc-samples-serviceref-ejbclient//EJBClient!" + EJBRemoteHome.class.getName()); EJBRemote ejbRemote = ejbHome.create(); String helloWorld = "Hello World!";

12 years, 5 months

1
0
0 / 0

JBossWS SVN: r15684 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-17 08:51:17 -0500 (Fri, 17 Feb 2012) New Revision: 15684 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java Log: Merged revisions 15682 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15682 | ropalka | 2012-02-17 14:45:17 +0100 (Fri, 17 Feb 2012) | 1 line remove AS6 support ....... 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,15675 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15675,15682 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2012-02-17 13:45:53 UTC (rev 15683) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2012-02-17 13:51:17 UTC (rev 15684) @@ -49,7 +49,7 @@ { String host = getServerHost(); InitialContext iniCtx = getInitialContext(); - Object obj = iniCtx.lookup(isTargetJBoss6() ? "/EJB3Client/remote" : "ejb:/jaxws-cxf-bus-ejb3-client//EJB3Client!" + EJB3ClientRemoteInterface.class.getName()); + Object obj = iniCtx.lookup("ejb:/jaxws-cxf-bus-ejb3-client//EJB3Client!" + EJB3ClientRemoteInterface.class.getName()); EJB3ClientRemoteInterface ejb3Remote = (EJB3ClientRemoteInterface)obj; ejb3Remote.testBusCreation(); ejb3Remote.testSOAPConnection(host);

12 years, 5 months

1
0
0 / 0

JBossWS SVN: r15683 - in shared-testsuite/trunk: testsuite/src/test/ant-import and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-17 08:45:53 -0500 (Fri, 17 Feb 2012) New Revision: 15683 Removed: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/DeployerJBoss6.java Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java Log: remove AS6 support Deleted: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/DeployerJBoss6.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/DeployerJBoss6.java 2012-02-17 13:45:17 UTC (rev 15682) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/DeployerJBoss6.java 2012-02-17 13:45:53 UTC (rev 15683) @@ -1,75 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.jboss.wsf.test; - -import java.net.URL; -import java.util.Map; - -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; - -import org.jboss.wsf.spi.deployer.Deployer; - -/** - * A JBossWS test helper that deals with test deployment/undeployment, etc. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public final class DeployerJBoss6 implements Deployer -{ - - private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer"; - - private MBeanServerConnection server; - - public DeployerJBoss6() - { - this.server = JBossWSTestHelper.getServer(); - } - - public void deploy(final URL url) throws Exception - { - invokeMainDeployer("deploy", url); - } - - public void undeploy(final URL url) throws Exception - { - invokeMainDeployer("undeploy", url); - } - - private void invokeMainDeployer(final String methodName, final URL url) throws Exception - { - server.invoke(new ObjectName(MAIN_DEPLOYER), methodName, new Object[] - {url}, new String[] - {"java.net.URL"}); - } - - @Override - public void addSecurityDomain(String name, Map<String, String> authenticationOptions) throws Exception - { - throw new UnsupportedOperationException(); - } - - @Override - public void removeSecurityDomain(String name) throws Exception - { - throw new UnsupportedOperationException(); - } - -} Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2012-02-17 13:45:17 UTC (rev 15682) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2012-02-17 13:45:53 UTC (rev 15683) @@ -205,11 +205,6 @@ return JBossWSTestHelper.getServer(); } - public static boolean isTargetJBoss6() - { - return JBossWSTestHelper.isTargetJBoss6(); - } - public static boolean isTargetJBoss7() { return JBossWSTestHelper.isTargetJBoss7(); Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-02-17 13:45:17 UTC (rev 15682) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-02-17 13:45:53 UTC (rev 15683) @@ -103,12 +103,6 @@ } } - public static boolean isTargetJBoss6() - { - String target = getIntegrationTarget(); - return target.startsWith("jboss6"); - } - public static boolean isTargetJBoss7() { String target = getIntegrationTarget(); Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-02-17 13:45:17 UTC (rev 15682) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-02-17 13:45:53 UTC (rev 15683) @@ -570,7 +570,6 @@ <sysproperty key="test.archive.directory" value="${tests.output.dir}/test-libs"/> <sysproperty key="test.classes.directory" value="${tests.output.dir}/test-classes"/> <sysproperty key="test.resources.directory" value="${tests.output.dir}/test-resources"/> - <sysproperty key="org.jboss.wsf.spi.deployer.Deployer" value="org.jboss.wsf.test.DeployerJBoss6"/> <sysproperty key="binary.distribution" value="true"/> <classpath> <path refid="tests.client.classpath"/> @@ -635,7 +634,6 @@ <sysproperty key="test.archive.directory" value="${tests.output.dir}/test-libs"/> <sysproperty key="test.classes.directory" value="${tests.output.dir}/test-classes"/> <sysproperty key="test.resources.directory" value="${tests.output.dir}/test-resources"/> - <sysproperty key="org.jboss.wsf.spi.deployer.Deployer" value="org.jboss.wsf.test.DeployerJBoss6"/> <sysproperty key="binary.distribution" value="true"/> <classpath> <path refid="tests.client.classpath"/> Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2012-02-17 13:45:17 UTC (rev 15682) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2012-02-17 13:45:53 UTC (rev 15683) @@ -58,7 +58,7 @@ port = Service.create(wsdlURL, serviceName).getPort(EndpointInterface.class); InitialContext ctx = getInitialContext(); - remote = (StatelessRemote)ctx.lookup(getRemoteEjbJndiName()); + remote = (StatelessRemote)ctx.lookup("ejb:/jaxws-jbws1841//" + StatelessBean.class.getSimpleName() + "!" + StatelessRemote.class.getName()); } } @@ -92,16 +92,4 @@ assertEquals("Relay4", result); } - private static String getRemoteEjbJndiName() - { - if (isTargetJBoss6()) - { - return "/" + StatelessBean.class.getSimpleName() + "/remote"; - } - else - { - return "ejb:/jaxws-jbws1841//" + StatelessBean.class.getSimpleName() + "!" + StatelessRemote.class.getName(); - } - } - }

12 years, 5 months

1
0
0 / 0

JBossWS SVN: r15682 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-17 08:45:17 -0500 (Fri, 17 Feb 2012) New Revision: 15682 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java Log: remove AS6 support Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2012-02-17 13:24:04 UTC (rev 15681) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2012-02-17 13:45:17 UTC (rev 15682) @@ -49,7 +49,7 @@ { String host = getServerHost(); InitialContext iniCtx = getInitialContext(); - Object obj = iniCtx.lookup(isTargetJBoss6() ? "/EJB3Client/remote" : "ejb:/jaxws-cxf-bus-ejb3-client//EJB3Client!" + EJB3ClientRemoteInterface.class.getName()); + Object obj = iniCtx.lookup("ejb:/jaxws-cxf-bus-ejb3-client//EJB3Client!" + EJB3ClientRemoteInterface.class.getName()); EJB3ClientRemoteInterface ejb3Remote = (EJB3ClientRemoteInterface)obj; ejb3Remote.testBusCreation(); ejb3Remote.testSOAPConnection(host);

12 years, 5 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 February 2012