activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r503688 - in /activemq/trunk: assembly/pom.xml assembly/src/main/descriptors/unix-bin.xml assembly/src/main/descriptors/windows-bin.xml pom.xml
Date Mon, 05 Feb 2007 14:05:30 GMT
Author: jstrachan
Date: Mon Feb  5 06:05:29 2007
New Revision: 503688

URL: http://svn.apache.org/viewvc?view=rev&rev=503688
Log:
fix for AMQ-1151 to include the activemq-xmpp jar in the binary distro - along with including
the shell scripts in the zip

Modified:
    activemq/trunk/assembly/pom.xml
    activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
    activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
    activemq/trunk/pom.xml

Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?view=diff&rev=503688&r1=503687&r2=503688
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Mon Feb  5 06:05:29 2007
@@ -75,6 +75,10 @@
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-xmpp</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
       <artifactId>activemq-web-demo</artifactId>
       <type>war</type>
     </dependency>

Modified: activemq/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/unix-bin.xml?view=diff&rev=503688&r1=503687&r2=503688
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/unix-bin.xml Mon Feb  5 06:05:29 2007
@@ -125,6 +125,7 @@
       <includes>
          <include>${pom.groupId}:activemq-rar</include>
          <include>${pom.groupId}:activemq-optional</include>
+         <include>${pom.groupId}:activemq-xmpp</include>
          <include>${pom.groupId}:activecluster</include>
          <include>commons-beanutils:commons-beanutils</include>
          <include>commons-collections:commons-collections</include>

Modified: activemq/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/windows-bin.xml?view=diff&rev=503688&r1=503687&r2=503688
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/windows-bin.xml Mon Feb  5 06:05:29 2007
@@ -46,6 +46,33 @@
       <lineEnding>dos</lineEnding>
     </fileSet>
 
+    <!-- Copy over the files that should not get the line endings converted but need to
be chmod to 755 -->
+    <fileSet>
+      <directory>src/release</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>bin/linux/wrapper</include>
+        <include>bin/linux/libwrapper.so</include>
+        <include>bin/macosx/wrapper</include>
+        <include>bin/macosx/libwrapper.jnilib</include>
+      </includes>
+      <fileMode>0755</fileMode>
+    </fileSet>
+
+    <!-- Copy over the files that need unix line endings and also chmod to 755 -->
+    <fileSet>
+      <directory>src/release</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>bin/activemq</include>
+        <include>bin/activemq-admin</include>
+        <include>bin/macosx/activemq</include>
+        <include>bin/linux/activemq</include>
+      </includes>
+      <fileMode>0755</fileMode>
+      <lineEnding>unix</lineEnding>
+    </fileSet>
+
     <!-- Copy over files that should not get the line endings converted -->
     <fileSet>
       <directory>src/release</directory>
@@ -102,6 +129,7 @@
       <includes>
          <include>${pom.groupId}:activemq-rar</include>
          <include>${pom.groupId}:activemq-optional</include>
+         <include>${pom.groupId}:activemq-xmpp</include>
          <include>${pom.groupId}:activecluster</include>
          <include>commons-beanutils:commons-beanutils</include>
          <include>commons-collections:commons-collections</include>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?view=diff&rev=503688&r1=503687&r2=503688
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Mon Feb  5 06:05:29 2007
@@ -177,6 +177,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-xmpp</artifactId>
+        <version>${activemq-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-web-demo</artifactId>
         <version>${activemq-version}</version>
         <type>war</type>
@@ -185,7 +190,7 @@
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-gbean-management</artifactId>
         <version>${activemq-version}</version>
-	  </dependency>
+  	  </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-console</artifactId>



Mime
View raw message