[jboss-svn-commits] JBossWS SVN: r898 - in trunk: . src/main/java/org/jboss/ws/integration/jboss src/main/java/org/jboss/ws/integration/jboss/jms src/main/java/org/jboss/ws/transport src/test/java/org/jboss/test/ws/samples/jmstransport src/test/resources/samples/jmstransport/META-INF
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Sep 5 04:23:14 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-09-05 04:23:03 -0400 (Tue, 05 Sep 2006)
New Revision: 898
Added:
trunk/src/main/java/org/jboss/ws/integration/jboss/jms/
Removed:
trunk/src/main/java/org/jboss/ws/transport/jms/
Modified:
trunk/build.xml
trunk/src/main/java/org/jboss/ws/integration/jboss/jms/JMSMessageDispatcher.java
trunk/src/main/java/org/jboss/ws/integration/jboss/jms/JMSTransportSupport.java
trunk/src/main/java/org/jboss/ws/integration/jboss/jms/MessageDispatcher.java
trunk/src/test/java/org/jboss/test/ws/samples/jmstransport/OrganizationJMSEndpoint.java
trunk/src/test/resources/samples/jmstransport/META-INF/jboss-service.xml
trunk/src/test/resources/samples/jmstransport/META-INF/jboss.xml
Log:
Use JBossMessaging instead of JBossMQ
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2006-09-04 23:15:04 UTC (rev 897)
+++ trunk/build.xml 2006-09-05 08:23:03 UTC (rev 898)
@@ -139,8 +139,6 @@
<include name="javax/jws/**"/>
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/**"/>
- <exclude name="org/jboss/ws/transport/jms/**"/>
- <exclude name="org/jboss/ws/server/ServiceEndpointInterceptor.java"/>
<classpath path="${build.classes14.dir}"/>
<classpath refid="core.classpath"/>
</javac>
@@ -153,7 +151,6 @@
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<include name="org/jboss/ws/integration/**"/>
<include name="org/jboss/ws/transport/jms/**"/>
- <include name="org/jboss/ws/server/ServiceEndpointInterceptor.java"/>
<classpath path="${build.classes14.dir}"/>
<classpath refid="integration.classpath"/>
</javac>
Copied: trunk/src/main/java/org/jboss/ws/integration/jboss/jms (from rev 897, trunk/src/main/java/org/jboss/ws/transport/jms)
Modified: trunk/src/main/java/org/jboss/ws/integration/jboss/jms/JMSMessageDispatcher.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/transport/jms/JMSMessageDispatcher.java 2006-09-04 23:15:04 UTC (rev 897)
+++ trunk/src/main/java/org/jboss/ws/integration/jboss/jms/JMSMessageDispatcher.java 2006-09-05 08:23:03 UTC (rev 898)
@@ -19,7 +19,7 @@
* 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.ws.transport.jms;
+package org.jboss.ws.integration.jboss.jms;
// $Id$
Modified: trunk/src/main/java/org/jboss/ws/integration/jboss/jms/JMSTransportSupport.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/transport/jms/JMSTransportSupport.java 2006-09-04 23:15:04 UTC (rev 897)
+++ trunk/src/main/java/org/jboss/ws/integration/jboss/jms/JMSTransportSupport.java 2006-09-05 08:23:03 UTC (rev 898)
@@ -19,7 +19,7 @@
* 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.ws.transport.jms;
+package org.jboss.ws.integration.jboss.jms;
// $Id$
Modified: trunk/src/main/java/org/jboss/ws/integration/jboss/jms/MessageDispatcher.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/transport/jms/MessageDispatcher.java 2006-09-04 23:15:04 UTC (rev 897)
+++ trunk/src/main/java/org/jboss/ws/integration/jboss/jms/MessageDispatcher.java 2006-09-05 08:23:03 UTC (rev 898)
@@ -19,7 +19,7 @@
* 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.ws.transport.jms;
+package org.jboss.ws.integration.jboss.jms;
// $Id$
Modified: trunk/src/test/java/org/jboss/test/ws/samples/jmstransport/OrganizationJMSEndpoint.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/samples/jmstransport/OrganizationJMSEndpoint.java 2006-09-04 23:15:04 UTC (rev 897)
+++ trunk/src/test/java/org/jboss/test/ws/samples/jmstransport/OrganizationJMSEndpoint.java 2006-09-05 08:23:03 UTC (rev 898)
@@ -11,7 +11,7 @@
import java.rmi.RemoteException;
import org.jboss.logging.Logger;
-import org.jboss.ws.transport.jms.JMSTransportSupport;
+import org.jboss.ws.integration.jboss.jms.JMSTransportSupport;
/**
* An example of a MDB acting as a web service endpoint.
Modified: trunk/src/test/resources/samples/jmstransport/META-INF/jboss-service.xml
===================================================================
--- trunk/src/test/resources/samples/jmstransport/META-INF/jboss-service.xml 2006-09-04 23:15:04 UTC (rev 897)
+++ trunk/src/test/resources/samples/jmstransport/META-INF/jboss-service.xml 2006-09-05 08:23:03 UTC (rev 898)
@@ -3,12 +3,12 @@
<!-- $Id$ -->
<server>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=RequestQueue">
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ <mbean code="org.jboss.jms.server.destination.Queue" name="jboss.messaging.destination:service=Queue,name=RequestQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer"> jboss.messaging:service=ServerPeer</depends>
</mbean>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=ResponseQueue">
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ <mbean code="org.jboss.jms.server.destination.Queue" name="jboss.messaging.destination:service=Queue,name=ResponseQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer"> jboss.messaging:service=ServerPeer</depends>
</mbean>
-</server>
+</server>
\ No newline at end of file
Modified: trunk/src/test/resources/samples/jmstransport/META-INF/jboss.xml
===================================================================
--- trunk/src/test/resources/samples/jmstransport/META-INF/jboss.xml 2006-09-04 23:15:04 UTC (rev 897)
+++ trunk/src/test/resources/samples/jmstransport/META-INF/jboss.xml 2006-09-05 08:23:03 UTC (rev 898)
@@ -8,7 +8,7 @@
<message-driven>
<ejb-name>OrganizationMDB</ejb-name>
<destination-jndi-name>queue/RequestQueue</destination-jndi-name>
- <depends>jboss.mq.destination:service=Queue,name=RequestQueue</depends>
+ <depends>jboss.messaging.destination:service=Queue,name=RequestQueue</depends>
</message-driven>
</enterprise-beans>
</jboss>
More information about the jboss-svn-commits
mailing list