You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/12/18 07:34:03 UTC

git commit: [KARAF-2549] Fix jms feature

Updated Branches:
  refs/heads/master 6fb138811 -> 0047897fb


[KARAF-2549] Fix jms feature


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0047897f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0047897f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0047897f

Branch: refs/heads/master
Commit: 0047897fbf8e3ca0d816bfb820803f935b924715
Parents: 6fb1388
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Dec 18 07:32:48 2013 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Dec 18 07:32:48 2013 +0100

----------------------------------------------------------------------
 assemblies/features/enterprise/src/main/feature/feature.xml | 1 +
 jms/core/pom.xml                                            | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/0047897f/assemblies/features/enterprise/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml
index 73eec93..045f0ab 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -70,6 +70,7 @@
 
     <feature name='jms' description='JMS service and commands' version='${project.version}' resolver='(obr)'>
         <details>JMS support provinding service, commands, and MBean.</details>
+        <feature>transaction</feature>
         <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
         <bundle>mvn:org.apache.karaf.jms/org.apache.karaf.jms.core/${project.version}</bundle>
         <bundle>mvn:org.apache.karaf.jms/org.apache.karaf.jms.command/${project.version}</bundle>

http://git-wip-us.apache.org/repos/asf/karaf/blob/0047897f/jms/core/pom.xml
----------------------------------------------------------------------
diff --git a/jms/core/pom.xml b/jms/core/pom.xml
index 1ae2f18..222216a 100644
--- a/jms/core/pom.xml
+++ b/jms/core/pom.xml
@@ -82,7 +82,8 @@
                             org.apache.karaf.jms
                         </Export-Package>
                         <Import-Package>
-                            org.apache.activemq*;resolution:=optional
+                            org.apache.activemq*;resolution:=optional,
+                            *
                         </Import-Package>
                         <Private-Package>
                             org.apache.karaf.jms.internal