[jboss-cvs] JBossAS SVN: r99624 - in branches/Branch_Hornet_Temporary: build and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jan 19 18:21:22 EST 2010


Author: clebert.suconic at jboss.com
Date: 2010-01-19 18:21:22 -0500 (Tue, 19 Jan 2010)
New Revision: 99624

Modified:
   branches/Branch_Hornet_Temporary/build/build.xml
   branches/Branch_Hornet_Temporary/build/pom.xml
   branches/Branch_Hornet_Temporary/messaging/pom.xml
   branches/Branch_Hornet_Temporary/pom.xml
   branches/Branch_Hornet_Temporary/server/src/etc/deployers/ejb-deployer-jboss-beans.xml
Log:
Changing build.xml to start AS6 properly

Modified: branches/Branch_Hornet_Temporary/build/build.xml
===================================================================
--- branches/Branch_Hornet_Temporary/build/build.xml	2010-01-19 23:17:04 UTC (rev 99623)
+++ branches/Branch_Hornet_Temporary/build/build.xml	2010-01-19 23:21:22 UTC (rev 99624)
@@ -1078,8 +1078,46 @@
            jboss-messaging libraries, unscoped deployment, same for "all" and "default" configurations.
      -->
      <mkdir dir="${install.common.lib}"/>
-     
- 	 <!--
+  	
+  	<copy file="${org.jboss.jbossas:jboss-as-hornetq-int:jar}" todir="${install.common.lib}"/>
+  	
+  	<copy file="${org.hornetq:hornetq-bootstrap:jar}" todir="${install.common.lib}">
+        <mapper refid="remove-versions" />
+    </copy>
+  	<copy file="${org.hornetq:hornetq-core-client:jar}" todir="${install.common.lib}">
+        <mapper refid="remove-versions" />
+    </copy>
+
+ 	<copy file="${org.hornetq:hornetq-core:jar}" todir="${install.common.lib}">
+        <mapper refid="remove-versions" />
+    </copy>
+
+ 	<copy file="${org.hornetq:hornetq-logging:jar}" todir="${install.common.lib}">
+        <mapper refid="remove-versions" />
+    </copy>
+
+ 	<copy file="${org.hornetq:hornetq-ra:jar}" todir="${install.common.lib}">
+        <mapper refid="remove-versions" />
+    </copy>
+
+ 	<copy file="${org.hornetq:hornetq-transports:jar}" todir="${install.common.lib}">
+        <mapper refid="remove-versions" />
+    </copy>
+
+ 	<copy file="${org.hornetq:hornetq-jboss-as-integration:jar}" todir="${install.common.lib}">
+        <mapper refid="remove-versions" />
+    </copy>
+
+ 	<copy file="${org.hornetq:hornetq-jms-client:jar}" todir="${install.common.lib}">
+        <mapper refid="remove-versions" />
+    </copy>
+
+ 	<copy file="${org.hornetq:hornetq-jms:jar}" todir="${install.common.lib}">
+        <mapper refid="remove-versions" />
+    </copy>
+
+
+  	<!--
          Default configuration
     -->
    <mkdir dir="${install.default.deploy}/hornetq.sar"/>
@@ -1089,6 +1127,17 @@
    	  </patternset>
    	  <mapper type="flatten"/>
    </unzip>
+    <mkdir dir="${install.default.deploy}/hornetq-ra.rar"/>
+    <mkdir dir="${install.default.deploy}/hornetq-ra.rar/META-INF"/>
+  	<copy file="${org.hornetq:hornetq-ra:jar}" todir="${install.default.deploy}/hornetq-ra.rar">
+        <mapper refid="remove-versions" />
+  	</copy>
+    <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.default.deploy}/hornetq-ra.rar/META-INF">
+    	  <patternset>
+    	    <include name="ra.xml"/>
+    	  </patternset>
+    	  <mapper type="flatten"/>
+    </unzip>
 
   	<!--
          All configuration
@@ -1100,6 +1149,15 @@
    	  </patternset>
    	  <mapper type="flatten"/>
    </unzip>
+    <mkdir dir="${install.all.deploy}/hornetq-ra.rar"/>
+    <mkdir dir="${install.all.deploy}/hornetq-ra.rar/META-INF"/>
+    <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.all.deploy}/hornetq-ra.rar/META-INF">
+    	  <patternset>
+    	    <include name="ra.xml"/>
+    	  </patternset>
+    	  <mapper type="flatten"/>
+    </unzip>
+
   </target>
 
   <!-- ======== -->

