activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r646153 - in /activemq/branches/activemq-4.1: ./ activemq-all/ activemq-jmdns_1.0/ activemq-run/ assembly/ assembly/src/main/descriptors/
Date Wed, 09 Apr 2008 00:32:37 GMT
Author: djencks
Date: Tue Apr  8 17:32:36 2008
New Revision: 646153

URL: http://svn.apache.org/viewvc?rev=646153&view=rev
Log:
Make the assembly start.  Use a common descriptor for unxis/windows bin assemblies

Added:
    activemq/branches/activemq-4.1/activemq-run/
      - copied from r646101, activemq/branches/activemq-4.1/activemq-all/
    activemq/branches/activemq-4.1/assembly/src/main/descriptors/common-bin.xml   (with props)
Modified:
    activemq/branches/activemq-4.1/activemq-all/pom.xml
    activemq/branches/activemq-4.1/activemq-jmdns_1.0/pom.xml
    activemq/branches/activemq-4.1/activemq-run/pom.xml
    activemq/branches/activemq-4.1/assembly/pom.xml
    activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-bin.xml
    activemq/branches/activemq-4.1/assembly/src/main/descriptors/windows-bin.xml
    activemq/branches/activemq-4.1/pom.xml

Modified: activemq/branches/activemq-4.1/activemq-all/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-all/pom.xml?rev=646153&r1=646152&r2=646153&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/activemq-all/pom.xml (original)
+++ activemq/branches/activemq-4.1/activemq-all/pom.xml Tue Apr  8 17:32:36 2008
@@ -58,51 +58,9 @@
 
       <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>
-        <!-- n.b. the use of executions here is a bit weird.  The plugin doesn't clean
up between executions so the first one
-        constructs the single-class run.jar and the second one addes everything else, excluding
the Main class from the run.jar -->
         <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>
-              <archive>
-                <manifest>
-                  <attribute name="Main-Class" value="org.apache.activemq.console.Main"/>
-                </manifest>
-              </archive>
-            </configuration>
-          </execution>
           <execution>
             <phase>package</phase>
             <id>all</id>

Modified: activemq/branches/activemq-4.1/activemq-jmdns_1.0/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-jmdns_1.0/pom.xml?rev=646153&r1=646152&r2=646153&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/activemq-jmdns_1.0/pom.xml (original)
+++ activemq/branches/activemq-4.1/activemq-jmdns_1.0/pom.xml Tue Apr  8 17:32:36 2008
@@ -20,6 +20,7 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <skip>true</skip>

Modified: activemq/branches/activemq-4.1/activemq-run/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/activemq-run/pom.xml?rev=646153&r1=646101&r2=646153&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/activemq-run/pom.xml (original)
+++ activemq/branches/activemq-4.1/activemq-run/pom.xml Tue Apr  8 17:32:36 2008
@@ -30,10 +30,9 @@
     <version>4.1-SNAPSHOT</version>
   </parent>
 
-  <artifactId>activemq-all</artifactId>
-  <packaging>jar</packaging>
-  <name>ActiveMQ :: Jar Bundle</name>
-  <description>Puts together an ActiveMQ jar bundle</description>
+  <artifactId>activemq-run</artifactId>
+  <name>ActiveMQ :: Run Jar</name>
+  <description>run.jar for assemblies</description>
 
   <dependencies>
 
@@ -42,14 +41,6 @@
       <groupId>${pom.groupId}</groupId>
       <artifactId>activemq-console</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>activemq-optional</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-    </dependency>
   </dependencies>
 
   <build>
@@ -58,10 +49,19 @@
 
       <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>
-        <!-- n.b. the use of executions here is a bit weird.  The plugin doesn't clean
up between executions so the first one
-        constructs the single-class run.jar and the second one addes everything else, excluding
the Main class from the run.jar -->
         <executions>
           <execution>
             <phase>package</phase>
