JBossWS SVN: r15264 - in container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices: dmr and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-11-15 13:31:55 -0500 (Tue, 15 Nov 2011)
New Revision: 15264
Modified:
container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/deployers/WebServiceContextResourceProcessor.java
container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/dmr/WSDeploymentActivator.java
Log:
Synch with AS 7.0.2.Final
Modified: container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/deployers/WebServiceContextResourceProcessor.java
===================================================================
--- container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/deployers/WebServiceContextResourceProcessor.java 2011-11-15 18:07:15 UTC (rev 15263)
+++ container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/deployers/WebServiceContextResourceProcessor.java 2011-11-15 18:31:55 UTC (rev 15264)
@@ -24,9 +24,9 @@
import org.jboss.as.ee.component.EEModuleClassDescription;
import org.jboss.as.ee.component.EEModuleDescription;
-import org.jboss.as.ee.component.EEResourceReferenceProcessor;
import org.jboss.as.ee.component.InjectionSource;
import org.jboss.as.ee.component.InjectionTarget;
+import org.jboss.as.ee.component.deployers.EEResourceReferenceProcessor;
import org.jboss.as.server.deployment.DeploymentPhaseContext;
import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
import org.jboss.as.webservices.injection.WebServiceContextInjectionSource;
Modified: container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/dmr/WSDeploymentActivator.java
===================================================================
--- container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/dmr/WSDeploymentActivator.java 2011-11-15 18:07:15 UTC (rev 15263)
+++ container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/dmr/WSDeploymentActivator.java 2011-11-15 18:31:55 UTC (rev 15264)
@@ -22,7 +22,7 @@
package org.jboss.as.webservices.dmr;
-import org.jboss.as.ee.component.EEResourceReferenceProcessorRegistry;
+import org.jboss.as.ee.component.deployers.EEResourceReferenceProcessorRegistry;
import org.jboss.as.server.DeploymentProcessorTarget;
import org.jboss.as.server.deployment.Phase;
import org.jboss.as.webservices.deployers.AspectDeploymentProcessor;
13 years, 1 month
JBossWS SVN: r15262 - container/jboss70/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-11-15 13:03:21 -0500 (Tue, 15 Nov 2011)
New Revision: 15262
Added:
container/jboss70/branches/jbossws-jboss702/
Log:
Copying jbossws-jboss700 CI into jbossws-jboss702
13 years, 1 month
JBossWS SVN: r15260 - container/jboss70/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-11-15 12:56:59 -0500 (Tue, 15 Nov 2011)
New Revision: 15260
Added:
container/jboss70/branches/jbossws-jboss701/
Log:
Copying jbossws-jboss700 CI into jbossws-jboss701
13 years, 1 month
JBossWS SVN: r15259 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-11-14 07:58:08 -0500 (Mon, 14 Nov 2011)
New Revision: 15259
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-11-14 12:57:30 UTC (rev 15258)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-11-14 12:58:08 UTC (rev 15259)
@@ -1318,8 +1318,7 @@
<!-- AS7 integration exclusions -->
<!-- ////////////////////////// -->
- <!-- TODO: EJB3 DD driven deployments -->
- <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
+ <!-- waiting for pull request to be merged upstream -->
<exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
<!-- TODO: JMX client to AS7 server -->
13 years, 1 month
JBossWS SVN: r15258 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-11-14 07:57:30 -0500 (Mon, 14 Nov 2011)
New Revision: 15258
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-11-14 12:56:02 UTC (rev 15257)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-11-14 12:57:30 UTC (rev 15258)
@@ -1033,8 +1033,7 @@
<exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude>
<exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude>
- <!-- TODO: EJB3 DD driven deployments -->
- <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
+ <!-- Waiting for pull request to be merged upstream -->
<exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
<!-- TODO: JMX client to AS7 server -->
13 years, 1 month
JBossWS SVN: r15257 - in stack/native/trunk/modules/testsuite: native-tests/src/test/etc and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-11-14 07:56:02 -0500 (Mon, 14 Nov 2011)
New Revision: 15257
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/etc/jboss-ejb-client.properties
stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/etc/jndi.properties
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/jndi.properties
Log:
[JBWS-3385] remote EJB JNDI support for AS7
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/etc/jboss-ejb-client.properties
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/etc/jboss-ejb-client.properties (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/etc/jboss-ejb-client.properties 2011-11-14 12:56:02 UTC (rev 15257)
@@ -0,0 +1,30 @@
+#
+# JBoss, Home of Professional Open Source.
+# Copyright 2011, Red Hat, Inc., and individual contributors
+# as indicated by the @author tags. See the copyright.txt file in the
+# distribution for a full listing of individual contributors.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
+
+remote.connections=default
+
+remote.connection.default.host=localhost
+remote.connection.default.port=4447
+remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
+
+
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/etc/jndi.properties
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/etc/jndi.properties 2011-11-14 12:55:29 UTC (rev 15256)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/etc/jndi.properties 2011-11-14 12:56:02 UTC (rev 15257)
@@ -1,3 +1,3 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces:org.jboss.ejb.client.naming
java.naming.provider.url=jnp://@jboss.bind.address@:1099
\ No newline at end of file
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-11-14 12:55:29 UTC (rev 15256)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-11-14 12:56:02 UTC (rev 15257)
@@ -937,6 +937,11 @@
<artifactId>mail</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-ejb-client</artifactId>
+ <version>1.0.0.Beta6</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.naming</groupId>
<artifactId>jnp-client</artifactId>
<version>5.0.5.Final</version>
Added: stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties
===================================================================
--- stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties (rev 0)
+++ stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties 2011-11-14 12:56:02 UTC (rev 15257)
@@ -0,0 +1,30 @@
+#
+# JBoss, Home of Professional Open Source.
+# Copyright 2011, Red Hat, Inc., and individual contributors
+# as indicated by the @author tags. See the copyright.txt file in the
+# distribution for a full listing of individual contributors.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
+
+remote.connections=default
+
+remote.connection.default.host=localhost
+remote.connection.default.port=4447
+remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
+
+
Modified: stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/jndi.properties
===================================================================
--- stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/jndi.properties 2011-11-14 12:55:29 UTC (rev 15256)
+++ stack/native/trunk/modules/testsuite/shared-tests/src/test/etc/jndi.properties 2011-11-14 12:56:02 UTC (rev 15257)
@@ -1,3 +1,3 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces:org.jboss.ejb.client.naming
java.naming.provider.url=jnp://@jboss.bind.address@:1099
\ No newline at end of file
13 years, 1 month
JBossWS SVN: r15256 - in stack/cxf/trunk/modules/testsuite: cxf-spring-tests/src/test/etc and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-11-14 07:55:29 -0500 (Mon, 14 Nov 2011)
New Revision: 15256
Added:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/jboss-ejb-client.properties
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/jndi.properties
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jndi.properties
stack/cxf/trunk/modules/testsuite/pom.xml
stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/jndi.properties
Log:
[JBWS-3385] remote EJB JNDI support for AS7
Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/jboss-ejb-client.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/jboss-ejb-client.properties (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/jboss-ejb-client.properties 2011-11-14 12:55:29 UTC (rev 15256)
@@ -0,0 +1,30 @@
+#
+# JBoss, Home of Professional Open Source.
+# Copyright 2011, Red Hat, Inc., and individual contributors
+# as indicated by the @author tags. See the copyright.txt file in the
+# distribution for a full listing of individual contributors.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
+
+remote.connections=default
+
+remote.connection.default.host=localhost
+remote.connection.default.port=4447
+remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
+
+
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/jndi.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/jndi.properties 2011-11-14 12:19:16 UTC (rev 15255)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/jndi.properties 2011-11-14 12:55:29 UTC (rev 15256)
@@ -1,3 +1,3 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces:org.jboss.ejb.client.naming
java.naming.provider.url=jnp://@jboss.bind.address@:1099
\ No newline at end of file
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties 2011-11-14 12:55:29 UTC (rev 15256)
@@ -0,0 +1,30 @@
+#
+# JBoss, Home of Professional Open Source.
+# Copyright 2011, Red Hat, Inc., and individual contributors
+# as indicated by the @author tags. See the copyright.txt file in the
+# distribution for a full listing of individual contributors.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
+
+remote.connections=default
+
+remote.connection.default.host=localhost
+remote.connection.default.port=4447
+remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
+
+
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jndi.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jndi.properties 2011-11-14 12:19:16 UTC (rev 15255)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/jndi.properties 2011-11-14 12:55:29 UTC (rev 15256)
@@ -1,3 +1,3 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces:org.jboss.ejb.client.naming
java.naming.provider.url=jnp://@jboss.bind.address@:1099
\ No newline at end of file
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-11-14 12:19:16 UTC (rev 15255)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-11-14 12:55:29 UTC (rev 15256)
@@ -1160,6 +1160,11 @@
<artifactId>mail</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-ejb-client</artifactId>
+ <version>1.0.0.Beta6</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.naming</groupId>
<artifactId>jnp-client</artifactId>
<version>5.0.5.Final</version>
Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties (rev 0)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties 2011-11-14 12:55:29 UTC (rev 15256)
@@ -0,0 +1,30 @@
+#
+# JBoss, Home of Professional Open Source.
+# Copyright 2011, Red Hat, Inc., and individual contributors
+# as indicated by the @author tags. See the copyright.txt file in the
+# distribution for a full listing of individual contributors.
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+#
+remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false
+
+remote.connections=default
+
+remote.connection.default.host=localhost
+remote.connection.default.port=4447
+remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false
+
+
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/jndi.properties
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/jndi.properties 2011-11-14 12:19:16 UTC (rev 15255)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/jndi.properties 2011-11-14 12:55:29 UTC (rev 15256)
@@ -1,3 +1,3 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces:org.jboss.ejb.client.naming
java.naming.provider.url=jnp://@jboss.bind.address@:1099
\ No newline at end of file
13 years, 1 month
JBossWS SVN: r15255 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws/jbws1841 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-11-14 07:19:16 -0500 (Mon, 14 Nov 2011)
New Revision: 15255
Added:
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/jboss-ejb3.xml
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
Log:
Fixing test to be executable agaisnt AS7 too
- provided service-ref overrides specific to AS7
- distinguishing remote EJB JNDI depending on AS version in use
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 2011-11-14 09:30:15 UTC (rev 15254)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-11-14 12:19:16 UTC (rev 15255)
@@ -483,6 +483,7 @@
<include name="wsdl/*" />
<include name="ejb-jar.xml" />
<include name="jboss.xml" />
+ <include name="jboss-ejb3.xml" />
<include name="jboss-webservices.xml" />
</metainf>
</jar>
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 2011-11-14 09:30:15 UTC (rev 15254)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2011-11-14 12:19:16 UTC (rev 15255)
@@ -58,7 +58,7 @@
port = Service.create(wsdlURL, serviceName).getPort(EndpointInterface.class);
InitialContext ctx = new InitialContext();
- remote = (StatelessRemote)ctx.lookup("/StatelessBean/remote");
+ remote = (StatelessRemote)ctx.lookup(getRemoteEjbJndiName());
}
}
@@ -91,4 +91,17 @@
String result = remote.echo4("Relay4");
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();
+ }
+ }
+
}
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/jboss-ejb3.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/jboss-ejb3.xml (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/jbws1841/META-INF/jboss-ejb3.xml 2011-11-14 12:19:16 UTC (rev 15255)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<jboss:jboss
+ xmlns:jboss="http://www.jboss.com/xml/ns/javaee"
+ xmlns="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">
+
+ <enterprise-beans>
+ <session>
+ <ejb-name>StatelessBean</ejb-name>
+ <service-ref>
+ <service-ref-name>service/Endpoint3</service-ref-name>
+ <wsdl-override>META-INF/wsdl/TestService.wsdl</wsdl-override>
+ </service-ref>
+ <service-ref>
+ <service-ref-name>service/Endpoint4</service-ref-name>
+ <!-- Metro compatibility: we declare the service-qname since we're using javax.xml.ws.Service in the ejb-jar.xml -->
+ <service-qname>{http://www.openuri.org/2004/04/HelloWorld}EndpointService</service-qname>
+ <wsdl-override>META-INF/wsdl/TestService.wsdl</wsdl-override>
+ </service-ref>
+ </session>
+ </enterprise-beans>
+
+</jboss:jboss>
13 years, 1 month