activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r902867 - in /activemq/branches/activemq-5.3: ./ activemq-console/ activemq-core/ activemq-karaf/ activemq-karaf/src/ activemq-karaf/src/main/ activemq-karaf/src/main/resources/ activemq-optional/ activemq-web-console/ assembly/src/main/des...
Date Mon, 25 Jan 2010 16:42:53 GMT
Author: dejanb
Date: Mon Jan 25 16:42:52 2010
New Revision: 902867

URL: http://svn.apache.org/viewvc?rev=902867&view=rev
Log:
merging 893834,899673,900850,901789,902134,902135,902728,902850 - https://issues.apache.org/activemq/browse/AMQ-2570
& https://issues.apache.org/activemq/browse/AMQ-2550 - osgi & karaf support

Added:
    activemq/branches/activemq-5.3/activemq-karaf/   (props changed)
      - copied from r899673, activemq/trunk/activemq-karaf/
    activemq/branches/activemq-5.3/activemq-karaf/pom.xml
      - copied, changed from r899673, activemq/trunk/activemq-karaf/pom.xml
    activemq/branches/activemq-5.3/activemq-karaf/src/
      - copied from r899673, activemq/trunk/activemq-karaf/src/
    activemq/branches/activemq-5.3/activemq-karaf/src/main/
      - copied from r899673, activemq/trunk/activemq-karaf/src/main/
    activemq/branches/activemq-5.3/activemq-karaf/src/main/resources/
      - copied from r899673, activemq/trunk/activemq-karaf/src/main/resources/
    activemq/branches/activemq-5.3/activemq-karaf/src/main/resources/features.xml
      - copied, changed from r899673, activemq/trunk/activemq-karaf/src/main/resources/features.xml
Modified:
    activemq/branches/activemq-5.3/activemq-console/pom.xml
    activemq/branches/activemq-5.3/activemq-core/pom.xml
    activemq/branches/activemq-5.3/activemq-optional/pom.xml
    activemq/branches/activemq-5.3/activemq-web-console/pom.xml
    activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml
    activemq/branches/activemq-5.3/pom.xml

Modified: activemq/branches/activemq-5.3/activemq-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-console/pom.xml?rev=902867&r1=902866&r2=902867&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-console/pom.xml (original)
+++ activemq/branches/activemq-5.3/activemq-console/pom.xml Mon Jan 25 16:42:52 2010
@@ -36,6 +36,7 @@
       org.springframework*;resolution:=optional,
       sun.management*;resolution:=optional,
       org.josql*;resolution:=optional,
+      org.apache.velocity*;resolution:=optional,
       *
     </activemq.osgi.import.pkg>
     <activemq.osgi.export>
@@ -97,7 +98,7 @@
     </dependency>
 
     <dependency>
-      <groupId>velocity</groupId>
+      <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
     </dependency>
     <dependency>
@@ -105,6 +106,11 @@
       <artifactId>commons-collections</artifactId>
     </dependency>
     <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>${commons-lang-version}</version>
+    </dependency>
+    <dependency>
       <groupId>net.sf.josql</groupId>
       <artifactId>josql</artifactId>
     </dependency>

Modified: activemq/branches/activemq-5.3/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-core/pom.xml?rev=902867&r1=902866&r2=902867&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-core/pom.xml (original)
+++ activemq/branches/activemq-5.3/activemq-core/pom.xml Mon Jan 25 16:42:52 2010
@@ -32,6 +32,7 @@
 
   <properties>
     <activemq.osgi.import.pkg>
+      org.osgi.framework;version="[1.3,2)",
       com.thoughtworks.xstream*;resolution:=optional,
       org.apache.activeio*;resolution:=optional,
       org.apache.camel*;resolution:=optional,
@@ -99,6 +100,24 @@
     <dependency>
         <groupId>org.springframework.osgi</groupId>
         <artifactId>spring-osgi-core</artifactId>
+        <exclusions>
+            <exclusion>
+                <groupId>org.springframework</groupId>
+                <artifactId>org.springframework.context</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.springframework</groupId>
+                <artifactId>org.springframework.beans</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.springframework</groupId>
+                <artifactId>org.springframework.aop</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.springframework</groupId>
+                <artifactId>org.springframework.core</artifactId>
+            </exclusion>
+        </exclusions>
     </dependency>
     
 

Propchange: activemq/branches/activemq-5.3/activemq-karaf/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 25 16:42:52 2010
@@ -0,0 +1,4 @@
+target
+bin
+.project
+.settings

