You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2013/11/04 15:09:39 UTC
git commit: https://issues.apache.org/jira/browse/AMQ-4844 -
introduce activemq core karaf features
Updated Branches:
refs/heads/trunk 4109b7905 -> 85fc68600
https://issues.apache.org/jira/browse/AMQ-4844 - introduce activemq core karaf features
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/85fc6860
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/85fc6860
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/85fc6860
Branch: refs/heads/trunk
Commit: 85fc6860062db2c6245382e1562288b95d5b6804
Parents: 4109b79
Author: Dejan Bosanac <de...@nighttale.net>
Authored: Mon Nov 4 15:07:51 2013 +0100
Committer: Dejan Bosanac <de...@nighttale.net>
Committed: Mon Nov 4 15:08:17 2013 +0100
----------------------------------------------------------------------
activemq-karaf/pom.xml | 5 ++
.../src/main/resources/features-core.xml | 67 ++++++++++++++++++++
activemq-karaf/src/main/resources/features.xml | 45 +------------
3 files changed, 73 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/85fc6860/activemq-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml
index 31e26f9..0aaa160 100644
--- a/activemq-karaf/pom.xml
+++ b/activemq-karaf/pom.xml
@@ -143,6 +143,11 @@
<classifier>features</classifier>
</artifact>
<artifact>
+ <file>target/classes/features-core.xml</file>
+ <type>xml</type>
+ <classifier>features-core</classifier>
+ </artifact>
+ <artifact>
<file>target/classes/activemq.xml</file>
<type>xml</type>
<classifier>activemq</classifier>
http://git-wip-us.apache.org/repos/asf/activemq/blob/85fc6860/activemq-karaf/src/main/resources/features-core.xml
----------------------------------------------------------------------
diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml
new file mode 100644
index 0000000..9c18f0c
--- /dev/null
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -0,0 +1,67 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+<features name="activemq-core-${project.version}">
+
+ <!-- Bundles needed if only client will be deployed in the container -->
+ <feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}" resolver="(obr)" start-level="50">
+ <feature version="[3.1,4)">spring</feature>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
+ <bundle dependency="true">mvn:org.jvnet.jaxb2_commons/jaxb2-basics-runtime/${jaxb-basics-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle>
+ <bundle dependency="false">mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
+ <bundle dependency="false">mvn:commons-net/commons-net/${commons-net-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
+ <!-- uber osgi bundle means client is not that lean, todo: introduce client osgi bundle -->
+ <bundle dependency="false">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
+ <bundle>mvn:org.apache.activemq/activemq-osgi/${project.version}</bundle>
+ </feature>
+
+ <!-- All bundles needed by the broker -->
+ <feature name="activemq" description="ActiveMQ broker libraries" version="${project.version}" resolver="(obr)" start-level="50">
+ <feature>jetty</feature>
+ <feature version="${project.version}">activemq-client</feature>
+ <bundle>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
+ <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
+ <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
+ <bundle dependency="true">mvn:commons-codec/commons-codec/1.4</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.7_5</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.9.0_1</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
+ <bundle dependency="true">mvn:joda-time/joda-time/${jodatime-bundle-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/2.0.0</bundle>
+ <bundle dependency="true">mvn:org.apache.aries/org.apache.aries.util/${aries-version}</bundle>
+ <bundle dependency="true">mvn:org.apache.activemq/activeio-core/${activeio-version}</bundle>
+ <bundle dependency="true">mvn:org.codehaus.jettison/jettison/${jettison-version}</bundle>
+ <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
+ <bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scala-library/${scala-bundle-version}</bundle>
+<!-- Scala 2.9 is not OSGi bundle. But 2.10 is
+ <bundle dependency="true">mvn:org.scala-lang/scala-library/${scala-version}</bundle>
+-->
+ </feature>
+ </features>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq/blob/85fc6860/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 f14a889..311733b 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -20,50 +20,7 @@
<features name="activemq-${project.version}">
- <!-- Bundles needed if only client will be deployed in the container -->
- <feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}" resolver="(obr)" start-level="50">
- <feature version="[3.1,4)">spring</feature>
- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
- <bundle dependency="true">mvn:org.jvnet.jaxb2_commons/jaxb2-basics-runtime/${jaxb-basics-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle>
- <bundle dependency="false">mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
- <bundle dependency="false">mvn:commons-net/commons-net/${commons-net-version}</bundle>
- <bundle dependency='true'>wrap:mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}$Import-Package=*;resolution:=optional&Export-Package=org.apache.zookeeper*;-noimport:=true&overwrite=merge</bundle>
- <!-- uber osgi bundle means client is not that lean, todo: introduce client osgi bundle -->
- <bundle dependency="false">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
- <bundle>mvn:org.apache.activemq/activemq-osgi/${project.version}</bundle>
- </feature>
-
- <!-- All bundles needed by the broker -->
- <feature name="activemq" description="ActiveMQ broker libraries" version="${project.version}" resolver="(obr)" start-level="50">
- <feature>jetty</feature>
- <feature version="${project.version}">activemq-client</feature>
- <bundle>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle>
- <bundle dependency="true">mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
- <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
- <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
- <bundle dependency="true">mvn:commons-codec/commons-codec/1.4</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.7_5</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/1.9.0_1</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
- <bundle dependency="true">mvn:joda-time/joda-time/${jodatime-bundle-version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
- <bundle dependency="true">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries-version}</bundle>
- <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/2.0.0</bundle>
- <bundle dependency="true">mvn:org.apache.aries/org.apache.aries.util/${aries-version}</bundle>
- <bundle dependency="true">mvn:org.apache.activemq/activeio-core/${activeio-version}</bundle>
- <bundle dependency="true">mvn:org.codehaus.jettison/jettison/${jettison-version}</bundle>
- <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
- <bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scala-library/${scala-bundle-version}</bundle>
-<!-- Scala 2.9 is not OSGi bundle. But 2.10 is
- <bundle dependency="true">mvn:org.scala-lang/scala-library/${scala-version}</bundle>
--->
- </feature>
+ <repository>mvn:org.apache.activemq/activemq-karaf/${project.version}/xml/features-core</repository>
<!-- Starts the broker with default configuration -->
<feature name="activemq-broker-noweb" description="Full ActiveMQ broker with default configuration" version="${project.version}" resolver="(obr)" start-level="50">