activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject [1/2] git commit: https://issues.apache.org/jira/browse/AMQ-4909
Date Wed, 11 Dec 2013 16:21:24 GMT
Updated Branches:
  refs/heads/trunk 0b581104c -> e64da4a71


https://issues.apache.org/jira/browse/AMQ-4909


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/26c41d03
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/26c41d03
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/26c41d03

Branch: refs/heads/trunk
Commit: 26c41d0362d9f4bf27568e6ce7fcfd7e2e59fde8
Parents: 0b58110
Author: Dejan Bosanac <dejan@nighttale.net>
Authored: Wed Dec 11 16:43:26 2013 +0100
Committer: Dejan Bosanac <dejan@nighttale.net>
Committed: Wed Dec 11 16:43:34 2013 +0100

----------------------------------------------------------------------
 activemq-camel/pom.xml                              |  1 +
 .../itest/ActiveMQBrokerNdCamelFeatureTest.java     |  4 ++--
 .../ActiveMQBrokerNdExternalCamelFeatureTest.java   |  2 +-
 activemq-karaf/src/main/resources/features.xml      |  1 +
 activemq-osgi/pom.xml                               | 16 +++-------------
 5 files changed, 8 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/26c41d03/activemq-camel/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index 8b8c51e..10303d3 100755
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -33,6 +33,7 @@
   <properties>
     <activemq.osgi.import.pkg>
        org.springframework.jms*;version="[3,4)",
+       *
     </activemq.osgi.import.pkg>
     <activemq.osgi.export>
       org.apache.activemq.camel*;version=${project.version};-noimport:=true

http://git-wip-us.apache.org/repos/asf/activemq/blob/26c41d03/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java
----------------------------------------------------------------------
diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java
b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java
index 9bec25d..bddb43e 100644
--- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java
+++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java
@@ -34,7 +34,7 @@ public class ActiveMQBrokerNdCamelFeatureTest extends AbstractJmsFeatureTest
{
 
     @Configuration
     public static Option[] configure() {
-        Option[] baseOptions = configure("activemq");
+        Option[] baseOptions = configure("activemq", "activemq-camel");
         return configureBrokerStart(append(scanFeatures(getCamelFeatureUrl(
                 MavenUtils.getArtifactVersion("org.apache.camel.karaf", "apache-camel")
         ), "activemq-camel"), baseOptions), "activemq-nd-camel");
@@ -42,7 +42,7 @@ public class ActiveMQBrokerNdCamelFeatureTest extends AbstractJmsFeatureTest
{
 
     @Test
     public void test() throws Throwable {
-        System.err.println(executeCommand("features:list").trim());
+        System.err.println(executeCommand("osgi:list").trim());
 
         withinReason(new Callable<Boolean>() {
             @Override

http://git-wip-us.apache.org/repos/asf/activemq/blob/26c41d03/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java
----------------------------------------------------------------------
diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java
b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java
index 35bea63..6bd4411 100644
--- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java
+++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java
@@ -39,7 +39,7 @@ public class ActiveMQBrokerNdExternalCamelFeatureTest extends AbstractJmsFeature
         // copy camel.xml into a temporary directory in karaf, so we later can hot-deploy
it
         Option[] baseOptions = append(
                 replaceConfigurationFile("data/tmp/camel.xml", new File(basedir + "/src/test/resources/org/apache/activemq/karaf/itest/camel.xml")),
-                configure("activemq"));
+                configure("activemq", "activemq-camel"));
         return configureBrokerStart(append(scanFeatures(getCamelFeatureUrl(
                 MavenUtils.getArtifactVersion("org.apache.camel.karaf", "apache-camel")
         ), "activemq-camel"), baseOptions));

http://git-wip-us.apache.org/repos/asf/activemq/blob/26c41d03/activemq-karaf/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml
index 311733b..0765770 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -39,6 +39,7 @@
 
     <feature name="activemq-camel" version="${project.version}" resolver="(obr)" start-level="50">
         <feature version="${project.version}">activemq-client</feature>
+        <bundle>mvn:org.apache.activemq/activemq-camel/${project.version}</bundle>
         <feature version="${camel-version-range}">camel-jms</feature>
         <feature version="${camel-version-range}">camel</feature>
     </feature>

http://git-wip-us.apache.org/repos/asf/activemq/blob/26c41d03/activemq-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 9882edb..4a917b0 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -41,6 +41,7 @@
       javax.servlet*;resolution:=optional,
       com.thoughtworks.xstream*;resolution:=optional,
       org.apache.activeio*;resolution:=optional,
+      org.apache.activemq.camel*;resolution:=optional,
       org.apache.camel*;resolution:=optional,
       org.apache.derby.jdbc*;resolution:=optional,
       org.apache.geronimo.transaction.manager*;resolution:=optional,
@@ -143,11 +144,6 @@
     <!-- Additional Dependencies. -->
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-camel</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-jaas</artifactId>
     </dependency>
 
@@ -279,6 +275,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
+          <excludeDependencies>activemq-all;scope=compile|runtime</excludeDependencies>
           <instructions>
             <Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator>
             <Embed-Dependency>
@@ -289,7 +286,7 @@
               groupId=org.xerial.snappy;inline=org/xerial/snappy/*
               -->
             </Embed-Dependency>
-            <Embed-Transitive>true</Embed-Transitive> 
+            <Embed-Transitive>true</Embed-Transitive>
             <!--
             <Bundle-NativeCode>
               META-INF/native/windows32/leveldbjni.dll;osname=Win32;processor=x86,
@@ -359,13 +356,6 @@
         </dependency>
         <dependency>
           <groupId>${project.groupId}</groupId>
-          <artifactId>activemq-camel</artifactId>
-          <version>${project.version}</version>
-          <classifier>sources</classifier>
-          <optional>true</optional>
-        </dependency>
-        <dependency>
-          <groupId>${project.groupId}</groupId>
           <artifactId>activemq-jaas</artifactId>
           <version>${project.version}</version>
           <classifier>sources</classifier>


Mime
View raw message