Copied: activemq/branches/activemq-5.3/activemq-karaf/pom.xml (from r899673, activemq/trunk/activemq-karaf/pom.xml)
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-karaf/pom.xml?p2=activemq/branches/activemq-5.3/activemq-karaf/pom.xml&p1=activemq/trunk/activemq-karaf/pom.xml&r1=899673&r2=902867&rev=902867&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/pom.xml (original)
+++ activemq/branches/activemq-5.3/activemq-karaf/pom.xml Mon Jan 25 16:42:52 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>5.4-SNAPSHOT</version>
+    <version>5.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-karaf</artifactId>

Copied: activemq/branches/activemq-5.3/activemq-karaf/src/main/resources/features.xml (from
r899673, activemq/trunk/activemq-karaf/src/main/resources/features.xml)
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-karaf/src/main/resources/features.xml?p2=activemq/branches/activemq-5.3/activemq-karaf/src/main/resources/features.xml&p1=activemq/trunk/activemq-karaf/src/main/resources/features.xml&r1=899673&r2=902867&rev=902867&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/branches/activemq-5.3/activemq-karaf/src/main/resources/features.xml Mon Jan
25 16:42:52 2010
@@ -1,10 +1,11 @@
 <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>

         <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/2.0.0</bundle>

-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.howl/1.0.1-1_1</bundle>

+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.howl/1.0.1-1_1</bundle>
         <bundle>mvn:org.apache.geronimo.components/geronimo-transaction/2.2-r634076</bundle>

         <bundle>mvn:org.springframework/spring-tx/2.5.6</bundle> 
         <bundle>mvn:org.apache.servicemix.transaction/org.apache.servicemix.transaction/1.0.0</bundle>

@@ -17,16 +18,37 @@
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jencks/2.1_1</bundle>

     </feature>
     
-    <feature name="activemq" version="5.3.0"> 
-    <feature version="4.0.0">connector</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.1.1">servlet-2.5</feature>
+        <feature version="${spring-version}">spring</feature>
+        <feature version="1.2.0">spring-dm</feature> 
+        <feature version="4.0.0">connector</feature> 
         <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>

-        <bundle>mvn:commons-pool/commons-pool/1.4</bundle> 
-        <bundle>mvn:org.apache.xbean/xbean-spring/3.6</bundle> 
-        <bundle>mvn:org.apache.activemq/activemq-core/5.3.0</bundle> 
-        <bundle>mvn:org.apache.activemq/kahadb/5.3.0</bundle> 
-        <bundle>mvn:org.apache.activemq/activemq-ra/5.3.0</bundle> 
-        <bundle>mvn:org.apache.activemq/activemq-console/5.3.0</bundle> 
-        <bundle>mvn:org.apache.activemq/activemq-pool/5.3.0</bundle> 
+        <bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>

+        <bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/2.4_3</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_3</bundle>
+        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.6.2_3</bundle>
+        <bundle>mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle> 
+        <bundle>mvn:org.apache.activemq/activemq-core/${activemq-version}</bundle>

+        <bundle>mvn:org.apache.activemq/kahadb/${activemq-version}</bundle> 
+        <bundle>mvn:org.apache.activemq/activemq-ra/${activemq-version}</bundle>

+        <bundle>mvn:org.apache.activemq/activemq-console/${activemq-version}</bundle>

+        <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>
+    
+    <!-- do "features:install pax-web" before installing this one  -->
+    <feature name="activemq-web-console" version="${activemq-version}">
+        <!-- <feature version="0.7.2">pax-web</feature> - it doesn't see 'war'
protocol since they are installed as the same feature -->
+        <bundle>war:mvn:org.apache.activemq/activemq-web-console/${activemq-version}/war?Webapp-Context=activemq-web-console</bundle>
+    </feature>
 </features>
\ No newline at end of file

Modified: activemq/branches/activemq-5.3/activemq-optional/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-optional/pom.xml?rev=902867&r1=902866&r2=902867&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-optional/pom.xml (original)
+++ activemq/branches/activemq-5.3/activemq-optional/pom.xml Mon Jan 25 16:42:52 2010
@@ -177,7 +177,7 @@
     </dependency>  
     
     <dependency>
-      <groupId>velocity</groupId>
+      <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
     </dependency>
     <dependency>