Modified: branches/Branch_Hornet_Temporary/build/pom.xml
===================================================================
--- branches/Branch_Hornet_Temporary/build/pom.xml	2010-01-19 23:17:04 UTC (rev 99623)
+++ branches/Branch_Hornet_Temporary/build/pom.xml	2010-01-19 23:21:22 UTC (rev 99624)
@@ -98,6 +98,11 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-hornetq-int</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-iiop</artifactId>
       <optional>true</optional>
     </dependency>
@@ -352,6 +357,18 @@
         <groupId>org.hornetq</groupId>
         <artifactId>hornetq-transports</artifactId>
       </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-jboss-as-integration</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-jms-client</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>org.hornetq</groupId>
+        <artifactId>hornetq-jms</artifactId>
+      </dependency>
     <dependency>
       <groupId>jboss.web</groupId>
       <artifactId>el-api</artifactId>

Modified: branches/Branch_Hornet_Temporary/messaging/pom.xml
===================================================================
--- branches/Branch_Hornet_Temporary/messaging/pom.xml	2010-01-19 23:17:04 UTC (rev 99623)
+++ branches/Branch_Hornet_Temporary/messaging/pom.xml	2010-01-19 23:21:22 UTC (rev 99624)
@@ -9,9 +9,9 @@
   
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jboss.jbossas</groupId>
-  <artifactId>jboss-as-messaging</artifactId>
+  <artifactId>jboss-as-hornetq-int</artifactId>
   <packaging>jar</packaging>
-  <name>JBoss Application Server Messaging</name>
+  <name>JBoss Application Server HornetQ Integration</name>
   <url>http://www.jboss.org/jbossas</url>
   <description>JBoss Application Server (messaging module)</description>
   
@@ -33,18 +33,6 @@
               <goal>run</goal>
             </goals>
             <phase>package</phase>
-            <configuration>
-              <tasks>
-                                
-                <mkdir dir="target/etc"/>
-                <copy todir="target/etc" filtering="yes">
-                  <fileset dir="src/etc">
-                    <include name="**"/>
-                  </fileset>
-                </copy>
-                
-             </tasks>
-            </configuration>
           </execution>
         </executions>
       </plugin>

Modified: branches/Branch_Hornet_Temporary/pom.xml
===================================================================
--- branches/Branch_Hornet_Temporary/pom.xml	2010-01-19 23:17:04 UTC (rev 99623)
+++ branches/Branch_Hornet_Temporary/pom.xml	2010-01-19 23:21:22 UTC (rev 99624)
@@ -383,7 +383,7 @@
       </dependency>
       <dependency>
         <groupId>org.jboss.jbossas</groupId>
-        <artifactId>jboss-as-messaging</artifactId>
+        <artifactId>jboss-as-hornetq-int</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>

Modified: branches/Branch_Hornet_Temporary/server/src/etc/deployers/ejb-deployer-jboss-beans.xml
===================================================================
--- branches/Branch_Hornet_Temporary/server/src/etc/deployers/ejb-deployer-jboss-beans.xml	2010-01-19 23:17:04 UTC (rev 99623)
+++ branches/Branch_Hornet_Temporary/server/src/etc/deployers/ejb-deployer-jboss-beans.xml	2010-01-19 23:21:22 UTC (rev 99624)
@@ -105,13 +105,13 @@
          <bean class="org.jboss.ejb.deployers.SimpleCreateDestinationMatcher">
             <property name="default">true</property>
             <property name="messageListener">javax.jms.MessageListener</property>
-            <property name="rarName">jms-ra.rar</property>
+            <property name="rarName">hornetq-ra.rar</property>
          </bean>
       </property>
       <!-- Create a destination with JBoss Messaging -->
       <property name="factory">
          <bean class="org.jboss.jms.server.integration.DestinationFactoryDeployerPlugin">
-            <property name="serverPeerName"><inject bean="JMSServerManager"/></property>
+            <property name="jmsManager"><inject bean="JMSServerManager"/></property>
          </bean>
       </property>
    </bean>




More information about the jboss-cvs-commits mailing list