[jboss-cvs] JBossAS SVN: r105334 - in branches/JBPAPP_5_1: webservices and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri May 28 11:44:37 EDT 2010
Author: alessio.soldano at jboss.com
Date: 2010-05-28 11:44:36 -0400 (Fri, 28 May 2010)
New Revision: 105334
Added:
branches/JBPAPP_5_1/webservices/src/main/org/jboss/wsf/container/jboss50/endpoint/
branches/JBPAPP_5_1/webservices/src/main/org/jboss/wsf/container/jboss50/endpoint/HornetQJMSResolver.java
branches/JBPAPP_5_1/webservices/src/resources/jbossws-hornetq.jar/
branches/JBPAPP_5_1/webservices/src/resources/jbossws-hornetq.jar/META-INF/
branches/JBPAPP_5_1/webservices/src/resources/jbossws-hornetq.jar/META-INF/services/
branches/JBPAPP_5_1/webservices/src/resources/jbossws-hornetq.jar/META-INF/services/org.jboss.wsf.spi.management.JMSEndpointResolver
Removed:
branches/JBPAPP_5_1/webservices/src/main/org/jboss/wsf/container/jboss50/endpoint/HornetQJMSResolver.java
branches/JBPAPP_5_1/webservices/src/resources/jbossws-hornetq.jar/META-INF/
branches/JBPAPP_5_1/webservices/src/resources/jbossws-hornetq.jar/META-INF/services/
branches/JBPAPP_5_1/webservices/src/resources/jbossws-hornetq.jar/META-INF/services/org.jboss.wsf.spi.management.JMSEndpointResolver
Modified:
branches/JBPAPP_5_1/hornetq-int/src/etc/switch.sh
branches/JBPAPP_5_1/webservices/build.xml
branches/JBPAPP_5_1/webservices/pom.xml
branches/JBPAPP_5_1/webservices/src/scripts/assembly-resources.xml
Log:
[JBPAPP-4359] Porting changes to JBPAPP_5_1 branch
Modified: branches/JBPAPP_5_1/hornetq-int/src/etc/switch.sh
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/etc/switch.sh 2010-05-28 14:36:12 UTC (rev 105333)
+++ branches/JBPAPP_5_1/hornetq-int/src/etc/switch.sh 2010-05-28 15:44:36 UTC (rev 105334)
@@ -23,8 +23,7 @@
cp lib/hornetq-core-client.jar $JBOSS_HOME/client
cp lib/hornetq-jms-client.jar $JBOSS_HOME/client
-# TODO: To be re-enabled by the web-services team
-#cp lib/jbossws-hornetq.jar $JBOSS_HOME/client
+cp lib/jbossws-hornetq.jar $JBOSS_HOME/client
create() {
CONFIG_NAME=$1
@@ -57,8 +56,7 @@
cp lib/hornetq-ra.jar $JBOSS_HOME/server/$CONFIG_NAME/deploy/jms-ra.rar/
cp resources/ra.xml $JBOSS_HOME/server/$CONFIG_NAME/deploy/jms-ra.rar/META-INF
-# TODO: To be re-enabled by the web-services team
-#cp lib/jbossws-hornetq.jar $JBOSS_HOME/server/$CONFIG_NAME/deployers/jbossws.deployer
+cp lib/jbossws-hornetq.jar $JBOSS_HOME/server/$CONFIG_NAME/deployers/jbossws.deployer
}
create "default" "non-clustered"
create "all" "clustered"
Modified: branches/JBPAPP_5_1/webservices/build.xml
===================================================================
--- branches/JBPAPP_5_1/webservices/build.xml 2010-05-28 14:36:12 UTC (rev 105333)
+++ branches/JBPAPP_5_1/webservices/build.xml 2010-05-28 15:44:36 UTC (rev 105334)
@@ -80,6 +80,7 @@
<path refid="jboss.jboss.security.spi.classpath"/>
<path refid="jboss.jboss.vfs.classpath"/>
<path refid="jboss.jbosssx.classpath"/>
+ <path refid="org.hornetq.classpath"/>
<path refid="org.jboss.ws.native.classpath"/>
<path refid="org.jboss.ws.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
@@ -148,6 +149,11 @@
<metainf dir="${build.resources}/jbossws-jboss50.jar/META-INF"/>
</jar>
+ <!-- Build jbossws-hornetq.jar -->
+ <jar jarfile="${build.lib}/jbossws-hornetq.jar" manifest="${build.etc}/default.mf">
+ <metainf dir="${build.resources}/jbossws-hornetq.jar/META-INF"/>
+ </jar>
+
<!-- Build jbossws.deployer -->
<zip zipfile="${build.lib}/jbossws-jboss50-deployer.zip">
<fileset dir="${build.lib}">
Modified: branches/JBPAPP_5_1/webservices/pom.xml
===================================================================
--- branches/JBPAPP_5_1/webservices/pom.xml 2010-05-28 14:36:12 UTC (rev 105333)
+++ branches/JBPAPP_5_1/webservices/pom.xml 2010-05-28 15:44:36 UTC (rev 105334)
@@ -79,6 +79,10 @@
</dependency>
<!-- transitive dependencies -->
<dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms-client</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
</dependency>
@@ -133,6 +137,9 @@
<resource>
<directory>src/resources/jbossws-jboss50.jar</directory>
</resource>
+ <resource>
+ <directory>src/resources/jbossws-hornetq.jar</directory>
+ </resource>
</resources>
<plugins>
<plugin>
Copied: branches/JBPAPP_5_1/webservices/src/main/org/jboss/wsf/container/jboss50/endpoint (from rev 105092, branches/JBPAPP_5_1_hornetq-int/webservices/src/main/org/jboss/wsf/container/jboss50/endpoint)
Deleted: branches/JBPAPP_5_1/webservices/src/main/org/jboss/wsf/container/jboss50/endpoint/HornetQJMSResolver.java
===================================================================
--- branches/JBPAPP_5_1_hornetq-int/webservices/src/main/org/jboss/wsf/container/jboss50/endpoint/HornetQJMSResolver.java 2010-05-21 14:07:47 UTC (rev 105092)
+++ branches/JBPAPP_5_1/webservices/src/main/org/jboss/wsf/container/jboss50/endpoint/HornetQJMSResolver.java 2010-05-28 15:44:36 UTC (rev 105334)
@@ -1,50 +0,0 @@
-/*
- * 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.container.jboss50.endpoint;
-
-import javax.jms.Destination;
-
-import org.jboss.logging.Logger;
-import org.hornetq.jms.client.HornetQDestination;
-import org.jboss.wsf.framework.management.DefaultJMSEndpointResolver;
-
-/**
- * A JMS endpoint resolver meant for working with HornetQ destination implementation
- *
- * @author alessio.soldano at jboss.com
- *
- */
-public class HornetQJMSResolver extends DefaultJMSEndpointResolver
-{
- public void setDestination(Destination destination)
- {
- if (destination instanceof HornetQDestination)
- setFromName(destination, ((HornetQDestination)destination).isQueue());
- else
- {
- Logger.getLogger(HornetQJMSResolver.class).warn(
- "Destination '" + destination + "' is not a org.hornetq.jms.client.HornetQDestination instance, falling back to default JMS endpoint resolution");
- super.setDestination(destination);
- }
- }
-
-}
Copied: branches/JBPAPP_5_1/webservices/src/main/org/jboss/wsf/container/jboss50/endpoint/HornetQJMSResolver.java (from rev 105092, branches/JBPAPP_5_1_hornetq-int/webservices/src/main/org/jboss/wsf/container/jboss50/endpoint/HornetQJMSResolver.java)
===================================================================
--- branches/JBPAPP_5_1/webservices/src/main/org/jboss/wsf/container/jboss50/endpoint/HornetQJMSResolver.java (rev 0)
+++ branches/JBPAPP_5_1/webservices/src/main/org/jboss/wsf/container/jboss50/endpoint/HornetQJMSResolver.java 2010-05-28 15:44:36 UTC (rev 105334)
@@ -0,0 +1,50 @@
+/*
+ * 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.container.jboss50.endpoint;
+
+import javax.jms.Destination;
+
+import org.jboss.logging.Logger;
+import org.hornetq.jms.client.HornetQDestination;
+import org.jboss.wsf.framework.management.DefaultJMSEndpointResolver;
+
+/**
+ * A JMS endpoint resolver meant for working with HornetQ destination implementation
+ *
+ * @author alessio.soldano at jboss.com
+ *
+ */
+public class HornetQJMSResolver extends DefaultJMSEndpointResolver
+{
+ public void setDestination(Destination destination)
+ {
+ if (destination instanceof HornetQDestination)
+ setFromName(destination, ((HornetQDestination)destination).isQueue());
+ else
+ {
+ Logger.getLogger(HornetQJMSResolver.class).warn(
+ "Destination '" + destination + "' is not a org.hornetq.jms.client.HornetQDestination instance, falling back to default JMS endpoint resolution");
+ super.setDestination(destination);
+ }
+ }
+
+}
Copied: branches/JBPAPP_5_1/webservices/src/resources/jbossws-hornetq.jar (from rev 105092, branches/JBPAPP_5_1_hornetq-int/webservices/src/resources/jbossws-hornetq.jar)
Copied: branches/JBPAPP_5_1/webservices/src/resources/jbossws-hornetq.jar/META-INF (from rev 105092, branches/JBPAPP_5_1_hornetq-int/webservices/src/resources/jbossws-hornetq.jar/META-INF)
Copied: branches/JBPAPP_5_1/webservices/src/resources/jbossws-hornetq.jar/META-INF/services (from rev 105092, branches/JBPAPP_5_1_hornetq-int/webservices/src/resources/jbossws-hornetq.jar/META-INF/services)
Deleted: branches/JBPAPP_5_1/webservices/src/resources/jbossws-hornetq.jar/META-INF/services/org.jboss.wsf.spi.management.JMSEndpointResolver
===================================================================
--- branches/JBPAPP_5_1_hornetq-int/webservices/src/resources/jbossws-hornetq.jar/META-INF/services/org.jboss.wsf.spi.management.JMSEndpointResolver 2010-05-21 14:07:47 UTC (rev 105092)
+++ branches/JBPAPP_5_1/webservices/src/resources/jbossws-hornetq.jar/META-INF/services/org.jboss.wsf.spi.management.JMSEndpointResolver 2010-05-28 15:44:36 UTC (rev 105334)
@@ -1 +0,0 @@
-org.jboss.wsf.container.jboss50.endpoint.HornetQJMSResolver
Copied: branches/JBPAPP_5_1/webservices/src/resources/jbossws-hornetq.jar/META-INF/services/org.jboss.wsf.spi.management.JMSEndpointResolver (from rev 105092, branches/JBPAPP_5_1_hornetq-int/webservices/src/resources/jbossws-hornetq.jar/META-INF/services/org.jboss.wsf.spi.management.JMSEndpointResolver)
===================================================================
--- branches/JBPAPP_5_1/webservices/src/resources/jbossws-hornetq.jar/META-INF/services/org.jboss.wsf.spi.management.JMSEndpointResolver (rev 0)
+++ branches/JBPAPP_5_1/webservices/src/resources/jbossws-hornetq.jar/META-INF/services/org.jboss.wsf.spi.management.JMSEndpointResolver 2010-05-28 15:44:36 UTC (rev 105334)
@@ -0,0 +1 @@
+org.jboss.wsf.container.jboss50.endpoint.HornetQJMSResolver
Modified: branches/JBPAPP_5_1/webservices/src/scripts/assembly-resources.xml
===================================================================
--- branches/JBPAPP_5_1/webservices/src/scripts/assembly-resources.xml 2010-05-28 14:36:12 UTC (rev 105333)
+++ branches/JBPAPP_5_1/webservices/src/scripts/assembly-resources.xml 2010-05-28 15:44:36 UTC (rev 105334)
@@ -12,7 +12,8 @@
<includes>
<include>jbossws-jboss50.deployer/**</include>
<include>jbossws-jboss50.jar/**</include>
+ <include>jbossws-hornetq.jar/**</include>
</includes>
</fileSet>
</fileSets>
-</assembly>
\ No newline at end of file
+</assembly>
More information about the jboss-cvs-commits
mailing list