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 2016/01/25 21:44:53 UTC
[15/26] servicemix git commit: SM-2768: Upgrade to Apache Karaf 4
SM-2768: Upgrade to Apache Karaf 4
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/51e64756
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/51e64756
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/51e64756
Branch: refs/heads/master
Commit: 51e64756665b65e93cd898a34917c0fbc4044d7e
Parents: c473f33
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Tue Jan 19 01:26:45 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Tue Jan 19 01:26:45 2016 +0100
----------------------------------------------------------------------
assemblies/apache-servicemix/pom.xml | 56 +++++++++----
.../etc/org.apache.karaf.features.cfg | 82 +++++++++++++-------
.../src/main/resources/common-unix-bin.xml | 55 +------------
.../src/main/resources/etc/jre.properties | 16 ++--
.../etc/org.apache.karaf.features.obr.cfg | 38 ---------
.../src/main/resources/etc/system.properties | 63 ++++++++-------
.../src/main/resources/etc/users.properties | 2 +-
.../src/main/resources/examples-unix-bin.xml | 16 ----
.../src/main/feature/feature.xml | 58 +++++++-------
.../src/main/feature/feature.xml | 20 ++---
.../src/main/feature/feature.xml | 4 +-
.../servicemix-kie/src/main/feature/feature.xml | 16 ++--
.../itests/Drools6IntegrationTests.scala | 1 +
.../itests/ExamplesIntegrationTests.scala | 53 ++++++++-----
.../itests/IntegrationTestConfigurations.scala | 4 +-
.../itests/IntegrationTestSupport.scala | 2 +-
parent/pom.xml | 14 ++--
17 files changed, 236 insertions(+), 264 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/51e64756/assemblies/apache-servicemix/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/pom.xml b/assemblies/apache-servicemix/pom.xml
index 4aa3899..ab8538f 100644
--- a/assemblies/apache-servicemix/pom.xml
+++ b/assemblies/apache-servicemix/pom.xml
@@ -49,7 +49,6 @@
<artifactId>standard</artifactId>
<classifier>features</classifier>
<type>xml</type>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
@@ -195,14 +194,14 @@
<id>install-kar</id>
<phase>compile</phase>
<goals>
- <goal>install-kars</goal>
+ <goal>assembly</goal>
</goals>
</execution>
<!-- we will use custom assembly
<execution>
<id>package</id>
<goals>
- <goal>instance-create-archive</goal>
+ <goal>archive</goal>
</goals>
</execution>
-->
@@ -211,17 +210,30 @@
<installedFeatures>
<feature>wrapper</feature>
</installedFeatures>
+ <startupFeatures>
+ <feature>eventadmin</feature>
+ </startupFeatures>
<bootFeatures>
- <feature>joda-time</feature>
- <feature>cxf</feature>
- <feature>obr</feature>
- <feature>config</feature>
- <feature>standard</feature>
- <feature>package</feature>
- <feature>kar</feature>
+ <feature>wrap</feature>
+ <feature>aries-blueprint</feature>
+ <feature>shell</feature>
+ <feature>shell-compat</feature>
+ <feature>feature</feature>
+ <feature>jaas</feature>
<feature>ssh</feature>
<feature>management</feature>
- <feature>eventadmin</feature>
+ <feature>bundle</feature>
+ <feature>config</feature>
+ <feature>deployer</feature>
+ <feature>diagnostic</feature>
+ <feature>feature</feature>
+ <feature>instance</feature>
+ <feature>kar</feature>
+ <feature>log</feature>
+ <feature>package</feature>
+ <feature>service</feature>
+ <feature>system</feature>
+ <feature>cxf</feature>
<feature>activemq-broker-noweb</feature>
<feature>activemq-service</feature>
<feature>camel</feature>
@@ -230,10 +242,28 @@
<feature>camel-blueprint</feature>
<feature>war</feature>
<feature>jaxrs-api</feature>
- <feature>kie-aries-blueprint</feature>
+ <feature>camel-xstream</feature>
+ <!--<feature>jaxrs-api</feature>-->
+ <!--<feature>kie-aries-blueprint</feature>
<feature>kie-spring</feature>
- <feature>kie-camel</feature>
+ <feature>kie-camel</feature>-->
</bootFeatures>
+ <libraries>
+ <library>xerces-${xerces.version}.jar;url:="wrap:mvn:xerces/xercesImpl/${xerces.version}$Export-Package=org.apache.*;version=${xerces.version}";type:=endorsed;export:=true;delegate:=true</library>
+
+ <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxp-api-1.4/${servicemix.specs.version};type:=endorsed;export:=true</library>
+ <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix.specs.version};type:=endorsed;export:=true</library>
+ <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix.specs.version};type:=endorsed;export:=true</library>
+ <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version};type:=endorsed;export:=true</library>
+ <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version};type:=endorsed;export:=true</library>
+ <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.2/${servicemix.specs.version};type:=endorsed;export:=true</library>
+ <library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan.bundle.version};type:=endorsed;export:=true</library>
+ <library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan-serializer/${xalan-serializer.bundle.version};type:=endorsed;export:=true</library>
+ <library>mvn:javax.annotation/javax.annotation-api/1.2;type:=endorsed;export:=true</library>
+
+ <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activator/${servicemix.specs.version};type:=default;export:=true</library>
+ <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.locator/${servicemix.specs.version};type:=default;export:=true</library>
+ </libraries>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/51e64756/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg b/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
index 28b52c0..d641a04 100644
--- a/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ b/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
@@ -36,42 +36,68 @@
#
# Comma separated list of features repositories to register by default
#
-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.features/servicemix-internal/${project.version}/xml/features,\
- mvn:org.apache.servicemix.features/servicemix-features/${project.version}/xml/features,\
- mvn:org.apache.servicemix.features/servicemix-kie/${project.version}/xml/features,\
- mvn:org.apache.servicemix.features/servicemix-examples/${project.version}/xml/features,\
- 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/enterprise/${karaf.version}/xml/features, \
+ mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features, \
+ mvn:org.apache.karaf.features/spring/${karaf.version}/xml/features, \
+ mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features, \
+ mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features, \
+ mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features, \
+ mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features, \
+ mvn:org.apache.servicemix.features/servicemix-internal/${project.version}/xml/features, \
+ mvn:org.apache.servicemix.features/servicemix-examples/${project.version}/xml/features, \
+ mvn:org.apache.servicemix.features/servicemix-features/${project.version}/xml/features, \
+ mvn:org.apache.servicemix.features/servicemix-kie/${project.version}/xml/features
+
#
# Comma separated list of features to install at startup
#
-featuresBoot=\
- (obr,\
- eventadmin,\
- war),\
- config,\
- standard,\
- package,\
- kar,\
- ssh,\
- management,\
- activemq-broker-noweb,\
- jaxrs-api,\
- activemq-camel,\
- cxf,\
- camel-cxf,\
- camel-blueprint,\
- activemq-service
-
+featuresBoot = \
+ wrap, \
+ aries-blueprint, \
+ shell, \
+ shell-compat, \
+ feature, \
+ jaas, \
+ ssh, \
+ management, \
+ bundle, \
+ config, \
+ deployer, \
+ diagnostic, \
+ instance, \
+ kar, \
+ log, \
+ package, \
+ service, \
+ system, \
+ activemq-broker-noweb, \
+ activemq-camel, \
+ camel, \
+ cxf, \
+ camel-cxf, \
+ camel-blueprint, \
+ activemq-service, \
+ camel-xstream, \
+ war
#
# Defines if the boot features are started in asynchronous mode (in a dedicated thread)
#
featuresBootAsynchronous=false
+#
+# Service requirements enforcement
+#
+# By default, the feature resolver checks the service requirements/capabilities of
+# bundles for new features (xml schema >= 1.3.0) in order to automatically installs
+# the required bundles.
+# The following flag can have those values:
+# - disable: service requirements are completely ignored
+# - default: service requirements are ignored for old features
+# - enforce: service requirements are always verified
+#
+#serviceRequirements=default
+
http://git-wip-us.apache.org/repos/asf/servicemix/blob/51e64756/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml b/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
index 236ba90..8a649b4 100644
--- a/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
+++ b/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
@@ -23,19 +23,11 @@
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>bin/**</exclude>
- <exclude>etc/system.properties</exclude>
- <exclude>etc/org.apache.karaf.features.cfg</exclude>
- <exclude>etc/org.apache.karaf.features.obr.cfg</exclude>
- <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
- <exclude>etc/org.ops4j.pax.url.mvn.cfg</exclude>
- <exclude>etc/users.properties</exclude>
- <exclude>etc/custom.properties</exclude>
- <exclude>etc/jre.properties</exclude>
- <exclude>etc/jre.properties.cxf</exclude>
<exclude>LICENSE</exclude>
<exclude>NOTICE</exclude>
- <exclude>README</exclude>
- <exclude>RELEASE-NOTES</exclude>
+ <exclude>**/META-INF/**</exclude>
+ <exclude>setenv-*</exclude>
+ <exclude>*-unix-bin.xml</exclude>
</excludes>
<fileMode>0644</fileMode>
<directoryMode>0775</directoryMode>
@@ -60,47 +52,6 @@
<lineEnding>dos</lineEnding>
<fileMode>0755</fileMode>
</fileSet>
-
- <!-- Copy README and RELEASE-NOTES from root -->
- <fileSet>
- <directory>${project.build.outputDirectory}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>README</include>
- <include>RELEASE*</include>
- </includes>
- <lineEnding>unix</lineEnding>
- <fileMode>0644</fileMode>
- </fileSet>
-
- <!-- Copy over everything that needs to get unix line endings -->
- <fileSet>
- <directory>${project.build.outputDirectory}/etc</directory>
- <outputDirectory>/etc/</outputDirectory>
- <lineEnding>unix</lineEnding>
- <fileMode>0644</fileMode>
- <directoryMode>0775</directoryMode>
- </fileSet>
-
- <fileSet>
- <directory>${project.build.outputDirectory}/licenses</directory>
- <outputDirectory>/licenses/</outputDirectory>
- <lineEnding>unix</lineEnding>
- <fileMode>0644</fileMode>
- <directoryMode>0775</directoryMode>
- </fileSet>
-
- <!-- Copy over filtered resources -->
- <fileSet>
- <directory>${project.build.outputDirectory}/etc</directory>
- <outputDirectory>/etc/</outputDirectory>
- <includes>
- <include>*.*</include>
- </includes>
- <lineEnding>unix</lineEnding>
- <fileMode>0644</fileMode>
- <directoryMode>0775</directoryMode>
- </fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/51e64756/assemblies/apache-servicemix/src/main/resources/etc/jre.properties
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/etc/jre.properties b/assemblies/apache-servicemix/src/main/resources/etc/jre.properties
index 0a67bc1..03d0377 100644
--- a/assemblies/apache-servicemix/src/main/resources/etc/jre.properties
+++ b/assemblies/apache-servicemix/src/main/resources/etc/jre.properties
@@ -27,8 +27,8 @@ jre-1.6= \
javax.accessibility, \
javax.activation;version="1.1", \
javax.activity, \
- javax.annotation;version="1.1", \
- javax.annotation.processing;version="1.1", \
+ javax.annotation;version="1.0", \
+ javax.annotation.processing;version="1.0", \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \
@@ -136,8 +136,8 @@ jre-1.6= \
javax.xml.ws.http;version="2.2", \
javax.xml.ws.soap;version="2.2", \
javax.xml.ws.spi;version="2.2", \
- javax.xml.ws.spi.http;version="2.2", \
javax.xml.ws.wsaddressing;version="2.2", \
+ javax.xml.ws.spi.http;version="2.2", \
javax.xml.xpath, \
org.ietf.jgss, \
org.omg.CORBA, \
@@ -190,8 +190,8 @@ jre-1.7= \
javax.accessibility, \
javax.activation;version="1.1", \
javax.activity, \
- javax.annotation;version="1.1", \
- javax.annotation.processing;version="1.1", \
+ javax.annotation;version="1.0", \
+ javax.annotation.processing;version="1.0", \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \
@@ -299,8 +299,8 @@ jre-1.7= \
javax.xml.ws.http;version="2.2", \
javax.xml.ws.soap;version="2.2", \
javax.xml.ws.spi;version="2.2", \
- javax.xml.ws.spi.http;version="2.2", \
javax.xml.ws.wsaddressing;version="2.2", \
+ javax.xml.ws.spi.http;version="2.2", \
javax.xml.xpath, \
org.ietf.jgss, \
org.omg.CORBA, \
@@ -351,8 +351,8 @@ jre-1.8= \
javax.accessibility, \
javax.activation;version="1.1", \
javax.activity, \
- javax.annotation;version="1.2", \
- javax.annotation.processing;version="1.2", \
+ javax.annotation;version="1.0", \
+ javax.annotation.processing;version="1.0", \
javax.crypto, \
javax.crypto.interfaces, \
javax.crypto.spec, \
http://git-wip-us.apache.org/repos/asf/servicemix/blob/51e64756/assemblies/apache-servicemix/src/main/resources/etc/org.apache.karaf.features.obr.cfg
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/etc/org.apache.karaf.features.obr.cfg b/assemblies/apache-servicemix/src/main/resources/etc/org.apache.karaf.features.obr.cfg
deleted file mode 100644
index bb459b2..0000000
--- a/assemblies/apache-servicemix/src/main/resources/etc/org.apache.karaf.features.obr.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-################################################################################
-#
-# 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.
-#
-################################################################################
-
-#
-# This configuration file is used to configure the default values for features OBR resolver
-#
-
-#
-# Defines whether or not the features OBR resolver has to resolve optional imports as well. The default value is
-# false (do not attempt to resolve optional imports).
-#
-resolveOptionalImports = true
-
-#
-# Defines whether resolved bundles should be started by default. The default is true.
-#
-startByDefault = true
-
-#
-# Defines the start level for resolved bundles. The default is 80.
-#
-startLevel = 80
http://git-wip-us.apache.org/repos/asf/servicemix/blob/51e64756/assemblies/apache-servicemix/src/main/resources/etc/system.properties
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/etc/system.properties b/assemblies/apache-servicemix/src/main/resources/etc/system.properties
index 7f8b389..29b18af 100644
--- a/assemblies/apache-servicemix/src/main/resources/etc/system.properties
+++ b/assemblies/apache-servicemix/src/main/resources/etc/system.properties
@@ -28,35 +28,50 @@
# is not fully available.
# To change log levels, please refer to the org.ops4j.pax.logging.cfg file
# instead.
-org.ops4j.pax.logging.DefaultServiceLog.level=ERROR
+org.ops4j.pax.logging.DefaultServiceLog.level = ERROR
#
-# Name of this karaf instance.
+# Name of this Karaf instance.
#
-karaf.name=root
+karaf.name = root
#
# Default repository where bundles will be loaded from before using
-# other maven repositories. For the full maven configuration, see
+# other Maven repositories. For the full Maven configuration, see
# the org.ops4j.pax.url.mvn.cfg file.
#
-karaf.default.repository=system
+karaf.default.repository = system
#
# Location of a shell script that will be run when starting a shell
# session. This script can be used to create aliases and define
# additional commands.
#
-karaf.shell.init.script=${karaf.home}/etc/shell.init.script
+karaf.shell.init.script = ${karaf.etc}/shell.init.script
#
# Sets the maximum size of the shell command history. If not set,
# defaults to 500 entries. Setting to 0 will disable history.
#
-# karaf.shell.history.maxSize=0
+# karaf.shell.history.maxSize = 0
#
-# Roles to use when logging into a local Karaf console.
+# 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
+
+#
+# User name for the Karaf local console
+#
+karaf.local.user = karaf
+
+#
+# Roles to use when for the default user in the local Karaf console.
#
# The syntax is the following:
# [classname:]principal
@@ -65,46 +80,33 @@ karaf.shell.init.script=${karaf.home}/etc/shell.init.script
# and principal is the name of the principal of that class
# (defaults to instance).
#
-# Note that this value can be overriden using the various ConfigAdmin
-# configurations for JMX, SSH or the WebConsole.
-#
-karaf.local.roles = admin,manager,viewer
+karaf.local.roles = admin,manager,viewer,systembundles
#
# Set this empty property to avoid errors when validating xml documents.
#
-xml.catalog.files=
+xml.catalog.files =
#
-# Suppress the bell in the console when hitting backspace to many times
+# Suppress the bell in the console when hitting backspace too many times
# for example
#
-jline.nobell=true
-
-#
-# 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
+jline.nobell = true
#
# ServiceMix specs options
#
-org.apache.servicemix.specs.debug=false
-org.apache.servicemix.specs.timeout=0
+org.apache.servicemix.specs.debug = false
+org.apache.servicemix.specs.timeout = 0
#
# Settings for the OSGi 4.3 Weaving
# By default, we will not weave any classes. Change this setting to include classes
# that you application needs to have woven.
#
-org.apache.aries.proxy.weaving.enabled=none
+org.apache.aries.proxy.weaving.enabled = none
# Classes not to weave - Aries default + Xerces which is known to have issues.
-org.apache.aries.proxy.weaving.disabled=org.objectweb.asm.*,org.slf4j.*,org.apache.log4j.*,javax.*,org.apache.xerces.*
+org.apache.aries.proxy.weaving.disabled = org.objectweb.asm.*,org.slf4j.*,org.apache.log4j.*,javax.*,org.apache.xerces.*
#
# By default, only Karaf shell commands are secured, but additional services can be
@@ -142,6 +144,7 @@ karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*))
# karaf.lock.dir=/path/to/the/directory/containing/the/lock
#
+
#
# Default port for the OSGI HTTP Service
#
@@ -174,4 +177,4 @@ javax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFac
#
# CXF Log configuration
#
-org.apache.cxf.Logger=org.apache.cxf.common.logging.Slf4jLogger
+org.apache.cxf.Logger=org.apache.cxf.common.logging.Slf4jLogger
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/51e64756/assemblies/apache-servicemix/src/main/resources/etc/users.properties
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/etc/users.properties b/assemblies/apache-servicemix/src/main/resources/etc/users.properties
index ca4b482..d2d7869 100644
--- a/assemblies/apache-servicemix/src/main/resources/etc/users.properties
+++ b/assemblies/apache-servicemix/src/main/resources/etc/users.properties
@@ -30,7 +30,7 @@
# with the name "karaf".
#
smx = smx,_g_:admingroup
-_g_\:admingroup = group,admin,manager,viewer,webconsole
+_g_\:admingroup = group,admin,manager,viewer,webconsole,systembundles
# Workaround for SM-2267: sometimes, the webconsole configuration first hands out a ConnectionFactory
# that uses karaf/karaf as the credentials before picking up the settings in system.properties
http://git-wip-us.apache.org/repos/asf/servicemix/blob/51e64756/assemblies/apache-servicemix/src/main/resources/examples-unix-bin.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/examples-unix-bin.xml b/assemblies/apache-servicemix/src/main/resources/examples-unix-bin.xml
index 1b9f1aa..3277d6e 100644
--- a/assemblies/apache-servicemix/src/main/resources/examples-unix-bin.xml
+++ b/assemblies/apache-servicemix/src/main/resources/examples-unix-bin.xml
@@ -17,12 +17,6 @@
-->
<component>
<fileSets>
- <!-- Copy over karaf demo to examples folder -->
- <fileSet>
- <directory>${project.build.outputDirectory}/examples/karaf</directory>
- <outputDirectory>/examples/karaf</outputDirectory>
- <lineEnding>unix</lineEnding>
- </fileSet>
<!-- Copy over the examples -->
<fileSet>
@@ -81,14 +75,4 @@
</fileSet>
</fileSets>
- <files>
- <file>
- <source>${project.build.outputDirectory}/examples/pom.xml</source>
- <outputDirectory>/examples/</outputDirectory>
- <filtered>true</filtered>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- </files>
-
</component>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/51e64756/assemblies/features/servicemix-examples/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-examples/src/main/feature/feature.xml b/assemblies/features/servicemix-examples/src/main/feature/feature.xml
index e5f3b66..2218368 100644
--- a/assemblies/features/servicemix-examples/src/main/feature/feature.xml
+++ b/assemblies/features/servicemix-examples/src/main/feature/feature.xml
@@ -15,35 +15,35 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<features name="servicemix-examples-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.1"
+<features name="servicemix-examples-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.1 http://karaf.apache.org/xmlns/features/v1.2.1">
+ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
<!--
-
- Examples
-
-->
- <feature name="examples-activemq-camel-blueprint" version="${project.version}" resolver="(obr)">
+ <feature name="examples-activemq-camel-blueprint" version="${project.version}">
<feature version="${activemq.version}">activemq-broker-noweb</feature>
<feature version="${camel.version}">camel-jms</feature>
<feature version="${camel.version}">camel-blueprint</feature>
<bundle>mvn:org.apache.servicemix.examples/activemq-camel-blueprint/${project.version}</bundle>
</feature>
- <feature name="examples-cxf-osgi" version="${project.version}" resolver="(obr)">
+ <feature name="examples-cxf-osgi" version="${project.version}">
<feature version="${cxf.version}">cxf</feature>
<bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-osgi/${project.version}</bundle>
</feature>
- <feature name="examples-cxf-jaxrs" version="${project.version}" resolver="(obr)">
+ <feature name="examples-cxf-jaxrs" version="${project.version}">
<feature version="${cxf.version}">cxf</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-jaxrs/${project.version}</bundle>
</feature>
- <feature name="examples-cxf-jaxrs-blueprint" version="${project.version}" resolver="(obr)">
+ <feature name="examples-cxf-jaxrs-blueprint" version="${project.version}">
<feature version="${cxf.version}">cxf</feature>
<feature version="${version}">swagger-2.11</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
@@ -51,28 +51,28 @@
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-jaxrs-blueprint/${project.version}</bundle>
</feature>
- <feature name="examples-cxf-jaxws-blueprint" version="${project.version}" resolver="(obr)">
+ <feature name="examples-cxf-jaxws-blueprint" version="${project.version}">
<feature version="${cxf.version}">cxf</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
<bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-jaxws-blueprint/${project.version}</bundle>
</feature>
- <feature name="examples-camel-sql-derby" version="${project.version}" resolver="(obr)">
+ <feature name="examples-camel-sql-derby" version="${project.version}">
<feature version="${camel.version}">camel-sql</feature>
<bundle dependency="true">mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.derby/${derby.bundle.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/camel-sql-datasource-derby/${version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/camel-sql-orders/${project.version}</bundle>
</feature>
- <feature name="examples-camel-sql-pgsql" version="${project.version}" resolver="(obr)">
+ <feature name="examples-camel-sql-pgsql" version="${project.version}">
<feature version="${camel.version}">camel-sql</feature>
<bundle dependency="true">mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
<bundle dependency="true">wrap:mvn:postgresql/postgresql/${postgresql.version}.jdbc4</bundle>
<bundle>mvn:org.apache.servicemix.examples/camel-sql-datasource-pgsql/${version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/camel-sql-orders/${project.version}</bundle>
</feature>
- <feature name="examples-camel-sql-h2" version="${project.version}" resolver="(obr)">
+ <feature name="examples-camel-sql-h2" version="${project.version}">
<feature version="${camel.version}">camel-sql</feature>
<bundle dependency="true">mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.compendium/${osgi.version}</bundle>
@@ -80,51 +80,51 @@
<bundle>mvn:org.apache.servicemix.examples/camel-sql-datasource-h2/${version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/camel-sql-orders/${project.version}</bundle>
</feature>
- <feature name="examples-camel-osgi" version="${project.version}" resolver="(obr)">
+ <feature name="examples-camel-osgi" version="${project.version}">
<feature version="${camel.version}">camel</feature>
<bundle>mvn:org.apache.servicemix.examples/camel-osgi/${project.version}</bundle>
</feature>
- <feature name="examples-camel-blueprint" version="${project.version}" resolver="(obr)">
+ <feature name="examples-camel-blueprint" version="${project.version}">
<feature version="${camel.version}">camel-blueprint</feature>
<bundle>mvn:org.apache.servicemix.examples/camel-blueprint/${project.version}</bundle>
</feature>
- <feature name="examples-camel-drools" version="${project.version}" resolver="(obr)">
+ <feature name="examples-camel-drools" version="${project.version}">
<feature version="${camel.version}">camel-jms</feature>
<feature version="${drools.version}">drools</feature>
<bundle>mvn:org.apache.servicemix.examples/camel-drools/${project.version}</bundle>
</feature>
- <feature name="examples-camel-drools-blueprint" version="${project.version}" resolver="(obr)">
+ <feature name="examples-camel-drools-blueprint" version="${project.version}">
<feature version="${camel.version}">camel-jms</feature>
<feature version="${drools.version}">drools</feature>
<bundle>mvn:org.apache.servicemix.examples/camel-drools-blueprint/${project.version}</bundle>
</feature>
- <feature name="examples-camel-cxf-rest" version="${project.version}" resolver="(obr)">
+ <feature name="examples-camel-cxf-rest" version="${project.version}">
<bundle>mvn:org.apache.servicemix.examples/camel-cxf-rest-service/${project.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/camel-cxf-rest-route/${project.version}</bundle>
</feature>
- <feature name="examples-camel-cxf-soap" version="${project.version}" resolver="(obr)">
+ <feature name="examples-camel-cxf-soap" version="${project.version}">
<feature version="${camel.version}">camel-jaxb</feature>
<bundle>mvn:org.apache.servicemix.examples/camel-cxf-soap-service/${project.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/camel-cxf-soap-route/${project.version}</bundle>
</feature>
- <feature name="examples-cxf-ws-addressing" version="${project.version}" resolver="(obr)">
+ <feature name="examples-cxf-ws-addressing" version="${project.version}">
<feature version="${cxf.version}">cxf-core</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
<bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-addressing/${project.version}</bundle>
</feature>
- <feature name="examples-cxf-ws-security-osgi" version="${project.version}" resolver="(obr)">
+ <feature name="examples-cxf-ws-security-osgi" version="${project.version}">
<feature version="${cxf.version}">cxf-core</feature>
<feature version="${cxf.version}">cxf-ws-security</feature>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-osgi/${project.version}</bundle>
</feature>
- <feature name="examples-cxf-ws-security-blueprint" version="${project.version}" resolver="(obr)">
+ <feature name="examples-cxf-ws-security-blueprint" version="${project.version}">
<feature version="${cxf.version}">cxf-core</feature>
<feature version="${cxf.version}">cxf-ws-security</feature>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-blueprint/${project.version}</bundle>
</feature>
- <feature name="examples-cxf-ws-security-signature" version="${project.version}" resolver="(obr)">
+ <feature name="examples-cxf-ws-security-signature" version="${project.version}">
<feature version="${cxf.version}">cxf-core</feature>
<feature version="${cxf.version}">cxf-ws-security</feature>
<feature version="${cxf.version}">cxf-ws-rm</feature>
@@ -133,12 +133,12 @@
<bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-signature/${project.version}</bundle>
</feature>
- <feature name="examples-cxf-ws-rm" version="${project.version}" resolver="(obr)">
+ <feature name="examples-cxf-ws-rm" version="${project.version}">
<feature version="${cxf.version}">cxf-core</feature>
<feature version="${cxf.version}">cxf-ws-rm</feature>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-rm/${project.version}</bundle>
</feature>
- <feature name="examples-cxf-wsn-receive" version="${project.version}" resolver="(obr)">
+ <feature name="examples-cxf-wsn-receive" version="${project.version}">
<feature version="${camel.version}">camel-jetty</feature>
<feature version="${camel.version}">camel-jms</feature>
<feature version="${camel.version}">camel-jaxb</feature>
@@ -146,40 +146,40 @@
<bundle>mvn:org.apache.servicemix.examples/cxf-wsn-base/${project.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-wsn-receive/${project.version}</bundle>
</feature>
- <feature name="examples-cxf-wsn-notifier" version="${project.version}" resolver="(obr)">
+ <feature name="examples-cxf-wsn-notifier" version="${project.version}">
<feature version="${version}">examples-cxf-wsn-receive</feature>
<bundle>mvn:org.apache.servicemix.examples/cxf-wsn-notifier/${project.version}</bundle>
</feature>
- <feature name="examples-activiti-camel" version="${project.version}" resolver="(obr)">
+ <feature name="examples-activiti-camel" version="${project.version}">
<feature version="${camel.version}">camel-core</feature>
<feature version="${activiti.version}">activiti</feature>
<bundle>mvn:org.apache.servicemix.examples/activiti-camel/${project.version}</bundle>
</feature>
- <feature name="examples-akka-camel" version="${project.version}" resolver="(obr)">
+ <feature name="examples-akka-camel" version="${project.version}">
<feature version="${akka.version}">akka</feature>
<feature version="${camel.version}">camel-scala</feature>
<bundle>mvn:org.apache.servicemix.examples/akka-camel/${project.version}</bundle>
</feature>
- <feature name="examples-drools-simple" version="${project.version}" resolver="(obr)">
+ <feature name="examples-drools-simple" version="${project.version}">
<feature version="${drools6.version}">drools6-module</feature>
<bundle>mvn:org.apache.servicemix.examples/drools-simple/${project.version}</bundle>
</feature>
- <feature name="examples-drools-camel-blueprint" version="${project.version}" resolver="(obr)">
+ <feature name="examples-drools-camel-blueprint" version="${project.version}">
<feature version="${drools6.version}">kie-camel</feature>
<feature version="${drools6.version}">kie-aries-blueprint</feature>
<bundle>mvn:org.apache.servicemix.examples/drools-camel-blueprint/${project.version}</bundle>
</feature>
- <feature name="examples-drools-spring" version="${project.version}" resolver="(obr)">
+ <feature name="examples-drools-spring" version="${project.version}">
<feature version="${drools6.version}">kie-spring</feature>
<bundle>mvn:org.apache.servicemix.examples/drools-spring/${project.version}</bundle>
</feature>
- <feature name="examples-drools-camel-cxf-server" version="${project.version}" resolver="(obr)">
+ <feature name="examples-drools-camel-cxf-server" version="${project.version}">
<feature version="${drools6.version}">kie-aries-blueprint</feature>
<feature version="${drools6.version}">kie-camel</feature>
<feature version="${camel.version}">camel-xstream</feature>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/51e64756/assemblies/features/servicemix-features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-features/src/main/feature/feature.xml b/assemblies/features/servicemix-features/src/main/feature/feature.xml
index 6ca7098..b24b54b 100644
--- a/assemblies/features/servicemix-features/src/main/feature/feature.xml
+++ b/assemblies/features/servicemix-features/src/main/feature/feature.xml
@@ -15,16 +15,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<features name="servicemix-features-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.1"
+<features name="servicemix-features-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.1 http://karaf.apache.org/xmlns/features/v1.2.1">
+ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
- <feature name="jms-appender" version="${project.version}" resolver="(obr)" start-level="50">
+ <feature name="jms-appender" version="${project.version}" start-level="50">
<feature version="${activemq.version}">activemq-broker-noweb</feature>
<bundle>mvn:org.apache.servicemix.logging/jms-appender/${project.version}</bundle>
</feature>
- <feature name="activemq-service" version="${project.version}" resolver="(obr)" start-level="50">
+ <feature name="activemq-service" version="${project.version}" start-level="50">
<feature version="${activemq.version}">activemq-broker-noweb</feature>
<feature version="${activemq.version}">activemq-camel</feature>
<bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.service/${project.version}</bundle>
@@ -35,7 +35,7 @@
</feature>
<!-- Activiti support -->
- <feature name="activiti" version="${activiti.version}" resolver="(obr)">
+ <feature name="activiti" version="${activiti.version}">
<feature version="${jpa.version}">jpa</feature>
<feature version="${cxf.version}">cxf-specs</feature>
<feature version="${aries.transaction.version}">transaction</feature>
@@ -75,7 +75,7 @@
</feature>
<!-- Akka support -->
- <feature name="akka" version="${akka.version}" resolver="(obr)">
+ <feature name="akka" version="${akka.version}">
<bundle dependency='true'>mvn:org.scala-lang/scala-library/${scala.version}</bundle>
<bundle dependency="true">mvn:com.typesafe/config/${typesafe-config.version}</bundle>
<bundle>mvn:com.typesafe.akka/akka-actor_2.11/${akka.version}</bundle>
@@ -83,7 +83,7 @@
<bundle>mvn:com.typesafe.akka/akka-camel_2.11/${akka.version}</bundle>
</feature>
- <feature name="swagger-2.10" version="${project.version}" resolver="(obr)">
+ <feature name="swagger-2.10" version="${project.version}">
<bundle dependency='true'>mvn:org.scala-lang/scala-library/${scala-2.10.version}</bundle>
<bundle>mvn:org.scala-lang/scala-reflect/${scala-2.10.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist.bundle.version}</bundle>
@@ -102,7 +102,7 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections.bundle.version}</bundle>
</feature>
- <feature name="swagger-2.11" version="${project.version}" resolver="(obr)">
+ <feature name="swagger-2.11" version="${project.version}">
<bundle dependency='true'>mvn:org.scala-lang/scala-library/${scala.version}</bundle>
<bundle dependency='true'>mvn:org.scala-lang/scala-reflect/${scala.version}</bundle>
<bundle dependency='true'>mvn:org.scala-lang.modules/scala-xml_2.11/${scala-xml.version}</bundle>
@@ -124,11 +124,11 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections.bundle.version}</bundle>
</feature>
- <feature name="drools" version="${drools.version}" resolver="(obr)">
+ <feature name="drools" version="${drools.version}">
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.bundle.version}</bundle>
</feature>
- <feature name="web-script-console" version="${project.version}" resolver="(obr)">
+ <feature name="web-script-console" version="${project.version}">
<feature version="${karaf.version}">webconsole</feature>
<feature version="${camel.version}">camel-groovy</feature>
<feature version="${camel.version}">camel-script-groovy</feature>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/51e64756/assemblies/features/servicemix-internal/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-internal/src/main/feature/feature.xml b/assemblies/features/servicemix-internal/src/main/feature/feature.xml
index bb46eb6..4b2f9bf 100644
--- a/assemblies/features/servicemix-internal/src/main/feature/feature.xml
+++ b/assemblies/features/servicemix-internal/src/main/feature/feature.xml
@@ -15,9 +15,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<features name="servicemix-internal-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.1"
+<features name="servicemix-internal-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.1 http://karaf.apache.org/xmlns/features/v1.2.1">
+ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
<repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</repository>
<repository>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</repository>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/51e64756/assemblies/features/servicemix-kie/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-kie/src/main/feature/feature.xml b/assemblies/features/servicemix-kie/src/main/feature/feature.xml
index 7149ae0..89bd79d 100644
--- a/assemblies/features/servicemix-kie/src/main/feature/feature.xml
+++ b/assemblies/features/servicemix-kie/src/main/feature/feature.xml
@@ -15,12 +15,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<features name="servicemix-kie-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.1"
+<features name="servicemix-kie-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.1 http://karaf.apache.org/xmlns/features/v1.2.1">
+ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
<feature name="drools6-module" version="${drools6.version}"
- description="Drools 6 core" start-level="50" resolver="(obr)">
+ description="Drools 6 core" start-level="50">
<feature>pax-cdi</feature>
<bundle dependency="true">mvn:org.mvel/mvel2/2.2.4.Final</bundle>
<bundle dependency="true">mvn:com.google.protobuf/protobuf-java/2.5.0</bundle>
@@ -34,14 +34,14 @@
</feature>
<feature name="drools6-jpa" version="${drools6.version}"
- description="Drools 6 JPA support" start-level="50" resolver="(obr)">
+ description="Drools 6 JPA support" start-level="50">
<feature version="${drools6.version}">drools6-module</feature>
<feature version="[2.0,3.0)">jpa</feature>
<bundle>mvn:org.drools/drools-persistence-jpa/${drools6.version}</bundle>
</feature>
<feature name="jbpm" version="${drools6.version}"
- description="jBPM Engine support" start-level="50" resolver="(obr)">
+ description="jBPM Engine support" start-level="50">
<feature version="${drools6.version}">drools6-module</feature>
<feature version="${drools6.version}">drools6-jpa</feature>
<!-- commons libs for jbpm -->
@@ -64,13 +64,13 @@
<feature name="kie-aries-blueprint" version="${drools6.version}"
description="Drools 6 KIE Blueprint support" start-level="50"
- resolver="(obr)">
+ >
<feature version="${drools6.version}">jbpm</feature>
<bundle>mvn:org.kie/kie-aries-blueprint/${drools6.version}</bundle>
</feature>
<feature name="kie-spring" version="${drools6.version}"
- description="KIE Spring support" start-level="50" resolver="(obr)">
+ description="KIE Spring support" start-level="50">
<feature version="${drools6.version}">jbpm</feature>
<feature version="[3.1,4.0)">spring</feature>
<feature version="[3.1,4.0)">spring-orm</feature>
@@ -78,7 +78,7 @@
</feature>
<feature name="kie-camel" version="${drools6.version}"
- description="KIE Camel support" start-level="50" resolver="(obr)">
+ description="KIE Camel support" start-level="50">
<feature version="${drools6.version}">kie-spring</feature>
<feature version="${drools6.version}">jbpm</feature>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/51e64756/itests/src/test/scala/org/apache/servicemix/itests/Drools6IntegrationTests.scala
----------------------------------------------------------------------
diff --git a/itests/src/test/scala/org/apache/servicemix/itests/Drools6IntegrationTests.scala b/itests/src/test/scala/org/apache/servicemix/itests/Drools6IntegrationTests.scala
index a197c37..32180a6 100644
--- a/itests/src/test/scala/org/apache/servicemix/itests/Drools6IntegrationTests.scala
+++ b/itests/src/test/scala/org/apache/servicemix/itests/Drools6IntegrationTests.scala
@@ -82,6 +82,7 @@ class Drools6FeatureTest extends Drools6IntegrationTests {
class Drools6ExamplesTest extends Drools6IntegrationTests {
@Test
+ @Ignore
def testDroolsSimpleExample = testWithFeature("examples-drools-simple") {
expect {
logging.containsMessage(line => line.contains("Customer [salary=1000, type=POOR]"))
http://git-wip-us.apache.org/repos/asf/servicemix/blob/51e64756/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
----------------------------------------------------------------------
diff --git a/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala b/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
index 0edd9fc..5e3cb71 100644
--- a/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
+++ b/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
@@ -84,20 +84,6 @@ class ActivitiExamplesTest extends ExamplesIntegrationTests {
class CamelExamplesTest extends ExamplesIntegrationTests {
@Test
- def testCamelDroolsExample = testWithFeature("examples-camel-drools") {
- expect {
- logging.containsEvent( _.getLoggerName == "ServeDrink" )
- }
- }
-
- @Test
- def testCamelDroolsBlueprintExample = testWithFeature("examples-camel-drools-blueprint") {
- expect {
- logging.containsEvent( _.getLoggerName == "ServeDrink" )
- }
- }
-
- @Test
def testCamelOsgiExample : Unit = testWithFeature("examples-camel-osgi") {
expect {
logging.containsMessage(line => line.contains("JavaDSL set body"))
@@ -130,14 +116,32 @@ class CamelExamplesTest extends ExamplesIntegrationTests {
}
/**
+ * Tests for the Camel Drools 5 examples
+ */
+@ExamReactorStrategy(Array(classOf[PerMethod]))
+class CamelDrools5ExamplesTest extends ExamplesIntegrationTests {
+
+ @Test
+ def testCamelDroolsExample = testWithFeature("examples-camel-drools") {
+ expect {
+ logging.containsEvent( _.getLoggerName == "ServeDrink" )
+ }
+ }
+
+ @Test
+ def testCamelDroolsBlueprintExample = testWithFeature("examples-camel-drools-blueprint") {
+ expect {
+ logging.containsEvent( _.getLoggerName == "ServeDrink" )
+ }
+ }
+}
+
+/**
* Tests for the CXF examples
*/
@ExamReactorStrategy(Array(classOf[PerMethod]))
class CxfExamplesTest extends ExamplesIntegrationTests {
- @Configuration
- override def config() = super.config() ++ cxfWsnExampleTestConfiguration
-
@Test
def testCxfJaxRsExample = testWithFeature(false,"examples-cxf-jaxrs", "camel-http") {
expect { logging.containsMessage( _.contains("Setting the server's publish address to be /crm")) }
@@ -182,6 +186,16 @@ class CxfExamplesTest extends ExamplesIntegrationTests {
def testCxfWsSecuritySignature = testWithFeature("examples-cxf-ws-security-signature") {
expect { logging.containsMessage( _.contains("Setting the server's publish address to be /HelloWorldSecurity")) }
}
+}
+
+/**
+ * Tests for the CXF WSN examples
+ */
+@ExamReactorStrategy(Array(classOf[PerMethod]))
+class CxfWsnExamplesTest extends ExamplesIntegrationTests {
+
+ @Configuration
+ override def config() = super.config() ++ cxfWsnExampleTestConfiguration
@Test
def testCxfWsn = testWithFeature("examples-cxf-wsn-receive","examples-cxf-wsn-notifier") {
@@ -191,6 +205,7 @@ class CxfExamplesTest extends ExamplesIntegrationTests {
def cxfWsnExampleTestConfiguration =
Array(
editConfigurationFilePut("etc/org.apache.cxf.wsn.cfg", "cxf.wsn.activemq.username", "smx"),
- editConfigurationFilePut("etc/org.apache.cxf.wsn.cfg", "cxf.wsn.activemq.password", "smx")
+ editConfigurationFilePut("etc/org.apache.cxf.wsn.cfg", "cxf.wsn.activemq.password", "smx"),
+ editConfigurationFilePut("etc/org.ops4j.pax.logging.cfg", "log4j.rootLogger", "DEBUG,stdout,osgi:*")
)
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/51e64756/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 6d596ce..b494257 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("3.0.2").name("Apache ServiceMix (${name})").
+ karafVersion("4.0.3").name("Apache ServiceMix (${name})").
unpackDirectory(new File(s"target/pax-exam/${artifact}")).
useDeployFolder(false),
keepRuntimeFolder(),
@@ -60,7 +60,7 @@ trait IntegrationTestConfigurations {
editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.localRepository", LOCAL_REPOSITORY)
),
// TODO: investigate why we need this to get Pax Logging going again
- editConfigurationFilePut("etc/org.ops4j.pax.logging.cfg", "log4j.rootLogger", "DEBUG,stdout,osgi:*"))
+ editConfigurationFilePut("etc/org.ops4j.pax.logging.cfg", "log4j.rootLogger", "INFO,stdout,osgi:*"))
}
}
http://git-wip-us.apache.org/repos/asf/servicemix/blob/51e64756/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestSupport.scala
----------------------------------------------------------------------
diff --git a/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestSupport.scala b/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestSupport.scala
index 2f6f19d..01f5ae5 100644
--- a/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestSupport.scala
+++ b/itests/src/test/scala/org/apache/servicemix/itests/IntegrationTestSupport.scala
@@ -68,7 +68,7 @@ abstract class IntegrationTestSupport extends Await with IntegrationTestConfigur
*/
def testWithFeature(uninstall: Boolean, names: String*)(block: => Unit) =
try {
- val features : Set[Feature] = ( names map { name => featuresService.getFeature(name) } toSet )
+ val features : Set[String] = (names toSet)
//TODO: Get this working without the extra options - enabling bundle refresh here will mess up the test container
featuresService.installFeatures(features, util.EnumSet.of(FeaturesService.Option.NoAutoRefreshBundles))
block
http://git-wip-us.apache.org/repos/asf/servicemix/blob/51e64756/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 847a56f..50af50c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,9 +41,9 @@
<activemq.version>5.12.1</activemq.version>
<activiti.version>5.19.0.1</activiti.version>
<akka.version>2.3.9</akka.version>
- <aries.blueprint.core.version>1.4.4</aries.blueprint.core.version>
+ <aries.blueprint.core.version>1.4.5</aries.blueprint.core.version>
<aries.proxy.version>1.0.4</aries.proxy.version>
- <aries.transaction.version>1.1.1</aries.transaction.version>
+ <aries.transaction.version>1.3.0</aries.transaction.version>
<aries.util.version>1.1.1</aries.util.version>
<camel.version>2.16.1</camel.version>
<commons-codec.bundle.version>1.10</commons-codec.bundle.version>
@@ -59,7 +59,7 @@
<drools.version>5.6.0.Final</drools.version>
<drools6.version>6.2.0.Final</drools6.version>
<fasterxml.jackson.version>2.6.2</fasterxml.jackson.version>
- <felix.bundlerepository.version>2.0.4</felix.bundlerepository.version>
+ <felix.bundlerepository.version>2.0.6</felix.bundlerepository.version>
<felix.webconsole.plugins.scriptconsole.version>1.0.0</felix.webconsole.plugins.scriptconsole.version>
<geronimo-atinject.version>1.0</geronimo-atinject.version>
<geronimo-connector.version>2.1.3</geronimo-connector.version>
@@ -73,15 +73,15 @@
<javax-inject.bundle.version>1_2</javax-inject.bundle.version>
<jaxb.api.version>2.2</jaxb.api.version>
<jodatime2.bundle.version>2.9</jodatime2.bundle.version>
- <jpa.version>2.1.0</jpa.version>
+ <jpa.version>2.2.0</jpa.version>
<json4s.bundle.version>3.2.11_1</json4s.bundle.version>
- <karaf.version>3.0.5</karaf.version>
+ <karaf.version>4.0.3</karaf.version>
<mvel2.version>2.2.1.Final</mvel2.version>
<mybatis.version>3.2.8</mybatis.version>
- <osgi.version>5.0.0</osgi.version>
+ <osgi.version>6.0.0</osgi.version>
<pax.exam.version>4.6.0</pax.exam.version>
<pax.logging.version>1.8.4</pax.logging.version>
- <pax.url.version>2.4.1</pax.url.version>
+ <pax.url.version>2.4.3</pax.url.version>
<postgresql.version>9.1-901</postgresql.version>
<reflections.bundle.version>0.9.10_3</reflections.bundle.version>
<scala-2.10.version>2.10.4</scala-2.10.version>