You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2014/04/14 00:39:23 UTC

git commit: SM-2282 Installation of the eventadmin feature fails

Repository: servicemix
Updated Branches:
  refs/heads/master f9f796669 -> 78f9aea36


SM-2282 Installation of the eventadmin feature fails

(cherry picked from the commit eb5eb4828c13aa580885b1e1b88c5fd71ec02edf)


Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/78f9aea3
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/78f9aea3
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/78f9aea3

Branch: refs/heads/master
Commit: 78f9aea3661d180f9afea2fa6124a16f3f12e83d
Parents: f9f7966
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Apr 14 00:35:43 2014 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Apr 14 00:38:47 2014 +0200

----------------------------------------------------------------------
 assembly/pom.xml                                                   | 1 +
 .../src/main/filtered-resources/etc/org.apache.karaf.features.cfg  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/78f9aea3/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 07a818d..77468fa 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -156,6 +156,7 @@
                                 <feature>cxf</feature>
                                 <feature>obr</feature>
                                 <feature>config</feature>
+                                <feature>eventadmin</feature>
                                 <feature>activemq-broker-noweb</feature>
                                 <feature>activemq-service</feature>
                                 <feature>camel</feature>

http://git-wip-us.apache.org/repos/asf/servicemix/blob/78f9aea3/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
index 4d80b06..9bedf60 100644
--- a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ b/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
@@ -25,7 +25,7 @@ featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.v
 #
 # Comma separated list of features to install at startup
 #
-featuresBoot=config,activemq-broker-noweb,activemq-service,jaxrs-api,camel,camel-jms,camel-cxf,camel-blueprint,war
+featuresBoot=config,eventadmin,activemq-broker-noweb,activemq-service,jaxrs-api,camel,camel-jms,camel-cxf,camel-blueprint,war
 
 #
 # Defines if the boot features are started in asynchronous mode (in a dedicated thread)