activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1064654 - in /activemq/activemq-apollo/trunk: ./ apollo-bdb/ apollo-broker/ apollo-cassandra/ apollo-cli/ apollo-dto/ apollo-hawtdb/ apollo-jdbm2/ apollo-scala/ apollo-selector/ apollo-stomp/ apollo-tcp/ apollo-transport/ apollo-util/
Date Fri, 28 Jan 2011 13:09:57 GMT
Author: chirino
Date: Fri Jan 28 13:09:56 2011
New Revision: 1064654

URL: http://svn.apache.org/viewvc?rev=1064654&view=rev
Log:
converting to bundles...

Modified:
    activemq/activemq-apollo/trunk/apollo-bdb/pom.xml
    activemq/activemq-apollo/trunk/apollo-broker/pom.xml
    activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml
    activemq/activemq-apollo/trunk/apollo-cli/pom.xml
    activemq/activemq-apollo/trunk/apollo-dto/pom.xml
    activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml
    activemq/activemq-apollo/trunk/apollo-jdbm2/pom.xml
    activemq/activemq-apollo/trunk/apollo-scala/pom.xml
    activemq/activemq-apollo/trunk/apollo-selector/pom.xml
    activemq/activemq-apollo/trunk/apollo-stomp/pom.xml
    activemq/activemq-apollo/trunk/apollo-tcp/pom.xml
    activemq/activemq-apollo/trunk/apollo-transport/pom.xml
    activemq/activemq-apollo/trunk/apollo-util/pom.xml
    activemq/activemq-apollo/trunk/pom.xml

Modified: activemq/activemq-apollo/trunk/apollo-bdb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-bdb/pom.xml?rev=1064654&r1=1064653&r2=1064654&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-bdb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-bdb/pom.xml Fri Jan 28 13:09:56 2011
@@ -29,8 +29,8 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>apollo-bdb</artifactId>
-  <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
   <name>${project.artifactId}</name>
 

Modified: activemq/activemq-apollo/trunk/apollo-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-broker/pom.xml?rev=1064654&r1=1064653&r2=1064654&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-broker/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-broker/pom.xml Fri Jan 28 13:09:56 2011
@@ -29,11 +29,19 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>apollo-broker</artifactId>
-  <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
   <name>${project.artifactId}</name>
 
+  <properties>
+    <apollo.osgi.export.pkg>org.apache.activemq.apollo.broker*</apollo.osgi.export.pkg>
+    <apollo.osgi.import>
+      org.eclipse.jetty*;resolution:=optional,
+      *
+    </apollo.osgi.import>
+  </properties>
+
   <dependencies>
   
     <dependency>

Modified: activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml?rev=1064654&r1=1064653&r2=1064654&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-cassandra/pom.xml Fri Jan 28 13:09:56 2011
@@ -29,8 +29,8 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>apollo-cassandra</artifactId>
-  <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
   <name>${project.artifactId}</name>
 

Modified: activemq/activemq-apollo/trunk/apollo-cli/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-cli/pom.xml?rev=1064654&r1=1064653&r2=1064654&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-cli/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-cli/pom.xml Fri Jan 28 13:09:56 2011
@@ -27,6 +27,7 @@
   <groupId>org.apache.activemq</groupId>
   <artifactId>apollo-cli</artifactId>
   <version>1.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
   <name>${project.artifactId}</name>
 

Modified: activemq/activemq-apollo/trunk/apollo-dto/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/pom.xml?rev=1064654&r1=1064653&r2=1064654&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/pom.xml Fri Jan 28 13:09:56 2011
@@ -28,8 +28,8 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>apollo-dto</artifactId>
-  <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
   <name>${project.artifactId}</name>
   

Modified: activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml?rev=1064654&r1=1064653&r2=1064654&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-hawtdb/pom.xml Fri Jan 28 13:09:56 2011
@@ -29,8 +29,8 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>apollo-hawtdb</artifactId>
-  <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
   <name>${project.artifactId}</name>
 

Modified: activemq/activemq-apollo/trunk/apollo-jdbm2/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-jdbm2/pom.xml?rev=1064654&r1=1064653&r2=1064654&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-jdbm2/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-jdbm2/pom.xml Fri Jan 28 13:09:56 2011
@@ -29,8 +29,8 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>apollo-jdbm2</artifactId>
-  <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
   <name>${project.artifactId}</name>
 

Modified: activemq/activemq-apollo/trunk/apollo-scala/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-scala/pom.xml?rev=1064654&r1=1064653&r2=1064654&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-scala/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-scala/pom.xml Fri Jan 28 13:09:56 2011
@@ -28,8 +28,8 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>apollo-scala</artifactId>
-  <packaging>pom</packaging>
   <version>1.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
 
   <name>${project.artifactId}</name>
   <description>Holds the common Maven settings for Scala based modules.</description>

Modified: activemq/activemq-apollo/trunk/apollo-selector/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-selector/pom.xml?rev=1064654&r1=1064653&r2=1064654&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-selector/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-selector/pom.xml Fri Jan 28 13:09:56 2011
@@ -28,8 +28,8 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>apollo-selector</artifactId>
-  <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
   <name>${project.artifactId}</name>
 

