JBossWS SVN: r13030 - stack/cxf/trunk/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-09-27 07:51:10 -0400 (Mon, 27 Sep 2010)
New Revision: 13030
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
Log:
[JBWS-2987] Restoring a fixed check on bus holder listener before calling bus shutdown (JBWS-3098)
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-09-27 08:46:22 UTC (rev 13029)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-09-27 11:51:10 UTC (rev 13030)
@@ -91,7 +91,11 @@
*/
public void close()
{
- bus.shutdown(true);
+ //call bus shutdown unless the listener tells us shutdown has already been asked
+ if (busHolderListener == null || !busHolderListener.isPreShutdown())
+ {
+ bus.shutdown(true);
+ }
busHolderListener = null;
}
13 years, 7 months
JBossWS SVN: r13029 - in stack/cxf/trunk/modules: server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-09-27 04:46:22 -0400 (Mon, 27 Sep 2010)
New Revision: 13029
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/SpringBusHolder.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
Log:
[JBWS-2987]:Enable the JMSTransportTestCase;code cleanup;execute bus.shutdown() wether the BusHolderListener is preShutDown or not
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-09-27 07:57:22 UTC (rev 13028)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2010-09-27 08:46:22 UTC (rev 13029)
@@ -91,11 +91,7 @@
*/
public void close()
{
- //call bus shutdown unless the listener tells us shutdown has already been asked
- if (busHolderListener != null && !busHolderListener.isPreShutdown())
- {
- bus.shutdown(true);
- }
+ bus.shutdown(true);
busHolderListener = null;
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2010-09-27 07:57:22 UTC (rev 13028)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/SpringBusHolder.java 2010-09-27 08:46:22 UTC (rev 13029)
@@ -176,6 +176,7 @@
{
gac.destroy();
}
+ ctx.destroy();
super.close();
}
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java 2010-09-27 07:57:22 UTC (rev 13028)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointDeploymentAspectDelegate.java 2010-09-27 08:46:22 UTC (rev 13029)
@@ -25,16 +25,10 @@
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.configuration.JBossWSSpringBusFactory;
/**
* To start the jms endpoints
@@ -42,9 +36,7 @@
* @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)
{
@@ -58,8 +50,7 @@
try
{
SecurityActions.setContextClassLoader(dep.getRuntimeClassLoader());
- SpringBusFactory bf = new SpringBusFactory();
- Bus bus = bf.createBus(url);
+ Bus bus = new JBossWSSpringBusFactory().createBus(url);
dep.addAttachment(Bus.class, bus);
}
catch (Exception e)
@@ -71,6 +62,7 @@
finally
{
BusFactory.setDefaultBus(null);
+ BusFactory.setThreadDefaultBus(null);
SecurityActions.setContextClassLoader(origClassLoader);
}
}
@@ -80,44 +72,10 @@
public void stop(Deployment dep)
{
log.debug("Undeploying jms endpoints in " + dep.getSimpleName());
- if (busHolder != null && busHolder.getBus() != null)
+ if (dep.getAttachment(Bus.class) != 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();
+ Bus bus = dep.getAttachment(Bus.class);
+ bus.shutdown(false);
}
}
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2010-09-27 07:57:22 UTC (rev 13028)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2010-09-27 08:46:22 UTC (rev 13029)
@@ -42,14 +42,10 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
-import org.apache.cxf.jaxws.ServiceImpl;
-import org.jboss.test.ws.jaxws.samples.jmsendpoints.jmstransport.JMSEndpointsTestCase;
import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.common.ObjectNameFactory;
import org.jboss.wsf.test.JBossWSTest;
@@ -197,5 +193,5 @@
}
}
}
-
+
}
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-09-27 07:57:22 UTC (rev 13028)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-09-27 08:46:22 UTC (rev 13029)
@@ -19,9 +19,6 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
-# [JBWS-2987] Review JMS integration
-org/jboss/test/ws/jaxws/samples/jmstransport/**
-
# [JBAS-8363] Virtual host issue in JBossWeb
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
13 years, 7 months
JBossWS SVN: r13028 - framework/trunk/hudson/jboss/bin.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-27 03:57:22 -0400 (Mon, 27 Sep 2010)
New Revision: 13028
Modified:
framework/trunk/hudson/jboss/bin/jbossws-qa.sh
Log:
Make sure hudson job ends with a failure when build errors occur
Modified: framework/trunk/hudson/jboss/bin/jbossws-qa.sh
===================================================================
--- framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2010-09-26 11:07:55 UTC (rev 13027)
+++ framework/trunk/hudson/jboss/bin/jbossws-qa.sh 2010-09-27 07:57:22 UTC (rev 13028)
@@ -138,7 +138,7 @@
detectFailures() {
rm -rf $WORKSPACE/jboss-as
- cat $WORKSPACE/tests.log | egrep "BUILD FAILURE|java.lang.OutOfMemoryError" | tee $WORKSPACE/failure.log
+ cat $WORKSPACE/tests.log | egrep "BUILD FAILURE|BUILD ERROR|java.lang.OutOfMemoryError" | tee $WORKSPACE/failure.log
if [ -s $WORKSPACE/failure.log ]; then
echo "Failure detected"
exit 1
13 years, 7 months
JBossWS SVN: r13027 - in stack/cxf/trunk/modules/testsuite/cxf-spring-tests: src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2010-09-26 07:07:55 -0400 (Sun, 26 Sep 2010)
New Revision: 13027
Added:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/fromjava/META-INF/
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/fromjava/META-INF/hornetq-jms.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/fromjava/META-INF/jbossws-cxf.xml
Modified:
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/hornetq-jms.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/jboss-web.xml
stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/web.xml
Log:
[JBWS-3127]:Updated the JMSTransportTestCase
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2010-09-24 12:27:16 UTC (rev 13026)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2010-09-26 11:07:55 UTC (rev 13027)
@@ -29,53 +29,25 @@
<include name="jboss-web.xml"/>
</webinf>
</war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport.sar">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxws-samples-jmstransport.war"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF">
- <include name="jboss-service.xml"/>
- </metainf>
- </jar>
+
<jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport-as6.sar">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxws-samples-jmstransport.war"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF">
+ <fileset dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF">
<include name="hornetq-jms.xml"/>
- </metainf>
+ </fileset>
</jar>
-
- <!-- jaxws-fromjava-jmstransport -->
- <war
- warfile="${tests.output.dir}/test-libs/jaxws-fromjava-jmstransport.war"
- webxml="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/fromjava/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes">
- <include name="org/jboss/test/ws/jaxws/samples/jmstransport/Organization.class"/>
- <include name="org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJmsImpl.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/fromjava/WEB-INF">
- <include name="jbossws-cxf.xml"/>
- <include name="jboss-web.xml"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-fromjava-jmstransport.sar">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxws-fromjava-jmstransport.war"/>
+
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-fromjava-jmsendpoints-as6.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/jmstransport/Organization.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJmsImpl.class"/>
</fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF">
- <include name="jboss-service.xml"/>
- </metainf>
- </jar>
- <jar jarfile="${tests.output.dir}/test-libs/jaxws-fromjava-jmstransport-as6.sar">
- <fileset dir="${tests.output.dir}/test-libs">
- <include name="jaxws-fromjava-jmstransport.war"/>
- </fileset>
- <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF">
- <include name="hornetq-jms.xml"/>
- </metainf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/fromjava/META-INF">
+ <include name="hornetq-jms.xml"/>
+ <include name="jbossws-cxf.xml"/>
+ </metainf>
</jar>
+
<!-- jms endpoints sample-->
<!-- jms transport from java for as6 -->
<jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmsendpoints-as6.jar">
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java 2010-09-24 12:27:16 UTC (rev 13026)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java 2010-09-26 11:07:55 UTC (rev 13027)
@@ -35,7 +35,9 @@
import javax.naming.InitialContext;
import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.jboss.test.ws.jaxws.samples.jmsendpoints.jmstransport.JMSEndpointsTestCase;
import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.common.ObjectNameFactory;
import org.jboss.wsf.test.JBossWSTest;
@@ -50,10 +52,19 @@
public class FromJavaJMSTransportTestCase extends JBossWSTest
{
private static boolean waitForResponse;
-
- public static Test suite() throws Exception
+
+ public static Test suite() throws Exception
{
- return new JBossWSTestSetup(FromJavaJMSTransportTestCase.class, isHornetQAvailable() ? "jaxws-fromjava-jmstransport-as6.sar" : "jaxws-fromjava-jmstransport.sar");
+ if (isHornetQAvailable())
+ {
+ return new JBossWSTestSetup(FromJavaJMSTransportTestCase.class,
+ "jaxws-fromjava-jmsendpoints-as6.jar");
+ }
+ else
+ {
+ return new TestSuite();
+ }
+
}
private static boolean isHornetQAvailable()
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2010-09-24 12:27:16 UTC (rev 13026)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2010-09-26 11:07:55 UTC (rev 13027)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.ws.jaxws.samples.jmstransport;
+import java.io.PrintWriter;
import java.net.URL;
import javax.jms.Message;
@@ -39,7 +40,16 @@
import javax.xml.ws.Service;
import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.interceptor.LoggingInInterceptor;
+import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.jaxws.ServiceImpl;
+import org.jboss.test.ws.jaxws.samples.jmsendpoints.jmstransport.JMSEndpointsTestCase;
import org.jboss.wsf.common.DOMUtils;
import org.jboss.wsf.common.ObjectNameFactory;
import org.jboss.wsf.test.JBossWSTest;
@@ -55,9 +65,18 @@
{
private static boolean waitForResponse;
- public static Test suite() throws Exception
+ public static Test suite() throws Exception
{
- return new JBossWSTestSetup(JMSTransportTestCase.class, isHornetQAvailable() ? "jaxws-samples-jmstransport-as6.sar" : "jaxws-samples-jmstransport.sar");
+ if (isHornetQAvailable())
+ {
+ return new JBossWSTestSetup(JMSTransportTestCase.class,
+ "jaxws-samples-jmstransport-as6.sar, jaxws-samples-jmstransport.war");
+ }
+ else
+ {
+ return new TestSuite();
+ }
+
}
private static boolean isHornetQAvailable()
@@ -74,15 +93,16 @@
}
}
- public void testJMSEndpointPort() throws Exception
+ public void testJMSEndpointPort() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-jmstransport?wsdl");
QName serviceName = new QName("http://org.jboss.ws/samples/jmstransport", "OrganizationService");
QName portName = new QName("http://org.jboss.ws/samples/jmstransport", "JmsEndpointPort");
-
Service service = Service.create(wsdlURL, serviceName);
Organization port = service.getPort(portName, Organization.class);
-
+ Client c = ClientProxy.getClient(port);
+ c.getInInterceptors().add(new LoggingInInterceptor(new PrintWriter(System.out)));
+ c.getOutInterceptors().add(new LoggingOutInterceptor(new PrintWriter(System.out)));
String res = port.getContactInfo("mafia");
assertEquals("The 'mafia' boss is currently out of office, please call again.", res);
}
@@ -177,4 +197,5 @@
}
}
}
+
}
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/hornetq-jms.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/hornetq-jms.xml 2010-09-24 12:27:16 UTC (rev 13026)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/META-INF/hornetq-jms.xml 2010-09-26 11:07:55 UTC (rev 13027)
@@ -1,10 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+<configuration xmlns="urn:hornetq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<queue name="RequestQueue">
<entry name="/queue/RequestQueue"/>
</queue>
<queue name="ResponseQueue">
<entry name="/queue/ResponseQueue"/>
</queue>
+
</configuration>
\ No newline at end of file
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/jboss-web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/jboss-web.xml 2010-09-24 12:27:16 UTC (rev 13026)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/jboss-web.xml 2010-09-26 11:07:55 UTC (rev 13027)
@@ -4,4 +4,5 @@
<jboss-web>
<context-root>/jaxws-samples-jmstransport</context-root>
+ <depends>org.hornetq:name="RequestQueue",module=JMS,type=Queue</depends>
</jboss-web>
Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/web.xml 2010-09-24 12:27:16 UTC (rev 13026)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/WEB-INF/web.xml 2010-09-26 11:07:55 UTC (rev 13027)
@@ -9,23 +9,10 @@
<servlet-name>OrganizationService</servlet-name>
<servlet-class>org.jboss.test.ws.jaxws.samples.jmstransport.OrganizationHttpEndpoint</servlet-class>
<load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>OrganizationJmsService</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.samples.jmstransport.OrganizationJmsEndpoint</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
+ </servlet>
<servlet-mapping>
<servlet-name>OrganizationService</servlet-name>
<url-pattern>/*</url-pattern>
</servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>OrganizationJmsService</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
</web-app>
Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/fromjava/META-INF/hornetq-jms.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/fromjava/META-INF/hornetq-jms.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/fromjava/META-INF/hornetq-jms.xml 2010-09-26 11:07:55 UTC (rev 13027)
@@ -0,0 +1,11 @@
+<configuration xmlns="urn:hornetq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+ <queue name="RequestQueue">
+ <entry name="/queue/RequestQueue"/>
+ </queue>
+ <queue name="ResponseQueue">
+ <entry name="/queue/ResponseQueue"/>
+ </queue>
+
+</configuration>
\ No newline at end of file
Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/fromjava/META-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/fromjava/META-INF/jbossws-cxf.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/fromjava/META-INF/jbossws-cxf.xml 2010-09-26 11:07:55 UTC (rev 13027)
@@ -0,0 +1,29 @@
+<beans xmlns='http://www.springframework.org/schema/beans'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:beans='http://www.springframework.org/schema/beans'
+ xmlns:jms="http://cxf.apache.org/transports/jms" xmlns:jaxws='http://cxf.apache.org/jaxws'
+ xsi:schemaLocation='http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.w3.org/2006/07/ws-policy http://www.w3.org/2006/07/ws-policy.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/transports/jms http://cxf.apache.org/schemas/configuration/jms.xsd'>
+
+ <jaxws:endpoint id='JMSQueryService'
+ implementor='org.jboss.test.ws.jaxws.samples.jmstransport.OrganizationJmsImpl'
+ transportId="http://cxf.apache.org/transports/jms">
+ </jaxws:endpoint>
+
+ <jms:conduit
+ name="{http://org.jboss.ws/samples/jmstransport}JmsPort.jms-conduit">
+ <jms:address destinationStyle="queue"
+ jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="/queue/RequestQueue"
+ jndiReplyDestinationName="/queue/ResponseQueue">
+ </jms:address>
+ </jms:conduit>
+ <jms:destination name="{http://org.jboss.ws/samples/jmstransport}JmsPort.jms-destination">
+ <jms:address destinationStyle="queue"
+ jndiConnectionFactoryName="ConnectionFactory" jndiDestinationName="/queue/RequestQueue"
+ jndiReplyDestinationName="/queue/ResponseQueue">
+ </jms:address>
+ </jms:destination>
+</beans>
+
+
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/jmstransport/fromjava/META-INF/jbossws-cxf.xml
___________________________________________________________________
Name: svn:mergeinfo
+
13 years, 7 months
JBossWS SVN: r13026 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-24 08:27:16 -0400 (Fri, 24 Sep 2010)
New Revision: 13026
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
Log:
updating excludes reason
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-09-24 12:08:18 UTC (rev 13025)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-09-24 12:27:16 UTC (rev 13026)
@@ -44,5 +44,5 @@
# [JBWS-2957] EJB3 webservices in web archives (fixed on AS 6 series only)
org/jboss/test/ws/jaxws/jbws2957/**
-# [JBWS-3123] @WebServiceRef support for servlet available on AS 6 only
+# [JBWS-3123] @WebServiceRef support for annotation driven servlets (fixed on AS 6 series only)
org/jboss/test/ws/jaxws/jbws3123/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-09-24 12:08:18 UTC (rev 13025)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-09-24 12:27:16 UTC (rev 13026)
@@ -44,5 +44,5 @@
# [JBWS-2957] EJB3 webservices in web archives (fixed on AS 6 series only)
org/jboss/test/ws/jaxws/jbws2957/**
-# [JBWS-3123] @WebServiceRef support for servlet available on AS 6 onl
+# [JBWS-3123] @WebServiceRef support for annotation driven servlets (fixed on AS 6 series only)
org/jboss/test/ws/jaxws/jbws3123/**
13 years, 7 months
JBossWS SVN: r13025 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-24 08:08:18 -0400 (Fri, 24 Sep 2010)
New Revision: 13025
Modified:
stack/native/trunk/pom.xml
Log:
upgrade Netty from 3.2.0.BETA1 -> 3.2.1.Final
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2010-09-24 12:06:25 UTC (rev 13024)
+++ stack/native/trunk/pom.xml 2010-09-24 12:08:18 UTC (rev 13025)
@@ -71,7 +71,7 @@
<jboss.jaxr.version>2.0.1</jboss.jaxr.version>
<apache.scout.version>1.1.1</apache.scout.version>
<juddi.version>0.9RC4</juddi.version>
- <netty.version>3.2.0.BETA1</netty.version>
+ <netty.version>3.2.1.Final</netty.version>
<sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
<sun.jaxws.version>2.2</sun.jaxws.version>
<sun.policy.version>2.0-b01</sun.policy.version>
13 years, 7 months
JBossWS SVN: r13024 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-24 08:06:25 -0400 (Fri, 24 Sep 2010)
New Revision: 13024
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
updating test excludes
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-09-24 11:27:48 UTC (rev 13023)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-09-24 12:06:25 UTC (rev 13024)
@@ -4,5 +4,8 @@
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-# [JBAS-8403] excluding test until jboss-web.xml override is fixed
+# [JBAS-8363] Virtual host issue in JBossWeb
+org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
+
+# [JBAS-8403] jboss-web.xml override have been fixed in AS 600 RC1
org/jboss/test/ws/jaxws/jbws3123/JBWS3123TestCase.*
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-09-24 11:27:48 UTC (rev 13023)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-09-24 12:06:25 UTC (rev 13024)
@@ -6,6 +6,3 @@
# [JBAS-8363] Virtual host issue in JBossWeb
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# [JBAS-8403] excluding test until jboss-web.xml override is fixed
-org/jboss/test/ws/jaxws/jbws3123/JBWS3123TestCase.*
\ No newline at end of file
13 years, 7 months
JBossWS SVN: r13023 - framework/trunk/hudson.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-24 07:27:48 -0400 (Fri, 24 Sep 2010)
New Revision: 13023
Modified:
framework/trunk/hudson/ant.properties.example
Log:
switch from AS 600M4 to 600M5
Modified: framework/trunk/hudson/ant.properties.example
===================================================================
--- framework/trunk/hudson/ant.properties.example 2010-09-24 11:20:06 UTC (rev 13022)
+++ framework/trunk/hudson/ant.properties.example 2010-09-24 11:27:48 UTC (rev 13023)
@@ -32,8 +32,8 @@
hudson.jboss510.build=jboss-5.1.0.GA
hudson.jboss510.rev=HEAD
-hudson.jboss600.url=http://anonsvn.jboss.org/repos/jbossas/tags/6.0.0.20100721-M4
-hudson.jboss600.build=jboss-6.0.0.20100721-M4
+hudson.jboss600.url=http://anonsvn.jboss.org/repos/jbossas/tags/6.0.0.20100911-M5
+hudson.jboss600.build=jboss-6.0.0.20100911-M5
hudson.jboss600.rev=HEAD
hudson.jboss601.url=http://anonsvn.jboss.org/repos/jbossas/trunk
13 years, 7 months
JBossWS SVN: r13022 - in stack/native/trunk: modules/core and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-24 07:20:06 -0400 (Fri, 24 Sep 2010)
New Revision: 13022
Modified:
stack/native/trunk/modules/core/pom.xml
stack/native/trunk/modules/management/pom.xml
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
stack/native/trunk/profiles.xml.example
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
switch from AS 600M4 to 600M5
Modified: stack/native/trunk/modules/core/pom.xml
===================================================================
--- stack/native/trunk/modules/core/pom.xml 2010-09-24 11:07:17 UTC (rev 13021)
+++ stack/native/trunk/modules/core/pom.xml 2010-09-24 11:20:06 UTC (rev 13022)
@@ -221,8 +221,8 @@
</artifactItem>
<artifactItem>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600M4</artifactId>
- <version>${jbossws.jboss600M4.version}</version>
+ <artifactId>jbossws-jboss600M5</artifactId>
+ <version>${jbossws.jboss600M5.version}</version>
<classifier>resources</classifier>
<type>zip</type>
<outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
Modified: stack/native/trunk/modules/management/pom.xml
===================================================================
--- stack/native/trunk/modules/management/pom.xml 2010-09-24 11:07:17 UTC (rev 13021)
+++ stack/native/trunk/modules/management/pom.xml 2010-09-24 11:20:06 UTC (rev 13022)
@@ -41,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600M4</artifactId>
+ <artifactId>jbossws-jboss600M5</artifactId>
<scope>provided</scope>
</dependency>
<!-- [JBWS-2505] -->
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2010-09-24 11:07:17 UTC (rev 13021)
+++ stack/native/trunk/modules/testsuite/pom.xml 2010-09-24 11:20:06 UTC (rev 13022)
@@ -441,7 +441,7 @@
<profile>
<id>jboss600</id>
<properties>
- <jboss.version>6.0.0.20100721-M4</jboss.version>
+ <jboss.version>6.0.0.20100911-M5</jboss.version>
<jbossws.integration.target>jboss600</jbossws.integration.target>
</properties>
<dependencies>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2010-09-24 11:07:17 UTC (rev 13021)
+++ stack/native/trunk/pom.xml 2010-09-24 11:20:06 UTC (rev 13022)
@@ -51,7 +51,7 @@
<jbossws.framework.version>3.4.0-SNAPSHOT</jbossws.framework.version>
<jbossws.jboss501.version>3.4.0-SNAPSHOT</jbossws.jboss501.version>
<jbossws.jboss510.version>3.4.0-SNAPSHOT</jbossws.jboss510.version>
- <jbossws.jboss600M4.version>3.4.0-SNAPSHOT</jbossws.jboss600M4.version>
+ <jbossws.jboss600M5.version>3.4.0-SNAPSHOT</jbossws.jboss600M5.version>
<!-- [JBWS-2505] -->
<!-- START -->
<!--
@@ -134,13 +134,13 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600M4</artifactId>
- <version>${jbossws.jboss600M4.version}</version>
+ <artifactId>jbossws-jboss600M5</artifactId>
+ <version>${jbossws.jboss600M5.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600M4</artifactId>
- <version>${jbossws.jboss600M4.version}</version>
+ <artifactId>jbossws-jboss600M5</artifactId>
+ <version>${jbossws.jboss600M5.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
Modified: stack/native/trunk/profiles.xml.example
===================================================================
--- stack/native/trunk/profiles.xml.example 2010-09-24 11:07:17 UTC (rev 13021)
+++ stack/native/trunk/profiles.xml.example 2010-09-24 11:20:06 UTC (rev 13022)
@@ -13,7 +13,7 @@
<properties>
<jboss501.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_1_GA/build/output/jboss-5.0.1.GA</jboss501.home>
<jboss510.home>/home/opalka/svn/jbossas/tags/JBoss_5_1_0_GA/build/output/jboss-5.1.0.GA</jboss510.home>
- <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.20100721-M4/build/target/6.0.0.20100721-M4</jboss600.home>
+ <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.20100911-M5/build/target/jboss-6.0.0.20100911-M5</jboss600.home>
<jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0-SNAPSHOT</jboss601.home>
</properties>
</profile>
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-09-24 11:07:17 UTC (rev 13021)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-09-24 11:20:06 UTC (rev 13022)
@@ -158,7 +158,7 @@
<scope>provided</scope>
<unpack>false</unpack>
<includes>
- <include>org.jboss.ws:jbossws-jboss600M4:jar</include>
+ <include>org.jboss.ws:jbossws-jboss600M5:jar</include>
</includes>
</dependencySet>
<!-- [JBWS-2505] -->
13 years, 7 months
JBossWS SVN: r13021 - container/jboss60/branches/jbossws-jboss600M5.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-24 07:07:17 -0400 (Fri, 24 Sep 2010)
New Revision: 13021
Modified:
container/jboss60/branches/jbossws-jboss600M5/pom.xml
Log:
rename maven artifact
Modified: container/jboss60/branches/jbossws-jboss600M5/pom.xml
===================================================================
--- container/jboss60/branches/jbossws-jboss600M5/pom.xml 2010-09-24 11:03:11 UTC (rev 13020)
+++ container/jboss60/branches/jbossws-jboss600M5/pom.xml 2010-09-24 11:07:17 UTC (rev 13021)
@@ -2,10 +2,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBoss Web Services - Container JBoss-6.0.0.M4</name>
+ <name>JBoss Web Services - Container JBoss-6.0.0.M5</name>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600M5</artifactId>
- <description>JBossWS Container integration for JBoss AS 6.0.0.M4</description>
+ <description>JBossWS Container integration for JBoss AS 6.0.0.M5</description>
<version>3.4.0-SNAPSHOT</version>
13 years, 7 months