activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1066200 - in /activemq/activemq-apollo/trunk: apollo-broker/pom.xml apollo-web/pom.xml pom.xml
Date Tue, 01 Feb 2011 20:51:06 GMT
Author: chirino
Date: Tue Feb  1 20:51:06 2011
New Revision: 1066200

URL: http://svn.apache.org/viewvc?rev=1066200&view=rev
Log:
web module now produces an OSGi bundle.

Modified:
    activemq/activemq-apollo/trunk/apollo-broker/pom.xml
    activemq/activemq-apollo/trunk/apollo-web/pom.xml
    activemq/activemq-apollo/trunk/pom.xml

Modified: activemq/activemq-apollo/trunk/apollo-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/pom.xml?rev=1066200&r1=1066199&r2=1066200&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/pom.xml Tue Feb  1 20:51:06 2011
@@ -35,7 +35,6 @@
   <name>${project.artifactId}</name>
 
   <properties>
-    <!-- <apollo.osgi.activator>org.apache.activemq.apollo.util.ClassFinderServiceExporter</apollo.osgi.activator>
-->
   </properties>
 
   <dependencies>

Modified: activemq/activemq-apollo/trunk/apollo-web/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-web/pom.xml?rev=1066200&r1=1066199&r2=1066200&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-web/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-web/pom.xml Tue Feb  1 20:51:06 2011
@@ -205,6 +205,34 @@
       </plugin>
       
       <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>${bundle-plugin-version}</version>
+        <extensions>true</extensions>
+        <inherited>true</inherited>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+            <configuration>
+              <supportedProjectTypes>
+                <supportedProjectType>war</supportedProjectType>
+              </supportedProjectTypes>
+              <instructions>
+                <!-- <Export-Package>!*</Export-Package> -->
+                <!-- <Import-Package>javax.servlet,javax.servlet.http,org.osgi.framework,org.osgi.service.packageadmin</Import-Package>
-->
+                <!-- <Bundle-ClassPath>WEB-INF/classes</Bundle-ClassPath>
-->
+                <Webapp-Context>apollo</Webapp-Context>
+              </instructions>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <version>2.3.1</version>
@@ -217,6 +245,20 @@
         </executions>
         <configuration>
           <classifier>slim</classifier>
+          <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.1</version>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
         </configuration>
       </plugin>
             
@@ -251,6 +293,38 @@
               </filters>            
             </configuration>
           </execution>
+          <execution>
+            <id>osgi</id>
+            <phase>package</phase>
+            <goals><goal>uberize</goal></goals>
+            <configuration>
+              <uberArtifactAttached>true</uberArtifactAttached>
+              <uberClassifierName>osgi</uberClassifierName>
+              <artifactSet>
+                <includes>
+                  <include>org.apache.activemq:apollo-web</include>
+                </includes>
+              </artifactSet>            
+              <filters>
+                <filter>
+                  <artifact>org.apache.activemq:apollo-web</artifact>
+                  <excludes>
+                    <exclude>WEB-INF/lib/**</exclude>
+                    <exclude>**/*.scaml</exclude>
+                    <exclude>**/*.jade</exclude>
+                    <exclude>**/*.ssp</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+              <transformers>
+                <transformer implementation="org.fusesource.mvnplugins.uberize.transformer.ManifestEditor">
+                  <manifestEntries>
+                    <Bundle-ClassPath>WEB-INF/classes</Bundle-ClassPath>
+                  </manifestEntries>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1066200&r1=1066199&r2=1066200&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Tue Feb  1 20:51:06 2011
@@ -103,7 +103,7 @@
     <bdb-version>4.1.6</bdb-version>
     <jasypt-version>1.6</jasypt-version>
 
-    <scalate-version>1.3.2</scalate-version>
+    <scalate-version>1.4.0-SNAPSHOT</scalate-version>
     <scalamd-version>1.4</scalamd-version>
 
     <servlet-api-version>2.5</servlet-api-version>
@@ -127,15 +127,7 @@
     <osgi-version>4.2.0</osgi-version>
     <karaf-version>2.1.2</karaf-version>
     <features-maven-plugin-version>2.1.0</features-maven-plugin-version>
-    <maven-bundle-plugin-version>2.3.0-SNAPSHOT</maven-bundle-plugin-version>
-    <apollo.osgi.export.pkg>{local-packages}</apollo.osgi.export.pkg>
-    <apollo.osgi.name>${project.groupId}.${project.artifactId}</apollo.osgi.name>
-    <apollo.osgi.import>*</apollo.osgi.import>
-    <apollo.osgi.export>${apollo.osgi.export.pkg};version=${project.version};-noimport:=true</apollo.osgi.export>
-    <apollo.osgi.private>!*</apollo.osgi.private>
-    <apollo.osgi.dynamic></apollo.osgi.dynamic>
-    <apollo.osgi.host></apollo.osgi.host>
-    <apollo.osgi.activator></apollo.osgi.activator>
+    <bundle-plugin-version>2.3.1-SNAPSHOT</bundle-plugin-version>
   </properties>
 
   <prerequisites>
@@ -389,43 +381,26 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>${maven-bundle-plugin-version}</version>
+        <version>${bundle-plugin-version}</version>
         <extensions>true</extensions>
         <inherited>true</inherited>
         <configuration>
           <instructions>
-            <Fragment-Host>${apollo.osgi.host}</Fragment-Host>
-            <Bundle-Name>${project.artifactId}</Bundle-Name>
-            <Bundle-SymbolicName>${apollo.osgi.name}</Bundle-SymbolicName>
-            <Bundle-Activator>${apollo.osgi.activator}</Bundle-Activator>
-            <Export-Package>${apollo.osgi.export}</Export-Package>
-            <Import-Package>${apollo.osgi.import}</Import-Package>
-            <Private-Package>${apollo.osgi.private}</Private-Package>
-            <DynamicImport-Package>${apollo.osgi.dynamic}</DynamicImport-Package>
-            <Implementation-Title>Apache ActiveMQ Apollo</Implementation-Title>
+            <Implementation-Title>${project.artifactId}</Implementation-Title>
             <Implementation-Version>${project.version}</Implementation-Version>
+            <Bundle-Name>${project.artifactId}</Bundle-Name>
+            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Export-Package>{local-packages};version=${project.version};-noimport:=true</Export-Package>
+            <Import-Package>*</Import-Package>
+            <Private-Package>!*</Private-Package>
             <_versionpolicy-impl>[$(version;==;$(@)),$(version;=+;$(@)))</_versionpolicy-impl>
             <_versionpolicy-uses>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy-uses>
             <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
-            <_failok>${apollo.osgi.failok}</_failok>
+            <_failok>false</_failok>
           </instructions>
         </configuration>
-        <executions>
-          <execution>
-            <id>cleanVersions</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>cleanVersions</goal>
-            </goals>
-            <configuration>
-              <versions>
-                <apollo.osgi.version>${project.version}</apollo.osgi.version>
-              </versions>
-            </configuration>
-          </execution>
-        </executions>
       </plugin>
-
+      
     </plugins>
   </build>
   <reporting>



Mime
View raw message