mirror of https://github.com/apache/activemq.git
This commit is contained in:
parent
0b581104c7
commit
26c41d0362
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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,
|
||||
|
@ -141,11 +142,6 @@
|
|||
</dependency>
|
||||
|
||||
<!-- Additional Dependencies. -->
|
||||
<dependency>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>activemq-camel</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<artifactId>activemq-jaas</artifactId>
|
||||
|
@ -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,
|
||||
|
@ -357,13 +354,6 @@
|
|||
<classifier>sources</classifier>
|
||||
<optional>true</optional>
|
||||
</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>
|
||||
|
|
Loading…
Reference in New Issue