@@ -70,9 +70,8 @@
               <goal>shade</goal>
             </goals>
             <configuration>
-              <shadedArtifactId>activemq-run</shadedArtifactId>
-              <shadedArtifactAttached>true</shadedArtifactAttached>
-              <shadedClassifierName></shadedClassifierName>
+              <!--<shadedArtifactAttached>true</shadedArtifactAttached>-->
+              <!--<shadedClassifierName>run</shadedClassifierName>-->
               <artifactSet>
                 <includes>
                   <include>${project.groupId}:activemq-console</include>
@@ -86,64 +85,12 @@
                   </includes>
                 </filter>
               </filters>
-              <manifest>
-                <attribute name="Main-Class" value="org.apache.activemq.console.Main"/>
-              </manifest>
-            </configuration>
-          </execution>
-          <execution>
-            <phase>package</phase>
-            <id>all</id>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-
-              <artifactSet>
-                <includes>
-                  <include>${project.groupId}:activemq-core</include>
-                  <include>${project.groupId}:activemq-console</include>
-                  <include>${project.groupId}:activemq-jaas</include>
-                  <include>${project.groupId}:activemq-optional</include>
-                  <include>${project.groupId}:activeio-core</include>
-                  <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
-                  <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
-                  <include>commons-logging:commons-logging</include>
-                  <include>backport-util-concurrent:backport-util-concurrent</include>
-                  <include>org.apache.derby:derby</include>
-                </includes>
-              </artifactSet>
-
-              <filters>
-                <filter>
-                  <artifact>${project.groupId}:activemq-console</artifact>
-                  <excludes>
-                    <exclude>org/apache/activemq/console/Main*.class</exclude>
-                  </excludes>
-                </filter>
-              </filters>
-              <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
-                  <projectName>Apache ActiveMQ</projectName>
-                </transformer>
-
-                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                  <resource>META-INF/spring.handlers</resource>
-                </transformer>
-
-                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                  <resource>META-INF/services/com.sun.tools.xjc.Plugin</resource>
-                </transformer>
-
-                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                  <resource>META-INF/spring.schemas</resource>
-                </transformer>
-              </transformers>
             </configuration>
           </execution>
         </executions>
       </plugin>
 
+<!--
       <plugin>
         <groupId>org.apache.geronimo.genesis.plugins</groupId>
         <artifactId>tools-maven-plugin</artifactId>
@@ -160,6 +107,15 @@
           </execution>
         </executions>
       </plugin>
+-->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      
 
     </plugins>
   </build>

Modified: activemq/branches/activemq-4.1/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/assembly/pom.xml?rev=646153&r1=646152&r2=646153&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/assembly/pom.xml (original)
+++ activemq/branches/activemq-4.1/assembly/pom.xml Tue Apr  8 17:32:36 2008
@@ -9,7 +9,7 @@
   </parent>
 
   <artifactId>apache-activemq</artifactId>
-  <packaging>jar</packaging>
+  <packaging>pom</packaging>
   <name>ActiveMQ :: Assembly</name>
   <description>Puts together the ActiveMQ distribution</description>
 
@@ -59,6 +59,10 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>activemq-all</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-run</artifactId>
     </dependency>
 
     <!-- commons -->

Added: activemq/branches/activemq-4.1/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/assembly/src/main/descriptors/common-bin.xml?rev=646153&view=auto
==============================================================================
--- activemq/branches/activemq-4.1/assembly/src/main/descriptors/common-bin.xml (added)
+++ activemq/branches/activemq-4.1/assembly/src/main/descriptors/common-bin.xml Tue Apr  8
17:32:36 2008
@@ -0,0 +1,83 @@
+<?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>unix-bin</id>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <unpack>false</unpack>
+      <includes>
+        <include>${pom.groupId}:activemq-all</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>/bin</outputDirectory>
+      <unpack>false</unpack>
+      <outputFileNameMapping>run.jar</outputFileNameMapping>
+      <includes>
+        <include>${pom.groupId}:activemq-run</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>/lib</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+      <includes>
+         <include>backport-util-concurrent:backport-util-concurrent</include>
+         <include>commons-logging:commons-logging</include>
+         <include>${pom.groupId}:activemq-core</include>
+         <include>${pom.groupId}:activeio-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>${pom.groupId}:activemq-web</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}:activecluster</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>
+         <include>org.apache.activemq:activemq-jmdns_1.0</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</component>

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