Modified: activemq/branches/activemq-5.3/activemq-web-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/activemq-web-console/pom.xml?rev=902867&r1=902866&r2=902867&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/activemq-web-console/pom.xml (original)
+++ activemq/branches/activemq-5.3/activemq-web-console/pom.xml Mon Jan 25 16:42:52 2010
@@ -29,7 +29,7 @@
   <packaging>war</packaging>
   <name>ActiveMQ :: Web Console</name>
   <description>Web Console for ActiveMQ</description>
-
+    
   <build>
     <plugins>
       <plugin>
@@ -44,6 +44,10 @@
             WEB-INF/lib/xml-apis*.jar,
             WEB-INF/lib/xerces*.jar
           </warSourceExcludes>
+          <!--  <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+          -->
         </configuration>
       </plugin>
       <plugin>
@@ -94,6 +98,35 @@
           <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>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Transitive>true</Embed-Transitive>
+            <Import-Package>*;resolution:=optional</Import-Package>
+          </instructions>
+        </configuration>
+      </plugin> -->
     </plugins>
   </build>
 
@@ -258,5 +291,11 @@
 
   <properties>
     <jetty.port>8080</jetty.port>
+<!--      <activemq.osgi.dynamic.import>
+        javax.naming,
+        org.xml.*,
+        javax.xml.*,
+        org.w3c.*,
+    </activemq.osgi.dynamic.import> -->
   </properties>
 </project>

Modified: activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml?rev=902867&r1=902866&r2=902867&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml (original)
+++ activemq/branches/activemq-5.3/assembly/src/main/descriptors/common-bin.xml Mon Jan 25
16:42:52 2010
@@ -202,6 +202,7 @@
         <include>commons-pool:commons-pool</include>
         <include>commons-codec:commons-codec</include>
         <include>commons-net:commons-net</include>
+        <include>commons-lang:commons-lang</include>
         <include>log4j:log4j</include>
         <include>mx4j:mx4j-remote</include>
         <include>mx4j:mx4j-tools</include>
@@ -221,7 +222,7 @@
         <include>org.codehaus.woodstox:wstx-asl</include>
         <include>org.springframework.ws:spring-oxm-tiger</include>
         <include>org.codehaus.jettison:jettison</include>
-        <include>velocity:velocity</include>
+        <include>org.apache.velocity:velocity</include>
         <include>net.sf.josql:josql</include>
       </includes>
     </dependencySet>

Modified: activemq/branches/activemq-5.3/pom.xml
URL: http://svn.apache.org/viewvc/activemq/branches/activemq-5.3/pom.xml?rev=902867&r1=902866&r2=902867&view=diff
==============================================================================
--- activemq/branches/activemq-5.3/pom.xml (original)
+++ activemq/branches/activemq-5.3/pom.xml Mon Jan 25 16:42:52 2010
@@ -51,6 +51,7 @@
     <openjpa-version>1.2.0</openjpa-version>
     <commons-dbcp-version>1.2.2</commons-dbcp-version>
     <commons-httpclient-version>3.1</commons-httpclient-version>
+    <commons-lang-version>2.4</commons-lang-version>
     <commons-logging-version>1.1</commons-logging-version>
     <commons-pool-version>1.4</commons-pool-version>
     <commons-primitives-version>1.0</commons-primitives-version>
@@ -78,6 +79,7 @@
     <xmlpull-version>1.1.3.4d_b4_min</xmlpull-version>
     <xstream-version>1.3.1</xstream-version>
     <xbean-version>3.6</xbean-version>
+    <velocity-version>1.6.2</velocity-version>
     <felix-version>2.0.1</felix-version>
     <commons-net-version>2.0</commons-net-version>
     <ftpserver-version>1.0.0</ftpserver-version>
@@ -124,6 +126,7 @@
     <module>activemq-core</module>
     <module>activemq-fileserver</module>
     <module>activemq-jaas</module>
+    <module>activemq-karaf</module>
     <module>activemq-openwire-generator</module>
     <module>activemq-optional</module>
     <module>activemq-pool</module>
@@ -286,6 +289,11 @@
         <artifactId>kahadb</artifactId>
         <version>${activemq-version}</version>
       </dependency>
+     <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-karaf</artifactId>
+        <version>${activemq-version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.activemq.protobuf</groupId>
         <artifactId>activemq-protobuf</artifactId>
@@ -911,9 +919,9 @@
     	</dependency>
 
       <dependency>
-        <groupId>velocity</groupId>
+        <groupId>org.apache.velocity</groupId>
         <artifactId>velocity</artifactId>
-        <version>1.4</version>
+        <version>${velocity-version}</version>
         <optional>true</optional>
       </dependency>
       <dependency>



Mime
View raw message