JBossWS SVN: r15521 - common/trunk/src/main/java/org/jboss/ws/common/management.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-25 07:46:37 -0500 (Wed, 25 Jan 2012)
New Revision: 15521
Modified:
common/trunk/src/main/java/org/jboss/ws/common/management/DefaultEndpointRegistryFactory.java
Log:
Minor changes
Modified: common/trunk/src/main/java/org/jboss/ws/common/management/DefaultEndpointRegistryFactory.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/management/DefaultEndpointRegistryFactory.java 2012-01-25 12:46:03 UTC (rev 15520)
+++ common/trunk/src/main/java/org/jboss/ws/common/management/DefaultEndpointRegistryFactory.java 2012-01-25 12:46:37 UTC (rev 15521)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -25,15 +25,14 @@
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
/**
- * Retrieves registry from MC kernel.
+ * Retrieves default registry
*
- * @author <a href="mailto:hbraun@redhat.com">Heiko Braun</a>
* @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
*/
public final class DefaultEndpointRegistryFactory extends EndpointRegistryFactory
{
- private static final EndpointRegistry ENDPOINT_REGISTRY = new DefaultEndpointRegistry();;
+ private static final EndpointRegistry ENDPOINT_REGISTRY = new DefaultEndpointRegistry();
public EndpointRegistry getEndpointRegistry()
{
12 years, 11 months
JBossWS SVN: r15520 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-25 07:46:03 -0500 (Wed, 25 Jan 2012)
New Revision: 15520
Modified:
stack/cxf/trunk/pom.xml
Log:
Move to 4.0.1-SNAPSHOT container integrations
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2012-01-25 12:45:17 UTC (rev 15519)
+++ stack/cxf/trunk/pom.xml 2012-01-25 12:46:03 UTC (rev 15520)
@@ -64,9 +64,9 @@
<jbossws.common.version>2.0.1-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.0.0.GA</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.0.1-SNAPSHOT</jbossws.shared.testsuite.version>
- <jbossws.jboss700.version>4.0.0.GA</jbossws.jboss700.version>
- <jbossws.jboss701.version>4.0.0.GA</jbossws.jboss701.version>
- <jbossws.jboss702.version>4.0.0.GA</jbossws.jboss702.version>
+ <jbossws.jboss700.version>4.0.1-SNAPSHOT</jbossws.jboss700.version>
+ <jbossws.jboss701.version>4.0.1-SNAPSHOT</jbossws.jboss701.version>
+ <jbossws.jboss702.version>4.0.1-SNAPSHOT</jbossws.jboss702.version>
<jboss700.version>7.0.0.Final</jboss700.version>
<jboss701.version>7.0.1.Final</jboss701.version>
<jboss702.version>7.0.2.Final</jboss702.version>
12 years, 11 months
JBossWS SVN: r15519 - in container/jboss70/branches/jbossws-jboss700/src/main: resources/META-INF/services and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-25 07:45:17 -0500 (Wed, 25 Jan 2012)
New Revision: 15519
Added:
container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/util/EndpointRegistryFactory.java
container/jboss70/branches/jbossws-jboss700/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
Log:
[JBWS-3419] Restore managed endpoint registry
Added: container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/util/EndpointRegistryFactory.java
===================================================================
--- container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/util/EndpointRegistryFactory.java (rev 0)
+++ container/jboss70/branches/jbossws-jboss700/src/main/java/org/jboss/as/webservices/util/EndpointRegistryFactory.java 2012-01-25 12:45:17 UTC (rev 15519)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.
+ */
+
+package org.jboss.as.webservices.util;
+
+import org.jboss.ws.common.management.DefaultEndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+
+/**
+ * JBoss AS 7 WS Endpoint registry factory
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 25-Jan-2012
+ *
+ */
+public final class EndpointRegistryFactory extends org.jboss.wsf.spi.management.EndpointRegistryFactory {
+
+ private static final EndpointRegistry fallbackRegistry = new DefaultEndpointRegistry();;
+
+ public EndpointRegistryFactory() {
+ super();
+ }
+
+ /**
+ * Retrieves endpoint registry through the corresponding Service
+ *
+ * @return endpoint registry
+ */
+ public EndpointRegistry getEndpointRegistry() {
+ try {
+ EndpointRegistry registry = (EndpointRegistry) WSServices.getContainerRegistry()
+ .getService(WSServices.REGISTRY_SERVICE).getService().getValue();
+ if (registry == null) {
+ registry = fallbackRegistry;
+ }
+ return registry;
+ } catch (Exception e) {
+ return fallbackRegistry;
+ }
+ }
+
+}
Added: container/jboss70/branches/jbossws-jboss700/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
===================================================================
--- container/jboss70/branches/jbossws-jboss700/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory (rev 0)
+++ container/jboss70/branches/jbossws-jboss700/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2012-01-25 12:45:17 UTC (rev 15519)
@@ -0,0 +1 @@
+org.jboss.as.webservices.util.EndpointRegistryFactory
\ No newline at end of file
12 years, 11 months
JBossWS SVN: r15518 - in container/jboss70/branches/jbossws-jboss701/src/main: resources/META-INF/services and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-25 07:42:02 -0500 (Wed, 25 Jan 2012)
New Revision: 15518
Added:
container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/util/EndpointRegistryFactory.java
container/jboss70/branches/jbossws-jboss701/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
Log:
[JBWS-3419] Restore managed endpoint registry
Added: container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/util/EndpointRegistryFactory.java
===================================================================
--- container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/util/EndpointRegistryFactory.java (rev 0)
+++ container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/util/EndpointRegistryFactory.java 2012-01-25 12:42:02 UTC (rev 15518)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.
+ */
+
+package org.jboss.as.webservices.util;
+
+import org.jboss.ws.common.management.DefaultEndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+
+/**
+ * JBoss AS 7 WS Endpoint registry factory
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 25-Jan-2012
+ *
+ */
+public final class EndpointRegistryFactory extends org.jboss.wsf.spi.management.EndpointRegistryFactory {
+
+ private static final EndpointRegistry fallbackRegistry = new DefaultEndpointRegistry();;
+
+ public EndpointRegistryFactory() {
+ super();
+ }
+
+ /**
+ * Retrieves endpoint registry through the corresponding Service
+ *
+ * @return endpoint registry
+ */
+ public EndpointRegistry getEndpointRegistry() {
+ try {
+ EndpointRegistry registry = (EndpointRegistry) WSServices.getContainerRegistry()
+ .getService(WSServices.REGISTRY_SERVICE).getService().getValue();
+ if (registry == null) {
+ registry = fallbackRegistry;
+ }
+ return registry;
+ } catch (Exception e) {
+ return fallbackRegistry;
+ }
+ }
+
+}
Added: container/jboss70/branches/jbossws-jboss701/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
===================================================================
--- container/jboss70/branches/jbossws-jboss701/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory (rev 0)
+++ container/jboss70/branches/jbossws-jboss701/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2012-01-25 12:42:02 UTC (rev 15518)
@@ -0,0 +1 @@
+org.jboss.as.webservices.util.EndpointRegistryFactory
\ No newline at end of file
12 years, 11 months
JBossWS SVN: r15517 - in container/jboss70/branches/jbossws-jboss702/src/main: resources/META-INF/services and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-25 07:36:16 -0500 (Wed, 25 Jan 2012)
New Revision: 15517
Added:
container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/util/EndpointRegistryFactory.java
container/jboss70/branches/jbossws-jboss702/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
Log:
[JBWS-3419] Restore managed endpoint registry
Added: container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/util/EndpointRegistryFactory.java
===================================================================
--- container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/util/EndpointRegistryFactory.java (rev 0)
+++ container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/util/EndpointRegistryFactory.java 2012-01-25 12:36:16 UTC (rev 15517)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, 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.
+ */
+
+package org.jboss.as.webservices.util;
+
+import org.jboss.ws.common.management.DefaultEndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+
+/**
+ * JBoss AS 7 WS Endpoint registry factory
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 25-Jan-2012
+ *
+ */
+public final class EndpointRegistryFactory extends org.jboss.wsf.spi.management.EndpointRegistryFactory {
+
+ private static final EndpointRegistry fallbackRegistry = new DefaultEndpointRegistry();;
+
+ public EndpointRegistryFactory() {
+ super();
+ }
+
+ /**
+ * Retrieves endpoint registry through the corresponding Service
+ *
+ * @return endpoint registry
+ */
+ public EndpointRegistry getEndpointRegistry() {
+ try {
+ EndpointRegistry registry = (EndpointRegistry) WSServices.getContainerRegistry()
+ .getService(WSServices.REGISTRY_SERVICE).getService().getValue();
+ if (registry == null) {
+ registry = fallbackRegistry;
+ }
+ return registry;
+ } catch (Exception e) {
+ return fallbackRegistry;
+ }
+ }
+
+}
Added: container/jboss70/branches/jbossws-jboss702/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory
===================================================================
--- container/jboss70/branches/jbossws-jboss702/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory (rev 0)
+++ container/jboss70/branches/jbossws-jboss702/src/main/resources/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2012-01-25 12:36:16 UTC (rev 15517)
@@ -0,0 +1 @@
+org.jboss.as.webservices.util.EndpointRegistryFactory
\ No newline at end of file
12 years, 11 months
JBossWS SVN: r15516 - shared-testsuite/trunk/src/main/java/org/jboss/wsf/test.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-25 06:04:21 -0500 (Wed, 25 Jan 2012)
New Revision: 15516
Modified:
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
Log:
[JBWS-3388] Use remoting-jmx on AS 7.1.0
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-01-25 08:59:35 UTC (rev 15515)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-01-25 11:04:21 UTC (rev 15516)
@@ -197,7 +197,7 @@
String integrationTarget = getIntegrationTarget();
if (integrationTarget.startsWith("jboss7"))
{
- server = getAS7ServerConnection();
+ server = getAS7ServerConnection(integrationTarget);
}
else
{
@@ -207,10 +207,15 @@
return server;
}
- private static MBeanServerConnection getAS7ServerConnection()
+ private static MBeanServerConnection getAS7ServerConnection(String integrationTarget)
{
String host = getServerHost();
- String urlString = System.getProperty("jmx.service.url", "service:jmx:rmi:///jndi/rmi://" + host + ":" + 1090 + "/jmxrmi");
+ String urlString;
+ if (integrationTarget.startsWith("jboss70")) {
+ urlString = System.getProperty("jmx.service.url", "service:jmx:rmi:///jndi/rmi://" + host + ":" + 1090 + "/jmxrmi");
+ } else {
+ urlString = System.getProperty("jmx.service.url", "service:jmx:remoting-jmx://" + host + ":" + 9999);
+ }
try {
JMXServiceURL serviceURL = new JMXServiceURL(urlString);
return JMXConnectorFactory.connect(serviceURL, null).getMBeanServerConnection();
12 years, 11 months
JBossWS SVN: r15515 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-25 03:59:35 -0500 (Wed, 25 Jan 2012)
New Revision: 15515
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java
Log:
Fixing regression by improving the test
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java 2012-01-24 22:46:56 UTC (rev 15514)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java 2012-01-25 08:59:35 UTC (rev 15515)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -86,22 +86,21 @@
public static void testWebServiceRef(Endpoint port) throws BusTestException
{
Bus initialDefaultBus = BusFactory.getDefaultBus(false);
- performInvocation(port);
+ Bus threadBus = BusFactory.getThreadDefaultBus(false);
+ performInvocation(port); //does not change anything to the bus, as the port is already created when injecting serviceref
checkDefaultBus(initialDefaultBus);
- Bus threadBus = BusFactory.getThreadDefaultBus(false);
+ checkThreadBus(threadBus);
try
{
BusFactory.setThreadDefaultBus(null);
- performInvocation(port);
- Bus newThreadBus = BusFactory.getThreadDefaultBus(false);
- if (newThreadBus == initialDefaultBus)
- {
- throw new BusTestException("Thread bus set to former default bus " + initialDefaultBus + " instead of a new bus!");
- }
- else if (newThreadBus == threadBus)
- {
- throw new BusTestException("Thread bus set to former thread bus " + threadBus + " (which is also default) instead of a new bus!");
- }
+ performInvocation(port); //does not change anything to the bus, as the port is already created when injecting serviceref
+ checkDefaultBus(initialDefaultBus);
+ checkThreadBus(null);
+ BusFactory factory = BusFactory.newInstance();
+ Bus bus = factory.createBus(); //internally sets the thread bus
+ performInvocation(port); //does not change anything to the bus, as the port is already created when injecting serviceref
+ checkDefaultBus(initialDefaultBus);
+ checkThreadBus(bus);
}
finally
{
@@ -118,8 +117,9 @@
Bus threadBus = BusFactory.getThreadDefaultBus(false);
try
{
+ final String url = getEndpointURL(host);
BusFactory.setThreadDefaultBus(null);
- performInvocation(getEndpointURL(host));
+ performInvocation(url); //goes through ServiceDelegate which sets the thread bus if it's null
Bus newThreadBus = BusFactory.getThreadDefaultBus(false);
if (newThreadBus == initialDefaultBus)
{
@@ -127,8 +127,11 @@
}
else if (newThreadBus == threadBus)
{
- throw new BusTestException("Thread bus set to former thread bus " + threadBus + " (which is also default) instead of a new bus!");
+ throw new BusTestException("Thread bus set to former thread bus " + threadBus + " instead of a new bus!");
}
+ performInvocation(url);
+ checkThreadBus(newThreadBus); //the thread bus is not changed as it's not null
+ checkDefaultBus(initialDefaultBus);
}
finally
{
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-01-24 22:46:56 UTC (rev 15514)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2012-01-25 08:59:35 UTC (rev 15515)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
12 years, 11 months
JBossWS SVN: r15514 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-24 17:46:56 -0500 (Tue, 24 Jan 2012)
New Revision: 15514
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java
Log:
Run EJB3 webserviceref test on AS 7.1 or greater only
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-01-24 22:32:24 UTC (rev 15513)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2012-01-24 22:46:56 UTC (rev 15514)
@@ -54,7 +54,9 @@
ejb3Remote.testBusCreation();
ejb3Remote.testSOAPConnection(host);
ejb3Remote.testWebServiceClient(host);
- ejb3Remote.testWebServiceRef();
+ if (!isTargetJBoss70()) {
+ ejb3Remote.testWebServiceRef();
+ }
}
finally
{
12 years, 11 months
JBossWS SVN: r15513 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-24 17:32:24 -0500 (Tue, 24 Jan 2012)
New Revision: 15513
Modified:
stack/cxf/trunk/pom.xml
Log:
[JBWS-3410] Upgrading to Apache CXF 2.4.6
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2012-01-24 22:14:21 UTC (rev 15512)
+++ stack/cxf/trunk/pom.xml 2012-01-24 22:32:24 UTC (rev 15513)
@@ -72,7 +72,7 @@
<jboss702.version>7.0.2.Final</jboss702.version>
<jboss710.version>7.1.0.Final-SNAPSHOT</jboss710.version>
<ejb.api.version>1.0.1.Final</ejb.api.version>
- <cxf.version>2.4.5</cxf.version>
+ <cxf.version>2.4.6</cxf.version>
<cxf.asm.version>3.3</cxf.asm.version>
<cxf.xjcplugins.version>2.4.0</cxf.xjcplugins.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
12 years, 11 months
JBossWS SVN: r15512 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-01-24 17:14:21 -0500 (Tue, 24 Jan 2012)
New Revision: 15512
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java
Log:
Actually running test on webserviceref...
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java 2012-01-24 22:13:42 UTC (rev 15511)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/AbstractClient.java 2012-01-24 22:14:21 UTC (rev 15512)
@@ -86,9 +86,27 @@
public static void testWebServiceRef(Endpoint port) throws BusTestException
{
Bus initialDefaultBus = BusFactory.getDefaultBus(false);
- Bus initialThreadBus = BusFactory.getThreadDefaultBus(false);
- checkThreadBus(initialThreadBus); //this can probably be relaxed as below
+ performInvocation(port);
checkDefaultBus(initialDefaultBus);
+ Bus threadBus = BusFactory.getThreadDefaultBus(false);
+ try
+ {
+ BusFactory.setThreadDefaultBus(null);
+ performInvocation(port);
+ Bus newThreadBus = BusFactory.getThreadDefaultBus(false);
+ if (newThreadBus == initialDefaultBus)
+ {
+ throw new BusTestException("Thread bus set to former default bus " + initialDefaultBus + " instead of a new bus!");
+ }
+ else if (newThreadBus == threadBus)
+ {
+ throw new BusTestException("Thread bus set to former thread bus " + threadBus + " (which is also default) instead of a new bus!");
+ }
+ }
+ finally
+ {
+ BusFactory.setThreadDefaultBus(threadBus);
+ }
}
public static void testWebServiceClient(String host) throws BusTestException, Exception
12 years, 11 months