Repository: servicemix Updated Branches: refs/heads/master bf9f30d72 -> 337486fd7
SM-2278 Upgrade to Karaf 3.0.1 (closes #6) Thanks to Wim Verreydt for the pull request!! Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/337486fd Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/337486fd Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/337486fd Branch: refs/heads/master Commit: 337486fd7312bd191e864743cc5e92b5e5054f05 Parents: bf9f30d Author: Krzysztof Sobkowiak <[email protected]> Authored: Tue May 6 17:51:14 2014 +0200 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Tue May 6 17:51:14 2014 +0200 ---------------------------------------------------------------------- assembly/pom.xml | 9 +++++---- .../etc/org.apache.karaf.features.cfg | 5 +++-- assembly/src/main/filtered-resources/internal.xml | 5 +++-- assembly/src/main/resources/etc/system.properties | 17 ++++++++++++++--- .../org/apache/karaf/branding/branding.properties | 2 ++ .../servicemix/itests/BasicAssemblyTests.scala | 2 +- .../itests/IntegrationTestConfigurations.scala | 2 +- parent/pom.xml | 2 +- 8 files changed, 30 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/337486fd/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 77468fa..4dc1885 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -132,19 +132,20 @@ <plugins> <plugin> <groupId>org.apache.karaf.tooling</groupId> - <artifactId>features-maven-plugin</artifactId> + <artifactId>karaf-maven-plugin</artifactId> <version>${karaf.version}</version> <executions> <execution> <id>add-features-to-repo</id> <phase>compile</phase> <goals> - <goal>add-features-to-repo</goal> + <goal>features-add-to-repository</goal> </goals> <configuration> <descriptors> - <descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor> - <descriptor>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</descriptor> + <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor> + <descriptor>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</descriptor> + <descriptor>mvn:org.apache.karaf.features/spring/${karaf.version}/xml/features</descriptor> <descriptor>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</descriptor> <descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor> <descriptor>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</descriptor> http://git-wip-us.apache.org/repos/asf/servicemix/blob/337486fd/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 9221e70..df2aac6 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 @@ -22,12 +22,13 @@ respectStartLvlDuringFeatureStartup=false # # Comma separated list of features repositories to register by default # -featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/internal,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/examples,mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features +featuresRepositories=mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features,mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features,mvn:org.apache.karaf.features/spring/${karaf.version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/internal,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/features,mvn:org.apache.servicemix/apache-servicemix/${version}/xml/examples,mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features,mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features # # Comma separated list of features to install at startup # -featuresBoot=config,eventadmin,activemq-broker-noweb,jaxrs-api,camel,camel-jms,camel-cxf,camel-blueprint,activemq-service,war +featuresBoot=config,standard,region,package,kar,ssh,management,eventadmin,activemq-broker-noweb,jaxrs-api,camel,camel-jms,camel-cxf,camel-blueprint,activemq-service,war + # # Defines if the boot features are started in asynchronous mode (in a dedicated thread) http://git-wip-us.apache.org/repos/asf/servicemix/blob/337486fd/assembly/src/main/filtered-resources/internal.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/internal.xml b/assembly/src/main/filtered-resources/internal.xml index 6c81d1d..ff93b6b 100644 --- a/assembly/src/main/filtered-resources/internal.xml +++ b/assembly/src/main/filtered-resources/internal.xml @@ -17,8 +17,9 @@ --> <features name="servicemix-internal-${version}"> <repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</repository> - <repository>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</repository> - <repository>mvn:org.apache.karaf.assemblies.features/enterprise/${karaf.version}/xml/features</repository> + <repository>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</repository> + <repository>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</repository> + <repository>mvn:org.apache.karaf.features/spring/${karaf.version}/xml/features</repository> <repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository> <!-- workaround before SM-2179 get addressed on CXF side--> http://git-wip-us.apache.org/repos/asf/servicemix/blob/337486fd/assembly/src/main/resources/etc/system.properties ---------------------------------------------------------------------- diff --git a/assembly/src/main/resources/etc/system.properties b/assembly/src/main/resources/etc/system.properties index d0f5e07..1b043e3 100644 --- a/assembly/src/main/resources/etc/system.properties +++ b/assembly/src/main/resources/etc/system.properties @@ -56,18 +56,29 @@ karaf.shell.init.script=${karaf.home}/etc/shell.init.script # karaf.shell.history.maxSize=0 # -# Default role name used for console authorization (JMX, SSH and WEB) +# Deletes the entire karaf.data directory at every start +# +karaf.clean.all = false + +# +# Deletes the karaf.data/cache directory at every start +# +karaf.clean.cache = false + + +# Default role names used for console authorization (JMX, SSH and WEB) +# # The syntax is the following: # [classname:]principal # where classname is the class name of the principal object # (defaults to org.apache.karaf.jaas.modules.RolePrincipal) # and principal is the name of the principal of that class -# (defaults to admin). +# (defaults to instance). # # Note that this value can be overriden using the various ConfigAdmin # configurations for JMX, SSH or the WebConsole. # -karaf.admin.role=admin +karaf.local.roles = admin,manager,viewer # # Set this empty property to avoid errors when validating xml documents. http://git-wip-us.apache.org/repos/asf/servicemix/blob/337486fd/branding/src/main/resources/org/apache/karaf/branding/branding.properties ---------------------------------------------------------------------- diff --git a/branding/src/main/resources/org/apache/karaf/branding/branding.properties b/branding/src/main/resources/org/apache/karaf/branding/branding.properties index 8e3332c..15aefec 100644 --- a/branding/src/main/resources/org/apache/karaf/branding/branding.properties +++ b/branding/src/main/resources/org/apache/karaf/branding/branding.properties @@ -30,3 +30,5 @@ Hit '\u001B[1m<tab>\u001B[0m' for a list of available commands\n\ and '\u001B[1m[cmd] --help\u001B[0m' for help on a specific command.\n\ Hit '<ctrl-d>' or 'osgi:shutdown' to shutdown ServiceMix.\n +prompt = \u001B[1m${USER}@${APPLICATION}\u001B[0m> + http://git-wip-us.apache.org/repos/asf/servicemix/blob/337486fd/itests/src/test/scala/org/apache/servicemix/itests/BasicAssemblyTests.scala ---------------------------------------------------------------------- diff --git a/itests/src/test/scala/org/apache/servicemix/itests/BasicAssemblyTests.scala b/itests/src/test/scala/org/apache/servicemix/itests/BasicAssemblyTests.scala index 477531b..4ebbe18 100644 --- a/itests/src/test/scala/org/apache/servicemix/itests/BasicAssemblyTests.scala +++ b/itests/src/test/scala/org/apache/servicemix/itests/BasicAssemblyTests.scala @@ -32,7 +32,7 @@ trait BasicAssemblyTests { self: IntegrationTestSupport => def isActive(bundle: Bundle) = Bundle.ACTIVE == bundle.getState def isResolved(bundle: Bundle) = Bundle.RESOLVED == bundle.getState - def isFragment(bundle: Bundle) = bundle.getHeaders("Fragement-Host").isEmpty + def isFragment(bundle: Bundle) = bundle.getHeaders().get("Fragment-Host") != null @Test http://git-wip-us.apache.org/repos/asf/servicemix/blob/337486fd/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala ---------------------------------------------------------------------- diff --git a/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala b/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala index c4479e5..070046e 100644 --- a/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala +++ b/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestConfigurations.scala @@ -51,7 +51,7 @@ trait IntegrationTestConfigurations { karafDistributionConfiguration(). frameworkUrl( maven().groupId("org.apache.servicemix").artifactId(artifact).`type`("zip").versionAsInProject()). - karafVersion("2.3.5").name("Apache ServiceMix (${name})"). + karafVersion("3.0.1").name("Apache ServiceMix (${name})"). unpackDirectory(new File(s"target/pax-exam/${artifact}")). useDeployFolder(false), keepRuntimeFolder(), http://git-wip-us.apache.org/repos/asf/servicemix/blob/337486fd/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index c0064c3..243fe19 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -43,7 +43,7 @@ <cxf.version>2.7.10</cxf.version> <felix.obr.version>1.6.6</felix.obr.version> - <karaf.version>2.3.5</karaf.version> + <karaf.version>3.0.1</karaf.version> <aries.proxy.version>1.0.2</aries.proxy.version> <aries.util.version>1.1.0</aries.util.version> <aries.blueprint.core.version>1.4.0</aries.blueprint.core.version>
