activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r646460 - in /activemq/trunk: activemq-run/ activemq-run/pom.xml assembly/pom.xml assembly/src/main/descriptors/common-bin.xml assembly/src/main/descriptors/unix-bin.xml assembly/src/main/descriptors/windows-bin.xml pom.xml
Date Wed, 09 Apr 2008 18:17:04 GMT
Author: chirino
Date: Wed Apr  9 11:17:02 2008
New Revision: 646460

URL: http://svn.apache.org/viewvc?rev=646460&view=rev
Log:
Merged in release chagnes from 4.1... generating the run.jar as seperate module now.  And
started using a
common assembly configuration for bits that are the same on both windows and unix


Added:
    activemq/trunk/activemq-run/
    activemq/trunk/activemq-run/pom.xml   (with props)
    activemq/trunk/assembly/src/main/descriptors/common-bin.xml   (with props)
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

Added: activemq/trunk/activemq-run/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-run/pom.xml?rev=646460&view=auto
==============================================================================
--- activemq/trunk/activemq-run/pom.xml (added)
+++ activemq/trunk/activemq-run/pom.xml Wed Apr  9 11:17:02 2008
@@ -0,0 +1,82 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.activemq</groupId>
+    <artifactId>activemq-parent</artifactId>
+    <version>5.1-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>activemq-run</artifactId>
+  <name>ActiveMQ :: Run Jar</name>
+  <description>run.jar for starting a standalone ActiveMQ broker</description>
+
+  <dependencies>
+
+    <!-- activemq -->
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-console</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+
+    <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <mainClass>org.apache.activemq.console.Main</mainClass>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.0.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <id>main-class</id>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <!--<shadedArtifactAttached>true</shadedArtifactAttached>-->
+              <!--<shadedClassifierName>run</shadedClassifierName>-->
+              <artifactSet>
+                <includes>
+                  <include>${project.groupId}:activemq-console</include>
+                </includes>
+              </artifactSet>
+              <filters>
+                <filter>
+                  <artifact>${project.groupId}:activemq-console</artifact>
+                  <includes>
+                    <include>org/apache/activemq/console/Main*.class</include>
+                  </includes>
+                </filter>
+              </filters>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+
+</project>

Propchange: activemq/trunk/activemq-run/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/activemq-run/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/trunk/activemq-run/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=646460&r1=646459&r2=646460&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Wed Apr  9 11:17:02 2008
@@ -31,7 +31,7 @@
   </parent>
 
   <artifactId>apache-activemq</artifactId>
-  <packaging>jar</packaging>
+  <packaging>pom</packaging>
   <name>ActiveMQ :: Assembly</name>
   <description>Puts together the ActiveMQ distribution</description>
 
@@ -96,6 +96,10 @@
       <type>rar</type>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-run</artifactId>
+    </dependency>
     
     <!-- camel -->
     <dependency>
@@ -186,6 +190,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.5_spec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
     </dependency>
     
@@ -330,29 +338,6 @@
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
             </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>run-jar</id>
-            <phase>package</phase>
-            <configuration>
-              <tasks>
-                <jar destfile="target/run.jar" basedir="target/classes">
-                  <include name="org/apache/activemq/console/Main*.class"/>
-                  <manifest>
-                    <attribute name="Main-Class" value="org.apache.activemq.console.Main"/>
-                  </manifest>
-                </jar>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
           </execution>
         </executions>
       </plugin>

