https://issues.apache.org/activemq/browse/AMQ-2570 - finishing activemq feature and work started on activemq-web-console feature

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@901789 13f79535-47bb-0310-9956-ffa450edef68

activemq-karaf/src/main/resources/features.xml

@@ -1,5 +1,6 @@
 <features>
     <repository>mvn:org.apache.felix.karaf/apache-felix-karaf/1.1.0-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.ops4j.pax.web/features/0.7.2/xml/features</repository>
     
     <feature name="transaction" version="1.0.0"> 
         <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle> 
@@ -17,11 +18,19 @@
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jencks/2.1_1</bundle> 
     </feature>
     
+    <feature name="spring" version="${spring-version}">
+        <bundle>mvn:org.springframework/spring-core/${spring-version}</bundle>
+        <bundle>mvn:org.springframework/spring-beans/${spring-version}</bundle>
+        <bundle>mvn:org.springframework/spring-aop/${spring-version}</bundle>
+        <bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
+        <bundle>mvn:org.springframework/spring-context-support/${spring-version}</bundle>
+    </feature>
+    
     <feature name="activemq" version="${activemq-version}">
+        <feature version="1.2.0">http</feature>
+        <feature version="${spring-version}">spring</feature>
+        <feature version="1.2.0">spring-dm</feature> 
         <feature version="4.0.0">connector</feature> 
-        <config name="org.apache.servicemix.transaction">
-            transactionLogDir = data/txlog/
-        </config> 
         <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle> 
         <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle> 
         <bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
@@ -36,4 +45,11 @@
         <bundle>mvn:org.apache.activemq/activemq-pool/${activemq-version}</bundle> 
         <bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.commands/4.1.0-SNAPSHOT</bundle> 
     </feature>
+    
+    <feature name="activemq-web-console" version="${activemq-version}">
+        <feature version="${activemq-version}">activemq</feature>
+        <feature version='0.7.2'>pax-web-extenders</feature> 
+        <feature version='1.1.1'>pax-url-war</feature> 
+        <bundle>mvn:org.apache.activemq/activemq-web-console/${activemq-version}/war</bundle>
+    </feature>
 </features>

activemq-web-console/pom.xml

@@ -44,6 +44,10 @@
             WEB-INF/lib/xml-apis*.jar,
             WEB-INF/lib/xerces*.jar
           </warSourceExcludes>
+          <archive>
+            <!-- add the generated manifest to the war -->
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
         </configuration>
       </plugin>
       <plugin>
@@ -94,6 +98,33 @@
           <scanIntervalSeconds>10</scanIntervalSeconds>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <supportedProjectTypes>
+            <supportedProjectType>jar</supportedProjectType>
+            <supportedProjectType>bundle</supportedProjectType>
+            <supportedProjectType>war</supportedProjectType>
+          </supportedProjectTypes>
+          <instructions>
+            <Webapp-Context>activemqweb</Webapp-Context>
+            <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 -->
+          </instructions>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
@@ -258,5 +289,6 @@
 
   <properties>
     <jetty.port>8080</jetty.port>
+    <activemq.osgi.import.pkg></activemq.osgi.import.pkg>
   </properties>
 </project>