You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2010/07/07 16:07:43 UTC

svn commit: r961381 - in /activemq/trunk: activemq-karaf/src/main/resources/features.xml activemq-web-console/pom.xml

Author: dejanb
Date: Wed Jul  7 14:07:43 2010
New Revision: 961381

URL: http://svn.apache.org/viewvc?rev=961381&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2570 - more web console pom improvements

Modified:
    activemq/trunk/activemq-karaf/src/main/resources/features.xml
    activemq/trunk/activemq-web-console/pom.xml

Modified: activemq/trunk/activemq-karaf/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/features.xml?rev=961381&r1=961380&r2=961381&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Wed Jul  7 14:07:43 2010
@@ -1,4 +1,4 @@
-<features>
+<features name="activemq-${activemq-version}">
     <repository>mvn:org.apache.felix.karaf/apache-felix-karaf/1.6.0/xml/features</repository>
     
     <feature name="transaction" version="1.0.0"> 

Modified: activemq/trunk/activemq-web-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/pom.xml?rev=961381&r1=961380&r2=961381&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/pom.xml (original)
+++ activemq/trunk/activemq-web-console/pom.xml Wed Jul  7 14:07:43 2010
@@ -38,23 +38,12 @@
         <version>2.1-beta-1</version>
         <configuration>
           <packagingExcludes>
-            WEB-INF/lib/activation*.jar,
-            WEB-INF/lib/activeio*.jar,
-            WEB-INF/lib/activemq-core*.jar,
-            WEB-INF/lib/activemq-pool*.jar
-            WEB-INF/lib/activemq-console*.jar
-            WEB-INF/lib/geronimo*.jar,
-            WEB-INF/lib/jetty*.jar
+            WEB-INF/lib/jetty*.jar,
             WEB-INF/lib/servlet*.jar
           </packagingExcludes>
             <archive>
             <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
-<!--           <archive>
-            <manifest>
-              <addClasspath>true</addClasspath>
-            </manifest>
-          </archive>  -->          
+          </archive>          
         </configuration>
       </plugin>
       <plugin>