Added: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/main/descriptors/common-bin.xml?rev=646460&view=auto
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/common-bin.xml (added)
+++ activemq/trunk/assembly/src/main/descriptors/common-bin.xml Wed Apr  9 11:17:02 2008
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<component>
+  <id>common-bin</id>
+
+  <fileSets>
+    <!-- Copy over files that should not get the line endings converted -->
+    <fileSet>
+      <directory>src/release</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>bin/*.jar</include>
+        <include>conf/*.ts</include>
+        <include>conf/*.ks</include>
+        <include>conf/*.cert</include>
+      </includes>
+    </fileSet>
+
+    <!-- lets copy the portions of the admin web app we need - as we can't exclude stuff
from the WAR -->
+    <fileSet>
+      <directory>../activemq-web-console/src/main/webapp</directory>
+      <outputDirectory>/webapps/admin</outputDirectory>
+      <excludes>
+        <exclude>**/activemq.xml</exclude>
+        <exclude>**/webconsole-embedded.xml</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>../activemq-web-console/target/classes</directory>
+      <outputDirectory>/webapps/admin/WEB-INF/classes</outputDirectory>
+      <includes>
+        <include>**/*.class</include>
+      </includes>
+    </fileSet>
+
+    <!-- the web demo -->
+    <fileSet>
+      <directory>../activemq-web-demo/src/main/webapp</directory>
+      <outputDirectory>/webapps/demo</outputDirectory>
+      <excludes>
+        <exclude>**/activemq.xml</exclude>
+        <exclude>**/webconsole-embedded.xml</exclude>
+      </excludes>
+    </fileSet>
+
+    <!-- the file server -->
+    <fileSet>
+      <directory>../activemq-fileserver/src/main/webapp</directory>
+      <outputDirectory>/webapps/fileserver</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>../activemq-fileserver/target/classes</directory>
+      <outputDirectory>/webapps/fileserver/WEB-INF/classes</outputDirectory>
+      <includes>
+        <include>**/*.class</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  
+  <dependencySets>
+    
+    <!-- Copy over jar files -->
+    <dependencySet>
+      <outputDirectory>/bin</outputDirectory>
+      <unpack>false</unpack>
+      <outputFileNameMapping>run.jar</outputFileNameMapping>
+      <includes>
+        <include>${pom.groupId}:activemq-run</include>
+      </includes>
+    </dependencySet>
+    
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+      <includes>
+        <include>${pom.groupId}:activemq-all</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>/lib</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+      <includes>
+        <include>commons-logging:commons-logging</include>
+        <include>geronimo-jms_1.1_spec:geronimo-jms_1.1_spec</include>
+        <include>${pom.groupId}:activemq-core</include>
+        <include>${pom.groupId}:activemq-console</include>
+        <include>${pom.groupId}:activemq-jaas</include>
+        <include>mx4j:mx4j</include>
+        <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
+        <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+        <include>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</include>
+        <include>${pom.groupId}:activemq-web</include>
+
+        <!-- camel -->
+        <include>org.apache.camel:camel-core</include>
+        <include>org.apache.camel:camel-spring</include>
+        <include>org.apache.camel:camel-jms</include>
+        <include>org.apache.camel:camel-activemq</include>
+				<!-- Java 5 only -->
+        <include>javax.xml:jaxb-api</include>
+        <include>javax.activation:activation</include>
+        <include>com.sun.xml.bind:jaxb-impl</include>
+        <include>stax:stax-api</include>
+        <include>stax:stax</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>/lib/optional</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+      <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>${pom.groupId}:activeio-core</include>
+        <include>${pom.groupId}:activemq-jmdns_1.0</include>
+        <include>commons-beanutils:commons-beanutils</include>
+        <include>commons-collections:commons-collections</include>
+        <include>commons-httpclient:commons-httpclient</include>
+        <include>commons-dbcp:commons-dbcp</include>
+        <include>commons-pool:commons-pool</include>
+        <include>log4j:log4j</include>
+        <include>mx4j:mx4j-remote</include>
+        <include>mx4j:mx4j-tools</include>
+        <include>org.apache.derby:derby</include>
+        <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
+        <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
+        <include>org.apache.xbean:xbean-spring</include>
+        <include>org.springframework:spring</include>
+        <include>xstream:xstream</include>
+        <include>xmlpull:xmlpull</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>/lib/web</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+      <includes>
+        <include>org.springframework:spring-web</include>
+        <include>org.springframework:spring-webmvc</include>
+        <include>org.mortbay.jetty:jetty</include>
+        <include>org.mortbay.jetty:jetty-util</include>
+        <include>org.mortbay.jetty:jetty-xbean</include>
+        <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
+        <include>org.slf4j:slf4j-api</include>
+        <include>org.slf4j:slf4j-jcl</include>
+
+        <!-- JSP support -->
+        <include>org.mortbay.jetty:jsp-2.1</include>
+        <include>org.mortbay.jetty:jsp-api-2.1</include>
+        <include>org.eclipse.jdt:core</include>
+        <include>ant:ant</include>
+
+        <!-- JSTL and other web stuff -->
+        <include>opensymphony:sitemesh</include>
+        <include>javax.servlet:jstl</include>
+        <include>taglibs:standard</include>
+
+        <!-- Atom/RSS support -->
+        <include>rome:rome</include>
+        <include>jdom:jdom</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</component>

Propchange: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: activemq/trunk/assembly/src/main/descriptors/common-bin.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

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?rev=646460&r1=646459&r2=646460&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/unix-bin.xml Wed Apr  9 11:17:02 2008
@@ -44,18 +44,6 @@
       <lineEnding>unix</lineEnding>
     </fileSet>
 
-    <!-- Copy over files that should not get the line endings converted -->
-    <fileSet>
-      <directory>src/release</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>bin/*.jar</include>
-        <include>conf/*.ts</include>
-        <include>conf/*.ks</include>
-        <include>conf/*.cert</include>
-      </includes>
-    </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>
@@ -83,167 +71,10 @@
       <lineEnding>unix</lineEnding>
     </fileSet>
 
-    <!-- Copy over jar files -->
-    <fileSet>
-      <directory>target</directory>
-      <outputDirectory>/bin</outputDirectory>
-      <includes>
-        <include>run.jar</include>
-      </includes>
-    </fileSet>
-
-    <!-- lets copy the portions of the admin web app we need - as we can't exclude stuff
from the WAR -->
-    <fileSet>
-      <directory>../activemq-web-console/src/main/webapp</directory>
-      <outputDirectory>/webapps/admin</outputDirectory>
-      <excludes>
-        <exclude>**/activemq.xml</exclude>
-        <exclude>**/webconsole-embedded.xml</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>../activemq-web-console/target/classes</directory>
-      <outputDirectory>/webapps/admin/WEB-INF/classes</outputDirectory>
-      <includes>
-        <include>**/*.class</include>
-      </includes>
-    </fileSet>
-
-    <!-- the web demo -->
-    <fileSet>
-      <directory>../activemq-web-demo/src/main/webapp</directory>
-      <outputDirectory>/webapps/demo</outputDirectory>
-      <excludes>
-        <exclude>**/activemq.xml</exclude>
-        <exclude>**/webconsole-embedded.xml</exclude>
-      </excludes>
-    </fileSet>
-
-    <!-- the file server -->
-    <fileSet>
-      <directory>../activemq-fileserver/src/main/webapp</directory>
-      <outputDirectory>/webapps/fileserver</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>../activemq-fileserver/target/classes</directory>
-      <outputDirectory>/webapps/fileserver/WEB-INF/classes</outputDirectory>
-      <includes>
-        <include>**/*.class</include>
-      </includes>
-    </fileSet>
-
   </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>/</outputDirectory>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <includes>
-        <include>${pom.groupId}:activemq-all</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>/lib</outputDirectory>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <includes>
-        <include>commons-logging:commons-logging</include>
-        <include>geronimo-jms_1.1_spec:geronimo-jms_1.1_spec</include>
-        <include>${pom.groupId}:activemq-core</include>
-        <include>${pom.groupId}:activemq-console</include>
-        <include>${pom.groupId}:activemq-jaas</include>
-        <include>mx4j:mx4j</include>
-        <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
-        <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
-        <include>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</include>
-        <include>${pom.groupId}:activemq-web</include>
-
-        <!-- camel -->
-        <include>org.apache.camel:camel-core</include>
-        <include>org.apache.camel:camel-spring</include>
-        <include>org.apache.camel:camel-jms</include>
-        <include>org.apache.camel:camel-activemq</include>
-				<!-- Java 5 only -->
-        <include>javax.xml:jaxb-api</include>
-        <include>javax.activation:activation</include>
-        <include>com.sun.xml.bind:jaxb-impl</include>
-        <include>stax:stax-api</include>
-        <include>stax:stax</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>/lib/optional</outputDirectory>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <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>${pom.groupId}:activeio-core</include>
-        <include>${pom.groupId}:activemq-jmdns_1.0</include>
-        <include>commons-beanutils:commons-beanutils</include>
-        <include>commons-collections:commons-collections</include>
-        <include>commons-httpclient:commons-httpclient</include>
-        <include>commons-dbcp:commons-dbcp</include>
-        <include>commons-pool:commons-pool</include>
-        <include>log4j:log4j</include>
-        <include>mx4j:mx4j-remote</include>
-        <include>mx4j:mx4j-tools</include>
-        <include>org.apache.derby:derby</include>
-        <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
-        <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
-        <include>org.apache.xbean:xbean-spring</include>
-        <include>org.springframework:spring</include>
-        <include>xstream:xstream</include>
-        <include>xmlpull:xmlpull</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>/lib/web</outputDirectory>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <includes>
-        <include>org.springframework:spring-web</include>
-        <include>org.springframework:spring-webmvc</include>
-        <include>org.mortbay.jetty:jetty</include>
-        <include>org.mortbay.jetty:jetty-util</include>
-        <include>org.mortbay.jetty:jetty-xbean</include>
-        <include>org.mortbay.jetty:servlet-api-2.5</include>
-        <include>org.slf4j:slf4j-api</include>
-        <include>org.slf4j:slf4j-jcl</include>
-
-        <!-- JSP support -->
-        <include>org.mortbay.jetty:jsp-2.1</include>
-        <include>org.mortbay.jetty:jsp-api-2.1</include>
-        <include>org.eclipse.jdt:core</include>
-        <include>ant:ant</include>
-
-        <!-- JSTL and other web stuff -->
-        <include>opensymphony:sitemesh</include>
-        <include>javax.servlet:jstl</include>
-        <include>taglibs:standard</include>
-
-        <!-- Atom/RSS support -->
-        <include>rome:rome</include>
-        <include>jdom:jdom</include>
-      </includes>
-    </dependencySet>
-
-
-
-    <!-- we cannot exclude stuff from inside the war...
-    <dependencySet>
-      <outputDirectory>/webapps/admin</outputDirectory>
-      <unpack>true</unpack>
-      <scope>runtime</scope>
-      <includes>
-        <include>${pom.groupId}:activemq-web-console</include>
-      </includes>
-      <excludes>
-        <exclude>**/*.jar</exclude>
-      </excludes>
-    </dependencySet>
-    -->
-  </dependencySets>
+  
+  <componentDescriptors>
+    <componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
+  </componentDescriptors>
+    
 </assembly>

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?rev=646460&r1=646459&r2=646460&view=diff
==============================================================================
--- activemq/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ activemq/trunk/assembly/src/main/descriptors/windows-bin.xml Wed Apr  9 11:17:02 2008
@@ -34,6 +34,7 @@
       </excludes>
       <lineEnding>dos</lineEnding>
     </fileSet>