Propchange: activemq/branches/activemq-4.1/assembly/src/main/descriptors/common-bin.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

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

Modified: activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-bin.xml?rev=646153&r1=646152&r2=646153&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-bin.xml (original)
+++ activemq/branches/activemq-4.1/assembly/src/main/descriptors/unix-bin.xml Tue Apr  8 17:32:36
2008
@@ -89,68 +89,7 @@
     </fileSet>
 
   </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>/</outputDirectory>
-      <unpack>false</unpack>
-      <includes>
-        <include>${pom.groupId}:activemq-all</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>/bin</outputDirectory>
-      <unpack>false</unpack>
-      <outputFileNameMapping>run.jar</outputFileNameMapping>
-      <includes>
-        <include>${pom.groupId}:activemq-all:*:run</include>
-      </includes>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>/lib</outputDirectory>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <includes>
-         <include>backport-util-concurrent:backport-util-concurrent</include>
-         <include>commons-logging:commons-logging</include>
-         <include>${pom.groupId}:activemq-core</include>
-         <include>${pom.groupId}:activeio-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>${pom.groupId}:activemq-web</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}:activecluster</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>org.springframework:beans</include>
-         <include>xstream:xstream</include>
-         <include>xmlpull:xmlpull</include>
-         <include>org.apache.activemq:activemq-jmdns_1.0</include>
-      </includes>
-    </dependencySet>
-  </dependencySets>  
+  <componentDescriptors>
+    <componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
+  </componentDescriptors>
 </assembly>

Modified: activemq/branches/activemq-4.1/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/assembly/src/main/descriptors/windows-bin.xml?rev=646153&r1=646152&r2=646153&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/assembly/src/main/descriptors/windows-bin.xml (original)
+++ activemq/branches/activemq-4.1/assembly/src/main/descriptors/windows-bin.xml Tue Apr 
8 17:32:36 2008
@@ -76,53 +76,8 @@
       </includes>
     </fileSet>
   </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>/lib</outputDirectory>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <includes>
-         <include>backport-util-concurrent:backport-util-concurrent</include>
-         <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}:activeio-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>${pom.groupId}:activemq-web</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}:activecluster</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>
-         <include>org.apache.activemq:activemq-jmdns_1.0</include>
-      </includes>
-    </dependencySet>
-  </dependencySets>  
+  <componentDescriptors>
+    <componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
+  </componentDescriptors>
+  
 </assembly>

Modified: activemq/branches/activemq-4.1/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-4.1/pom.xml?rev=646153&r1=646152&r2=646153&view=diff
==============================================================================
--- activemq/branches/activemq-4.1/pom.xml (original)
+++ activemq/branches/activemq-4.1/pom.xml Tue Apr  8 17:32:36 2008
@@ -84,6 +84,7 @@
     <module>activemq-web-console</module>
     <module>activemq-xmpp</module>
     <module>activemq-all</module>
+    <module>activemq-run</module>
     <module>assembly</module>
     <module>activemq-jmdns_1.0</module>
   </modules>
@@ -175,9 +176,9 @@
       </dependency>
 	  <dependency>
         <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-all</artifactId>
+        <artifactId>activemq-run</artifactId>
         <version>${activemq-version}</version>
-        <classifier>run</classifier>
+        <!--<classifier>run</classifier>-->
       </dependency>
 	  <dependency>
         <groupId>org.apache.activemq</groupId>



Mime
View raw message