activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1027549 - in /activemq/activemq-apollo/trunk: apollo-distro/pom.xml apollo-distro/src/main/descriptors/common-bin.xml apollo-distro/src/main/release/bin/apollo apollo-web/pom.xml
Date Tue, 26 Oct 2010 13:36:32 GMT
Author: chirino
Date: Tue Oct 26 13:36:32 2010
New Revision: 1027549

URL: http://svn.apache.org/viewvc?rev=1027549&view=rev
Log:
making more progress on slim webapp for the cli.

Modified:
    activemq/activemq-apollo/trunk/apollo-distro/pom.xml
    activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml
    activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo
    activemq/activemq-apollo/trunk/apollo-web/pom.xml

Modified: activemq/activemq-apollo/trunk/apollo-distro/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/pom.xml?rev=1027549&r1=1027548&r2=1027549&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-distro/pom.xml Tue Oct 26 13:36:32 2010
@@ -71,6 +71,14 @@
       <groupId>org.apache.activemq</groupId>
       <artifactId>apollo-web</artifactId>
       <version>6.0-SNAPSHOT</version>
+      <type>jar</type>
+      <classifier>slim</classifier>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>apollo-web</artifactId>
+      <version>6.0-SNAPSHOT</version>
       <type>pom</type>
     </dependency>
 

Modified: activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml?rev=1027549&r1=1027548&r2=1027549&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-distro/src/main/descriptors/common-bin.xml Tue Oct
26 13:36:32 2010
@@ -40,7 +40,7 @@
         <include>asm:asm</include>
         <include>org.codehaus.jackson:jackson-jaxrs</include>
         <include>org.fusesource.scalate:scalate-core</include>
-        <include>org.scala-lang:scala-compiler</include>
+        <!-- <include>org.scala-lang:scala-compiler</include> -->
         
         <!-- the logging apis used -->
         <include>org.slf4j:slf4j-api</include>
@@ -52,6 +52,9 @@
         <include>org.apache.karaf.shell:org.apache.karaf.shell.console</include>
         
       </includes>
+      <excludes>
+        <exclude>org.apache.activemq:apollo-web:pom</exclude>
+      </excludes>
     </dependencySet>
   </dependencySets>
 

Modified: activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo?rev=1027549&r1=1027548&r2=1027549&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo (original)
+++ activemq/activemq-apollo/trunk/apollo-distro/src/main/release/bin/apollo Tue Oct 26 13:36:32
2010
@@ -142,7 +142,7 @@ JVM_FLAGS="${APOLLO_OPTS}"
 
 # Optionally enable remote debugging
 if [ "x$APOLLO_DEBUG" != "x" ]; then
-    JVM_FLAGS="${JVM_FLAGS} Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
+    JVM_FLAGS="${JVM_FLAGS} -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
 fi
 
 # Optionally enable YourKit debugging

Modified: activemq/activemq-apollo/trunk/apollo-web/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/pom.xml?rev=1027549&r1=1027548&r2=1027549&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-web/pom.xml Tue Oct 26 13:36:32 2010
@@ -239,6 +239,22 @@
       </plugin>
       
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <classifier>slim</classifier>
+        </configuration>
+      </plugin>
+            
+      <plugin>
         <groupId>org.fusesource.mvnplugins</groupId>
         <artifactId>maven-uberize-plugin</artifactId>
         <version>1.11</version>
@@ -259,7 +275,11 @@
                 <filter>
                   <artifact>org.apache.activemq:apollo-web</artifact>
                   <excludes>
+                    <exclude>WEB-INF/classes/**</exclude>
                     <exclude>WEB-INF/lib/**</exclude>
+                    <exclude>**/*.scaml</exclude>
+                    <exclude>**/*.jade</exclude>
+                    <exclude>**/*.ssp</exclude>
                   </excludes>
                 </filter>
               </filters>            



Mime
View raw message