+    
     <fileSet>
       <directory>src/release</directory>
       <outputDirectory>/</outputDirectory>
@@ -41,206 +42,24 @@
         <include>bin/*.bat</include>
         <include>bin/win32/*.bat</include>
         <include>bin/win32/*.conf</include>
-        <include>bin/core/boot/*.jar</include>
       </includes>
       <lineEnding>dos</lineEnding>
     </fileSet>
-
-    <!-- Copy over the files that should not get the line endings converted but need to
be chmod to 755 -->
-    <!-- Do not copy unix files
-    <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 -->
-    <!-- Do not copy unix files
-    <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>
       <outputDirectory></outputDirectory>
       <includes>
-        <include>conf/*.ts</include>
-        <include>conf/*.ks</include>
-        <include>conf/*.cert</include>
-        <include>bin/*.jar</include>
         <include>bin/win32/*.exe</include>
         <include>bin/win32/*.dll</include>
       </includes>
     </fileSet>
 
-    <!-- Copy over jar files -->
-    <fileSet>
-      <directory>target</directory>
-      <outputDirectory>/bin</outputDirectory>
-      <includes>
-        <include>run.jar</include>
-      </includes>
-    </fileSet>
-
-    <!-- lets copy the portions of the web app we need - as we can't exclude stuff from
the WAR -->
-    <fileSet>
-      <directory>../activemq-web-console/src/main/webapp</directory>
-      <outputDirectory>/webapps/admin</outputDirectory>
-      <excludes>
-        <exclude>**/activemq.xml</exclude>
-        <exclude>**/webconsole-embedded.xml</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>../activemq-web-console/target/classes</directory>
-      <outputDirectory>/webapps/admin/WEB-INF/classes</outputDirectory>
-      <includes>
-        <include>**/*.class</include>
-      </includes>
-    </fileSet>
-
-
-    <!-- the web demo -->
-    <fileSet>
-      <directory>../activemq-web-demo/src/main/webapp</directory>
-      <outputDirectory>/webapps/demo</outputDirectory>
-      <excludes>
-        <exclude>**/activemq.xml</exclude>
-        <exclude>**/webconsole-embedded.xml</exclude>
-      </excludes>
-    </fileSet>
-
-    <!-- the file server -->
-    <fileSet>
-      <directory>../activemq-fileserver/src/main/webapp</directory>
-      <outputDirectory>/webapps/fileserver</outputDirectory>
-    </fileSet>
-  <fileSet>
-      <directory>../activemq-fileserver/target/classes</directory>
-      <outputDirectory>/webapps/fileserver/WEB-INF/classes</outputDirectory>
-      <includes>
-        <include>**/*.class</include>
-      </includes>
-    </fileSet>
    </fileSets>
-
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>/</outputDirectory>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <includes>
-        <include>${pom.groupId}:activemq-all</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>/lib</outputDirectory>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <includes>
-        <include>commons-logging:commons-logging</include>
-        <include>geronimo-jms_1.1_spec:geronimo-jms_1.1_spec</include>
-        <include>${pom.groupId}:activemq-core</include>
-        <include>${pom.groupId}:activemq-console</include>
-        <include>${pom.groupId}:activemq-jaas</include>
-        <include>mx4j:mx4j</include>
-        <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
-        <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
-        <include>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</include>
-        <include>${pom.groupId}:activemq-web</include>
-
-        <!-- camel -->
-        <include>org.apache.camel:camel-core</include>
-        <include>org.apache.camel:camel-spring</include>
-        <include>org.apache.camel:camel-jms</include>
-        <include>org.apache.camel:camel-activemq</include>
-				<!-- Java 5 only -->
-        <include>javax.xml:jaxb-api</include>
-        <include>javax.activation:activation</include>
-        <include>com.sun.xml.bind:jaxb-impl</include>
-        <include>stax:stax-api</include>
-        <include>stax:stax</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>/lib/optional</outputDirectory>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <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>${pom.groupId}:activeio-core</include>
-        <include>${pom.groupId}:activemq-jmdns_1.0</include>
-        <include>commons-beanutils:commons-beanutils</include>
-        <include>commons-collections:commons-collections</include>
-        <include>commons-httpclient:commons-httpclient</include>
-        <include>commons-dbcp:commons-dbcp</include>
-        <include>commons-pool:commons-pool</include>
-        <include>org.mortbay.jetty:jetty</include>
-        <include>org.mortbay.jetty:jetty-util</include>
-        <include>org.mortbay.jetty:servlet-api-2.5</include>
-        <include>log4j:log4j</include>
-        <include>mx4j:mx4j-remote</include>
-        <include>mx4j:mx4j-tools</include>
-        <include>org.apache.derby:derby</include>
-        <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
-        <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
-        <include>org.apache.xbean:xbean-spring</include>
-        <include>org.springframework:spring</include>
-        <include>xstream:xstream</include>
-        <include>xmlpull:xmlpull</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>/lib/web</outputDirectory>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <includes>
-        <include>org.springframework:spring-web</include>
-        <include>org.springframework:spring-webmvc</include>
-        <include>org.mortbay.jetty:jetty</include>
-        <include>org.mortbay.jetty:jetty-util</include>
-        <include>org.mortbay.jetty:jetty-xbean</include>
-        <include>org.mortbay.jetty:servlet-api-2.5</include>
-        <include>org.slf4j:slf4j-api</include>
-        <include>org.slf4j:slf4j-jcl</include>
-
-        <!-- JSP support -->
-        <include>org.mortbay.jetty:jsp-2.1</include>
-        <include>org.mortbay.jetty:jsp-api-2.1</include>
-        <include>org.eclipse.jdt:core</include>
-        <include>ant:ant</include>
-
-        <!-- JSTL and other web stuff -->
-        <include>opensymphony:sitemesh</include>
-        <include>javax.servlet:jstl</include>
-        <include>taglibs:standard</include>
-
-        <!-- Atom/RSS support -->
-        <include>rome:rome</include>
-        <include>jdom:jdom</include>
-      </includes>
-    </dependencySet>
-    
-  </dependencySets>
+  
+  <componentDescriptors>
+    <componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
+  </componentDescriptors>
+  
 </assembly>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=646460&r1=646459&r2=646460&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Wed Apr  9 11:17:02 2008
@@ -145,6 +145,7 @@
     <module>activemq-optional</module>
     <module>activemq-ra</module>
     <module>activemq-rar</module>
+    <module>activemq-run</module>
     <module>activemq-test-atomikos</module>
     <module>activemq-tooling</module>
     <module>activemq-web</module>
@@ -253,6 +254,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-run</artifactId>
+        <version>${version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-web</artifactId>
         <version>${version}</version>
         <type>war</type>
@@ -881,7 +887,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.1</version>
+          <version>2.2-beta-2</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>



Mime
View raw message