JBossWS SVN: r12761 - in stack/cxf/branches/cxf-2.3/modules: testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-08-07 21:41:55 -0400 (Sat, 07 Aug 2010)
New Revision: 12761
Added:
stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/
Modified:
stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
Log:
svn merge -r 12759:12760 https://svn.jboss.org/repos/jbossws/stack/cxf/trunk .
Modified: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-08-08 01:32:36 UTC (rev 12760)
+++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-08-08 01:41:55 UTC (rev 12761)
@@ -25,6 +25,8 @@
import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.SoapTransportFactory;
+import org.apache.cxf.buslifecycle.BusLifeCycleListener;
+import org.apache.cxf.buslifecycle.BusLifeCycleManager;
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
@@ -47,6 +49,7 @@
{
public static final String PARAM_CXF_BEANS_URL = "jbossws.cxf.beans.url";
protected Bus bus;
+ protected BusHolderLifeCycleListener busHolderListener;
public BusHolder()
{
@@ -68,6 +71,9 @@
*/
public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer)
{
+ busHolderListener = new BusHolderLifeCycleListener();
+ bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(busHolderListener);
+
if (configurer != null)
{
bus.setExtension(configurer, Configurer.class);
@@ -84,7 +90,12 @@
*/
public void close()
{
-
+ //call bus shutdown unless the listener tells us shutdown has already been asked
+ if (busHolderListener != null && !busHolderListener.isPreShutdown())
+ {
+ bus.shutdown(true);
+ }
+ busHolderListener = null;
}
/**
@@ -143,4 +154,32 @@
{
this.bus = bus;
}
+
+ private class BusHolderLifeCycleListener implements BusLifeCycleListener
+ {
+ private volatile boolean preShutdown = false;
+
+ public boolean isPreShutdown()
+ {
+ return preShutdown;
+ }
+
+ @Override
+ public void initComplete()
+ {
+ //NOOP
+ }
+
+ @Override
+ public void preShutdown()
+ {
+ preShutdown = true;
+ }
+
+ @Override
+ public void postShutdown()
+ {
+ //NOOP
+ }
+ }
}
Modified: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
===================================================================
--- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-08 01:32:36 UTC (rev 12760)
+++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-08 01:41:55 UTC (rev 12761)
@@ -122,10 +122,13 @@
for (EndpointImpl endpoint : endpoints)
{
- endpoint.stop();
+ if (endpoint.isPublished())
+ {
+ endpoint.stop();
+ }
}
endpoints.clear();
- bus.shutdown(true);
+
super.close();
}
Copied: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098 (from rev 12760, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098)
Modified: stack/cxf/branches/cxf-2.3/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
===================================================================
15 years, 9 months
JBossWS SVN: r12760 - in stack/cxf/trunk/modules: testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-08-07 21:32:36 -0400 (Sat, 07 Aug 2010)
New Revision: 12760
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
Log:
[JBWS-3098] Ensure bus shutdown at undeployment
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-08-07 23:21:50 UTC (rev 12759)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-08-08 01:32:36 UTC (rev 12760)
@@ -25,6 +25,8 @@
import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.SoapTransportFactory;
+import org.apache.cxf.buslifecycle.BusLifeCycleListener;
+import org.apache.cxf.buslifecycle.BusLifeCycleManager;
import org.apache.cxf.configuration.Configurer;
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
@@ -47,6 +49,7 @@
{
public static final String PARAM_CXF_BEANS_URL = "jbossws.cxf.beans.url";
protected Bus bus;
+ protected BusHolderLifeCycleListener busHolderListener;
public BusHolder()
{
@@ -68,6 +71,9 @@
*/
public void configure(SoapTransportFactory soapTransportFactory, ResourceResolver resolver, Configurer configurer)
{
+ busHolderListener = new BusHolderLifeCycleListener();
+ bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(busHolderListener);
+
if (configurer != null)
{
bus.setExtension(configurer, Configurer.class);
@@ -84,7 +90,12 @@
*/
public void close()
{
-
+ //call bus shutdown unless the listener tells us shutdown has already been asked
+ if (busHolderListener != null && !busHolderListener.isPreShutdown())
+ {
+ bus.shutdown(true);
+ }
+ busHolderListener = null;
}
/**
@@ -143,4 +154,32 @@
{
this.bus = bus;
}
+
+ private class BusHolderLifeCycleListener implements BusLifeCycleListener
+ {
+ private volatile boolean preShutdown = false;
+
+ public boolean isPreShutdown()
+ {
+ return preShutdown;
+ }
+
+ @Override
+ public void initComplete()
+ {
+ //NOOP
+ }
+
+ @Override
+ public void preShutdown()
+ {
+ preShutdown = true;
+ }
+
+ @Override
+ public void postShutdown()
+ {
+ //NOOP
+ }
+ }
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-07 23:21:50 UTC (rev 12759)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-08 01:32:36 UTC (rev 12760)
@@ -122,10 +122,13 @@
for (EndpointImpl endpoint : endpoints)
{
- endpoint.stop();
+ if (endpoint.isPublished())
+ {
+ endpoint.stop();
+ }
}
endpoints.clear();
- bus.shutdown(true);
+
super.close();
}
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2010-08-08 01:32:36 UTC (rev 12760)
@@ -0,0 +1,123 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.cxf.jbws3098;
+
+import java.net.URL;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.buslifecycle.BusLifeCycleListener;
+import org.apache.cxf.buslifecycle.BusLifeCycleManager;
+import org.jboss.wsf.stack.cxf.client.util.SpringUtils;
+import org.jboss.wsf.stack.cxf.configuration.BusHolder;
+import org.jboss.wsf.stack.cxf.configuration.NonSpringBusHolder;
+import org.jboss.wsf.stack.cxf.configuration.SpringBusHolder;
+import org.jboss.wsf.stack.cxf.metadata.services.DDBeans;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * Verifies the Bus is properly shutdown when created through the BusHolder
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 08-Aug-2010
+ *
+ */
+public class BusHolderLifeCycleTestCase extends JBossWSTest
+{
+ public void testBusShutdown()
+ {
+ if (SpringUtils.isSpringAvailable(Thread.currentThread().getContextClassLoader()))
+ {
+ simpleShutdownTest(new SpringBusHolder(null, new URL[]{}));
+ shutdownTestWithInnerShutdown(new SpringBusHolder(null, new URL[]{}));
+ shutdownTestWithNoShutdown(new SpringBusHolder(null, new URL[]{}));
+ }
+ else
+ {
+ simpleShutdownTest(new NonSpringBusHolder(new DDBeans()));
+ shutdownTestWithInnerShutdown(new NonSpringBusHolder(new DDBeans()));
+ shutdownTestWithNoShutdown(new NonSpringBusHolder(new DDBeans()));
+ }
+ }
+
+ private static void simpleShutdownTest(BusHolder holder)
+ {
+ Bus bus = holder.getBus();
+ TestLifeCycleListener listener = new TestLifeCycleListener();
+ bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener);
+ holder.configure(null, null, null);
+ holder.close();
+ assertEquals("preShutdown method on listener should be called exactly once; number of actual calls: "
+ + listener.getCount(), 1, listener.getCount());
+ }
+
+ private static void shutdownTestWithInnerShutdown(BusHolder holder)
+ {
+ Bus bus = holder.getBus();
+ TestLifeCycleListener listener = new TestLifeCycleListener();
+ bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener);
+ holder.configure(null, null, null);
+ bus.shutdown(true);
+ holder.close();
+ assertEquals("preShutdown method on listener should be called exactly once; number of actual calls: "
+ + listener.getCount(), 1, listener.getCount());
+ }
+
+ private static void shutdownTestWithNoShutdown(BusHolder holder)
+ {
+ Bus bus = holder.getBus();
+ TestLifeCycleListener listener = new TestLifeCycleListener();
+ bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(listener);
+ holder.configure(null, null, null);
+ assertEquals("preShutdown method on listener shouldn't be called before holder is closed: number of actual calls: "
+ + listener.getCount(), 0, listener.getCount());
+ holder.close();
+ }
+
+ private static class TestLifeCycleListener implements BusLifeCycleListener
+ {
+ private volatile int count = 0;
+
+ public int getCount()
+ {
+ return count;
+ }
+
+ @Override
+ public void initComplete()
+ {
+ //NOOP
+ }
+
+ @Override
+ public void preShutdown()
+ {
+ count++;
+ }
+
+ @Override
+ public void postShutdown()
+ {
+ //NOOP
+ }
+
+ }
+}
15 years, 9 months
JBossWS SVN: r12759 - stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/cxf.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-08-07 19:21:50 -0400 (Sat, 07 Aug 2010)
New Revision: 12759
Modified:
stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml
Log:
Synch jbossws-cxf.xml with Apache CXF 2.3-SNAPSHOT cxf.xml - lazy init
Modified: stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml
===================================================================
--- stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml 2010-08-06 19:57:33 UTC (rev 12758)
+++ stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/cxf/jbossws-cxf.xml 2010-08-07 23:21:50 UTC (rev 12759)
@@ -52,82 +52,90 @@
</property>
</bean>
- <bean id="org.apache.cxf.binding.BindingFactoryManager" class="org.apache.cxf.binding.BindingFactoryManagerImpl">
- <property name="mapProvider">
- <bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
- <property name="type" value="org.apache.cxf.binding.BindingFactory"/>
- <property name="idsProperty" value="activationNamespaces"/>
- </bean>
- </property>
- <property name="bus" ref="cxf"/>
+ <bean id="org.apache.cxf.binding.BindingFactoryManager"
+ class="org.apache.cxf.binding.BindingFactoryManagerImpl"
+ lazy-init="true">
+ <constructor-arg ref="cxf"/>
</bean>
- <bean id="org.apache.cxf.transport.DestinationFactoryManager" class="org.apache.cxf.transport.DestinationFactoryManagerImpl">
- <property name="mapProvider">
- <bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
- <property name="type" value="org.apache.cxf.transport.DestinationFactory"/>
- <property name="idsProperty" value="transportIds"/>
- </bean>
- </property>
- <property name="bus" ref="cxf"/>
+ <bean id="org.apache.cxf.transport.DestinationFactoryManager"
+ class="org.apache.cxf.transport.DestinationFactoryManagerImpl"
+ lazy-init="true">
+ <constructor-arg ref="cxf"/>
</bean>
- <bean id="org.apache.cxf.transport.ConduitInitiatorManager" class="org.apache.cxf.transport.ConduitInitiatorManagerImpl">
- <property name="mapProvider">
- <bean class="org.apache.cxf.configuration.spring.SpringBeanMap">
- <property name="type" value="org.apache.cxf.transport.ConduitInitiator"/>
- <property name="idsProperty" value="transportIds"/>
- </bean>
- </property>
- <property name="bus" ref="cxf"/>
+ <bean id="org.apache.cxf.transport.ConduitInitiatorManager"
+ class="org.apache.cxf.transport.ConduitInitiatorManagerImpl"
+ lazy-init="true">
+ <constructor-arg ref="cxf"/>
</bean>
- <bean id="org.apache.cxf.wsdl.WSDLManager" class="org.apache.cxf.wsdl11.WSDLManagerImpl">
- <property name="bus" ref="cxf"/>
+ <bean id="org.apache.cxf.wsdl.WSDLManager"
+ class="org.apache.cxf.wsdl11.WSDLManagerImpl"
+ lazy-init="true">
+ <constructor-arg ref="cxf"/>
</bean>
- <bean id="org.apache.cxf.phase.PhaseManager" class="org.apache.cxf.phase.PhaseManagerImpl">
-
- </bean>
+ <bean id="org.apache.cxf.phase.PhaseManager"
+ class="org.apache.cxf.phase.PhaseManagerImpl"
+ lazy-init="true"/>
- <bean id="org.apache.cxf.workqueue.WorkQueueManager" class="org.apache.cxf.workqueue.WorkQueueManagerImpl">
- <property name="bus" ref="cxf"/>
+ <bean id="org.apache.cxf.workqueue.WorkQueueManager"
+ class="org.apache.cxf.workqueue.WorkQueueManagerImpl"
+ lazy-init="true">
+ <constructor-arg ref="cxf"/>
</bean>
- <bean id="org.apache.cxf.buslifecycle.BusLifeCycleManager" class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager">
- <property name="bus" ref="cxf"/>
+ <bean id="org.apache.cxf.buslifecycle.BusLifeCycleManager"
+ class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager"
+ lazy-init="true">
+ <constructor-arg ref="cxf"/>
</bean>
- <bean id="org.apache.cxf.endpoint.ServerRegistry" class="org.apache.cxf.endpoint.ServerRegistryImpl">
- <property name="bus" ref="cxf"/>
+ <bean id="org.apache.cxf.endpoint.ServerRegistry"
+ class="org.apache.cxf.endpoint.ServerRegistryImpl"
+ lazy-init="true">
+ <constructor-arg ref="cxf"/>
</bean>
- <bean id="org.apache.cxf.endpoint.ServerLifeCycleManager" class="org.apache.cxf.endpoint.ServerLifeCycleManagerImpl"/>
- <bean id="org.apache.cxf.endpoint.ClientLifeCycleManager" class="org.apache.cxf.endpoint.ClientLifeCycleManagerImpl"/>
+ <bean id="org.apache.cxf.endpoint.ServerLifeCycleManager"
+ class="org.apache.cxf.endpoint.ServerLifeCycleManagerImpl"
+ lazy-init="true"/>
+ <bean id="org.apache.cxf.endpoint.ClientLifeCycleManager"
+ class="org.apache.cxf.endpoint.ClientLifeCycleManagerImpl"
+ lazy-init="true"/>
- <bean id="org.apache.cxf.transports.http.QueryHandlerRegistry" class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl">
- <property name="bus" ref="cxf"/>
- <property name="queryHandlers">
- <list>
- <bean class="org.apache.cxf.transport.http.WSDLQueryHandler">
- <property name="bus" ref="cxf"/>
- </bean>
- </list>
- </property>
+ <bean id="org.apache.cxf.transports.http.QueryHandlerRegistry"
+ class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl"
+ lazy-init="true">
+ <constructor-arg ref="cxf"/>
</bean>
- <bean id="org.apache.cxf.endpoint.EndpointResolverRegistry" class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl">
- <property name="bus" ref="cxf"/>
+ <bean id="org.apache.cxf.endpoint.EndpointResolverRegistry"
+ class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl"
+ lazy-init="true">
+ <constructor-arg ref="cxf"/>
</bean>
- <bean id="org.apache.cxf.headers.HeaderManager" class="org.apache.cxf.headers.HeaderManagerImpl">
- <property name="bus" ref="cxf"/>
+ <bean id="org.apache.cxf.headers.HeaderManager"
+ class="org.apache.cxf.headers.HeaderManagerImpl"
+ lazy-init="true">
+ <constructor-arg ref="cxf"/>
</bean>
- <bean id="org.apache.cxf.catalog.OASISCatalogManager" class="org.apache.cxf.catalog.OASISCatalogManager">
- <property name="bus" ref="cxf"/>
+ <bean id="org.apache.cxf.catalog.OASISCatalogManager"
+ class="org.apache.cxf.catalog.OASISCatalogManager"
+ lazy-init="true">
+ <constructor-arg ref="cxf"/>
</bean>
-
- <bean id="org.apache.cxf.endpoint.ServiceContractResolverRegistry" class="org.apache.cxf.endpoint.ServiceContractResolverRegistryImpl">
- <property name="bus" ref="cxf"/>
+ <bean id="org.apache.cxf.service.factory.FactoryBeanListenerManager"
+ class="org.apache.cxf.service.factory.FactoryBeanListenerManager"
+ lazy-init="true">
+ <constructor-arg ref="cxf"/>
</bean>
+
+ <bean id="org.apache.cxf.endpoint.ServiceContractResolverRegistry"
+ class="org.apache.cxf.endpoint.ServiceContractResolverRegistryImpl"
+ lazy-init="true">
+ <constructor-arg ref="cxf"/>
+ </bean>
</beans>
15 years, 9 months
JBossWS SVN: r12758 - stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-08-06 15:57:33 -0400 (Fri, 06 Aug 2010)
New Revision: 12758
Modified:
stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
Log:
No need anymore for manual registration of servlet transport factory
Modified: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
===================================================================
--- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-06 19:56:22 UTC (rev 12757)
+++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-06 19:57:33 UTC (rev 12758)
@@ -72,7 +72,6 @@
{
registerTransport(factory, s);
}
- registerTransport(factory, "http://schemas.xmlsoap.org/soap/http");
}
/**
15 years, 9 months
JBossWS SVN: r12757 - stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-08-06 15:56:22 -0400 (Fri, 06 Aug 2010)
New Revision: 12757
Removed:
stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/bus-extensions.xml
stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/extensions.xml
Log:
svn merge -r 12754:12755 https://svn.jboss.org/repos/jbossws/stack/cxf/trunk .
Deleted: stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/bus-extensions.xml
===================================================================
--- stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-08-06 18:14:15 UTC (rev 12756)
+++ stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-08-06 19:56:22 UTC (rev 12757)
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<extensions xmlns="http://cxf.apache.org/bus/extension">
- <!-- <extension class="org.apache.cxf.binding.BindingFactoryManagerImpl"-->
- <!-- interface="org.apache.cxf.binding.BindingFactoryManager"/>-->
- <!-- <extension class="org.apache.cxf.transport.DestinationFactoryManagerImpl"-->
- <!-- interface="org.apache.cxf.transport.DestinationFactoryManager"/>-->
- <!-- <extension class="org.apache.cxf.transport.ConduitInitiatorManagerImpl"-->
- <!-- interface="org.apache.cxf.transport.ConduitInitiatorManager"/>-->
- <extension class="org.apache.cxf.wsdl11.WSDLManagerImpl" interface="org.apache.cxf.wsdl.WSDLManager" />
- <extension class="org.apache.cxf.phase.PhaseManagerImpl" interface="org.apache.cxf.phase.PhaseManager" />
- <extension class="org.apache.cxf.workqueue.WorkQueueManagerImpl" interface="org.apache.cxf.workqueue.WorkQueueManager" />
- <extension class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager" interface="org.apache.cxf.buslifecycle.BusLifeCycleManager" />
- <extension class="org.apache.cxf.endpoint.ServerRegistryImpl" interface="org.apache.cxf.endpoint.ServerRegistry" />
- <extension class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl" interface="org.apache.cxf.transports.http.QueryHandlerRegistry" />
- <extension class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl" interface="org.apache.cxf.endpoint.EndpointResolverRegistry" />
- <extension class="org.apache.cxf.headers.HeaderManagerImpl" interface="org.apache.cxf.headers.HeaderManager" />
- <extension class="org.apache.cxf.catalog.OASISCatalogManager" interface="org.apache.cxf.catalog.OASISCatalogManager" />
- <extension class="org.apache.cxf.binding.soap.SoapBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
- <namespace>http://schemas.xmlsoap.org/soap/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
- <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
- </extension>
- <extension class="org.apache.cxf.binding.soap.SoapTransportFactory" interface="org.apache.cxf.transport.DestinationFactory" deferred="true">
- <namespace>http://schemas.xmlsoap.org/soap/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
- </extension>
- <extension class="org.apache.cxf.binding.xml.XMLBindingFactory" deferred="true">
- <namespace>http://cxf.apache.org/bindings/xformat</namespace>
- <namespace>http://www.w3.org/2004/08/wsdl/http</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
- </extension>
- <extension class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" deferred="true">
- <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
- <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
- <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
- <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
- <namespace>http://cxf.apache.org/bindings/xformat</namespace>
- </extension>
- <extension class="org.apache.cxf.management.jmx.InstrumentationManagerImpl" interface="org.apache.cxf.management.InstrumentationManager" />
- <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="false">
- <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
- <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
- <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
- <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
- <namespace>http://cxf.apache.org/bindings/xformat</namespace>
- </extension>
- <extension class="org.apache.cxf.transport.jms.JMSTransportFactory" deferred="true">
- <namespace>http://cxf.apache.org/transports/jms</namespace>
- <namespace>http://cxf.apache.org/transports/jms/configuration</namespace>
- </extension>
- <extension class="org.apache.cxf.binding.object.ObjectBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
- <namespace>http://cxf.apache.org/binding/object/</namespace>
- </extension>
- <extension class="org.apache.cxf.binding.http.HttpBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
- <namespace>http://apache.org/cxf/binding/http</namespace>
- </extension>
-</extensions>
-
Deleted: stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/extensions.xml
===================================================================
--- stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/extensions.xml 2010-08-06 18:14:15 UTC (rev 12756)
+++ stack/cxf/branches/cxf-2.3/modules/client/src/main/resources/META-INF/extensions.xml 2010-08-06 19:56:22 UTC (rev 12757)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-
-<properties>
- <entry key="org.apache.cxf.bindings.xml-1">javax.wsdl.BindingInput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry>
- <entry key="org.apache.cxf.bindings.xml-2">javax.wsdl.BindingOutput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry>
- <entry key="org.apache.cxf.bindings.xml-3">javax.wsdl.Binding=org.apache.cxf.bindings.xformat.XMLFormatBinding</entry>
- <entry key="org.apache.cxf.ws.addressing-1">javax.wsdl.Binding=org.apache.cxf.ws.addressing.wsdl.UsingAddressing</entry>
- <entry key="org.apache.cxf.transports.http-1">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPClientPolicy</entry>
- <entry key="org.apache.cxf.transports.http-2">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPServerPolicy</entry>
- <entry key="org.apache.cxf.transports.http-3">javax.wsdl.Port=org.apache.cxf.wsdl.http.AddressType</entry>
- <entry key="org.apache.cxf.transport.jms-1">javax.wsdl.Port=org.apache.cxf.transport.jms.AddressType</entry>
- <entry key="org.apache.cxf.transport.jms-2">javax.wsdl.Port=org.apache.cxf.transport.jms.ClientBehaviorPolicyType</entry>
- <entry key="org.apache.cxf.transport.jms-3">javax.wsdl.Port=org.apache.cxf.transport.jms.ServerBehaviorPolicyType</entry>
- <entry key="org.apache.cxf.transport.jms-4">javax.wsdl.Port=org.apache.cxf.transport.jms.ClientConfig</entry>
- <entry key="org.apache.cxf.transport.jms-5">javax.wsdl.Port=org.apache.cxf.transport.jms.ServerConfig</entry>
- <entry key="org.apache.cxf.transport.jms-6">javax.wsdl.Port=org.apache.cxf.transport.jms.SessionPoolType</entry>
-</properties>
-
15 years, 9 months
JBossWS SVN: r12756 - in stack/cxf/branches/cxf-2.3/modules: server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-08-06 14:14:15 -0400 (Fri, 06 Aug 2010)
New Revision: 12756
Added:
stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java
stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java
Modified:
stack/cxf/branches/cxf-2.3/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java
stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspect.java
stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java
Log:
svn merge -r 12730:12743 https://svn.jboss.org/repos/jbossws/stack/cxf/trunk .
Modified: stack/cxf/branches/cxf-2.3/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java
===================================================================
--- stack/cxf/branches/cxf-2.3/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java 2010-08-06 17:36:32 UTC (rev 12755)
+++ stack/cxf/branches/cxf-2.3/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/util/SpringUtils.java 2010-08-06 18:14:15 UTC (rev 12756)
@@ -30,6 +30,13 @@
*/
public class SpringUtils
{
+ public static final boolean SPRING_AVAILABLE;
+ static
+ {
+ SPRING_AVAILABLE =
+ isSpringAvailable(SpringUtils.class.getClassLoader(),
+ Thread.currentThread().getContextClassLoader());
+ }
/**
* Check if Spring is available using the provided classloader
*
@@ -44,6 +51,10 @@
}
for (ClassLoader cl : loaders)
{
+ if (cl == null)
+ {
+ continue;
+ }
try
{
cl.loadClass("org.springframework.context.ApplicationContext");
Modified: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspect.java
===================================================================
--- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspect.java 2010-08-06 17:36:32 UTC (rev 12755)
+++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspect.java 2010-08-06 18:14:15 UTC (rev 12756)
@@ -21,20 +21,9 @@
*/
package org.jboss.wsf.stack.cxf.deployment.aspect;
-import java.net.URL;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
-import org.apache.cxf.bus.spring.SpringBusFactory;
-import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.endpoint.ServerRegistry;
-import org.apache.cxf.transport.jms.JMSConfiguration;
-import org.apache.cxf.transport.jms.JMSDestination;
import org.jboss.wsf.common.integration.JMSDeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData;
-import org.jboss.wsf.stack.cxf.configuration.BusHolder;
-import org.springframework.jms.connection.SingleConnectionFactory;
+import org.jboss.wsf.stack.cxf.client.util.SpringUtils;
/**
* To start the jms endpoints
@@ -43,81 +32,31 @@
*/
public class JMSEndpointDeploymentAspect extends JMSDeploymentAspect
{
- private BusHolder busHolder = null;
+ private JMSEndpointDeploymentAspectDelegate aspect;
+ public JMSEndpointDeploymentAspect()
+ {
+ if (SpringUtils.SPRING_AVAILABLE)
+ {
+ aspect = new JMSEndpointDeploymentAspectDelegate();
+ }
+ }
+
+
@Override
public void start(Deployment dep)
{
- //TODO:handler JAXBIntro
- if (dep.getAttachment(JMSEndpointsMetaData.class) != null)
+ if (aspect != null)
{
- JMSEndpointsMetaData jmsEndpoints = dep.getAttachment(JMSEndpointsMetaData.class);
- URL url = jmsEndpoints.getDescriptorURL();
-
- ClassLoader origClassLoader = SecurityActions.getContextClassLoader();
- try
- {
- SecurityActions.setContextClassLoader(dep.getRuntimeClassLoader());
- SpringBusFactory bf = new SpringBusFactory();
- Bus bus = bf.createBus(url);
- dep.addAttachment(Bus.class, bus);
- }
- catch (Exception e)
- {
- log.error("Failed to deploy jms endpoints deployment " + url);
- throw new RuntimeException(e);
- }
-
- finally
- {
- BusFactory.setDefaultBus(null);
- SecurityActions.setContextClassLoader(origClassLoader);
- }
+ aspect.start(dep);
}
}
-
- @Override
+
public void stop(Deployment dep)
{
- log.debug("Undeploying jms endpoints in " + dep.getSimpleName());
- if (busHolder != null && busHolder.getBus() != null)
+ if (aspect != null)
{
- //CXF uses WrappedConnectionFactory to create "jmsListener". DefaultMessageListenerContainer.shutdown() can not colse all the jms connections.
- //We need to explicitly call detroy() to close connection. This should be fixed in CXF side.
- SingleConnectionFactory connectionFactory = null;
- Server jmsServer = null;
- ServerRegistry serRegistry = busHolder.getBus().getExtension(ServerRegistry.class);
- for (Server server : serRegistry.getServers())
- {
- if (server.getDestination() != null && server.getDestination() instanceof JMSDestination)
- {
- JMSDestination jmsDestination = (JMSDestination) server.getDestination();
- JMSConfiguration jmsConfig = jmsDestination.getJmsConfig();
- if (jmsConfig.getWrappedConnectionFactory() != null
- && jmsConfig.getWrappedConnectionFactory() instanceof SingleConnectionFactory)
- {
- connectionFactory = (SingleConnectionFactory) jmsConfig
- .getWrappedConnectionFactory();
- jmsServer = server;
- }
-
- }
-
- }
-
- if (jmsServer != null)
- {
- jmsServer.stop();
- }
-
- if (connectionFactory != null)
- {
- connectionFactory.destroy();
- }
- //TODO:Remove above code after fix CXF-2788
- //close LifecycleListener if exists
- busHolder.getBus().shutdown(false);
- busHolder.close();
+ aspect.stop(dep);
}
}
}
Copied: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java (from rev 12743, stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java)
===================================================================
--- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java (rev 0)
+++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java 2010-08-06 18:14:15 UTC (rev 12756)
@@ -0,0 +1,124 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.
+ *
+ * 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.wsf.stack.cxf.deployment.aspect;
+
+import java.net.URL;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.endpoint.ServerRegistry;
+import org.apache.cxf.transport.jms.JMSConfiguration;
+import org.apache.cxf.transport.jms.JMSDestination;
+import org.jboss.wsf.common.integration.JMSDeploymentAspect;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData;
+import org.jboss.wsf.stack.cxf.configuration.BusHolder;
+import org.springframework.jms.connection.SingleConnectionFactory;
+
+/**
+ * To start the jms endpoints
+ *
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+public class JMSEndpointDeploymentAspectDelegate extends JMSDeploymentAspect
+{
+ private BusHolder busHolder = null;
+
+ @Override
+ public void start(Deployment dep)
+ {
+ //TODO:handler JAXBIntro
+ if (dep.getAttachment(JMSEndpointsMetaData.class) != null)
+ {
+ JMSEndpointsMetaData jmsEndpoints = dep.getAttachment(JMSEndpointsMetaData.class);
+ URL url = jmsEndpoints.getDescriptorURL();
+
+ ClassLoader origClassLoader = SecurityActions.getContextClassLoader();
+ try
+ {
+ SecurityActions.setContextClassLoader(dep.getRuntimeClassLoader());
+ SpringBusFactory bf = new SpringBusFactory();
+ Bus bus = bf.createBus(url);
+ dep.addAttachment(Bus.class, bus);
+ }
+ catch (Exception e)
+ {
+ log.error("Failed to deploy jms endpoints deployment " + url);
+ throw new RuntimeException(e);
+ }
+
+ finally
+ {
+ BusFactory.setDefaultBus(null);
+ SecurityActions.setContextClassLoader(origClassLoader);
+ }
+ }
+ }
+
+ @Override
+ public void stop(Deployment dep)
+ {
+ log.debug("Undeploying jms endpoints in " + dep.getSimpleName());
+ if (busHolder != null && busHolder.getBus() != null)
+ {
+ //CXF uses WrappedConnectionFactory to create "jmsListener". DefaultMessageListenerContainer.shutdown() can not colse all the jms connections.
+ //We need to explicitly call detroy() to close connection. This should be fixed in CXF side.
+ SingleConnectionFactory connectionFactory = null;
+ Server jmsServer = null;
+ ServerRegistry serRegistry = busHolder.getBus().getExtension(ServerRegistry.class);
+ for (Server server : serRegistry.getServers())
+ {
+ if (server.getDestination() != null && server.getDestination() instanceof JMSDestination)
+ {
+ JMSDestination jmsDestination = (JMSDestination) server.getDestination();
+ JMSConfiguration jmsConfig = jmsDestination.getJmsConfig();
+ if (jmsConfig.getWrappedConnectionFactory() != null
+ && jmsConfig.getWrappedConnectionFactory() instanceof SingleConnectionFactory)
+ {
+ connectionFactory = (SingleConnectionFactory) jmsConfig
+ .getWrappedConnectionFactory();
+ jmsServer = server;
+ }
+
+ }
+
+ }
+
+ if (jmsServer != null)
+ {
+ jmsServer.stop();
+ }
+
+ if (connectionFactory != null)
+ {
+ connectionFactory.destroy();
+ }
+ //TODO:Remove above code after fix CXF-2788
+ //close LifecycleListener if exists
+ busHolder.getBus().shutdown(false);
+ busHolder.close();
+ }
+ }
+}
+
Modified: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java
===================================================================
--- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java 2010-08-06 17:36:32 UTC (rev 12755)
+++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java 2010-08-06 18:14:15 UTC (rev 12756)
@@ -21,25 +21,9 @@
*/
package org.jboss.wsf.stack.cxf.deployment.aspect;
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.endpoint.ServerRegistry;
-import org.apache.cxf.frontend.MethodDispatcher;
-import org.apache.cxf.frontend.SimpleMethodDispatcher;
-import org.apache.cxf.transport.Destination;
-import org.apache.cxf.transport.jms.JMSConfiguration;
-import org.apache.cxf.transport.jms.JMSDestination;
import org.jboss.wsf.common.integration.JMSDeploymentAspect;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.JMSEndpoint;
-import org.jboss.wsf.spi.management.EndpointRegistry;
-import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+import org.jboss.wsf.stack.cxf.client.util.SpringUtils;
/**
* The DeploymentAspect to register the jms endpoints
@@ -48,71 +32,33 @@
*/
public class JMSEndpointRegistryDeploymentAspect extends JMSDeploymentAspect
{
- private EndpointRegistry registry = null;
- @Override
- public void start(Deployment dep)
+ private JMSEndpointRegistryDeploymentAspectDelegate aspect;
+
+ public JMSEndpointRegistryDeploymentAspect()
{
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- if (registry == null)
- registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
- Bus bus = dep.getAttachment(Bus.class);
- Map<String, JMSConfiguration> jmsConfigMap = createEndpointJmsConfigMap(bus);
- for (Endpoint endpoint : dep.getService().getEndpoints())
+ if (SpringUtils.SPRING_AVAILABLE)
{
- JMSEndpoint jmsEndpoint = (JMSEndpoint)endpoint;
- String endpointImplClass = jmsEndpoint.getTargetBeanName();
- JMSConfiguration jmsConfig = jmsConfigMap.get(endpointImplClass);
- if (jmsConfig != null)
- {
- jmsEndpoint.setTargetDestination(jmsConfig.getTargetDestination());
- jmsEndpoint.setReplyDestination(jmsConfig.getReplyDestination());
- }
-
- registry.register(jmsEndpoint);
+ aspect = new JMSEndpointRegistryDeploymentAspectDelegate();
}
}
- public void stop(Deployment dep)
+
+ @Override
+ public void start(Deployment dep)
{
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- if (registry == null)
- registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
- for (Endpoint ep : dep.getService().getEndpoints())
+ if (aspect != null)
{
- registry.unregister(ep);
+ aspect.start(dep);
}
}
-
- private Map<String, JMSConfiguration> createEndpointJmsConfigMap(Bus bus)
+
+ public void stop(Deployment dep)
{
- Map<String, JMSConfiguration> endpointJmsConfigMap = new java.util.HashMap<String, JMSConfiguration>();
- ServerRegistry serverRegsitry = bus.getExtension(ServerRegistry.class);
- for (Server server : serverRegsitry.getServers())
+ if (aspect != null)
{
- Destination destination = server.getDestination();
- if (destination instanceof JMSDestination)
- {
- JMSConfiguration jmsConfiguration = ((JMSDestination)destination).getJmsConfig();
- String implClassName = getEndpointClassName(server);
- if (implClassName != null)
- {
- endpointJmsConfigMap.put(implClassName, jmsConfiguration);
- }
- }
+ aspect.stop(dep);
}
- return endpointJmsConfigMap;
}
-
- private String getEndpointClassName(Server server)
- {
- MethodDispatcher methodDispatcher = (SimpleMethodDispatcher) server.getEndpoint().getService().get(
- MethodDispatcher.class.getName());
- if (methodDispatcher != null && methodDispatcher instanceof SimpleMethodDispatcher)
- {
- Method method = ((SimpleMethodDispatcher)methodDispatcher).getPrimaryMethod(server.getEndpoint().getEndpointInfo().getInterface()
- .getOperations().iterator().next());
- return method != null ? method.getDeclaringClass().getName() : null;
- }
- return null;
- }
+
+
}
Copied: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java (from rev 12743, stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java)
===================================================================
--- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java (rev 0)
+++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java 2010-08-06 18:14:15 UTC (rev 12756)
@@ -0,0 +1,118 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, 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.
+ *
+ * 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.wsf.stack.cxf.deployment.aspect;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.endpoint.Server;
+import org.apache.cxf.endpoint.ServerRegistry;
+import org.apache.cxf.frontend.MethodDispatcher;
+import org.apache.cxf.frontend.SimpleMethodDispatcher;
+import org.apache.cxf.transport.Destination;
+import org.apache.cxf.transport.jms.JMSConfiguration;
+import org.apache.cxf.transport.jms.JMSDestination;
+import org.jboss.wsf.common.integration.JMSDeploymentAspect;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.JMSEndpoint;
+import org.jboss.wsf.spi.management.EndpointRegistry;
+import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+
+/**
+ * The DeploymentAspect to register the jms endpoints
+ *
+ * @author <a href="ema(a)redhat.com">Jim Ma</a>
+ */
+class JMSEndpointRegistryDeploymentAspectDelegate extends JMSDeploymentAspect
+{
+ private EndpointRegistry registry = null;
+ @Override
+ public void start(Deployment dep)
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ if (registry == null)
+ registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
+ Bus bus = dep.getAttachment(Bus.class);
+ Map<String, JMSConfiguration> jmsConfigMap = createEndpointJmsConfigMap(bus);
+ for (Endpoint endpoint : dep.getService().getEndpoints())
+ {
+ JMSEndpoint jmsEndpoint = (JMSEndpoint)endpoint;
+ String endpointImplClass = jmsEndpoint.getTargetBeanName();
+ JMSConfiguration jmsConfig = jmsConfigMap.get(endpointImplClass);
+ if (jmsConfig != null)
+ {
+ jmsEndpoint.setTargetDestination(jmsConfig.getTargetDestination());
+ jmsEndpoint.setReplyDestination(jmsConfig.getReplyDestination());
+ }
+
+ registry.register(jmsEndpoint);
+ }
+ }
+
+ public void stop(Deployment dep)
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ if (registry == null)
+ registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
+ for (Endpoint ep : dep.getService().getEndpoints())
+ {
+ registry.unregister(ep);
+ }
+ }
+
+ private Map<String, JMSConfiguration> createEndpointJmsConfigMap(Bus bus)
+ {
+ Map<String, JMSConfiguration> endpointJmsConfigMap = new java.util.HashMap<String, JMSConfiguration>();
+ ServerRegistry serverRegsitry = bus.getExtension(ServerRegistry.class);
+ for (Server server : serverRegsitry.getServers())
+ {
+ Destination destination = server.getDestination();
+ if (destination instanceof JMSDestination)
+ {
+ JMSConfiguration jmsConfiguration = ((JMSDestination)destination).getJmsConfig();
+ String implClassName = getEndpointClassName(server);
+ if (implClassName != null)
+ {
+ endpointJmsConfigMap.put(implClassName, jmsConfiguration);
+ }
+ }
+ }
+ return endpointJmsConfigMap;
+ }
+
+ private String getEndpointClassName(Server server)
+ {
+ MethodDispatcher methodDispatcher = (SimpleMethodDispatcher) server.getEndpoint().getService().get(
+ MethodDispatcher.class.getName());
+ if (methodDispatcher != null && methodDispatcher instanceof SimpleMethodDispatcher)
+ {
+ Method method = ((SimpleMethodDispatcher)methodDispatcher).getPrimaryMethod(server.getEndpoint().getEndpointInfo().getInterface()
+ .getOperations().iterator().next());
+ return method != null ? method.getDeclaringClass().getName() : null;
+ }
+ return null;
+ }
+}
15 years, 9 months
JBossWS SVN: r12755 - stack/cxf/trunk/modules/client/src/main/resources/META-INF.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-08-06 13:36:32 -0400 (Fri, 06 Aug 2010)
New Revision: 12755
Removed:
stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml
stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml
Log:
[JBWS-3102] remove bus-extensions.xml and extensions.xml from jbossws-cxf-client.jar
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-08-06 17:26:04 UTC (rev 12754)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/bus-extensions.xml 2010-08-06 17:36:32 UTC (rev 12755)
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<extensions xmlns="http://cxf.apache.org/bus/extension">
- <!-- <extension class="org.apache.cxf.binding.BindingFactoryManagerImpl"-->
- <!-- interface="org.apache.cxf.binding.BindingFactoryManager"/>-->
- <!-- <extension class="org.apache.cxf.transport.DestinationFactoryManagerImpl"-->
- <!-- interface="org.apache.cxf.transport.DestinationFactoryManager"/>-->
- <!-- <extension class="org.apache.cxf.transport.ConduitInitiatorManagerImpl"-->
- <!-- interface="org.apache.cxf.transport.ConduitInitiatorManager"/>-->
- <extension class="org.apache.cxf.wsdl11.WSDLManagerImpl" interface="org.apache.cxf.wsdl.WSDLManager" />
- <extension class="org.apache.cxf.phase.PhaseManagerImpl" interface="org.apache.cxf.phase.PhaseManager" />
- <extension class="org.apache.cxf.workqueue.WorkQueueManagerImpl" interface="org.apache.cxf.workqueue.WorkQueueManager" />
- <extension class="org.apache.cxf.buslifecycle.CXFBusLifeCycleManager" interface="org.apache.cxf.buslifecycle.BusLifeCycleManager" />
- <extension class="org.apache.cxf.endpoint.ServerRegistryImpl" interface="org.apache.cxf.endpoint.ServerRegistry" />
- <extension class="org.apache.cxf.transport.http.QueryHandlerRegistryImpl" interface="org.apache.cxf.transports.http.QueryHandlerRegistry" />
- <extension class="org.apache.cxf.endpoint.EndpointResolverRegistryImpl" interface="org.apache.cxf.endpoint.EndpointResolverRegistry" />
- <extension class="org.apache.cxf.headers.HeaderManagerImpl" interface="org.apache.cxf.headers.HeaderManager" />
- <extension class="org.apache.cxf.catalog.OASISCatalogManager" interface="org.apache.cxf.catalog.OASISCatalogManager" />
- <extension class="org.apache.cxf.binding.soap.SoapBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
- <namespace>http://schemas.xmlsoap.org/soap/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
- <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
- </extension>
- <extension class="org.apache.cxf.binding.soap.SoapTransportFactory" interface="org.apache.cxf.transport.DestinationFactory" deferred="true">
- <namespace>http://schemas.xmlsoap.org/soap/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/soap/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/soap12/</namespace>
- </extension>
- <extension class="org.apache.cxf.binding.xml.XMLBindingFactory" deferred="true">
- <namespace>http://cxf.apache.org/bindings/xformat</namespace>
- <namespace>http://www.w3.org/2004/08/wsdl/http</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
- </extension>
- <extension class="org.apache.cxf.transport.http.ClientOnlyHTTPTransportFactory" deferred="true">
- <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
- <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
- <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
- <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
- <namespace>http://cxf.apache.org/bindings/xformat</namespace>
- </extension>
- <extension class="org.apache.cxf.management.jmx.InstrumentationManagerImpl" interface="org.apache.cxf.management.InstrumentationManager" />
- <extension class="org.apache.cxf.transport.http_jetty.JettyHTTPTransportFactory" deferred="false">
- <namespace>http://schemas.xmlsoap.org/wsdl/soap/http</namespace>
- <namespace>http://schemas.xmlsoap.org/soap/http</namespace>
- <namespace>http://www.w3.org/2003/05/soap/bindings/HTTP/</namespace>
- <namespace>http://schemas.xmlsoap.org/wsdl/http/</namespace>
- <namespace>http://cxf.apache.org/transports/http/configuration</namespace>
- <namespace>http://cxf.apache.org/bindings/xformat</namespace>
- </extension>
- <extension class="org.apache.cxf.transport.jms.JMSTransportFactory" deferred="true">
- <namespace>http://cxf.apache.org/transports/jms</namespace>
- <namespace>http://cxf.apache.org/transports/jms/configuration</namespace>
- </extension>
- <extension class="org.apache.cxf.binding.object.ObjectBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
- <namespace>http://cxf.apache.org/binding/object/</namespace>
- </extension>
- <extension class="org.apache.cxf.binding.http.HttpBindingFactory" interface="org.apache.cxf.binding.BindingFactory" deferred="true">
- <namespace>http://apache.org/cxf/binding/http</namespace>
- </extension>
-</extensions>
-
Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml
===================================================================
--- stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml 2010-08-06 17:26:04 UTC (rev 12754)
+++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/extensions.xml 2010-08-06 17:36:32 UTC (rev 12755)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-
-<properties>
- <entry key="org.apache.cxf.bindings.xml-1">javax.wsdl.BindingInput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry>
- <entry key="org.apache.cxf.bindings.xml-2">javax.wsdl.BindingOutput=org.apache.cxf.bindings.xformat.XMLBindingMessageFormat</entry>
- <entry key="org.apache.cxf.bindings.xml-3">javax.wsdl.Binding=org.apache.cxf.bindings.xformat.XMLFormatBinding</entry>
- <entry key="org.apache.cxf.ws.addressing-1">javax.wsdl.Binding=org.apache.cxf.ws.addressing.wsdl.UsingAddressing</entry>
- <entry key="org.apache.cxf.transports.http-1">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPClientPolicy</entry>
- <entry key="org.apache.cxf.transports.http-2">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPServerPolicy</entry>
- <entry key="org.apache.cxf.transports.http-3">javax.wsdl.Port=org.apache.cxf.wsdl.http.AddressType</entry>
- <entry key="org.apache.cxf.transport.jms-1">javax.wsdl.Port=org.apache.cxf.transport.jms.AddressType</entry>
- <entry key="org.apache.cxf.transport.jms-2">javax.wsdl.Port=org.apache.cxf.transport.jms.ClientBehaviorPolicyType</entry>
- <entry key="org.apache.cxf.transport.jms-3">javax.wsdl.Port=org.apache.cxf.transport.jms.ServerBehaviorPolicyType</entry>
- <entry key="org.apache.cxf.transport.jms-4">javax.wsdl.Port=org.apache.cxf.transport.jms.ClientConfig</entry>
- <entry key="org.apache.cxf.transport.jms-5">javax.wsdl.Port=org.apache.cxf.transport.jms.ServerConfig</entry>
- <entry key="org.apache.cxf.transport.jms-6">javax.wsdl.Port=org.apache.cxf.transport.jms.SessionPoolType</entry>
-</properties>
-
15 years, 9 months
JBossWS SVN: r12754 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-08-06 13:26:04 -0400 (Fri, 06 Aug 2010)
New Revision: 12754
Modified:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java
Log:
[JBWS-3087] Need to set the RMManager in the bus for CXF 2.2.x
Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2010-08-06 09:19:12 UTC (rev 12753)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/configuration/JBossWSNonSpringBusFactory.java 2010-08-06 17:26:04 UTC (rev 12754)
@@ -123,9 +123,8 @@
//RM
RMManager rmManager = new RMManager();
-// rmManager.initialise();
-// rmManager.registerListeners();
- rmManager.setBus(bus);
+ bus.setExtension(rmManager, RMManager.class);
+// rmManager.init();
//RM Policy
policyInterceptorProviderRegistry.register(new RMPolicyInterceptorProvider(bus));
15 years, 9 months
JBossWS SVN: r12753 - in stack/cxf/tags/jbossws-cxf-3.1.2.SP7: modules/client and 6 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-08-06 05:19:12 -0400 (Fri, 06 Aug 2010)
New Revision: 12753
Modified:
stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/client/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/management/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/resources/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/server/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/cxf-tests/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/framework-tests/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/pom.xml
stack/cxf/tags/jbossws-cxf-3.1.2.SP7/pom.xml
Log:
Fixing poms
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/client/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/client/pom.xml 2010-08-06 09:07:05 UTC (rev 12752)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/client/pom.xml 2010-08-06 09:19:12 UTC (rev 12753)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/management/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/management/pom.xml 2010-08-06 09:07:05 UTC (rev 12752)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/management/pom.xml 2010-08-06 09:19:12 UTC (rev 12753)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/resources/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/resources/pom.xml 2010-08-06 09:07:05 UTC (rev 12752)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/resources/pom.xml 2010-08-06 09:19:12 UTC (rev 12753)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/server/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/server/pom.xml 2010-08-06 09:07:05 UTC (rev 12752)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/server/pom.xml 2010-08-06 09:19:12 UTC (rev 12753)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/cxf-tests/pom.xml 2010-08-06 09:07:05 UTC (rev 12752)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/cxf-tests/pom.xml 2010-08-06 09:19:12 UTC (rev 12753)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/framework-tests/pom.xml 2010-08-06 09:07:05 UTC (rev 12752)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/framework-tests/pom.xml 2010-08-06 09:19:12 UTC (rev 12753)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-testsuite</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/pom.xml 2010-08-06 09:07:05 UTC (rev 12752)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP7/modules/testsuite/pom.xml 2010-08-06 09:19:12 UTC (rev 12753)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/cxf/tags/jbossws-cxf-3.1.2.SP7/pom.xml
===================================================================
--- stack/cxf/tags/jbossws-cxf-3.1.2.SP7/pom.xml 2010-08-06 09:07:05 UTC (rev 12752)
+++ stack/cxf/tags/jbossws-cxf-3.1.2.SP7/pom.xml 2010-08-06 09:19:12 UTC (rev 12753)
@@ -17,7 +17,7 @@
<artifactId>jbossws-cxf</artifactId>
<packaging>pom</packaging>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP7</version>
<!-- Parent -->
<parent>
@@ -28,9 +28,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/branches/jbossws...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/branches/jbossws-cx...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/branches/jbossws-cxf-3...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-3....</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-3.1.2...</url>
</scm>
<!-- Modules -->
@@ -43,9 +43,9 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.1.0-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version>
- <jbossws.spi.version>1.1.2-SNAPSHOT</jbossws.spi.version>
+ <jbossws.common.version>1.1.0.SP6</jbossws.common.version>
+ <jbossws.framework.version>3.1.2.SP8</jbossws.framework.version>
+ <jbossws.spi.version>1.1.2.SP4</jbossws.spi.version>
<!-- JBWS-2505 -->
<!-- START -->
<!--
15 years, 9 months
JBossWS SVN: r12752 - stack/cxf/tags.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-08-06 05:07:05 -0400 (Fri, 06 Aug 2010)
New Revision: 12752
Added:
stack/cxf/tags/jbossws-cxf-3.1.2.SP7/
Log:
Tagging jbossws-cxf-3.1.2.SP7
Copied: stack/cxf/tags/jbossws-cxf-3.1.2.SP7 (from rev 12751, stack/cxf/branches/jbossws-cxf-3.1.2)
15 years, 9 months