Modified: activemq/activemq-apollo/trunk/apollo-stomp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/pom.xml?rev=1064654&r1=1064653&r2=1064654&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/pom.xml Fri Jan 28 13:09:56 2011
@@ -29,8 +29,8 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>apollo-stomp</artifactId>
-  <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
   <name>${project.artifactId}</name>
 

Modified: activemq/activemq-apollo/trunk/apollo-tcp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-tcp/pom.xml?rev=1064654&r1=1064653&r2=1064654&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-tcp/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-tcp/pom.xml Fri Jan 28 13:09:56 2011
@@ -28,8 +28,8 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>apollo-tcp</artifactId>
-  <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
   <name>${project.artifactId}</name>
 

Modified: activemq/activemq-apollo/trunk/apollo-transport/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-transport/pom.xml?rev=1064654&r1=1064653&r2=1064654&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-transport/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-transport/pom.xml Fri Jan 28 13:09:56 2011
@@ -28,8 +28,8 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>apollo-transport</artifactId>
-  <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
   <name>${project.artifactId}</name>
 

Modified: activemq/activemq-apollo/trunk/apollo-util/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/pom.xml?rev=1064654&r1=1064653&r2=1064654&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-util/pom.xml Fri Jan 28 13:09:56 2011
@@ -29,8 +29,8 @@
 
   <groupId>org.apache.activemq</groupId>
   <artifactId>apollo-util</artifactId>
-  <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
 
   <name>${project.artifactId}</name>
 
@@ -47,7 +47,13 @@
       <url>http://scala-tools.org/repo-releases</url>
     </repository>
   </repositories>
-  
+
+  <properties>
+    <apollo.osgi.import.pkg>
+      *;resolution:=optional
+    </apollo.osgi.import.pkg>
+  </properties>
+
   <dependencies>
                 
     <dependency>
@@ -101,7 +107,7 @@
         </exclusion>
       </exclusions>
     </dependency>
-                
+
     <!-- Scala Support -->
     <dependency>
       <groupId>org.scala-lang</groupId>

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1064654&r1=1064653&r2=1064654&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Fri Jan 28 13:09:56 2011
@@ -123,14 +123,25 @@
     
     <cascal-version>1.3-SNAPSHOT</cascal-version>
     <hawtdb-version>1.6-SNAPSHOT</hawtdb-version>
+    
+    
+    <maven-bundle-plugin-version>2.2.0</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>
+    
   </properties>
 
   <prerequisites>
     <maven>2.2.1</maven>
   </prerequisites>
 
-  <url>http://activemq.apache.org/</url>
+  <url>http://activemq.apache.org/apollo</url>
 
   <mailingLists>
     <mailingList>
@@ -293,11 +304,6 @@
           </configuration>
         </plugin>
         
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>${felix-version}</version>
-        </plugin>
         <!-- <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>ianal-maven-plugin</artifactId>
@@ -377,37 +383,45 @@
           </execution>
         </executions>
       </plugin>
-      <!-- <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>ianal-maven-plugin</artifactId>
+      
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>${maven-bundle-plugin-version}</version>
+        <extensions>true</extensions>
+        <inherited>true</inherited>
+        <configuration>
+          <instructions>
+            <Bundle-Name>${project.artifactId}</Bundle-Name>
+            <Bundle-SymbolicName>${apollo.osgi.name}</Bundle-SymbolicName>
+            <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-Version>${project.version}</Implementation-Version>
+            <_versionpolicy-impl>[$(version;==;$(@)),$(version;=+;$(@)))</_versionpolicy-impl>
+            <_versionpolicy-uses>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy-uses>
+            <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+            <_failok>${apollo.osgi.failok}</_failok>
+          </instructions>
+        </configuration>
         <executions>
           <execution>
+            <id>cleanVersions</id>
+            <phase>generate-sources</phase>
             <goals>
-              <goal>verify-legal-files</goal>
+              <goal>cleanVersions</goal>
             </goals>
             <configuration>
-              <strict>true</strict>
+              <versions>
+                <apollo.osgi.version>${project.version}</apollo.osgi.version>
+              </versions>
             </configuration>
           </execution>
         </executions>
-      </plugin> -->
-      <!--<plugin>-->
-        <!--<groupId>org.apache.felix</groupId>-->
-        <!--<artifactId>maven-bundle-plugin</artifactId>-->
-        <!--<version>${felix-version}</version>-->
-        <!--<extensions>true</extensions>-->
-        <!--<configuration>-->
-          <!--<instructions>-->
-            <!--<Bundle-Name>${artifactId}</Bundle-Name>-->
-            <!--<Bundle-SymbolicName>${activemq.osgi.symbolic.name}</Bundle-SymbolicName>-->
-            <!--<Export-Package>${activemq.osgi.export}</Export-Package>-->
-            <!--<Import-Package>${activemq.osgi.import}</Import-Package>-->
-            <!--<Private-Package>${activemq.osgi.private.pkg}</Private-Package>-->
-            <!--<Implementation-Title>Apache ActiveMQ</Implementation-Title>-->
-            <!--<Implementation-Version>${project.version}</Implementation-Version>-->
-          <!--</instructions>-->
-        <!--</configuration>-->
-      <!--</plugin>-->
+      </plugin>
+
     </plugins>
   </build>
   <reporting>



Mime
View raw message