Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Dejan Bosanac 2013-12-11 16:43:26 +01:00
parent 0b581104c7
commit 26c41d0362
5 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
activemq-camel/pom.xml
View File

@ -33,6 +33,7 @@
<properties> <properties>
<activemq.osgi.import.pkg> <activemq.osgi.import.pkg>
org.springframework.jms*;version="[3,4)", org.springframework.jms*;version="[3,4)",
*
</activemq.osgi.import.pkg> </activemq.osgi.import.pkg>
<activemq.osgi.export> <activemq.osgi.export>
org.apache.activemq.camel*;version=${project.version};-noimport:=true org.apache.activemq.camel*;version=${project.version};-noimport:=true

4
activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdCamelFeatureTest.java
View File

@ -34,7 +34,7 @@ public class ActiveMQBrokerNdCamelFeatureTest extends AbstractJmsFeatureTest {
@Configuration @Configuration
public static Option[] configure() { public static Option[] configure() {
Option[] baseOptions = configure("activemq"); Option[] baseOptions = configure("activemq", "activemq-camel");
return configureBrokerStart(append(scanFeatures(getCamelFeatureUrl( return configureBrokerStart(append(scanFeatures(getCamelFeatureUrl(
MavenUtils.getArtifactVersion("org.apache.camel.karaf", "apache-camel") MavenUtils.getArtifactVersion("org.apache.camel.karaf", "apache-camel")
), "activemq-camel"), baseOptions), "activemq-nd-camel"); ), "activemq-camel"), baseOptions), "activemq-nd-camel");
@ -42,7 +42,7 @@ public class ActiveMQBrokerNdCamelFeatureTest extends AbstractJmsFeatureTest {
@Test @Test
public void test() throws Throwable { public void test() throws Throwable {
System.err.println(executeCommand("features:list").trim()); System.err.println(executeCommand("osgi:list").trim());
withinReason(new Callable<Boolean>() { withinReason(new Callable<Boolean>() {
@Override @Override

2
activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdExternalCamelFeatureTest.java
View File

@ -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 // copy camel.xml into a temporary directory in karaf, so we later can hot-deploy it
Option[] baseOptions = append( Option[] baseOptions = append(
replaceConfigurationFile("data/tmp/camel.xml", new File(basedir + "/src/test/resources/org/apache/activemq/karaf/itest/camel.xml")), 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( return configureBrokerStart(append(scanFeatures(getCamelFeatureUrl(
MavenUtils.getArtifactVersion("org.apache.camel.karaf", "apache-camel") MavenUtils.getArtifactVersion("org.apache.camel.karaf", "apache-camel")
), "activemq-camel"), baseOptions)); ), "activemq-camel"), baseOptions));

1
activemq-karaf/src/main/resources/features.xml
View File

@ -39,6 +39,7 @@
<feature name="activemq-camel" version="${project.version}" resolver="(obr)" start-level="50"> <feature name="activemq-camel" version="${project.version}" resolver="(obr)" start-level="50">
<feature version="${project.version}">activemq-client</feature> <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-jms</feature>
<feature version="${camel-version-range}">camel</feature> <feature version="${camel-version-range}">camel</feature>
</feature> </feature>

14
activemq-osgi/pom.xml
View File

@ -41,6 +41,7 @@
javax.servlet*;resolution:=optional, javax.servlet*;resolution:=optional,
com.thoughtworks.xstream*;resolution:=optional, com.thoughtworks.xstream*;resolution:=optional,
org.apache.activeio*;resolution:=optional, org.apache.activeio*;resolution:=optional,
org.apache.activemq.camel*;resolution:=optional,
org.apache.camel*;resolution:=optional, org.apache.camel*;resolution:=optional,
org.apache.derby.jdbc*;resolution:=optional, org.apache.derby.jdbc*;resolution:=optional,
org.apache.geronimo.transaction.manager*;resolution:=optional, org.apache.geronimo.transaction.manager*;resolution:=optional,
@ -141,11 +142,6 @@
</dependency> </dependency>
<!-- Additional Dependencies. --> <!-- Additional Dependencies. -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-camel</artifactId>
</dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>activemq-jaas</artifactId> <artifactId>activemq-jaas</artifactId>
@ -279,6 +275,7 @@
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<configuration> <configuration>
<excludeDependencies>activemq-all;scope=compile|runtime</excludeDependencies>
<instructions> <instructions>
<Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator> <Bundle-Activator>org.apache.activemq.util.osgi.Activator</Bundle-Activator>
<Embed-Dependency> <Embed-Dependency>
@ -357,13 +354,6 @@
<classifier>sources</classifier> <classifier>sources</classifier>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-camel</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>activemq-jaas</artifactId> <artifactId>activemq-jaas</artifactId>