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/01/22 16:59:05 UTC

svn commit: r902134 - /activemq/trunk/activemq-web-console/pom.xml

Author: dejanb
Date: Fri Jan 22 15:59:05 2010
New Revision: 902134

URL: http://svn.apache.org/viewvc?rev=902134&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2570 - unsuccessful attempt to osgify the web console, karaf and amq spring versions clashes, saving this to try again when we upgrade spring

Modified:
    activemq/trunk/activemq-web-console/pom.xml

Modified: activemq/trunk/activemq-web-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/pom.xml?rev=902134&r1=902133&r2=902134&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/pom.xml (original)
+++ activemq/trunk/activemq-web-console/pom.xml Fri Jan 22 15:59:05 2010
@@ -44,10 +44,10 @@
             WEB-INF/lib/xml-apis*.jar,
             WEB-INF/lib/xerces*.jar
           </warSourceExcludes>
-          <archive>
-            <!-- add the generated manifest to the war -->
+          <!--  <archive>
             <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
           </archive>
+          -->
         </configuration>
       </plugin>
       <plugin>
@@ -98,7 +98,7 @@
           <scanIntervalSeconds>10</scanIntervalSeconds>
         </configuration>
       </plugin>
-      <plugin>
+ <!--       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <executions>
@@ -121,10 +121,12 @@
             <Web-ContextPath>activemqweb</Web-ContextPath>
             <Bundle-ClassPath>.,WEB-INF/classes</Bundle-ClassPath>
             <Embed-Directory>WEB-INF/lib</Embed-Directory>
-            <!-- use <Embed-Dependencies> to add other libs -->
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Transitive>true</Embed-Transitive>
+            <Import-Package>*;resolution:=optional</Import-Package>
           </instructions>
         </configuration>
-      </plugin>
+      </plugin> -->
     </plugins>
   </build>
 
@@ -289,6 +291,11 @@
 
   <properties>
     <jetty.port>8080</jetty.port>
-    <activemq.osgi.import.pkg></activemq.osgi.import.pkg>
+<!--      <activemq.osgi.dynamic.import>
+        javax.naming,
+        org.xml.*,
+        javax.xml.*,
+        org.w3c.*,
+    </activemq.osgi.dynamic.import> -->
   </properties>
 </project>