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:39 UTC
[01/26] servicemix git commit: SM-2803: Refactor the assembly creation
Repository: servicemix
Updated Branches:
refs/heads/master 5e45e3ed8 -> 8288a53d7
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/drools/pom.xml
----------------------------------------------------------------------
diff --git a/drools/pom.xml b/drools/pom.xml
deleted file mode 100644
index 68f6a4a..0000000
--- a/drools/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <!--
- 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.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>parent</artifactId>
- <version>6.1.1-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.servicemix.drools</groupId>
- <artifactId>features</artifactId>
- <packaging>pom</packaging>
- <name>Apache ServiceMix :: Drools 6 :: Features</name>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>filter</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>resources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <inherited>false</inherited>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${project.build.outputDirectory}/features.xml</file>
- <type>xml</type>
- <classifier>features</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/drools/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/drools/src/main/resources/features.xml b/drools/src/main/resources/features.xml
deleted file mode 100644
index 0dba794..0000000
--- a/drools/src/main/resources/features.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?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="servicemix-drools6-${version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
- <feature name="drools6-module" version="${drools6.version}"
- description="Drools 6 core" start-level="50" resolver="(obr)">
- <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>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/3.5_1</bundle>
-
- <bundle>mvn:org.kie/kie-api/${drools6.version}</bundle>
- <bundle>mvn:org.kie/kie-internal/${drools6.version}</bundle>
- <bundle>mvn:org.drools/drools-core/${drools6.version}</bundle>
- <bundle>mvn:org.drools/drools-compiler/${drools6.version}</bundle>
- <bundle>mvn:org.drools/drools-osgi-integration/${drools6.version}</bundle>
- </feature>
-
- <feature name="drools6-jpa" version="${drools6.version}"
- description="Drools 6 JPA support" start-level="50" resolver="(obr)">
- <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)">
- <feature version="${drools6.version}">drools6-module</feature>
- <feature version="${drools6.version}">drools6-jpa</feature>
- <!-- commons libs for jbpm -->
- <bundle dependency="true">mvn:org.jboss.spec.javax.security.jacc/jboss-jacc-api_1.5_spec/1.0.0.Final</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/1.8.6_1</bundle>
- <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle>
- <!-- jbpm-human -->
- <bundle>mvn:org.jbpm/jbpm-human-task-core/${drools6.version}</bundle>
- <bundle>mvn:org.jbpm/jbpm-human-task-workitems/${drools6.version}</bundle>
- <bundle>mvn:org.jbpm/jbpm-human-task-jpa/${drools6.version}</bundle>
- <bundle>mvn:org.jbpm/jbpm-human-task-audit/${drools6.version}</bundle>
- <!-- jbpm engine -->
- <bundle>mvn:org.jbpm/jbpm-flow-builder/${drools6.version}</bundle>
- <bundle>mvn:org.jbpm/jbpm-flow/${drools6.version}</bundle>
- <bundle>mvn:org.jbpm/jbpm-bpmn2/${drools6.version}</bundle>
- <bundle>mvn:org.jbpm/jbpm-audit/${drools6.version}</bundle>
- <bundle>mvn:org.jbpm/jbpm-runtime-manager/${drools6.version}</bundle>
- <bundle>mvn:org.jbpm/jbpm-persistence-jpa/${drools6.version}</bundle>
- </feature>
-
- <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)">
- <feature version="${drools6.version}">jbpm</feature>
- <feature version="[3.1,4.0)">spring</feature>
- <feature version="[3.1,4.0)">spring-orm</feature>
- <bundle>mvn:org.kie/kie-spring/${drools6.version}</bundle>
- </feature>
-
- <feature name="kie-camel" version="${drools6.version}"
- description="KIE Camel support" start-level="50" resolver="(obr)">
- <feature version="${drools6.version}">kie-spring</feature>
- <feature version="${drools6.version}">jbpm</feature>
-
- <feature version="${camel.version}">camel-core</feature>
- <feature version="${camel.version}">camel-spring</feature>
- <feature version="${camel.version}">camel-cxf</feature>
-
- <feature version="${cxf.version}">cxf-specs</feature>
- <feature version="${cxf.version}">cxf-core</feature>
- <feature version="${cxf.version}">cxf-jaxrs</feature>
-
- <bundle>mvn:org.kie/kie-camel/${drools6.version}</bundle>
- </feature>
-</features>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9ff38ef..2041cb1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -592,6 +592,12 @@
<artifactId>depends-maven-plugin</artifactId>
<version>${depends-maven-plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <version>${karaf.version}</version>
+ <extensions>true</extensions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b21a859..6da0832 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,11 +41,11 @@
<module>parent</module>
<module>activemq</module>
<module>activiti</module>
- <module>drools</module>
<module>branding</module>
<module>logging</module>
<module>examples</module>
<module>itests</module>
+ <module>assemblies</module>
<module>assembly</module>
<module>tooling</module>
</modules>
[22/26] servicemix git commit: SM-2814: Drools6ExamplesTest fails
with error
Posted by ks...@apache.org.
SM-2814: Drools6ExamplesTest fails with error
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/a79969d3
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/a79969d3
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/a79969d3
Branch: refs/heads/master
Commit: a79969d3540f94d0b5ff3f210f349e9ff3b0a5de
Parents: d4b76b5
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sun Jan 24 22:50:44 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sun Jan 24 22:50:44 2016 +0100
----------------------------------------------------------------------
.../org/apache/servicemix/itests/Drools6IntegrationTests.scala | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/a79969d3/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 32180a6..49c20c8 100644
--- a/itests/src/test/scala/org/apache/servicemix/itests/Drools6IntegrationTests.scala
+++ b/itests/src/test/scala/org/apache/servicemix/itests/Drools6IntegrationTests.scala
@@ -82,8 +82,7 @@ class Drools6FeatureTest extends Drools6IntegrationTests {
class Drools6ExamplesTest extends Drools6IntegrationTests {
@Test
- @Ignore
- def testDroolsSimpleExample = testWithFeature("examples-drools-simple") {
+ def testDroolsSimpleExample = testWithFeature(false, "examples-drools-simple") {
expect {
logging.containsMessage(line => line.contains("Customer [salary=1000, type=POOR]"))
}
@@ -94,7 +93,7 @@ class Drools6ExamplesTest extends Drools6IntegrationTests {
logging.containsMessage(line => line.contains("Customer [salary=9001, type=VIP]"))
}
}
-
+
@Test
def testDroolsCamelExample = testWithFeature("examples-drools-camel-blueprint") {
expect {
[17/26] servicemix git commit: SM-2786: Drools 5 examples fail due to
missing Eclipse JDT
Posted by ks...@apache.org.
SM-2786: Drools 5 examples fail due to missing Eclipse JDT
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/0cac9573
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/0cac9573
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/0cac9573
Branch: refs/heads/master
Commit: 0cac9573627db7d0e504064c1d834307ebace1a2
Parents: a5080ef
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Fri Jan 22 23:48:45 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Fri Jan 22 23:48:45 2016 +0100
----------------------------------------------------------------------
.../features/servicemix-features/src/main/feature/feature.xml | 1 +
parent/pom.xml | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/0cac9573/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 088311b..950ebe8 100644
--- a/assemblies/features/servicemix-features/src/main/feature/feature.xml
+++ b/assemblies/features/servicemix-features/src/main/feature/feature.xml
@@ -125,6 +125,7 @@
</feature>
<feature name="drools" version="${drools.version}">
+ <bundle dependency="true">mvn:org.eclipse.jdt.core.compiler/ecj/${eclipse.jdt.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.bundle.version}</bundle>
</feature>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/0cac9573/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b3d79f1..a117475 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -58,6 +58,7 @@
<drools.bundle.version>${drools.version}_1</drools.bundle.version>
<drools.version>5.6.0.Final</drools.version>
<drools6.version>6.2.0.Final</drools6.version>
+ <eclipse.jdt.version>4.4</eclipse.jdt.version>
<fasterxml.jackson.version>2.6.2</fasterxml.jackson.version>
<felix.bundlerepository.version>2.0.6</felix.bundlerepository.version>
<felix.webconsole.plugins.scriptconsole.version>1.0.0</felix.webconsole.plugins.scriptconsole.version>
[10/26] servicemix git commit: SM-2803: Refactor the assembly creation
Posted by ks...@apache.org.
SM-2803: Refactor the assembly creation
- assembly definition structure simplified
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/13c9b818
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/13c9b818
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/13c9b818
Branch: refs/heads/master
Commit: 13c9b8184706116f885c2999896e149113b8f2a6
Parents: 4c070f8
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Thu Jan 14 23:35:52 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Thu Jan 14 23:35:52 2016 +0100
----------------------------------------------------------------------
.../src/main/descriptors/unix-bin.xml | 1 -
.../src/main/resources/common-bin.xml | 31 --------------------
.../src/main/resources/common-unix-bin.xml | 12 ++++++++
3 files changed, 12 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/13c9b818/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml b/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
index 22ab142..1b478ef 100644
--- a/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
+++ b/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
@@ -23,7 +23,6 @@
</formats>
<componentDescriptors>
- <componentDescriptor>${project.build.outputDirectory}/common-bin.xml</componentDescriptor>
<componentDescriptor>${project.build.outputDirectory}/common-unix-bin.xml</componentDescriptor>
<componentDescriptor>${project.build.outputDirectory}/examples-unix-bin.xml</componentDescriptor>
</componentDescriptors>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/13c9b818/assemblies/apache-servicemix/src/main/resources/common-bin.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/common-bin.xml b/assemblies/apache-servicemix/src/main/resources/common-bin.xml
deleted file mode 100644
index f8a49f0..0000000
--- a/assemblies/apache-servicemix/src/main/resources/common-bin.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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.
--->
-<component>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <outputFileNameMapping>servicemix-version.jar</outputFileNameMapping>
- <fileMode>0644</fileMode>
- <includes>
- <include>org.apache.servicemix:org.apache.servicemix.branding</include>
- </includes>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-</component>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/13c9b818/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 6ce6513..236ba90 100644
--- a/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
+++ b/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
@@ -135,4 +135,16 @@
</file>
</files>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <outputFileNameMapping>servicemix-version.jar</outputFileNameMapping>
+ <fileMode>0644</fileMode>
+ <includes>
+ <include>org.apache.servicemix:org.apache.servicemix.branding</include>
+ </includes>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+
</component>
\ No newline at end of file
[18/26] servicemix git commit: SM-2819: Upgrade to Pax Exam 4.8.0
Posted by ks...@apache.org.
SM-2819: Upgrade to Pax Exam 4.8.0
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/09ac07be
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/09ac07be
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/09ac07be
Branch: refs/heads/master
Commit: 09ac07be903de3c1c1525c8521dd7adc7ce0cc12
Parents: 0cac957
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Fri Jan 22 23:50:01 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Fri Jan 22 23:50:01 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/09ac07be/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a117475..c61bec2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -80,7 +80,7 @@
<mvel2.version>2.2.1.Final</mvel2.version>
<mybatis.version>3.2.8</mybatis.version>
<osgi.version>6.0.0</osgi.version>
- <pax.exam.version>4.6.0</pax.exam.version>
+ <pax.exam.version>4.8.0</pax.exam.version>
<pax.logging.version>1.8.4</pax.logging.version>
<pax.url.version>2.4.3</pax.url.version>
<postgresql.version>9.1-901</postgresql.version>
[03/26] servicemix git commit: Revert pom version to 6.1.1-SNAPSHOT
Posted by ks...@apache.org.
Revert pom version to 6.1.1-SNAPSHOT
- it should make the merge from 6.x simplier
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/8a030bb3
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/8a030bb3
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/8a030bb3
Branch: refs/heads/master
Commit: 8a030bb3aa94d4caa9ef05192c5b9528325fa482
Parents: 5e45e3e
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Wed Jan 6 20:10:46 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat Jan 9 13:18:18 2016 +0100
----------------------------------------------------------------------
activemq/activemq-camel/pom.xml | 2 +-
activemq/activemq-service/pom.xml | 2 +-
activemq/pom.xml | 2 +-
activiti/activiti-config/pom.xml | 2 +-
activiti/pom.xml | 2 +-
assembly/pom.xml | 2 +-
branding/pom.xml | 2 +-
drools/pom.xml | 2 +-
examples/activemq/activemq-camel-blueprint/pom.xml | 2 +-
examples/activemq/pom.xml | 2 +-
examples/activiti/activiti-camel/pom.xml | 2 +-
examples/activiti/pom.xml | 2 +-
examples/akka/akka-camel/pom.xml | 2 +-
examples/akka/pom.xml | 2 +-
examples/camel/camel-blueprint/pom.xml | 2 +-
examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml | 2 +-
examples/camel/camel-cxf-rest/camel-cxf-rest-route/pom.xml | 2 +-
examples/camel/camel-cxf-rest/camel-cxf-rest-service/pom.xml | 2 +-
examples/camel/camel-cxf-rest/pom.xml | 2 +-
examples/camel/camel-cxf-soap/camel-cxf-soap-client/pom.xml | 2 +-
examples/camel/camel-cxf-soap/camel-cxf-soap-route/pom.xml | 2 +-
examples/camel/camel-cxf-soap/camel-cxf-soap-service/pom.xml | 2 +-
examples/camel/camel-cxf-soap/pom.xml | 2 +-
examples/camel/camel-drools-blueprint/pom.xml | 2 +-
examples/camel/camel-drools/pom.xml | 2 +-
examples/camel/camel-osgi/pom.xml | 2 +-
examples/camel/camel-sql/camel-sql-datasource-derby/pom.xml | 2 +-
examples/camel/camel-sql/camel-sql-datasource-h2/pom.xml | 2 +-
examples/camel/camel-sql/camel-sql-datasource-pgsql/pom.xml | 2 +-
examples/camel/camel-sql/camel-sql-orders/pom.xml | 2 +-
examples/camel/camel-sql/pom.xml | 2 +-
examples/camel/pom.xml | 2 +-
examples/cxf/cxf-jaxrs-blueprint/pom.xml | 2 +-
examples/cxf/cxf-jaxrs/pom.xml | 2 +-
examples/cxf/cxf-jaxws-blueprint/pom.xml | 2 +-
examples/cxf/cxf-osgi/pom.xml | 2 +-
examples/cxf/cxf-ws-addressing/pom.xml | 2 +-
examples/cxf/cxf-ws-rm/pom.xml | 2 +-
examples/cxf/cxf-ws-security-blueprint/pom.xml | 2 +-
examples/cxf/cxf-ws-security-osgi/pom.xml | 2 +-
examples/cxf/cxf-ws-security-signature/pom.xml | 2 +-
examples/cxf/cxf-wsn/cxf-wsn-base/pom.xml | 2 +-
examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml | 2 +-
examples/cxf/cxf-wsn/cxf-wsn-notifier/pom.xml | 2 +-
examples/cxf/cxf-wsn/cxf-wsn-receive/pom.xml | 2 +-
examples/cxf/cxf-wsn/pom.xml | 2 +-
examples/cxf/pom.xml | 2 +-
examples/drools/drools-camel-blueprint/pom.xml | 2 +-
examples/drools/drools-camel-cxf-server/pom.xml | 2 +-
examples/drools/drools-simple/pom.xml | 2 +-
examples/drools/drools-spring/pom.xml | 2 +-
examples/drools/pom.xml | 2 +-
examples/pom.xml | 2 +-
itests/pom.xml | 2 +-
logging/jms-appender/pom.xml | 2 +-
logging/pom.xml | 2 +-
parent/pom.xml | 2 +-
pom.xml | 2 +-
tooling/archetypes/pom.xml | 2 +-
tooling/archetypes/servicemix-cxf-code-first-osgi-bundle/pom.xml | 2 +-
tooling/archetypes/servicemix-cxf-wsdl-first-osgi-bundle/pom.xml | 2 +-
tooling/archetypes/servicemix-osgi-bundle/pom.xml | 2 +-
tooling/pom.xml | 2 +-
63 files changed, 63 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/activemq/activemq-camel/pom.xml
----------------------------------------------------------------------
diff --git a/activemq/activemq-camel/pom.xml b/activemq/activemq-camel/pom.xml
index a07d512..4467973 100644
--- a/activemq/activemq-camel/pom.xml
+++ b/activemq/activemq-camel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>activemq</artifactId>
<groupId>org.apache.servicemix</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/activemq/activemq-service/pom.xml
----------------------------------------------------------------------
diff --git a/activemq/activemq-service/pom.xml b/activemq/activemq-service/pom.xml
index 5dfdc0d..e50cde1 100644
--- a/activemq/activemq-service/pom.xml
+++ b/activemq/activemq-service/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>activemq</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.activemq</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/activemq/pom.xml
----------------------------------------------------------------------
diff --git a/activemq/pom.xml b/activemq/pom.xml
index 2bee5f5..8e874f1 100644
--- a/activemq/pom.xml
+++ b/activemq/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>parent</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/activiti/activiti-config/pom.xml
----------------------------------------------------------------------
diff --git a/activiti/activiti-config/pom.xml b/activiti/activiti-config/pom.xml
index bb6be58..3cd9a38 100644
--- a/activiti/activiti-config/pom.xml
+++ b/activiti/activiti-config/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>activiti</artifactId>
<groupId>org.apache.servicemix.activiti</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>org.apache.servicemix.activiti.config</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/activiti/pom.xml
----------------------------------------------------------------------
diff --git a/activiti/pom.xml b/activiti/pom.xml
index 71f2087..24287b1 100644
--- a/activiti/pom.xml
+++ b/activiti/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>parent</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index c2f736f..5cfe5aa 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>parent</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/branding/pom.xml
----------------------------------------------------------------------
diff --git a/branding/pom.xml b/branding/pom.xml
index 0c7854f..b16a714 100644
--- a/branding/pom.xml
+++ b/branding/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>parent</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/drools/pom.xml
----------------------------------------------------------------------
diff --git a/drools/pom.xml b/drools/pom.xml
index 0099add..68f6a4a 100644
--- a/drools/pom.xml
+++ b/drools/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>parent</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/activemq/activemq-camel-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/activemq/activemq-camel-blueprint/pom.xml b/examples/activemq/activemq-camel-blueprint/pom.xml
index f5a9ed4..61d033e 100644
--- a/examples/activemq/activemq-camel-blueprint/pom.xml
+++ b/examples/activemq/activemq-camel-blueprint/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>activemq-examples</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>activemq-camel-blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/activemq/pom.xml
----------------------------------------------------------------------
diff --git a/examples/activemq/pom.xml b/examples/activemq/pom.xml
index cbe9ed4..0b9510d 100644
--- a/examples/activemq/pom.xml
+++ b/examples/activemq/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>examples</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.examples</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/activiti/activiti-camel/pom.xml
----------------------------------------------------------------------
diff --git a/examples/activiti/activiti-camel/pom.xml b/examples/activiti/activiti-camel/pom.xml
index 8d70914..4ead991 100644
--- a/examples/activiti/activiti-camel/pom.xml
+++ b/examples/activiti/activiti-camel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>activiti-examples</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>activiti-camel</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/activiti/pom.xml
----------------------------------------------------------------------
diff --git a/examples/activiti/pom.xml b/examples/activiti/pom.xml
index 1c81930..387b31a 100644
--- a/examples/activiti/pom.xml
+++ b/examples/activiti/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>examples</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.examples</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/akka/akka-camel/pom.xml
----------------------------------------------------------------------
diff --git a/examples/akka/akka-camel/pom.xml b/examples/akka/akka-camel/pom.xml
index 23025e3..a4599ae 100644
--- a/examples/akka/akka-camel/pom.xml
+++ b/examples/akka/akka-camel/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>akka-examples</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/akka/pom.xml
----------------------------------------------------------------------
diff --git a/examples/akka/pom.xml b/examples/akka/pom.xml
index 907f175..6d4f420 100644
--- a/examples/akka/pom.xml
+++ b/examples/akka/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>examples</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.examples</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/camel/camel-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-blueprint/pom.xml b/examples/camel/camel-blueprint/pom.xml
index 82eb2a7..31fb387 100644
--- a/examples/camel/camel-blueprint/pom.xml
+++ b/examples/camel/camel-blueprint/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>camel-examples</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>camel-blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml b/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml
index f981909..2ec2423 100644
--- a/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml
+++ b/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>camel-cxf-rest</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/camel/camel-cxf-rest/camel-cxf-rest-route/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-cxf-rest/camel-cxf-rest-route/pom.xml b/examples/camel/camel-cxf-rest/camel-cxf-rest-route/pom.xml
index 220f50b..7f7b4b6 100644
--- a/examples/camel/camel-cxf-rest/camel-cxf-rest-route/pom.xml
+++ b/examples/camel/camel-cxf-rest/camel-cxf-rest-route/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>camel-cxf-rest</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/camel/camel-cxf-rest/camel-cxf-rest-service/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-cxf-rest/camel-cxf-rest-service/pom.xml b/examples/camel/camel-cxf-rest/camel-cxf-rest-service/pom.xml
index 87ec349..f92fd91 100644
--- a/examples/camel/camel-cxf-rest/camel-cxf-rest-service/pom.xml
+++ b/examples/camel/camel-cxf-rest/camel-cxf-rest-service/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>camel-cxf-rest</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/camel/camel-cxf-rest/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-cxf-rest/pom.xml b/examples/camel/camel-cxf-rest/pom.xml
index 2dac9cc..236fbf2 100644
--- a/examples/camel/camel-cxf-rest/pom.xml
+++ b/examples/camel/camel-cxf-rest/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>camel-examples</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/camel/camel-cxf-soap/camel-cxf-soap-client/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-cxf-soap/camel-cxf-soap-client/pom.xml b/examples/camel/camel-cxf-soap/camel-cxf-soap-client/pom.xml
index ba646fd..95ea9a2 100644
--- a/examples/camel/camel-cxf-soap/camel-cxf-soap-client/pom.xml
+++ b/examples/camel/camel-cxf-soap/camel-cxf-soap-client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>camel-cxf-soap</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/camel/camel-cxf-soap/camel-cxf-soap-route/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-cxf-soap/camel-cxf-soap-route/pom.xml b/examples/camel/camel-cxf-soap/camel-cxf-soap-route/pom.xml
index d314cf2..0cda8de 100644
--- a/examples/camel/camel-cxf-soap/camel-cxf-soap-route/pom.xml
+++ b/examples/camel/camel-cxf-soap/camel-cxf-soap-route/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>camel-cxf-soap</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/camel/camel-cxf-soap/camel-cxf-soap-service/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-cxf-soap/camel-cxf-soap-service/pom.xml b/examples/camel/camel-cxf-soap/camel-cxf-soap-service/pom.xml
index 620eeb5..56c9fcb 100644
--- a/examples/camel/camel-cxf-soap/camel-cxf-soap-service/pom.xml
+++ b/examples/camel/camel-cxf-soap/camel-cxf-soap-service/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>camel-cxf-soap</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/camel/camel-cxf-soap/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-cxf-soap/pom.xml b/examples/camel/camel-cxf-soap/pom.xml
index 5bf2253..5bd2aaa 100644
--- a/examples/camel/camel-cxf-soap/pom.xml
+++ b/examples/camel/camel-cxf-soap/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>camel-examples</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/camel/camel-drools-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-drools-blueprint/pom.xml b/examples/camel/camel-drools-blueprint/pom.xml
index b1e47d2..5724ac0 100644
--- a/examples/camel/camel-drools-blueprint/pom.xml
+++ b/examples/camel/camel-drools-blueprint/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>camel-examples</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/camel/camel-drools/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-drools/pom.xml b/examples/camel/camel-drools/pom.xml
index 1fede57..6177cce 100644
--- a/examples/camel/camel-drools/pom.xml
+++ b/examples/camel/camel-drools/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>camel-examples</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>camel-drools</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/camel/camel-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-osgi/pom.xml b/examples/camel/camel-osgi/pom.xml
index e54b3b7..2e97b41 100644
--- a/examples/camel/camel-osgi/pom.xml
+++ b/examples/camel/camel-osgi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>camel-examples</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>camel-osgi</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/camel/camel-sql/camel-sql-datasource-derby/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-sql/camel-sql-datasource-derby/pom.xml b/examples/camel/camel-sql/camel-sql-datasource-derby/pom.xml
index a3bae9f..274db10 100644
--- a/examples/camel/camel-sql/camel-sql-datasource-derby/pom.xml
+++ b/examples/camel/camel-sql/camel-sql-datasource-derby/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>camel-sql</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/camel/camel-sql/camel-sql-datasource-h2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-sql/camel-sql-datasource-h2/pom.xml b/examples/camel/camel-sql/camel-sql-datasource-h2/pom.xml
index 37bd714..ae5e979 100644
--- a/examples/camel/camel-sql/camel-sql-datasource-h2/pom.xml
+++ b/examples/camel/camel-sql/camel-sql-datasource-h2/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>camel-sql</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/camel/camel-sql/camel-sql-datasource-pgsql/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-sql/camel-sql-datasource-pgsql/pom.xml b/examples/camel/camel-sql/camel-sql-datasource-pgsql/pom.xml
index 6382395..f78b44b 100644
--- a/examples/camel/camel-sql/camel-sql-datasource-pgsql/pom.xml
+++ b/examples/camel/camel-sql/camel-sql-datasource-pgsql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>camel-sql</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/camel/camel-sql/camel-sql-orders/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-sql/camel-sql-orders/pom.xml b/examples/camel/camel-sql/camel-sql-orders/pom.xml
index e1e219e..f20ceac 100644
--- a/examples/camel/camel-sql/camel-sql-orders/pom.xml
+++ b/examples/camel/camel-sql/camel-sql-orders/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>camel-sql</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/camel/camel-sql/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-sql/pom.xml b/examples/camel/camel-sql/pom.xml
index 568fb23..0e5f638 100644
--- a/examples/camel/camel-sql/pom.xml
+++ b/examples/camel/camel-sql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>camel-examples</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/camel/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/pom.xml b/examples/camel/pom.xml
index 6873246..6abcf94 100644
--- a/examples/camel/pom.xml
+++ b/examples/camel/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>examples</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.examples</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/cxf/cxf-jaxrs-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-jaxrs-blueprint/pom.xml b/examples/cxf/cxf-jaxrs-blueprint/pom.xml
index eee603e..e58ce01 100644
--- a/examples/cxf/cxf-jaxrs-blueprint/pom.xml
+++ b/examples/cxf/cxf-jaxrs-blueprint/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>cxf-jaxrs-blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/cxf/cxf-jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-jaxrs/pom.xml b/examples/cxf/cxf-jaxrs/pom.xml
index f1293bd..bce8893 100644
--- a/examples/cxf/cxf-jaxrs/pom.xml
+++ b/examples/cxf/cxf-jaxrs/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>cxf-jaxrs</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/cxf/cxf-jaxws-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-jaxws-blueprint/pom.xml b/examples/cxf/cxf-jaxws-blueprint/pom.xml
index ed27e5c..4c42b25 100644
--- a/examples/cxf/cxf-jaxws-blueprint/pom.xml
+++ b/examples/cxf/cxf-jaxws-blueprint/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>cxf-jaxws-blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/cxf/cxf-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-osgi/pom.xml b/examples/cxf/cxf-osgi/pom.xml
index ff4d273..68bb21d 100644
--- a/examples/cxf/cxf-osgi/pom.xml
+++ b/examples/cxf/cxf-osgi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>cxf-osgi</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/cxf/cxf-ws-addressing/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-addressing/pom.xml b/examples/cxf/cxf-ws-addressing/pom.xml
index e370e21..f0aed45 100644
--- a/examples/cxf/cxf-ws-addressing/pom.xml
+++ b/examples/cxf/cxf-ws-addressing/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>cxf-ws-addressing</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/cxf/cxf-ws-rm/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-rm/pom.xml b/examples/cxf/cxf-ws-rm/pom.xml
index 79dba66..18d94b6 100644
--- a/examples/cxf/cxf-ws-rm/pom.xml
+++ b/examples/cxf/cxf-ws-rm/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>cxf-ws-rm</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/cxf/cxf-ws-security-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-blueprint/pom.xml b/examples/cxf/cxf-ws-security-blueprint/pom.xml
index 1d37b16..8af6a50 100644
--- a/examples/cxf/cxf-ws-security-blueprint/pom.xml
+++ b/examples/cxf/cxf-ws-security-blueprint/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>cxf-ws-security-blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/cxf/cxf-ws-security-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-osgi/pom.xml b/examples/cxf/cxf-ws-security-osgi/pom.xml
index b8acee5..eaa4817 100644
--- a/examples/cxf/cxf-ws-security-osgi/pom.xml
+++ b/examples/cxf/cxf-ws-security-osgi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>cxf-ws-security-osgi</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/cxf/cxf-ws-security-signature/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-signature/pom.xml b/examples/cxf/cxf-ws-security-signature/pom.xml
index 20bd030..440e877 100644
--- a/examples/cxf/cxf-ws-security-signature/pom.xml
+++ b/examples/cxf/cxf-ws-security-signature/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>cxf-ws-security-signature</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/cxf/cxf-wsn/cxf-wsn-base/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-wsn/cxf-wsn-base/pom.xml b/examples/cxf/cxf-wsn/cxf-wsn-base/pom.xml
index 2e021c9..6f6bb71 100644
--- a/examples/cxf/cxf-wsn/cxf-wsn-base/pom.xml
+++ b/examples/cxf/cxf-wsn/cxf-wsn-base/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>cxf-wsn</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml b/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml
index 81a771c..c21ac0d 100644
--- a/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml
+++ b/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>cxf-wsn</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/cxf/cxf-wsn/cxf-wsn-notifier/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-wsn/cxf-wsn-notifier/pom.xml b/examples/cxf/cxf-wsn/cxf-wsn-notifier/pom.xml
index 8aaabf1..73930d2 100644
--- a/examples/cxf/cxf-wsn/cxf-wsn-notifier/pom.xml
+++ b/examples/cxf/cxf-wsn/cxf-wsn-notifier/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>cxf-wsn</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/cxf/cxf-wsn/cxf-wsn-receive/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-wsn/cxf-wsn-receive/pom.xml b/examples/cxf/cxf-wsn/cxf-wsn-receive/pom.xml
index 3cf8cc7..598d09b 100644
--- a/examples/cxf/cxf-wsn/cxf-wsn-receive/pom.xml
+++ b/examples/cxf/cxf-wsn/cxf-wsn-receive/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>cxf-wsn</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/cxf/cxf-wsn/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-wsn/pom.xml b/examples/cxf/cxf-wsn/pom.xml
index 59ea43b..c4b0e84 100644
--- a/examples/cxf/cxf-wsn/pom.xml
+++ b/examples/cxf/cxf-wsn/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>cxf-wsn</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/cxf/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/pom.xml b/examples/cxf/pom.xml
index 1cd4cb0..3451592 100644
--- a/examples/cxf/pom.xml
+++ b/examples/cxf/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>examples</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.examples</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/drools/drools-camel-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/drools/drools-camel-blueprint/pom.xml b/examples/drools/drools-camel-blueprint/pom.xml
index fd8fe4b..6e4bff4 100644
--- a/examples/drools/drools-camel-blueprint/pom.xml
+++ b/examples/drools/drools-camel-blueprint/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>drools</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>drools-camel-blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/drools/drools-camel-cxf-server/pom.xml
----------------------------------------------------------------------
diff --git a/examples/drools/drools-camel-cxf-server/pom.xml b/examples/drools/drools-camel-cxf-server/pom.xml
index f31e937..5e8f3c6 100644
--- a/examples/drools/drools-camel-cxf-server/pom.xml
+++ b/examples/drools/drools-camel-cxf-server/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>drools</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>drools-camel-cxf-server</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/drools/drools-simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/drools/drools-simple/pom.xml b/examples/drools/drools-simple/pom.xml
index 6e78969..d17f57d 100644
--- a/examples/drools/drools-simple/pom.xml
+++ b/examples/drools/drools-simple/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>drools</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>drools-simple</artifactId>
<name>Apache ServiceMix :: Examples :: Drools :: Simple</name>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/drools/drools-spring/pom.xml
----------------------------------------------------------------------
diff --git a/examples/drools/drools-spring/pom.xml b/examples/drools/drools-spring/pom.xml
index e832798..fb8c55e 100644
--- a/examples/drools/drools-spring/pom.xml
+++ b/examples/drools/drools-spring/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>drools</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>drools-spring</artifactId>
<name>Apache ServiceMix :: Examples :: Drools :: Spring</name>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/drools/pom.xml
----------------------------------------------------------------------
diff --git a/examples/drools/pom.xml b/examples/drools/pom.xml
index 3d93bd9..115c228 100644
--- a/examples/drools/pom.xml
+++ b/examples/drools/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>examples</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>drools</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 05edf77..2464529 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>parent</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 6d6bab4..9d8a635 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>parent</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/logging/jms-appender/pom.xml
----------------------------------------------------------------------
diff --git a/logging/jms-appender/pom.xml b/logging/jms-appender/pom.xml
index a2a6b2a..1fc9c82 100644
--- a/logging/jms-appender/pom.xml
+++ b/logging/jms-appender/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.logging</groupId>
<artifactId>logging</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<artifactId>jms-appender</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/logging/pom.xml
----------------------------------------------------------------------
diff --git a/logging/pom.xml b/logging/pom.xml
index 83b5e15..a87e4ff 100644
--- a/logging/pom.xml
+++ b/logging/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>parent</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d921a4c..9ff38ef 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 198fbec..b21a859 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix</artifactId>
<packaging>pom</packaging>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
<name>Apache ServiceMix</name>
<url>http://servicemix.apache.org/</url>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/tooling/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/pom.xml b/tooling/archetypes/pom.xml
index dd66654..c905328 100644
--- a/tooling/archetypes/pom.xml
+++ b/tooling/archetypes/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>tooling</artifactId>
<groupId>org.apache.servicemix.tooling</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.tooling</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/tooling/archetypes/servicemix-cxf-code-first-osgi-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/servicemix-cxf-code-first-osgi-bundle/pom.xml b/tooling/archetypes/servicemix-cxf-code-first-osgi-bundle/pom.xml
index 6b98808..05bc4ed 100644
--- a/tooling/archetypes/servicemix-cxf-code-first-osgi-bundle/pom.xml
+++ b/tooling/archetypes/servicemix-cxf-code-first-osgi-bundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>archetypes</artifactId>
<groupId>org.apache.servicemix.tooling</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.tooling.archetypes</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/tooling/archetypes/servicemix-cxf-wsdl-first-osgi-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/servicemix-cxf-wsdl-first-osgi-bundle/pom.xml b/tooling/archetypes/servicemix-cxf-wsdl-first-osgi-bundle/pom.xml
index f021d83..38faeca 100644
--- a/tooling/archetypes/servicemix-cxf-wsdl-first-osgi-bundle/pom.xml
+++ b/tooling/archetypes/servicemix-cxf-wsdl-first-osgi-bundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>archetypes</artifactId>
<groupId>org.apache.servicemix.tooling</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.tooling.archetypes</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/tooling/archetypes/servicemix-osgi-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/servicemix-osgi-bundle/pom.xml b/tooling/archetypes/servicemix-osgi-bundle/pom.xml
index 312f122..c62e891 100644
--- a/tooling/archetypes/servicemix-osgi-bundle/pom.xml
+++ b/tooling/archetypes/servicemix-osgi-bundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>archetypes</artifactId>
<groupId>org.apache.servicemix.tooling</groupId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.tooling.archetypes</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8a030bb3/tooling/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/pom.xml b/tooling/pom.xml
index 37448a4..4d6be72 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>parent</artifactId>
- <version>7.0.0-SNAPSHOT</version>
+ <version>6.1.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
[04/26] servicemix git commit: SM-2803: Refactor the assembly creation
Posted by ks...@apache.org.
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg b/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
deleted file mode 100644
index d0092d7..0000000
--- a/assembly/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
+++ /dev/null
@@ -1,104 +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.
-#
-################################################################################
-
-#
-# If set to true, the following property will not allow any certificate to be used
-# when accessing Maven repositories through SSL
-#
-#org.ops4j.pax.url.mvn.certificateCheck=
-
-#
-# Path to the local Maven settings file.
-# The repositories defined in this file will be automatically added to the list
-# of default repositories if the 'org.ops4j.pax.url.mvn.repositories' property
-# below is not set.
-# The following locations are checked for the existence of the settings.xml file
-# * 1. looks for the specified url
-# * 2. if not found looks for ${user.home}/.m2/settings.xml
-# * 3. if not found looks for ${maven.home}/conf/settings.xml
-# * 4. if not found looks for ${M2_HOME}/conf/settings.xml
-#
-#org.ops4j.pax.url.mvn.settings=
-
-#
-# Path to the local Maven repository which is used to avoid downloading
-# artifacts when they already exist locally.
-# The value of this property will be extracted from the settings.xml file
-# above, or defaulted to:
-# System.getProperty( "user.home" ) + "/.m2/repository"
-#
-#org.ops4j.pax.url.mvn.localRepository=
-
-#
-# Default this to false. It's just weird to use undocumented repos
-#
-org.ops4j.pax.url.mvn.useFallbackRepositories=false
-
-#
-# Uncomment if you don't wanna use the proxy settings
-# from the Maven conf/settings.xml file
-#
-# org.ops4j.pax.url.mvn.proxySupport=false
-
-#
-# Comma separated list of repositories scanned when resolving an artifact.
-# Those repositories will be checked before iterating through the
-# below list of repositories and even before the local repository
-# A repository url can be appended with zero or more of the following flags:
-# @snapshots : the repository contains snaphots
-# @noreleases : the repository does not contain any released artifacts
-# @id=reponid : the id for the repository, just like in the settings.xml this is optional but recomendet
-#
-# The following property value will add the system folder as a repo.
-#
-org.ops4j.pax.url.mvn.defaultRepositories=\
- file:${karaf.home}/${karaf.default.repository}@id=system.repository@snapshots,\
- file:${karaf.data}/kar@id=kar.repository@multi@snapshots,\
- file:${karaf.base}/${karaf.default.repository}@id=child.system.repository@snapshots,\
- file:${karaf.home}/local-repo@snapshots@id=system.local-repo
-
-# Use the default local repo (e.g.~/.m2/repository) as a "remote" repo
-#org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote=false
-
-#
-# Comma separated list of repositories scanned when resolving an artifact.
-# The default list includes the following repositories:
-# http://repo1.maven.org/maven2@id=maven.central.repo, \
-# http://repository.springsource.com/maven/bundles/release@id=springsource.release.repo, \
-# http://repository.springsource.com/maven/bundles/external@id=springsource.external.repo, \
-# http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache.snapshots.repo, \
-# http://svn.apache.org/repos/asf/servicemix/m2-repo@id=maven.smx.repo, \
-# http://zodiac.springsource.com/maven/bundles/release@id=gemini, \
-# https://oss.sonatype.org/content/repositories/releases/@id=maven.sonatype.repo
-# To add repositories to the default ones, prepend '+' to the list of repositories
-# to add.
-# A repository url can be appended with zero or more of the following flags:
-# @snapshots : the repository contains snaphots
-# @noreleases : the repository does not contain any released artifacts
-# @id=reponid : the id for the repository, just like in the settings.xml this is optional but recomendet
-#
-org.ops4j.pax.url.mvn.repositories= \
- http://repo1.maven.org/maven2@id=maven.central.repo, \
- http://repository.springsource.com/maven/bundles/release@id=springsource.release.repo, \
- http://repository.springsource.com/maven/bundles/external@id=springsource.external.repo, \
- http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache.snapshots.repo, \
- http://svn.apache.org/repos/asf/servicemix/m2-repo@id=maven.smx.repo, \
- http://zodiac.springsource.com/maven/bundles/release@id=gemini, \
- https://oss.sonatype.org/content/repositories/releases/@id=maven.sonatype.repo
-
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub b/assembly/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub
deleted file mode 100644
index c83c914..0000000
--- a/assembly/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub
+++ /dev/null
@@ -1,41 +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 is a stub configuration file for pax-web ssl configuration.
-# More details please refer to
-# http://wiki.ops4j.org/display/paxweb/SSL+Configuration
-# Important Notes: If file named org.ops4j.pax.web.cfg in etc folder,
-# Pax Web will always try to read configuration from
- this file, so any org.ops4j.pax.web configuration
- in http feature get ignored, that's why we name this
- file as org.ops4j.pax.web.empty.stub.
- If you need this configuration file, rename it to
- org.ops4j.pax.web before use it.
-#################################################################################
-
-#org.osgi.service.http.secure.enabled=true
-#org.ops4j.pax.web.ssl.keystore=etc/servicemix.jks
-#org.ops4j.pax.web.ssl.password=password
-#org.ops4j.pax.web.ssl.keypassword=password
-#org.osgi.service.http.port.secure=8443
-org.ops4j.pax.web.config.file=etc/jetty.xml
-org.osgi.service.http.port=8181
-javax.servlet.context.tempdir=data/pax-web-jsp
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/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
deleted file mode 100644
index 7f8b389..0000000
--- a/assembly/src/main/resources/etc/system.properties
+++ /dev/null
@@ -1,177 +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.
-#
-################################################################################
-
-#
-# The properties defined in this file will be made available through system
-# properties at the very beginning of the Karaf's boot process.
-#
-
-
-# Log level when the pax-logging service is not available
-# This level will only be used while the pax-logging service bundle
-# 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
-
-#
-# Name of this karaf instance.
-#
-karaf.name=root
-
-#
-# Default repository where bundles will be loaded from before using
-# other maven repositories. For the full maven configuration, see
-# the org.ops4j.pax.url.mvn.cfg file.
-#
-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
-
-#
-# 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
-
-#
-# Roles to use when logging into a local Karaf console.
-#
-# 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 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
-
-#
-# Set this empty property to avoid errors when validating xml documents.
-#
-xml.catalog.files=
-
-#
-# Suppress the bell in the console when hitting backspace to 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
-
-#
-# ServiceMix specs options
-#
-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
-# 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.*
-
-#
-# By default, only Karaf shell commands are secured, but additional services can be
-# secured by expanding this filter
-#
-karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*))
-
-#
-# By default, if there's no ACL policy for a certain karaf command, this command is allowed to access
-# without the RBAC. We can change this behavior by enable the following property, which means
-# if a karaf command has no corresponding ACL then access it must have one of the karaf.secured.command.compulsory.roles
-#
-#karaf.secured.command.compulsory.roles=admin
-
-#
-# Security properties
-#
-# To enable OSGi security, uncomment the properties below,
-# install the framework-security feature and restart.
-#
-#java.security.policy=${karaf.etc}/all.policy
-#org.osgi.framework.security=osgi
-#org.osgi.framework.trust.repositories=${karaf.etc}/trustStore.ks
-
-#
-# HA/Lock configuration
-#
-# Karaf uses a lock mechanism to know which instance is the master (HA)
-# The lock can be on the filesystem (default) or on a database.
-#
-# See http://karaf.apache.org/manual/latest/users-guide/failover.html for details.
-#
-# Even using a single instance, Karaf creates the lock file
-# You can specify the location of the lock file using the
-# karaf.lock.dir=/path/to/the/directory/containing/the/lock
-#
-
-#
-# Default port for the OSGI HTTP Service
-#
-org.osgi.service.http.port=8181
-
-#
-# Allow usage of ${servicemix.home} as an alias for ${karaf.home}
-#
-servicemix.home=${karaf.home}
-
-#
-# Activemq configuration
-#
-activemq.port = 61616
-activemq.host = localhost
-activemq.url = tcp://${activemq.host}:${activemq.port}
-
-
-#
-# Activemq JMX configuration
-#
-activemq.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-${karaf.name}
-activemq.jmx.user=smx
-activemq.jmx.password=smx
-
-
-javax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
-javax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFactoryImpl
-
-#
-# CXF Log configuration
-#
-org.apache.cxf.Logger=org.apache.cxf.common.logging.Slf4jLogger
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/resources/etc/users.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/users.properties b/assembly/src/main/resources/etc/users.properties
deleted file mode 100644
index ca4b482..0000000
--- a/assembly/src/main/resources/etc/users.properties
+++ /dev/null
@@ -1,37 +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 file contains the users, groups, and roles.
-# Each line has to be of the format:
-#
-# USER=PASSWORD,ROLE1,ROLE2,...
-# USER=PASSWORD,_g_:GROUP,...
-# _g_\:GROUP=ROLE1,ROLE2,...
-#
-# All users, grousp, and roles entered in this file are available after Karaf startup
-# and modifiable via the JAAS command group. These users reside in a JAAS domain
-# with the name "karaf".
-#
-smx = smx,_g_:admingroup
-_g_\:admingroup = group,admin,manager,viewer,webconsole
-
-# 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
-karaf = karaf,_g_:admingroup
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/resources/examples-unix-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/examples-unix-bin.xml b/assembly/src/main/resources/examples-unix-bin.xml
deleted file mode 100644
index 0d80191..0000000
--- a/assembly/src/main/resources/examples-unix-bin.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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.
--->
-<component>
- <fileSets>
- <!-- Copy over karaf demo to examples folder -->
- <fileSet>
- <directory>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/demos</directory>
- <outputDirectory>/examples/karaf</outputDirectory>
- <lineEnding>unix</lineEnding>
- </fileSet>
-
- <!-- Copy over the examples -->
- <fileSet>
- <directory>${basedir}/../examples</directory>
- <outputDirectory>/examples/</outputDirectory>
- <lineEnding>unix</lineEnding>
- <includes>
- <include>activemq/**</include>
- <include>activiti/**</include>
- <include>akka/**</include>
- <include>camel/**</include>
- <include>cxf/**</include>
- <include>drools/**</include>
- </includes>
- <excludes>
- <exclude>pom.xml</exclude>
- <!-- we need add filtered README.txt, so exclude the raw one here -->
- <exclude>**/README.txt</exclude>
- <!-- exclude build output/IDE config/... files -->
- <exclude>**/target/**</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/**</exclude>
- <exclude>**/*.i??</exclude>
- <exclude>**/*.jks</exclude>
- </excludes>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../examples</directory>
- <outputDirectory>/examples/</outputDirectory>
- <lineEnding>keep</lineEnding>
- <includes>
- <include>activemq/**/*.jks</include>
- <include>activiti/**/*.jks</include>
- <include>akka/**/*.jks</include>
- <include>camel/**/*.jks</include>
- <include>cxf/**/*.jks</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../examples</directory>
- <outputDirectory>/examples/</outputDirectory>
- <lineEnding>unix</lineEnding>
- <filtered>true</filtered>
- <fileMode>0644</fileMode>
- <includes>
- <include>README.txt</include>
- <include>activemq/**/README.txt</include>
- <include>activiti/**/README.txt</include>
- <include>akka/**/README.txt</include>
- <include>camel/**/README.txt</include>
- <include>cxf/**/README.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <files>
- <file>
- <source>${project.build.outputDirectory}/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/da7e9421/assembly/src/main/resources/licenses/asm.txt
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/licenses/asm.txt b/assembly/src/main/resources/licenses/asm.txt
deleted file mode 100644
index 6eff43a..0000000
--- a/assembly/src/main/resources/licenses/asm.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Copyright (c) 2000-2005 INRIA, France Telecom
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/resources/licenses/bsd.txt
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/licenses/bsd.txt b/assembly/src/main/resources/licenses/bsd.txt
deleted file mode 100644
index 1568be2..0000000
--- a/assembly/src/main/resources/licenses/bsd.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-The BSD License
-
- Copyright (c) <YEAR>, <OWNER>
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/resources/licenses/cddl-1.0.txt
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/licenses/cddl-1.0.txt b/assembly/src/main/resources/licenses/cddl-1.0.txt
deleted file mode 100644
index 4830da9..0000000
--- a/assembly/src/main/resources/licenses/cddl-1.0.txt
+++ /dev/null
@@ -1,385 +0,0 @@
-
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-
- 1. Definitions.
-
- 1.1. ÒContributorÓ means each individual or entity that
- creates or contributes to the creation of Modifications.
-
- 1.2. ÒContributor VersionÓ means the combination of the
- Original Software, prior Modifications used by a
- Contributor (if any), and the Modifications made by that
- particular Contributor.
-
- 1.3. ÒCovered SoftwareÓ means (a) the Original Software, or
- (b) Modifications, or (c) the combination of files
- containing Original Software with files containing
- Modifications, in each case including portions thereof.
-
- 1.4. ÒExecutableÓ means the Covered Software in any form
- other than Source Code.
-
- 1.5. ÒInitial DeveloperÓ means the individual or entity
- that first makes Original Software available under this
- License.
-
- 1.6. ÒLarger WorkÓ means a work which combines Covered
- Software or portions thereof with code not governed by the
- terms of this License.
-
- 1.7. ÒLicenseÓ means this document.
-
- 1.8. ÒLicensableÓ means having the right to grant, to the
- maximum extent possible, whether at the time of the initial
- grant or subsequently acquired, any and all of the rights
- conveyed herein.
-
- 1.9. ÒModificationsÓ means the Source Code and Executable
- form of any of the following:
-
- A. Any file that results from an addition to,
- deletion from or modification of the contents of a
- file containing Original Software or previous
- Modifications;
-
- B. Any new file that contains any part of the
- Original Software or previous Modification; or
-
- C. Any new file that is contributed or otherwise made
- available under the terms of this License.
-
- 1.10. ÒOriginal SoftwareÓ means the Source Code and
- Executable form of computer software code that is
- originally released under this License.
-
- 1.11. ÒPatent ClaimsÓ means any patent claim(s), now owned
- or hereafter acquired, including without limitation,
- method, process, and apparatus claims, in any patent
- Licensable by grantor.
-
- 1.12. ÒSource CodeÓ means (a) the common form of computer
- software code in which modifications are made and (b)
- associated documentation included in or with such code.
-
- 1.13. ÒYouÓ (or ÒYourÓ) means an individual or a legal
- entity exercising rights under, and complying with all of
- the terms of, this License. For legal entities, ÒYouÓ
- includes any entity which controls, is controlled by, or is
- under common control with You. For purposes of this
- definition, ÒcontrolÓ means (a) the power, direct or
- indirect, to cause the direction or management of such
- entity, whether by contract or otherwise, or (b) ownership
- of more than fifty percent (50%) of the outstanding shares
- or beneficial ownership of such entity.
-
- 2. License Grants.
-
- 2.1. The Initial Developer Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and
- subject to third party intellectual property claims, the
- Initial Developer hereby grants You a world-wide,
- royalty-free, non-exclusive license:
-
- (a) under intellectual property rights (other than
- patent or trademark) Licensable by Initial Developer,
- to use, reproduce, modify, display, perform,
- sublicense and distribute the Original Software (or
- portions thereof), with or without Modifications,
- and/or as part of a Larger Work; and
-
- (b) under Patent Claims infringed by the making,
- using or selling of Original Software, to make, have
- made, use, practice, sell, and offer for sale, and/or
- otherwise dispose of the Original Software (or
- portions thereof).
-
- (c) The licenses granted in Sections 2.1(a) and (b)
- are effective on the date Initial Developer first
- distributes or otherwise makes the Original Software
- available to a third party under the terms of this
- License.
-
- (d) Notwithstanding Section 2.1(b) above, no patent
- license is granted: (1) for code that You delete from
- the Original Software, or (2) for infringements
- caused by: (i) the modification of the Original
- Software, or (ii) the combination of the Original
- Software with other software or devices.
-
- 2.2. Contributor Grant.
-
- Conditioned upon Your compliance with Section 3.1 below and
- subject to third party intellectual property claims, each
- Contributor hereby grants You a world-wide, royalty-free,
- non-exclusive license:
-
- (a) under intellectual property rights (other than
- patent or trademark) Licensable by Contributor to
- use, reproduce, modify, display, perform, sublicense
- and distribute the Modifications created by such
- Contributor (or portions thereof), either on an
- unmodified basis, with other Modifications, as
- Covered Software and/or as part of a Larger Work; and
-
-
- (b) under Patent Claims infringed by the making,
- using, or selling of Modifications made by that
- Contributor either alone and/or in combination with
- its Contributor Version (or portions of such
- combination), to make, use, sell, offer for sale,
- have made, and/or otherwise dispose of: (1)
- Modifications made by that Contributor (or portions
- thereof); and (2) the combination of Modifications
- made by that Contributor with its Contributor Version
- (or portions of such combination).
-
- (c) The licenses granted in Sections 2.2(a) and
- 2.2(b) are effective on the date Contributor first
- distributes or otherwise makes the Modifications
- available to a third party.
-
- (d) Notwithstanding Section 2.2(b) above, no patent
- license is granted: (1) for any code that Contributor
- has deleted from the Contributor Version; (2) for
- infringements caused by: (i) third party
- modifications of Contributor Version, or (ii) the
- combination of Modifications made by that Contributor
- with other software (except as part of the
- Contributor Version) or other devices; or (3) under
- Patent Claims infringed by Covered Software in the
- absence of Modifications made by that Contributor.
-
- 3. Distribution Obligations.
-
- 3.1. Availability of Source Code.
-
- Any Covered Software that You distribute or otherwise make
- available in Executable form must also be made available in
- Source Code form and that Source Code form must be
- distributed only under the terms of this License. You must
- include a copy of this License with every copy of the
- Source Code form of the Covered Software You distribute or
- otherwise make available. You must inform recipients of any
- such Covered Software in Executable form as to how they can
- obtain such Covered Software in Source Code form in a
- reasonable manner on or through a medium customarily used
- for software exchange.
-
- 3.2. Modifications.
-
- The Modifications that You create or to which You
- contribute are governed by the terms of this License. You
- represent that You believe Your Modifications are Your
- original creation(s) and/or You have sufficient rights to
- grant the rights conveyed by this License.
-
- 3.3. Required Notices.
-
- You must include a notice in each of Your Modifications
- that identifies You as the Contributor of the Modification.
- You may not remove or alter any copyright, patent or
- trademark notices contained within the Covered Software, or
- any notices of licensing or any descriptive text giving
- attribution to any Contributor or the Initial Developer.
-
- 3.4. Application of Additional Terms.
-
- You may not offer or impose any terms on any Covered
- Software in Source Code form that alters or restricts the
- applicable version of this License or the recipientsÕ
- rights hereunder. You may choose to offer, and to charge a
- fee for, warranty, support, indemnity or liability
- obligations to one or more recipients of Covered Software.
- However, you may do so only on Your own behalf, and not on
- behalf of the Initial Developer or any Contributor. You
- must make it absolutely clear that any such warranty,
- support, indemnity or liability obligation is offered by
- You alone, and You hereby agree to indemnify the Initial
- Developer and every Contributor for any liability incurred
- by the Initial Developer or such Contributor as a result of
- warranty, support, indemnity or liability terms You offer.
-
-
- 3.5. Distribution of Executable Versions.
-
- You may distribute the Executable form of the Covered
- Software under the terms of this License or under the terms
- of a license of Your choice, which may contain terms
- different from this License, provided that You are in
- compliance with the terms of this License and that the
- license for the Executable form does not attempt to limit
- or alter the recipientÕs rights in the Source Code form
- from the rights set forth in this License. If You
- distribute the Covered Software in Executable form under a
- different license, You must make it absolutely clear that
- any terms which differ from this License are offered by You
- alone, not by the Initial Developer or Contributor. You
- hereby agree to indemnify the Initial Developer and every
- Contributor for any liability incurred by the Initial
- Developer or such Contributor as a result of any such terms
- You offer.
-
- 3.6. Larger Works.
-
- You may create a Larger Work by combining Covered Software
- with other code not governed by the terms of this License
- and distribute the Larger Work as a single product. In such
- a case, You must make sure the requirements of this License
- are fulfilled for the Covered Software.
-
- 4. Versions of the License.
-
- 4.1. New Versions.
-
- Sun Microsystems, Inc. is the initial license steward and
- may publish revised and/or new versions of this License
- from time to time. Each version will be given a
- distinguishing version number. Except as provided in
- Section 4.3, no one other than the license steward has the
- right to modify this License.
-
- 4.2. Effect of New Versions.
-
- You may always continue to use, distribute or otherwise
- make the Covered Software available under the terms of the
- version of the License under which You originally received
- the Covered Software. If the Initial Developer includes a
- notice in the Original Software prohibiting it from being
- distributed or otherwise made available under any
- subsequent version of the License, You must distribute and
- make the Covered Software available under the terms of the
- version of the License under which You originally received
- the Covered Software. Otherwise, You may also choose to
- use, distribute or otherwise make the Covered Software
- available under the terms of any subsequent version of the
- License published by the license steward.
-
- 4.3. Modified Versions.
-
- When You are an Initial Developer and You want to create a
- new license for Your Original Software, You may create and
- use a modified version of this License if You: (a) rename
- the license and remove any references to the name of the
- license steward (except to note that the license differs
- from this License); and (b) otherwise make it clear that
- the license contains terms which differ from this License.
-
-
- 5. DISCLAIMER OF WARRANTY.
-
- COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN ÒAS ISÓ
- BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
- INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
- SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
- PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
- PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
- COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
- INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
- ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
- WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
- ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
- DISCLAIMER.
-
- 6. TERMINATION.
-
- 6.1. This License and the rights granted hereunder will
- terminate automatically if You fail to comply with terms
- herein and fail to cure such breach within 30 days of
- becoming aware of the breach. Provisions which, by their
- nature, must remain in effect beyond the termination of
- this License shall survive.
-
- 6.2. If You assert a patent infringement claim (excluding
- declaratory judgment actions) against Initial Developer or
- a Contributor (the Initial Developer or Contributor against
- whom You assert such claim is referred to as ÒParticipantÓ)
- alleging that the Participant Software (meaning the
- Contributor Version where the Participant is a Contributor
- or the Original Software where the Participant is the
- Initial Developer) directly or indirectly infringes any
- patent, then any and all rights granted directly or
- indirectly to You by such Participant, the Initial
- Developer (if the Initial Developer is not the Participant)
- and all Contributors under Sections 2.1 and/or 2.2 of this
- License shall, upon 60 days notice from Participant
- terminate prospectively and automatically at the expiration
- of such 60 day notice period, unless if within such 60 day
- period You withdraw Your claim with respect to the
- Participant Software against such Participant either
- unilaterally or pursuant to a written agreement with
- Participant.
-
- 6.3. In the event of termination under Sections 6.1 or 6.2
- above, all end user licenses that have been validly granted
- by You or any distributor hereunder prior to termination
- (excluding licenses granted to You by any distributor)
- shall survive termination.
-
- 7. LIMITATION OF LIABILITY.
-
- UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
- (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
- INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
- COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
- LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
- CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
- LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
- STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
- COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
- INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
- LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
- INJURY RESULTING FROM SUCH PARTYÕS NEGLIGENCE TO THE EXTENT
- APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
- NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
- CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
- APPLY TO YOU.
-
- 8. U.S. GOVERNMENT END USERS.
-
- The Covered Software is a Òcommercial item,Ó as that term is
- defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of Òcommercial
- computer softwareÓ (as that term is defined at 48 C.F.R. ¤
- 252.227-7014(a)(1)) and Òcommercial computer software
- documentationÓ as such terms are used in 48 C.F.R. 12.212 (Sept.
- 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
- through 227.7202-4 (June 1995), all U.S. Government End Users
- acquire Covered Software with only those rights set forth herein.
- This U.S. Government Rights clause is in lieu of, and supersedes,
- any other FAR, DFAR, or other clause or provision that addresses
- Government rights in computer software under this License.
-
- 9. MISCELLANEOUS.
-
- This License represents the complete agreement concerning subject
- matter hereof. If any provision of this License is held to be
- unenforceable, such provision shall be reformed only to the
- extent necessary to make it enforceable. This License shall be
- governed by the law of the jurisdiction specified in a notice
- contained within the Original Software (except to the extent
- applicable law, if any, provides otherwise), excluding such
- jurisdictionÕs conflict-of-law provisions. Any litigation
- relating to this License shall be subject to the jurisdiction of
- the courts located in the jurisdiction and venue specified in a
- notice contained within the Original Software, with the losing
- party responsible for costs, including, without limitation, court
- costs and reasonable attorneysÕ fees and expenses. The
- application of the United Nations Convention on Contracts for the
- International Sale of Goods is expressly excluded. Any law or
- regulation which provides that the language of a contract shall
- be construed against the drafter shall not apply to this License.
- You agree that You alone are responsible for compliance with the
- United States export administration regulations (and the export
- control laws and regulation of any other countries) when You use,
- distribute or otherwise make available any Covered Software.
-
- 10. RESPONSIBILITY FOR CLAIMS.
-
- As between Initial Developer and the Contributors, each party is
- responsible for claims and damages arising, directly or
- indirectly, out of its utilization of rights under this License
- and You agree to work with Initial Developer and Contributors to
- distribute such responsibility on an equitable basis. Nothing
- herein is intended or shall be deemed to constitute any admission
- of liability.
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/resources/licenses/cpl-1.0.txt
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/licenses/cpl-1.0.txt b/assembly/src/main/resources/licenses/cpl-1.0.txt
deleted file mode 100644
index c9990a7..0000000
--- a/assembly/src/main/resources/licenses/cpl-1.0.txt
+++ /dev/null
@@ -1,213 +0,0 @@
-Common Public License Version 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
-LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
- a) in the case of the initial Contributor, the initial code and
-documentation distributed under this Agreement, and
-
- b) in the case of each subsequent Contributor:
-
- i) changes to the Program, and
-
- ii) additions to the Program;
-
- where such changes and/or additions to the Program originate from and are
-distributed by that particular Contributor. A Contribution 'originates' from a
-Contributor if it was added to the Program by such Contributor itself or anyone
-acting on such Contributor's behalf. Contributions do not include additions to
-the Program which: (i) are separate modules of software distributed in
-conjunction with the Program under their own license agreement, and (ii) are not
-derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are
-necessarily infringed by the use or sale of its Contribution alone or when
-combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement,
-including all Contributors.
-
-2. GRANT OF RIGHTS
-
- a) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free copyright license to
-reproduce, prepare derivative works of, publicly display, publicly perform,
-distribute and sublicense the Contribution of such Contributor, if any, and such
-derivative works, in source code and object code form.
-
- b) Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
-Patents to make, use, sell, offer to sell, import and otherwise transfer the
-Contribution of such Contributor, if any, in source code and object code form.
-This patent license shall apply to the combination of the Contribution and the
-Program if, at the time the Contribution is added by the Contributor, such
-addition of the Contribution causes such combination to be covered by the
-Licensed Patents. The patent license shall not apply to any other combinations
-which include the Contribution. No hardware per se is licensed hereunder.
-
- c) Recipient understands that although each Contributor grants the licenses
-to its Contributions set forth herein, no assurances are provided by any
-Contributor that the Program does not infringe the patent or other intellectual
-property rights of any other entity. Each Contributor disclaims any liability to
-Recipient for claims brought by any other entity based on infringement of
-intellectual property rights or otherwise. As a condition to exercising the
-rights and licenses granted hereunder, each Recipient hereby assumes sole
-responsibility to secure any other intellectual property rights needed, if any.
-For example, if a third party patent license is required to allow Recipient to
-distribute the Program, it is Recipient's responsibility to acquire that license
-before distributing the Program.
-
- d) Each Contributor represents that to its knowledge it has sufficient
-copyright rights in its Contribution, if any, to grant the copyright license set
-forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its
-own license agreement, provided that:
-
- a) it complies with the terms and conditions of this Agreement; and
-
- b) its license agreement:
-
- i) effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title and
-non-infringement, and implied warranties or conditions of merchantability and
-fitness for a particular purpose;
-
- ii) effectively excludes on behalf of all Contributors all liability for
-damages, including direct, indirect, special, incidental and consequential
-damages, such as lost profits;
-
- iii) states that any provisions which differ from this Agreement are offered
-by that Contributor alone and not by any other party; and
-
- iv) states that source code for the Program is available from such
-Contributor, and informs licensees how to obtain it in a reasonable manner on or
-through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
- a) it must be made available under this Agreement; and
-
- b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the
-Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if
-any, in a manner that reasonably allows subsequent Recipients to identify the
-originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with
-respect to end users, business partners and the like. While this license is
-intended to facilitate the commercial use of the Program, the Contributor who
-includes the Program in a commercial product offering should do so in a manner
-which does not create potential liability for other Contributors. Therefore, if
-a Contributor includes the Program in a commercial product offering, such
-Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-every other Contributor ("Indemnified Contributor") against any losses, damages
-and costs (collectively "Losses") arising from claims, lawsuits and other legal
-actions brought by a third party against the Indemnified Contributor to the
-extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor to
-control, and cooperate with the Commercial Contributor in, the defense and any
-related settlement negotiations. The Indemnified Contributor may participate in
-any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product
-offering, Product X. That Contributor is then a Commercial Contributor. If that
-Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such
-Commercial Contributor's responsibility alone. Under this section, the
-Commercial Contributor would have to defend claims against the other
-Contributors related to those performance claims and warranties, and if a court
-requires any other Contributor to pay any damages as a result, the Commercial
-Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-Recipient is solely responsible for determining the appropriateness of using and
-distributing the Program and assumes all risks associated with its exercise of
-rights under this Agreement, including but not limited to the risks and costs of
-program errors, compliance with applicable laws, damage to or loss of data,
-programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable
-law, it shall not affect the validity or enforceability of the remainder of the
-terms of this Agreement, and without further action by the parties hereto, such
-provision shall be reformed to the minimum extent necessary to make such
-provision valid and enforceable.
-
-If Recipient institutes patent litigation against a Contributor with respect to
-a patent applicable to software (including a cross-claim or counterclaim in a
-lawsuit), then any patent licenses granted by that Contributor to such Recipient
-under this Agreement shall terminate as of the date such litigation is filed. In
-addition, if Recipient institutes patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
-itself (excluding combinations of the Program with other software or hardware)
-infringes such Recipient's patent(s), then such Recipient's rights granted under
-Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to
-comply with any of the material terms or conditions of this Agreement and does
-not cure such failure in a reasonable period of time after becoming aware of
-such noncompliance. If all Recipient's rights under this Agreement terminate,
-Recipient agrees to cease use and distribution of the Program as soon as
-reasonably practicable. However, Recipient's obligations under this Agreement
-and any licenses granted by Recipient relating to the Program shall continue and
-survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in
-order to avoid inconsistency the Agreement is copyrighted and may only be
-modified in the following manner. The Agreement Steward reserves the right to
-publish new versions (including revisions) of this Agreement from time to time.
-No one other than the Agreement Steward has the right to modify this Agreement.
-IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
-as the Agreement Steward to a suitable separate entity. Each new version of the
-Agreement will be given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the Agreement
-under which it was received. In addition, after a new version of the Agreement
-is published, Contributor may elect to distribute the Program (including its
-Contributions) under the new version. Except as expressly stated in Sections
-2(a) and 2(b) above, Recipient receives no rights or licenses to the
-intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the
-intellectual property laws of the United States of America. No party to this
-Agreement will bring a legal action under this Agreement more than one year
-after the cause of action arose. Each party waives its rights to a jury trial in
-any resulting litigation.
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/resources/licenses/epl-1.0.txt
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/licenses/epl-1.0.txt b/assembly/src/main/resources/licenses/epl-1.0.txt
deleted file mode 100644
index fddc311..0000000
--- a/assembly/src/main/resources/licenses/epl-1.0.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-b) its license agreement:
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-b) a copy of this Agreement must be included with each copy of the Program.
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Los
ses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b)
above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/resources/licenses/slf4j-mit.txt
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/licenses/slf4j-mit.txt b/assembly/src/main/resources/licenses/slf4j-mit.txt
deleted file mode 100644
index 0bf5791..0000000
--- a/assembly/src/main/resources/licenses/slf4j-mit.txt
+++ /dev/null
@@ -1,21 +0,0 @@
- Copyright (c) 2004-2011 QOS.ch
- All rights reserved.
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/resources/setenv-unix
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/setenv-unix b/assembly/src/main/resources/setenv-unix
deleted file mode 100644
index 3e3761b..0000000
--- a/assembly/src/main/resources/setenv-unix
+++ /dev/null
@@ -1,18 +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.
-#
-
-export JAVA_MAX_PERM_MEM=256M
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/resources/setenv-win
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/setenv-win b/assembly/src/main/resources/setenv-win
deleted file mode 100644
index ba8a743..0000000
--- a/assembly/src/main/resources/setenv-win
+++ /dev/null
@@ -1,18 +0,0 @@
-rem
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
-rem
-
-set JAVA_MAX_PERM_MEM=256M
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 9d8a635..cee06a8 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -32,10 +32,6 @@
<artifactId>itests</artifactId>
<name>Apache ServiceMix :: Integration Tests</name>
- <properties>
- <pax-exam-version>2.6.0</pax-exam-version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.scala-lang</groupId>
@@ -97,12 +93,6 @@
<artifactId>apache-servicemix</artifactId>
<version>${project.version}</version>
<type>zip</type>
- <exclusions>
- <exclusion>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6da0832..c169404 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,9 +44,8 @@
<module>branding</module>
<module>logging</module>
<module>examples</module>
- <module>itests</module>
<module>assemblies</module>
- <module>assembly</module>
+ <module>itests</module>
<module>tooling</module>
</modules>
[16/26] servicemix git commit: SM-2803: Refactor the assembly creation
Posted by ks...@apache.org.
SM-2803: Refactor the assembly creation
- correct the spring version range
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/a5080efc
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/a5080efc
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/a5080efc
Branch: refs/heads/master
Commit: a5080efcdc49c2d1b28018adbb27e77ae3eb11d6
Parents: 51e6475
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Fri Jan 22 22:28:39 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Fri Jan 22 22:28:39 2016 +0100
----------------------------------------------------------------------
.../features/servicemix-features/src/main/feature/feature.xml | 2 +-
assemblies/features/servicemix-kie/src/main/feature/feature.xml | 4 ++--
parent/pom.xml | 3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/a5080efc/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 b24b54b..088311b 100644
--- a/assemblies/features/servicemix-features/src/main/feature/feature.xml
+++ b/assemblies/features/servicemix-features/src/main/feature/feature.xml
@@ -40,7 +40,7 @@
<feature version="${cxf.version}">cxf-specs</feature>
<feature version="${aries.transaction.version}">transaction</feature>
<feature version="${camel.version}">camel</feature>
- <feature version="[3.2,3.3)">spring-orm</feature>
+ <feature version="${spring-version-range-karaf}">spring-orm</feature>
<feature version="${drools.version}">drools</feature>
<bundle dependency="true">mvn:joda-time/joda-time/${jodatime2.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/a5080efc/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 89bd79d..21fcf56 100644
--- a/assemblies/features/servicemix-kie/src/main/feature/feature.xml
+++ b/assemblies/features/servicemix-kie/src/main/feature/feature.xml
@@ -72,8 +72,8 @@
<feature name="kie-spring" version="${drools6.version}"
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>
+ <feature version="${spring-version-range-karaf}">spring</feature>
+ <feature version="${spring-version-range-karaf}">spring-orm</feature>
<bundle>mvn:org.kie/kie-spring/${drools6.version}</bundle>
</feature>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/a5080efc/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 50af50c..b3d79f1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -90,6 +90,9 @@
<servicemix.specs.version>2.5.0</servicemix.specs.version>
<slf4j.version>1.7.12</slf4j.version>
<spring.version>3.2.14.RELEASE_1</spring.version>
+ <!-- spring-dm does not support spring 4.x so import-range must be 3.x for the -->
+ <!-- Karaf features file. -->
+ <spring-version-range-karaf>[3.2,4)</spring-version-range-karaf>
<swagger.bundle.version>1.3.12_1</swagger.bundle.version>
<swagger.core.bundle.version>1.3.12_2</swagger.core.bundle.version>
<swagger.version>1.3.12</swagger.version>
[11/26] servicemix git commit: SM-2803: Refactor the assembly creation
Posted by ks...@apache.org.
SM-2803: Refactor the assembly creation
- mvn repo list updated
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/5724a977
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/5724a977
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/5724a977
Branch: refs/heads/master
Commit: 5724a977f27e8516bd8b098c45077aff81284098
Parents: 13c9b81
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Thu Jan 14 23:47:31 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Thu Jan 14 23:47:31 2016 +0100
----------------------------------------------------------------------
.../resources/etc/org.ops4j.pax.url.mvn.cfg | 26 ++++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/5724a977/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg b/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
index d0092d7..93b8ef9 100644
--- a/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
+++ b/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
@@ -79,13 +79,13 @@ org.ops4j.pax.url.mvn.defaultRepositories=\
#
# Comma separated list of repositories scanned when resolving an artifact.
# The default list includes the following repositories:
-# http://repo1.maven.org/maven2@id=maven.central.repo, \
-# http://repository.springsource.com/maven/bundles/release@id=springsource.release.repo, \
-# http://repository.springsource.com/maven/bundles/external@id=springsource.external.repo, \
-# http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache.snapshots.repo, \
-# http://svn.apache.org/repos/asf/servicemix/m2-repo@id=maven.smx.repo, \
-# http://zodiac.springsource.com/maven/bundles/release@id=gemini, \
-# https://oss.sonatype.org/content/repositories/releases/@id=maven.sonatype.repo
+# http://repo1.maven.org/maven2@id=central
+# http://repository.springsource.com/maven/bundles/release@id=spring.ebr
+# http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external
+# http://zodiac.springsource.com/maven/bundles/release@id=gemini
+# http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases
+# https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases
+# https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases
# To add repositories to the default ones, prepend '+' to the list of repositories
# to add.
# A repository url can be appended with zero or more of the following flags:
@@ -94,11 +94,11 @@ org.ops4j.pax.url.mvn.defaultRepositories=\
# @id=reponid : the id for the repository, just like in the settings.xml this is optional but recomendet
#
org.ops4j.pax.url.mvn.repositories= \
- http://repo1.maven.org/maven2@id=maven.central.repo, \
- http://repository.springsource.com/maven/bundles/release@id=springsource.release.repo, \
- http://repository.springsource.com/maven/bundles/external@id=springsource.external.repo, \
- http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache.snapshots.repo, \
- http://svn.apache.org/repos/asf/servicemix/m2-repo@id=maven.smx.repo, \
+ http://repo1.maven.org/maven2@id=central, \
+ http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, \
+ http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, \
http://zodiac.springsource.com/maven/bundles/release@id=gemini, \
- https://oss.sonatype.org/content/repositories/releases/@id=maven.sonatype.repo
+ http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, \
+ https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, \
+ https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases
[05/26] servicemix git commit: SM-2803: Refactor the assembly creation
Posted by ks...@apache.org.
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
deleted file mode 100644
index 05eb8ec..0000000
--- a/assembly/pom.xml
+++ /dev/null
@@ -1,386 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <!--
-
- 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.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>parent</artifactId>
- <version>6.1.1-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>apache-servicemix</artifactId>
- <packaging>pom</packaging>
- <name>Apache ServiceMix :: Assembly</name>
-
- <properties>
- <examples.directory>../examples</examples.directory>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.servicemix.features</groupId>
- <artifactId>servicemix-internal</artifactId>
- <version>${project.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.features</groupId>
- <artifactId>servicemix-features</artifactId>
- <version>${project.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.features</groupId>
- <artifactId>servicemix-examples</artifactId>
- <version>${project.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.features</groupId>
- <artifactId>servicemix-kie</artifactId>
- <version>${project.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxp-api-1.4</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-2.2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxws-api-2.2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.activator</artifactId>
- </dependency>
-
-
- <!-- Download Karaf assemblies for dependency:unpack-->
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <type>tar.gz</type>
- </dependency>
-
- <!--Xerces jar to be included in lib/endorsed -->
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
-
- <!--xalan jar to be included in lib/endorsed-->
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xalan</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xalan-serializer</artifactId>
- </dependency>
-
- <!-- branding -->
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>org.apache.servicemix.branding</artifactId>
- </dependency>
-
- </dependencies>
-
- <repositories>
- <!-- SpringSource EBR is necessary to get some Spring OSGi bundles atm -->
- <repository>
- <id>com.springsource.repository.bundles.release</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
- <url>http://repository.springsource.com/maven/bundles/release</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <build>
- <resources>
- <resource>
- <!-- we need unfiltered copies of these files -->
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/filtered-resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>karaf-maven-plugin</artifactId>
- <version>${karaf.version}</version>
- <executions>
- <execution>
- <id>add-features-to-repo</id>
- <phase>compile</phase>
- <goals>
- <goal>features-add-to-repository</goal>
- </goals>
- <configuration>
- <descriptors>
- <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>
- <descriptor>mvn:org.apache.servicemix.features/servicemix-internal/${project.version}/xml/features</descriptor>
- <descriptor>mvn:org.apache.servicemix.features/servicemix-features/${project.version}/xml/features</descriptor>
- <descriptor>mvn:org.apache.servicemix.features/servicemix-kie/${project.version}/xml/features</descriptor>
- <descriptor>mvn:org.apache.servicemix.features/servicemix-examples/${project.version}/xml/features</descriptor>
- </descriptors>
- <features>
- <feature>joda-time</feature>
- <feature>cxf</feature>
- <feature>obr</feature>
- <feature>config</feature>
- <feature>standard</feature>
- <feature>package</feature>
- <feature>kar</feature>
- <feature>ssh</feature>
- <feature>management</feature>
- <feature>eventadmin</feature>
- <feature>activemq-broker-noweb</feature>
- <feature>activemq-service</feature>
- <feature>camel</feature>
- <feature>camel-cxf</feature>
- <feature>activemq-camel</feature>
- <feature>camel-blueprint</feature>
- <feature>war</feature>
- <feature>jaxrs-api</feature>
- <feature>kie-aries-blueprint</feature>
- <feature>kie-spring</feature>
- <feature>kie-camel</feature>
- </features>
- <includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
- <repository>${project.build.directory}/features-repo</repository>
- </configuration>
- <inherited>false</inherited>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>filter</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>resources</goal>
- </goals>
- </execution>
- <execution>
- <id>copy-system-folder</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/features-repo</outputDirectory>
- <resources>
- <resource>
- <directory>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/system</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-unix</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <type>tar.gz</type>
- <outputDirectory>${project.build.directory}/dependencies/unix</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>unpack-win</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/dependencies/win</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>enable-obr</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target name="enable-obr">
- <echo message="Updating etc/startup.properties in assembly" />
- <concat destfile="${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/etc/startup.properties" append="true">
- <string value="${line.separator}" />
- <fileset file="${project.build.outputDirectory}/startup-obr.properties" />
- </concat>
- </target>
- </configuration>
- </execution>
- <execution>
- <id>increase-perm-mem</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target name="increase-perm-mem">
- <echo message="Updating bin/setenv in unix assembly" />
- <concat destfile="${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/bin/setenv" append="true" eol="unix">
- <fileset file="${project.build.outputDirectory}/setenv-unix" />
- </concat>
- <echo message="Updating bin/setenv.bat in windows assembly" />
- <concat destfile="${project.build.directory}/dependencies/win/apache-karaf-${karaf.version}/bin/setenv.bat" append="true" eol="dos">
- <fileset file="${project.build.outputDirectory}/setenv-win" />
- </concat>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>unix-bin</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
- </descriptors>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <tarLongFileMode>gnu</tarLongFileMode>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- </build>
-
-
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>unix-src</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/descriptors/unix-src.xml</descriptor>
- </descriptors>
- </configuration>
- <inherited>false</inherited>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-
-</project>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/appended-resources/META-INF/LICENSE.vm
----------------------------------------------------------------------
diff --git a/assembly/src/main/appended-resources/META-INF/LICENSE.vm b/assembly/src/main/appended-resources/META-INF/LICENSE.vm
deleted file mode 100644
index b3f4d8e..0000000
--- a/assembly/src/main/appended-resources/META-INF/LICENSE.vm
+++ /dev/null
@@ -1,40 +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.
-##
-## $Date: 2008-03-09 23:17:06 -0700 (Sun, 09 Mar 2008) $ $Rev: 635446 $
-##
-
-========================================================================
-
-Apache ServiceMix includes a number of components and libraries with
-separate copyright notices and license terms. Your use of those
-components are subject to the terms and conditions of the following
-licenses.
-
-#set ( $apacheTxt = "The Apache Software License, Version 2.0" )
-#foreach ( $project in $projects )
-#foreach ( $license in $project.licenses)
-#if ( ! ($apacheTxt == $license.name) )
-
-$project.name #if ($project.url)($project.url)#end $project.artifact
- License: $license.name #if ($license.url) ($license.url)#end
-
-#end
-#end
-#end
-
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/appended-resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/assembly/src/main/appended-resources/META-INF/NOTICE b/assembly/src/main/appended-resources/META-INF/NOTICE
deleted file mode 100644
index 896541a..0000000
--- a/assembly/src/main/appended-resources/META-INF/NOTICE
+++ /dev/null
@@ -1,8 +0,0 @@
-This product contains software developed by
-Open Participation Software for Java (http://www.ops4j.org/).
-
-This software contains unmodified binary redistributions for H2 database engine (http://www.h2database.com/),
-which is dual licensed and available under a modified version of the MPL 1.1 (Mozilla Public License)
-or under the (unmodified) EPL 1.0 (Eclipse Public License).
-An original copy of the license agreement can be found at: http://www.h2database.com/html/license.html
-
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/descriptors/unix-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/descriptors/unix-bin.xml b/assembly/src/main/descriptors/unix-bin.xml
deleted file mode 100644
index 22ab142..0000000
--- a/assembly/src/main/descriptors/unix-bin.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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.
--->
-<assembly>
- <id>apache-servicemix</id>
-
- <formats>
- <format>zip</format>
- </formats>
-
- <componentDescriptors>
- <componentDescriptor>${project.build.outputDirectory}/common-bin.xml</componentDescriptor>
- <componentDescriptor>${project.build.outputDirectory}/common-unix-bin.xml</componentDescriptor>
- <componentDescriptor>${project.build.outputDirectory}/examples-unix-bin.xml</componentDescriptor>
- </componentDescriptors>
-
-</assembly>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/descriptors/unix-src.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/descriptors/unix-src.xml b/assembly/src/main/descriptors/unix-src.xml
deleted file mode 100644
index b6b507a..0000000
--- a/assembly/src/main/descriptors/unix-src.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?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.
--->
-<assembly>
- <id>src</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <!-- Copy license and other files from root -->
- <fileSet>
- <directory>${basedir}/..</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>BUILDING</include>
- <include>README</include>
- <include>RELEASE*</include>
- </includes>
- <lineEnding>unix</lineEnding>
- </fileSet>
-
- <!-- Binary Files -->
- <fileSet>
- <directory>${basedir}/..</directory>
- <outputDirectory>src</outputDirectory>
- <includes>
- <include>**/*.jpeg</include>
- <include>**/*.jpg</include>
- <include>**/*.gif</include>
- <include>**/*.png</include>
- <include>**/*.exe</include>
- <include>**/*.dll</include>
- <include>**/*.jar</include>
- <include>**/*.so</include>
- <include>**/*.ks</include>
- <include>**/*.ts</include>
- <include>**/*.keystore</include>
- <include>**/*.bin</include>
- <include>**/*.jnilib</include>
- <include>**/*.cert</include>
- <include>**/*.jks</include>
- </includes>
- <excludes>
- <exclude>**/eclipse-classes/**</exclude>
- <exclude>**/target/**</exclude>
- </excludes>
- </fileSet>
-
- <!-- Text Files -->
- <fileSet>
- <directory>${basedir}/..</directory>
- <outputDirectory>src</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- <excludes>
- <exclude>**/*.jpeg</exclude>
- <exclude>**/*.jpg</exclude>
- <exclude>**/*.gif</exclude>
- <exclude>**/*.png</exclude>
- <exclude>**/*.exe</exclude>
- <exclude>**/*.dll</exclude>
- <exclude>**/*.jar</exclude>
- <exclude>**/*.so</exclude>
- <exclude>**/*.ks</exclude>
- <exclude>**/*.ts</exclude>
- <exclude>**/*.keystore</exclude>
- <exclude>**/*.bin</exclude>
- <exclude>**/*.jnilib</exclude>
- <exclude>**/*.cert</exclude>
- <exclude>**/target/**</exclude>
- <exclude>**/build/**</exclude>
- <exclude>activemq-data/**</exclude>
- <exclude>*/activemq-data/**</exclude>
- <exclude>**/eclipse-classes/**</exclude>
- <exclude>**/.*</exclude>
- <exclude>**/.*/**</exclude>
-
- <exclude>**/surefire*</exclude>
- <exclude>**/svn-commit*</exclude>
-
- <exclude>**/*.iml</exclude>
- <exclude>**/*.ipr</exclude>
- <exclude>**/*.iws</exclude>
- <exclude>**/*.jks</exclude>
-
- <exclude>**/cobertura.ser</exclude>
-
- </excludes>
- <lineEnding>unix</lineEnding>
- </fileSet>
- </fileSets>
- <files>
- <file>
- <source>${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE</source>
- <outputDirectory>/</outputDirectory>
- <destName>LICENSE</destName>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- <file>
- <source>${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE</source>
- <outputDirectory>/</outputDirectory>
- <destName>NOTICE</destName>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- </files>
-</assembly>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/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
deleted file mode 100644
index 28b52c0..0000000
--- a/assembly/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
+++ /dev/null
@@ -1,77 +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.
-#
-################################################################################
-
-#
-# Defines if the startlvl should be respected during feature startup. The default value is true. The default
-# behavior for 2.x is false (!) for this property
-#
-# Be aware that this property is deprecated and will be removed in Karaf 4.0. So, if you need to
-# set this to false, please use this only as a temporary solution!
-#
-#respectStartLvlDuringFeatureStartup=true
-
-
-#
-# Defines if the startlvl should be respected during feature uninstall. The default value is true.
-# If true, means stop bundles respecting the descend order of start level in a certain feature.
-#
-#respectStartLvlDuringFeatureUninstall=true
-
-#
-# 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
-
-#
-# 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
-
-
-#
-# Defines if the boot features are started in asynchronous mode (in a dedicated thread)
-#
-featuresBootAsynchronous=false
-
-
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/filtered-resources/etc/overrides.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/etc/overrides.properties b/assembly/src/main/filtered-resources/etc/overrides.properties
deleted file mode 100644
index 566abcf..0000000
--- a/assembly/src/main/filtered-resources/etc/overrides.properties
+++ /dev/null
@@ -1,36 +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.
-#
-
-# workaround for SM-2469
-#
-# some standard features install the version 2.2 of joda-time bundle ans bundles which depend on joda-time
-# wire to this bundle. Later installation of activiti fails, because it needs higher version of joda-time
-# and activiti tries to resolve this bundle via multiple paths. We want to force all features installing
-# joda-time/joda-time bundle with range [2,3) to use exactly the version given below to make sure only one
-# version of joda-time is installed in the system.
-mvn:joda-time/joda-time/${jodatime2.bundle.version};range="[2,3)"
-
-# workaround for SM-2727
-# Camel 2.16.x includes jackson in version 2.6.x but ActiveMQ and CXF still use the version 2.4.x. It makes
-# problems while resolving some bundles (see the issue for details). We should force usage of 2.6.x until
-# ActiveMQ and CXF upgrade to 2.6.x
-mvn:com.fasterxml.jackson.core/jackson-core/${fasterxml.jackson.version};range="[2,3)"
-mvn:com.fasterxml.jackson.core/jackson-databind/${fasterxml.jackson.version};range="[2,3)"
-mvn:com.fasterxml.jackson.core/jackson-annotations/${fasterxml.jackson.version};range="[2,3)"
-mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${fasterxml.jackson.version};range="[2,3)"
-mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version};range="[2,3)"
-mvn:com.fasterxml.jackson.module/jackson-module-scala_2.11/${fasterxml.jackson.version};range="[2,3)"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/filtered-resources/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/pom.xml b/assembly/src/main/filtered-resources/pom.xml
deleted file mode 100644
index 778ef74..0000000
--- a/assembly/src/main/filtered-resources/pom.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <!--
-
- 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.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.servicemix.examples</groupId>
- <artifactId>examples</artifactId>
- <packaging>pom</packaging>
- <version>${project.version}</version>
- <name>Apache ServiceMix :: Examples</name>
- <properties>
- <akka.version>${akka.version}</akka.version>
- <cxf.version>${cxf.version}</cxf.version>
- <drools.version>${drools.version}</drools.version>
- <drools6.version>${drools6.version}</drools6.version>
- <jaxb.api.version>${jaxb.api.version}</jaxb.api.version>
- <karaf.version>${karaf.version}</karaf.version>
- <scala.version>${scala.version}</scala.version>
- <slf4j.version>${slf4j.version}</slf4j.version>
- <swagger.version>${swagger.version}</swagger.version>
- <xerces.version>${xerces.version}</xerces.version>
-
- <cxf.codegen-plugin.version>${cxf.codegen-plugin.version}</cxf.codegen-plugin.version>
- <exec-maven-plugin.version>${exec-maven-plugin.version}</exec-maven-plugin.version>
- <maven-scala-plugin.version>${maven-scala-plugin.version}</maven-scala-plugin.version>
- </properties>
- <!-- Managed dependencies -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-parent</artifactId>
- <version>${camel.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-security</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>karaf</artifactId>
- <version>${karaf.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jsr339-api-2.0</artifactId>
- <version>${servicemix.specs.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
- <version>${servicemix.specs.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-core</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-rm</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-addr</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-policy</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.services.wsn</groupId>
- <artifactId>cxf-services-wsn-core</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.activiti</groupId>
- <artifactId>activiti-camel</artifactId>
- <version>${activiti.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- <version>${geronimo-ws-metadata.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
- <version>${commons-httpclient.bundle.version}</version>
- </dependency>
- <dependency>
- <groupId>com.wordnik</groupId>
- <artifactId>swagger-jaxrs_2.11</artifactId>
- <version>${swagger.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle-plugin.version}</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>${exec-maven-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- <version>${maven-scala-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
- <version>${cxf.codegen-plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <modules>
- <module>activemq</module>
- <module>activiti</module>
- <module>akka</module>
- <module>camel</module>
- <module>cxf</module>
- <module>drools</module>
- <module>karaf</module>
- </modules>
-
- <repositories>
- <!-- Required to build the examples in a SNAPSHOT assembly -->
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
-</project>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/filtered-resources/startup-obr.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/startup-obr.properties b/assembly/src/main/filtered-resources/startup-obr.properties
deleted file mode 100644
index d754e01..0000000
--- a/assembly/src/main/filtered-resources/startup-obr.properties
+++ /dev/null
@@ -1,19 +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.
-#
-
-# add here bundles you want to install while system startup, e.g.
-# joda-time/joda-time/${jodatime2.bundle.version}/joda-time-${jodatime2.bundle.version}.jar=10
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/resources/common-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/common-bin.xml b/assembly/src/main/resources/common-bin.xml
deleted file mode 100644
index 5c549f8..0000000
--- a/assembly/src/main/resources/common-bin.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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.
--->
-<component>
- <fileSets>
- <fileSet>
- <outputDirectory>system</outputDirectory>
- <directory>${project.build.directory}/features-repo</directory>
- </fileSet>
- </fileSets>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <outputFileNameMapping>servicemix-version.jar</outputFileNameMapping>
- <fileMode>0644</fileMode>
- <includes>
- <include>org.apache.servicemix:org.apache.servicemix.branding</include>
- </includes>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activator</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/lib/endorsed</outputDirectory>
- <fileMode>0644</fileMode>
- <includes>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.2</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.saaj-api-1.3</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.2</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan-serializer</include>
- <include>xerces:xercesImpl</include>
- </includes>
- </dependencySet>
- </dependencySets>
-</component>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/resources/common-unix-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/common-unix-bin.xml b/assembly/src/main/resources/common-unix-bin.xml
deleted file mode 100644
index 4c41195..0000000
--- a/assembly/src/main/resources/common-unix-bin.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?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.
--->
-<component>
- <fileSets>
- <!-- Cherry-pick files from the expanded Karaf distribution -->
- <fileSet>
- <directory>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>**/demos/**</exclude>
- <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>system/**</exclude>
- <exclude>LICENSE</exclude>
- <exclude>NOTICE</exclude>
- <exclude>README</exclude>
- <exclude>RELEASE-NOTES</exclude>
- <exclude>karaf-manual*</exclude>
- </excludes>
- <fileMode>0644</fileMode>
- <directoryMode>0775</directoryMode>
- </fileSet>
-
- <!-- Copy over bin/* scripts separately to get the correct file mode -->
- <fileSet>
- <directory>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>bin/*</include>
- </includes>
- <lineEnding>unix</lineEnding>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/dependencies/win/apache-karaf-${karaf.version}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>bin/*</include>
- </includes>
- <lineEnding>dos</lineEnding>
- <fileMode>0755</fileMode>
- </fileSet>
-
- <!-- Copy README and RELEASE-NOTES from root -->
- <fileSet>
- <directory>${basedir}/..</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>
-
- <files>
- <file>
- <source>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/bin/karaf</source>
- <outputDirectory>/bin/</outputDirectory>
- <destName>servicemix</destName>
- <fileMode>0755</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- <file>
- <source>${project.build.directory}/dependencies/win/apache-karaf-${karaf.version}/bin/karaf.bat</source>
- <outputDirectory>/bin/</outputDirectory>
- <destName>servicemix.bat</destName>
- <fileMode>0755</fileMode>
- <lineEnding>dos</lineEnding>
- </file>
- <file>
- <source>${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE</source>
- <outputDirectory>/</outputDirectory>
- <destName>LICENSE</destName>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- <file>
- <source>${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE</source>
- <outputDirectory>/</outputDirectory>
- <destName>NOTICE</destName>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- </files>
-
-</component>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/resources/etc/custom.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/custom.properties b/assembly/src/main/resources/etc/custom.properties
deleted file mode 100644
index 6764f76..0000000
--- a/assembly/src/main/resources/etc/custom.properties
+++ /dev/null
@@ -1,125 +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.
-#
-################################################################################
-
-#
-# You can place any customized configuration here.
-# All the values specified here will override the default value.
-#
-
-karaf.systemBundlesStartLevel=50
-
-# javax.transaction is needed to avoid class loader constraint violation when using javax.sql
-# as servicemix is using sun saaj impl bundle, we should ignore the package of saaj
-# as servicemix is using sun jaxb impl bundle, we should ignore the package of jaxb
-org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,org.apache.karaf.jaas.boot.principal,!com.sun.xml.messaging.saaj.*,!com.sun.xml.internal.bind.*,sun.*,com.sun.*,javax.transaction,javax.transaction.*,javax.xml.crypto,javax.xml.crypto.*,org.apache.xalan.processor,org.apache.xpath.jaxp,org.apache.xml.dtm.ref,org.apache.xerces.jaxp.datatype,org.apache.xerces.stax,org.apache.xerces.parsers,org.apache.xerces.jaxp,org.apache.xerces.jaxp.validation,org.apache.xerces.dom
-
-
-org.osgi.framework.system.packages.extra = \
- org.apache.karaf.branding, \
- com.sun.org.apache.xalan.internal.xsltc.trax, \
- com.sun.org.apache.xerces.internal.dom, \
- com.sun.org.apache.xerces.internal.jaxp, \
- com.sun.org.apache.xerces.internal.xni, \
- com.sun.jndi.ldap, \
- org.apache.xalan.extensions; version="2.7.2", \
- org.apache.xalan.xsltc.compiler; version="2.7.2", \
- org.apache.xalan.xsltc.cmdline.getopt; version="2.7.2", \
- org.apache.xalan.xsltc.util; version="2.7.2", \
- org.apache.xalan.transformer; version="2.7.2", \
- org.apache.xalan.xsltc.trax; version="2.7.2", \
- org.apache.xalan.processor; version="2.7.2", \
- org.apache.xalan.lib; version="2.7.2", \
- org.apache.xalan.trace; version="2.7.2", \
- org.apache.xalan.xsltc.compiler.util; version="2.7.2", \
- org.apache.xalan.templates; version="2.7.2", \
- org.apache.xalan.xsltc; version="2.7.2", \
- org.apache.xalan.xsltc.runtime; version="2.7.2", \
- org.apache.xalan; version="2.7.2", \
- org.apache.xalan.xslt; version="2.7.2", \
- org.apache.xalan.lib.sql; version="2.7.2", \
- org.apache.xalan.xsltc.runtime.output; version="2.7.2", \
- org.apache.xalan.xsltc.dom; version="2.7.2", \
- org.apache.xalan.client; version="2.7.2", \
- org.apache.xalan.xsltc.cmdline; version="2.7.2", \
- org.apache.xalan.serialize; version="2.7.2", \
- org.apache.xalan.res; version="2.7.2", \
- org.apache.xml.dtm.ref; version="2.7.2", \
- org.apache.xml.dtm; version="2.7.2", \
- org.apache.xml.dtm.ref.sax2dtm; version="2.7.2", \
- org.apache.xml.dtm.ref.dom2dtm; version="2.7.2", \
- org.apache.xml.res; version="2.7.2", \
- org.apache.xml.serializer.dom3; version="2.7.2", \
- org.apache.xml.serializer; version="2.7.2", \
- org.apache.xml.serializer.utils; version="2.7.2", \
- org.apache.xml.utils.res; version="2.7.2", \
- org.apache.xml.utils; version="2.7.2", \
- org.apache.xpath.functions; version="2.7.2", \
- org.apache.xpath.jaxp; version="2.7.2", \
- org.apache.xpath.patterns; version="2.7.2", \
- org.apache.xpath.objects; version="2.7.2", \
- org.apache.xpath.res; version="2.7.2", \
- org.apache.xpath; version="2.7.2", \
- org.apache.xpath.axes; version="2.7.2", \
- org.apache.xpath.compiler; version="2.7.2", \
- org.apache.xpath.operations; version="2.7.2", \
- org.apache.xpath.domapi; version="2.7.2", \
- org.apache.html.dom; version="2.11.0", \
- org.apache.wml.dom; version="2.11.0", \
- org.apache.wml; version="2.11.0", \
- org.apache.xerces.parsers; version="2.11.0", \
- org.apache.xerces.impl.dtd.models; version="2.11.0", \
- org.apache.xerces.xni.parser; version="2.11.0", \
- org.apache.xerces.impl.dv.xs; version="2.11.0", \
- org.apache.xerces.impl.xs.traversers; version="2.11.0", \
- org.apache.xerces.util; version="2.11.0", \
- org.apache.xerces.impl.dtd; version="2.11.0", \
- org.apache.xerces.jaxp.validation; version="2.11.0", \
- org.apache.xerces.dom3.as; version="2.11.0", \
- org.apache.xerces.impl.dv; version="2.11.0", \
- org.apache.xerces.jaxp; version="2.11.0", \
- org.apache.xerces.jaxp.datatype; version="2.11.0", \
- org.apache.xerces.impl.xpath.regex; version="2.11.0", \
- org.apache.xerces.xni; version="2.11.0", \
- org.apache.xerces.impl.msg; version="2.11.0", \
- org.apache.xerces.impl.dv.util; version="2.11.0", \
- org.apache.xerces.impl.xs.util; version="2.11.0", \
- org.apache.xerces.dom; version="2.11.0", \
- org.apache.xerces.dom.events; version="2.11.0", \
- org.apache.xerces.impl.xs.opti; version="2.11.0", \
- org.apache.xerces.impl; version="2.11.0", \
- org.apache.xerces.xs; version="2.11.0", \
- org.apache.xerces.impl.io; version="2.11.0", \
- org.apache.xerces.xpointer; version="2.11.0", \
- org.apache.xerces.impl.dv.dtd; version="2.11.0", \
- org.apache.xerces.xinclude; version="2.11.0", \
- org.apache.xerces.impl.xpath; version="2.11.0", \
- org.apache.xerces.xs.datatypes; version="2.11.0", \
- org.apache.xerces.impl.xs.identity; version="2.11.0", \
- org.apache.xerces.impl.xs.models; version="2.11.0", \
- org.apache.xerces.xni.grammars; version="2.11.0", \
- org.apache.xerces.impl.xs; version="2.11.0", \
- org.apache.xerces.impl.validation; version="2.11.0", \
- org.apache.xml.serialize; version="2.11.0", \
- sun.misc
-
-#
-# Delay console startup until bundles have been properly started
-#
-karaf.delay.console=true
-karaf.startup.message=Please wait while Apache ServiceMix is starting...
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/resources/etc/jre.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/jre.properties b/assembly/src/main/resources/etc/jre.properties
deleted file mode 100644
index 0a67bc1..0000000
--- a/assembly/src/main/resources/etc/jre.properties
+++ /dev/null
@@ -1,542 +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.
-#
-################################################################################
-
-#
-# Java platform package export properties.
-#
-
-# Standard package set. Note that:
-# - javax.transaction* is exported with a mandatory attribute
-jre-1.6= \
- javax.accessibility, \
- javax.activation;version="1.1", \
- javax.activity, \
- javax.annotation;version="1.1", \
- javax.annotation.processing;version="1.1", \
- javax.crypto, \
- javax.crypto.interfaces, \
- javax.crypto.spec, \
- javax.imageio, \
- javax.imageio.event, \
- javax.imageio.metadata, \
- javax.imageio.plugins.bmp, \
- javax.imageio.plugins.jpeg, \
- javax.imageio.spi, \
- javax.imageio.stream, \
- javax.jws;version="2.0", \
- javax.jws.soap;version="2.0", \
- javax.lang.model, \
- javax.lang.model.element, \
- javax.lang.model.type, \
- javax.lang.model.util, \
- javax.management, \
- javax.management.loading, \
- javax.management.modelmbean, \
- javax.management.monitor, \
- javax.management.openmbean, \
- javax.management.relation, \
- javax.management.remote, \
- javax.management.remote.rmi, \
- javax.management.timer, \
- javax.naming, \
- javax.naming.directory, \
- javax.naming.event, \
- javax.naming.ldap, \
- javax.naming.spi, \
- javax.net, \
- javax.net.ssl, \
- javax.print, \
- javax.print.attribute, \
- javax.print.attribute.standard, \
- javax.print.event, \
- javax.rmi, \
- javax.rmi.CORBA, \
- javax.rmi.ssl, \
- javax.script, \
- javax.security.auth, \
- javax.security.auth.callback, \
- javax.security.auth.kerberos, \
- javax.security.auth.login, \
- javax.security.auth.spi, \
- javax.security.auth.x500, \
- javax.security.cert, \
- javax.security.sasl, \
- javax.sound.midi, \
- javax.sound.midi.spi, \
- javax.sound.sampled, \
- javax.sound.sampled.spi, \
- javax.sql, \
- javax.sql.rowset, \
- javax.sql.rowset.serial, \
- javax.sql.rowset.spi, \
- javax.swing, \
- javax.swing.border, \
- javax.swing.colorchooser, \
- javax.swing.event, \
- javax.swing.filechooser, \
- javax.swing.plaf, \
- javax.swing.plaf.basic, \
- javax.swing.plaf.metal, \
- javax.swing.plaf.multi, \
- javax.swing.plaf.synth, \
- javax.swing.table, \
- javax.swing.text, \
- javax.swing.text.html, \
- javax.swing.text.html.parser, \
- javax.swing.text.rtf, \
- javax.swing.tree, \
- javax.swing.undo, \
- javax.tools, \
- javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
- javax.xml, \
- javax.xml.bind;version="2.2.1", \
- javax.xml.bind.annotation;version="2.2.1", \
- javax.xml.bind.annotation.adapters;version="2.2.1", \
- javax.xml.bind.attachment;version="2.2.1", \
- javax.xml.bind.helpers;version="2.2.1", \
- javax.xml.bind.util;version="2.2.1", \
- javax.xml.crypto, \
- javax.xml.crypto.dom, \
- javax.xml.crypto.dsig, \
- javax.xml.crypto.dsig.dom, \
- javax.xml.crypto.dsig.keyinfo, \
- javax.xml.crypto.dsig.spec, \
- javax.xml.datatype, \
- javax.xml.namespace, \
- javax.xml.parsers, \
- javax.xml.soap;version="1.3", \
- javax.xml.stream;version="1.2", \
- javax.xml.stream.events;version="1.2", \
- javax.xml.stream.util;version="1.2", \
- javax.xml.transform, \
- javax.xml.transform.dom, \
- javax.xml.transform.sax, \
- javax.xml.transform.stax, \
- javax.xml.transform.stream, \
- javax.xml.validation, \
- javax.xml.ws;version="2.2", \
- javax.xml.ws.handler;version="2.2", \
- javax.xml.ws.handler.soap;version="2.2", \
- 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.xpath, \
- org.ietf.jgss, \
- org.omg.CORBA, \
- org.omg.CORBA_2_3, \
- org.omg.CORBA_2_3.portable, \
- org.omg.CORBA.DynAnyPackage, \
- org.omg.CORBA.ORBPackage, \
- org.omg.CORBA.portable, \
- org.omg.CORBA.TypeCodePackage, \
- org.omg.CosNaming, \
- org.omg.CosNaming.NamingContextExtPackage, \
- org.omg.CosNaming.NamingContextPackage, \
- org.omg.Dynamic, \
- org.omg.DynamicAny, \
- org.omg.DynamicAny.DynAnyFactoryPackage, \
- org.omg.DynamicAny.DynAnyPackage, \
- org.omg.IOP, \
- org.omg.IOP.CodecFactoryPackage, \
- org.omg.IOP.CodecPackage, \
- org.omg.Messaging, \
- org.omg.PortableInterceptor, \
- org.omg.PortableInterceptor.ORBInitInfoPackage, \
- org.omg.PortableServer, \
- org.omg.PortableServer.CurrentPackage, \
- org.omg.PortableServer.POAManagerPackage, \
- org.omg.PortableServer.POAPackage, \
- org.omg.PortableServer.portable, \
- org.omg.PortableServer.ServantLocatorPackage, \
- org.omg.SendingContext, \
- org.omg.stub.java.rmi, \
- org.omg.stub.javax.management.remote.rmi, \
- org.w3c.dom, \
- org.w3c.dom.bootstrap, \
- org.w3c.dom.css, \
- org.w3c.dom.events, \
- org.w3c.dom.html, \
- org.w3c.dom.ls, \
- org.w3c.dom.ranges, \
- org.w3c.dom.stylesheets, \
- org.w3c.dom.traversal, \
- org.w3c.dom.views, \
- org.w3c.dom.xpath, \
- org.xml.sax, \
- org.xml.sax.ext, \
- org.xml.sax.helpers
-
-# Standard package set. Note that:
-# - javax.transaction* is exported with a mandatory attribute
-jre-1.7= \
- javax.accessibility, \
- javax.activation;version="1.1", \
- javax.activity, \
- javax.annotation;version="1.1", \
- javax.annotation.processing;version="1.1", \
- javax.crypto, \
- javax.crypto.interfaces, \
- javax.crypto.spec, \
- javax.imageio, \
- javax.imageio.event, \
- javax.imageio.metadata, \
- javax.imageio.plugins.bmp, \
- javax.imageio.plugins.jpeg, \
- javax.imageio.spi, \
- javax.imageio.stream, \
- javax.jws;version="2.0", \
- javax.jws.soap;version="2.0", \
- javax.lang.model, \
- javax.lang.model.element, \
- javax.lang.model.type, \
- javax.lang.model.util, \
- javax.management, \
- javax.management.loading, \
- javax.management.modelmbean, \
- javax.management.monitor, \
- javax.management.openmbean, \
- javax.management.relation, \
- javax.management.remote, \
- javax.management.remote.rmi, \
- javax.management.timer, \
- javax.naming, \
- javax.naming.directory, \
- javax.naming.event, \
- javax.naming.ldap, \
- javax.naming.spi, \
- javax.net, \
- javax.net.ssl, \
- javax.print, \
- javax.print.attribute, \
- javax.print.attribute.standard, \
- javax.print.event, \
- javax.rmi, \
- javax.rmi.CORBA, \
- javax.rmi.ssl, \
- javax.script, \
- javax.security.auth, \
- javax.security.auth.callback, \
- javax.security.auth.kerberos, \
- javax.security.auth.login, \
- javax.security.auth.spi, \
- javax.security.auth.x500, \
- javax.security.cert, \
- javax.security.sasl, \
- javax.sound.midi, \
- javax.sound.midi.spi, \
- javax.sound.sampled, \
- javax.sound.sampled.spi, \
- javax.sql, \
- javax.sql.rowset, \
- javax.sql.rowset.serial, \
- javax.sql.rowset.spi, \
- javax.swing, \
- javax.swing.border, \
- javax.swing.colorchooser, \
- javax.swing.event, \
- javax.swing.filechooser, \
- javax.swing.plaf, \
- javax.swing.plaf.basic, \
- javax.swing.plaf.metal, \
- javax.swing.plaf.multi, \
- javax.swing.plaf.synth, \
- javax.swing.table, \
- javax.swing.text, \
- javax.swing.text.html, \
- javax.swing.text.html.parser, \
- javax.swing.text.rtf, \
- javax.swing.tree, \
- javax.swing.undo, \
- javax.tools, \
- javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
- javax.xml, \
- javax.xml.bind;version="2.2.1", \
- javax.xml.bind.annotation;version="2.2.1", \
- javax.xml.bind.annotation.adapters;version="2.2.1", \
- javax.xml.bind.attachment;version="2.2.1", \
- javax.xml.bind.helpers;version="2.2.1", \
- javax.xml.bind.util;version="2.2.1", \
- javax.xml.crypto, \
- javax.xml.crypto.dom, \
- javax.xml.crypto.dsig, \
- javax.xml.crypto.dsig.dom, \
- javax.xml.crypto.dsig.keyinfo, \
- javax.xml.crypto.dsig.spec, \
- javax.xml.datatype, \
- javax.xml.namespace, \
- javax.xml.parsers, \
- javax.xml.soap;version="1.3", \
- javax.xml.stream;version="1.2", \
- javax.xml.stream.events;version="1.2", \
- javax.xml.stream.util;version="1.2", \
- javax.xml.transform, \
- javax.xml.transform.dom, \
- javax.xml.transform.sax, \
- javax.xml.transform.stax, \
- javax.xml.transform.stream, \
- javax.xml.validation, \
- javax.xml.ws;version="2.2", \
- javax.xml.ws.handler;version="2.2", \
- javax.xml.ws.handler.soap;version="2.2", \
- 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.xpath, \
- org.ietf.jgss, \
- org.omg.CORBA, \
- org.omg.CORBA_2_3, \
- org.omg.CORBA_2_3.portable, \
- org.omg.CORBA.DynAnyPackage, \
- org.omg.CORBA.ORBPackage, \
- org.omg.CORBA.portable, \
- org.omg.CORBA.TypeCodePackage, \
- org.omg.CosNaming, \
- org.omg.CosNaming.NamingContextExtPackage, \
- org.omg.CosNaming.NamingContextPackage, \
- org.omg.Dynamic, \
- org.omg.DynamicAny, \
- org.omg.DynamicAny.DynAnyFactoryPackage, \
- org.omg.DynamicAny.DynAnyPackage, \
- org.omg.IOP, \
- org.omg.IOP.CodecFactoryPackage, \
- org.omg.IOP.CodecPackage, \
- org.omg.Messaging, \
- org.omg.PortableInterceptor, \
- org.omg.PortableInterceptor.ORBInitInfoPackage, \
- org.omg.PortableServer, \
- org.omg.PortableServer.CurrentPackage, \
- org.omg.PortableServer.POAManagerPackage, \
- org.omg.PortableServer.POAPackage, \
- org.omg.PortableServer.portable, \
- org.omg.PortableServer.ServantLocatorPackage, \
- org.omg.SendingContext, \
- org.omg.stub.java.rmi, \
- org.omg.stub.javax.management.remote.rmi, \
- org.w3c.dom, \
- org.w3c.dom.bootstrap, \
- org.w3c.dom.css, \
- org.w3c.dom.events, \
- org.w3c.dom.html, \
- org.w3c.dom.ls, \
- org.w3c.dom.ranges, \
- org.w3c.dom.stylesheets, \
- org.w3c.dom.traversal, \
- org.w3c.dom.views, \
- org.w3c.dom.xpath, \
- org.xml.sax, \
- org.xml.sax.ext, \
- org.xml.sax.helpers
-
-jre-1.8= \
- javax.accessibility, \
- javax.activation;version="1.1", \
- javax.activity, \
- javax.annotation;version="1.2", \
- javax.annotation.processing;version="1.2", \
- javax.crypto, \
- javax.crypto.interfaces, \
- javax.crypto.spec, \
- javax.imageio, \
- javax.imageio.event, \
- javax.imageio.metadata, \
- javax.imageio.plugins.bmp, \
- javax.imageio.plugins.jpeg, \
- javax.imageio.spi, \
- javax.imageio.stream, \
- javax.jws;version="2.0", \
- javax.jws.soap;version="2.0", \
- javax.lang.model, \
- javax.lang.model.element, \
- javax.lang.model.type, \
- javax.lang.model.util, \
- javax.management, \
- javax.management.loading, \
- javax.management.modelmbean, \
- javax.management.monitor, \
- javax.management.openmbean, \
- javax.management.relation, \
- javax.management.remote, \
- javax.management.remote.rmi, \
- javax.management.timer, \
- javax.naming, \
- javax.naming.directory, \
- javax.naming.event, \
- javax.naming.ldap, \
- javax.naming.spi, \
- javax.net, \
- javax.net.ssl, \
- javax.print, \
- javax.print.attribute, \
- javax.print.attribute.standard, \
- javax.print.event, \
- javax.rmi, \
- javax.rmi.CORBA, \
- javax.rmi.ssl, \
- javax.script, \
- javax.security.auth, \
- javax.security.auth.callback, \
- javax.security.auth.kerberos, \
- javax.security.auth.login, \
- javax.security.auth.spi, \
- javax.security.auth.x500, \
- javax.security.cert, \
- javax.security.sasl, \
- javax.sound.midi, \
- javax.sound.midi.spi, \
- javax.sound.sampled, \
- javax.sound.sampled.spi, \
- javax.sql, \
- javax.sql.rowset, \
- javax.sql.rowset.serial, \
- javax.sql.rowset.spi, \
- javax.swing, \
- javax.swing.border, \
- javax.swing.colorchooser, \
- javax.swing.event, \
- javax.swing.filechooser, \
- javax.swing.plaf, \
- javax.swing.plaf.basic, \
- javax.swing.plaf.metal, \
- javax.swing.plaf.multi, \
- javax.swing.plaf.synth, \
- javax.swing.table, \
- javax.swing.text, \
- javax.swing.text.html, \
- javax.swing.text.html.parser, \
- javax.swing.text.rtf, \
- javax.swing.tree, \
- javax.swing.undo, \
- javax.tools, \
- javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
- javax.xml, \
- javax.xml.bind;version="2.2.1", \
- javax.xml.bind.annotation;version="2.2.1", \
- javax.xml.bind.annotation.adapters;version="2.2.1", \
- javax.xml.bind.attachment;version="2.2.1", \
- javax.xml.bind.helpers;version="2.2.1", \
- javax.xml.bind.util;version="2.2.1", \
- javax.xml.crypto, \
- javax.xml.crypto.dom, \
- javax.xml.crypto.dsig, \
- javax.xml.crypto.dsig.dom, \
- javax.xml.crypto.dsig.keyinfo, \
- javax.xml.crypto.dsig.spec, \
- javax.xml.datatype, \
- javax.xml.namespace, \
- javax.xml.parsers, \
- javax.xml.soap;version="1.3", \
- javax.xml.stream;version="1.2", \
- javax.xml.stream.events;version="1.2", \
- javax.xml.stream.util;version="1.2", \
- javax.xml.transform, \
- javax.xml.transform.dom, \
- javax.xml.transform.sax, \
- javax.xml.transform.stax, \
- javax.xml.transform.stream, \
- javax.xml.validation, \
- javax.xml.ws;version="2.2", \
- javax.xml.ws.handler;version="2.2", \
- javax.xml.ws.handler.soap;version="2.2", \
- javax.xml.ws.http;version="2.2", \
- javax.xml.ws.soap;version="2.2", \
- javax.xml.ws.spi;version="2.2", \
- javax.xml.ws.wsaddressing;version="2.2", \
- javax.xml.ws.spi.http;version="2.2", \
- javax.xml.xpath, \
- javafx.animation, \
- javafx.application, \
- javafx.beans, \
- javafx.beans.binding, \
- javafx.beans.property, \
- javafx.beans.property.adapter, \
- javafx.beans.value, \
- javafx.collections, \
- javafx.concurrent, \
- javafx.css, \
- javafx.embed.swing, \
- javafx.embed.swt, \
- javafx.event, \
- javafx.fxml, \
- javafx.geometry, \
- javafx.scene, \
- javafx.scene.canvas, \
- javafx.scene.chart, \
- javafx.scene.control, \
- javafx.scene.control.cell, \
- javafx.scene.effect, \
- javafx.scene.image, \
- javafx.scene.input, \
- javafx.scene.layout, \
- javafx.scene.media, \
- javafx.scene.paint, \
- javafx.scene.shape, \
- javafx.scene.text, \
- javafx.scene.transform, \
- javafx.scene.web, \
- javafx.stage, \
- javafx.util, \
- javafx.util.converter, \
- org.ietf.jgss, \
- org.omg.CORBA, \
- org.omg.CORBA_2_3, \
- org.omg.CORBA_2_3.portable, \
- org.omg.CORBA.DynAnyPackage, \
- org.omg.CORBA.ORBPackage, \
- org.omg.CORBA.portable, \
- org.omg.CORBA.TypeCodePackage, \
- org.omg.CosNaming, \
- org.omg.CosNaming.NamingContextExtPackage, \
- org.omg.CosNaming.NamingContextPackage, \
- org.omg.Dynamic, \
- org.omg.DynamicAny, \
- org.omg.DynamicAny.DynAnyFactoryPackage, \
- org.omg.DynamicAny.DynAnyPackage, \
- org.omg.IOP, \
- org.omg.IOP.CodecFactoryPackage, \
- org.omg.IOP.CodecPackage, \
- org.omg.Messaging, \
- org.omg.PortableInterceptor, \
- org.omg.PortableInterceptor.ORBInitInfoPackage, \
- org.omg.PortableServer, \
- org.omg.PortableServer.CurrentPackage, \
- org.omg.PortableServer.POAManagerPackage, \
- org.omg.PortableServer.POAPackage, \
- org.omg.PortableServer.portable, \
- org.omg.PortableServer.ServantLocatorPackage, \
- org.omg.SendingContext, \
- org.omg.stub.java.rmi, \
- org.omg.stub.javax.management.remote.rmi, \
- org.w3c.dom, \
- org.w3c.dom.bootstrap, \
- org.w3c.dom.css, \
- org.w3c.dom.events, \
- org.w3c.dom.html, \
- org.w3c.dom.ls, \
- org.w3c.dom.ranges, \
- org.w3c.dom.stylesheets, \
- org.w3c.dom.traversal, \
- org.w3c.dom.views, \
- org.w3c.dom.xpath, \
- org.xml.sax, \
- org.xml.sax.ext, \
- org.xml.sax.helpers
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/resources/etc/org.apache.activemq.webconsole.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/org.apache.activemq.webconsole.cfg b/assembly/src/main/resources/etc/org.apache.activemq.webconsole.cfg
deleted file mode 100644
index 16e4adc..0000000
--- a/assembly/src/main/resources/etc/org.apache.activemq.webconsole.cfg
+++ /dev/null
@@ -1,23 +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.
-## ---------------------------------------------------------------------------
-
-webconsole.jms.url=${activemq.url}
-webconsole.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-${karaf.name}
-webconsole.jmx.user=smx
-webconsole.jmx.password=smx
-webconsole.jms.user=smx
-webconsole.jms.password=smx
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/resources/etc/org.apache.aries.transaction.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/org.apache.aries.transaction.cfg b/assembly/src/main/resources/etc/org.apache.aries.transaction.cfg
deleted file mode 100644
index 6083d8c..0000000
--- a/assembly/src/main/resources/etc/org.apache.aries.transaction.cfg
+++ /dev/null
@@ -1,22 +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.
-#
-#
-aries.transaction.timeout=600
-aries.transaction.howl.logFileDir=${karaf.data}/txlog/
-aries.transaction.recoverable=true
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/resources/etc/org.apache.cxf.wsn.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/org.apache.cxf.wsn.cfg b/assembly/src/main/resources/etc/org.apache.cxf.wsn.cfg
deleted file mode 100644
index c51994d..0000000
--- a/assembly/src/main/resources/etc/org.apache.cxf.wsn.cfg
+++ /dev/null
@@ -1,24 +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.
-#
-#
-cxf.wsn.activemq = vm:localhost
-cxf.wsn.rootUrl = http://0.0.0.0:8182
-cxf.wsn.context = /wsn
-cxf.wsn.activemq.username=smx
-cxf.wsn.activemq.password=smx
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assembly/src/main/resources/etc/org.apache.karaf.features.obr.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/org.apache.karaf.features.obr.cfg b/assembly/src/main/resources/etc/org.apache.karaf.features.obr.cfg
deleted file mode 100644
index bb459b2..0000000
--- a/assembly/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/da7e9421/assembly/src/main/resources/etc/org.ops4j.pax.logging.cfg
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/etc/org.ops4j.pax.logging.cfg b/assembly/src/main/resources/etc/org.ops4j.pax.logging.cfg
deleted file mode 100644
index 4c94b0f..0000000
--- a/assembly/src/main/resources/etc/org.ops4j.pax.logging.cfg
+++ /dev/null
@@ -1,49 +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.
-#
-################################################################################
-
-# Root logger
-log4j.rootLogger=INFO, out, osgi:VmLogAppender
-log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer
-
-# To avoid flooding the log when using DEBUG level on an ssh connection and doing log:tail
-log4j.logger.org.apache.sshd.server.channel.ChannelSession = INFO
-
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.RollingFileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
-log4j.appender.out.file=${karaf.data}/log/servicemix.log
-log4j.appender.out.append=true
-log4j.appender.out.maxFileSize=1MB
-log4j.appender.out.maxBackupIndex=10
-
-# Sift appender
-log4j.appender.sift=org.apache.log4j.sift.MDCSiftingAppender
-log4j.appender.sift.key=bundle.name
-log4j.appender.sift.default=servicemix
-log4j.appender.sift.appender=org.apache.log4j.FileAppender
-log4j.appender.sift.appender.layout=org.apache.log4j.PatternLayout
-log4j.appender.sift.appender.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %m%n
-log4j.appender.sift.appender.file=${karaf.data}/log/$\\{bundle.name\\}.log
-log4j.appender.sift.appender.append=true
[08/26] servicemix git commit: SM-2803: Refactor the assembly creation
Posted by ks...@apache.org.
SM-2803: Refactor the assembly creation
- use the new karaf plugin goals
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/30487359
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/30487359
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/30487359
Branch: refs/heads/master
Commit: 30487359321c6dfd1ab99b391e5f08b664afc472
Parents: da7e942
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Thu Jan 14 23:14:44 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Thu Jan 14 23:14:44 2016 +0100
----------------------------------------------------------------------
assemblies/apache-servicemix/pom.xml | 256 +++++++++++--------
.../main/filtered-resources/examples/pom.xml | 202 +++++++++++++++
.../src/main/filtered-resources/pom.xml | 202 ---------------
.../src/main/resources/common-bin.xml | 6 -
.../src/main/resources/common-unix-bin.xml | 48 ++--
.../src/main/resources/examples-unix-bin.xml | 4 +-
parent/pom.xml | 34 ++-
7 files changed, 399 insertions(+), 353 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/30487359/assemblies/apache-servicemix/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/pom.xml b/assemblies/apache-servicemix/pom.xml
index fc574d1..c1c0f0b 100644
--- a/assemblies/apache-servicemix/pom.xml
+++ b/assemblies/apache-servicemix/pom.xml
@@ -38,6 +38,62 @@
<dependencies>
+ <!-- Apache Karaf -->
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
+ <type>kar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>standard</artifactId>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>spring</artifactId>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>enterprise</artifactId>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Apache Camel -->
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>apache-camel</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Apache CXF -->
+ <dependency>
+ <groupId>org.apache.cxf.karaf</groupId>
+ <artifactId>apache-cxf</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Apache ActiveMQ -->
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-karaf</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Apache ServiceMix -->
<dependency>
<groupId>org.apache.servicemix.features</groupId>
<artifactId>servicemix-internal</artifactId>
@@ -96,19 +152,6 @@
<artifactId>org.apache.servicemix.specs.activator</artifactId>
</dependency>
-
- <!-- Download Karaf assemblies for dependency:unpack-->
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <type>tar.gz</type>
- </dependency>
-
<!--Xerces jar to be included in lib/endorsed -->
<dependency>
<groupId>xerces</groupId>
@@ -151,8 +194,11 @@
<build>
<resources>
<resource>
- <!-- we need unfiltered copies of these files -->
<directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
</resource>
<resource>
<directory>src/main/filtered-resources</directory>
@@ -161,6 +207,23 @@
<include>**/*</include>
</includes>
</resource>
+ <resource>
+ <directory>${project.basedir}/../..</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>README</include>
+ <include>RELEASE*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}/dependencies</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>**/*.i??</exclude>
+ <exclude>**/.target</exclude>
+ <exclude>**/.classpath</exclude>
+ </excludes>
+ </resource>
</resources>
<plugins>
@@ -170,122 +233,94 @@
<version>${karaf.version}</version>
<executions>
<execution>
- <id>add-features-to-repo</id>
+ <id>install-kar</id>
<phase>compile</phase>
<goals>
- <goal>features-add-to-repository</goal>
- </goals>
- <configuration>
- <descriptors>
- <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>
- <descriptor>mvn:org.apache.servicemix.features/servicemix-internal/${project.version}/xml/features</descriptor>
- <descriptor>mvn:org.apache.servicemix.features/servicemix-features/${project.version}/xml/features</descriptor>
- <descriptor>mvn:org.apache.servicemix.features/servicemix-kie/${project.version}/xml/features</descriptor>
- <descriptor>mvn:org.apache.servicemix.features/servicemix-examples/${project.version}/xml/features</descriptor>
- </descriptors>
- <features>
- <feature>joda-time</feature>
- <feature>cxf</feature>
- <feature>obr</feature>
- <feature>config</feature>
- <feature>standard</feature>
- <feature>package</feature>
- <feature>kar</feature>
- <feature>ssh</feature>
- <feature>management</feature>
- <feature>eventadmin</feature>
- <feature>activemq-broker-noweb</feature>
- <feature>activemq-service</feature>
- <feature>camel</feature>
- <feature>camel-cxf</feature>
- <feature>activemq-camel</feature>
- <feature>camel-blueprint</feature>
- <feature>war</feature>
- <feature>jaxrs-api</feature>
- <feature>kie-aries-blueprint</feature>
- <feature>kie-spring</feature>
- <feature>kie-camel</feature>
- </features>
- <includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
- <repository>${project.build.directory}/features-repo</repository>
- </configuration>
- <inherited>false</inherited>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>filter</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>resources</goal>
+ <goal>install-kars</goal>
</goals>
</execution>
+ <!-- we will use custom assembly
<execution>
- <id>copy-system-folder</id>
- <phase>package</phase>
+ <id>package</id>
<goals>
- <goal>copy-resources</goal>
+ <goal>instance-create-archive</goal>
</goals>
- <configuration>
- <outputDirectory>${project.build.directory}/features-repo</outputDirectory>
- <resources>
- <resource>
- <directory>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/system</directory>
- </resource>
- </resources>
- </configuration>
</execution>
+ -->
</executions>
+ <configuration>
+ <installedFeatures>
+ <feature>wrapper</feature>
+ </installedFeatures>
+ <bootFeatures>
+ <feature>joda-time</feature>
+ <feature>cxf</feature>
+ <feature>obr</feature>
+ <feature>config</feature>
+ <feature>standard</feature>
+ <feature>package</feature>
+ <feature>kar</feature>
+ <feature>ssh</feature>
+ <feature>management</feature>
+ <feature>eventadmin</feature>
+ <feature>activemq-broker-noweb</feature>
+ <feature>activemq-service</feature>
+ <feature>camel</feature>
+ <feature>camel-cxf</feature>
+ <feature>activemq-camel</feature>
+ <feature>camel-blueprint</feature>
+ <feature>war</feature>
+ <feature>jaxrs-api</feature>
+ <feature>kie-aries-blueprint</feature>
+ <feature>kie-spring</feature>
+ <feature>kie-camel</feature>
+ </bootFeatures>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <executions>
+ <executions>
<execution>
- <id>unpack-unix</id>
- <phase>generate-resources</phase>
+ <id>unpack</id>
+ <phase>process-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <type>tar.gz</type>
- <outputDirectory>${project.build.directory}/dependencies/unix</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
</execution>
+ </executions>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>demos</artifactId>
+ <version>${karaf.version}</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/dependencies/examples/karaf</outputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
<execution>
- <id>unpack-win</id>
- <phase>generate-resources</phase>
+ <id>process-resources</id>
<goals>
- <goal>unpack</goal>
+ <goal>resources</goal>
</goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/dependencies/win</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
</execution>
</executions>
</plugin>
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -299,7 +334,7 @@
<configuration>
<target name="enable-obr">
<echo message="Updating etc/startup.properties in assembly" />
- <concat destfile="${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/etc/startup.properties" append="true">
+ <concat destfile="${project.build.directory}/assembly/etc/startup.properties" append="true">
<string value="${line.separator}" />
<fileset file="${project.build.outputDirectory}/startup-obr.properties" />
</concat>
@@ -315,11 +350,11 @@
<configuration>
<target name="increase-perm-mem">
<echo message="Updating bin/setenv in unix assembly" />
- <concat destfile="${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/bin/setenv" append="true" eol="unix">
+ <concat destfile="${project.build.directory}/assembly/bin/setenv" append="true" eol="unix">
<fileset file="${project.build.outputDirectory}/setenv-unix" />
</concat>
<echo message="Updating bin/setenv.bat in windows assembly" />
- <concat destfile="${project.build.directory}/dependencies/win/apache-karaf-${karaf.version}/bin/setenv.bat" append="true" eol="dos">
+ <concat destfile="${project.build.directory}/assembly/bin/setenv.bat" append="true" eol="dos">
<fileset file="${project.build.outputDirectory}/setenv-win" />
</concat>
</target>
@@ -349,10 +384,8 @@
</executions>
</plugin>
</plugins>
-
</build>
-
<profiles>
<profile>
<id>release</id>
@@ -382,5 +415,4 @@
</profile>
</profiles>
-
</project>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/30487359/assemblies/apache-servicemix/src/main/filtered-resources/examples/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/filtered-resources/examples/pom.xml b/assemblies/apache-servicemix/src/main/filtered-resources/examples/pom.xml
new file mode 100644
index 0000000..778ef74
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/filtered-resources/examples/pom.xml
@@ -0,0 +1,202 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.servicemix.examples</groupId>
+ <artifactId>examples</artifactId>
+ <packaging>pom</packaging>
+ <version>${project.version}</version>
+ <name>Apache ServiceMix :: Examples</name>
+ <properties>
+ <akka.version>${akka.version}</akka.version>
+ <cxf.version>${cxf.version}</cxf.version>
+ <drools.version>${drools.version}</drools.version>
+ <drools6.version>${drools6.version}</drools6.version>
+ <jaxb.api.version>${jaxb.api.version}</jaxb.api.version>
+ <karaf.version>${karaf.version}</karaf.version>
+ <scala.version>${scala.version}</scala.version>
+ <slf4j.version>${slf4j.version}</slf4j.version>
+ <swagger.version>${swagger.version}</swagger.version>
+ <xerces.version>${xerces.version}</xerces.version>
+
+ <cxf.codegen-plugin.version>${cxf.codegen-plugin.version}</cxf.codegen-plugin.version>
+ <exec-maven-plugin.version>${exec-maven-plugin.version}</exec-maven-plugin.version>
+ <maven-scala-plugin.version>${maven-scala-plugin.version}</maven-scala-plugin.version>
+ </properties>
+ <!-- Managed dependencies -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>${camel.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>karaf</artifactId>
+ <version>${karaf.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jsr339-api-2.0</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-core</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-rm</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-addr</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-policy</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.services.wsn</groupId>
+ <artifactId>cxf-services-wsn-core</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.activiti</groupId>
+ <artifactId>activiti-camel</artifactId>
+ <version>${activiti.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <version>${geronimo-ws-metadata.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
+ <version>${commons-httpclient.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.wordnik</groupId>
+ <artifactId>swagger-jaxrs_2.11</artifactId>
+ <version>${swagger.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven-bundle-plugin.version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>${exec-maven-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ <version>${maven-scala-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <version>${cxf.codegen-plugin.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <modules>
+ <module>activemq</module>
+ <module>activiti</module>
+ <module>akka</module>
+ <module>camel</module>
+ <module>cxf</module>
+ <module>drools</module>
+ <module>karaf</module>
+ </modules>
+
+ <repositories>
+ <!-- Required to build the examples in a SNAPSHOT assembly -->
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+</project>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/30487359/assemblies/apache-servicemix/src/main/filtered-resources/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/filtered-resources/pom.xml b/assemblies/apache-servicemix/src/main/filtered-resources/pom.xml
deleted file mode 100644
index 778ef74..0000000
--- a/assemblies/apache-servicemix/src/main/filtered-resources/pom.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <!--
-
- 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.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.servicemix.examples</groupId>
- <artifactId>examples</artifactId>
- <packaging>pom</packaging>
- <version>${project.version}</version>
- <name>Apache ServiceMix :: Examples</name>
- <properties>
- <akka.version>${akka.version}</akka.version>
- <cxf.version>${cxf.version}</cxf.version>
- <drools.version>${drools.version}</drools.version>
- <drools6.version>${drools6.version}</drools6.version>
- <jaxb.api.version>${jaxb.api.version}</jaxb.api.version>
- <karaf.version>${karaf.version}</karaf.version>
- <scala.version>${scala.version}</scala.version>
- <slf4j.version>${slf4j.version}</slf4j.version>
- <swagger.version>${swagger.version}</swagger.version>
- <xerces.version>${xerces.version}</xerces.version>
-
- <cxf.codegen-plugin.version>${cxf.codegen-plugin.version}</cxf.codegen-plugin.version>
- <exec-maven-plugin.version>${exec-maven-plugin.version}</exec-maven-plugin.version>
- <maven-scala-plugin.version>${maven-scala-plugin.version}</maven-scala-plugin.version>
- </properties>
- <!-- Managed dependencies -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-parent</artifactId>
- <version>${camel.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-security</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>karaf</artifactId>
- <version>${karaf.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jsr339-api-2.0</artifactId>
- <version>${servicemix.specs.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
- <version>${servicemix.specs.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-core</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-rm</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-addr</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-policy</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.services.wsn</groupId>
- <artifactId>cxf-services-wsn-core</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.activiti</groupId>
- <artifactId>activiti-camel</artifactId>
- <version>${activiti.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- <version>${geronimo-ws-metadata.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
- <version>${commons-httpclient.bundle.version}</version>
- </dependency>
- <dependency>
- <groupId>com.wordnik</groupId>
- <artifactId>swagger-jaxrs_2.11</artifactId>
- <version>${swagger.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>${maven-bundle-plugin.version}</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>${exec-maven-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- <version>${maven-scala-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
- <version>${cxf.codegen-plugin.version}</version>
- <dependencies>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <modules>
- <module>activemq</module>
- <module>activiti</module>
- <module>akka</module>
- <module>camel</module>
- <module>cxf</module>
- <module>drools</module>
- <module>karaf</module>
- </modules>
-
- <repositories>
- <!-- Required to build the examples in a SNAPSHOT assembly -->
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
-</project>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/30487359/assemblies/apache-servicemix/src/main/resources/common-bin.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/common-bin.xml b/assemblies/apache-servicemix/src/main/resources/common-bin.xml
index 5c549f8..2c4b999 100644
--- a/assemblies/apache-servicemix/src/main/resources/common-bin.xml
+++ b/assemblies/apache-servicemix/src/main/resources/common-bin.xml
@@ -16,12 +16,6 @@
limitations under the License.
-->
<component>
- <fileSets>
- <fileSet>
- <outputDirectory>system</outputDirectory>
- <directory>${project.build.directory}/features-repo</directory>
- </fileSet>
- </fileSets>
<dependencySets>
<dependencySet>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/30487359/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 4c41195..6ce6513 100644
--- a/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
+++ b/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
@@ -19,26 +19,23 @@
<fileSets>
<!-- Cherry-pick files from the expanded Karaf distribution -->
<fileSet>
- <directory>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}</directory>
+ <directory>${project.build.directory}/assembly</directory>
<outputDirectory>/</outputDirectory>
<excludes>
- <exclude>**/demos/**</exclude>
- <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>system/**</exclude>
- <exclude>LICENSE</exclude>
- <exclude>NOTICE</exclude>
- <exclude>README</exclude>
- <exclude>RELEASE-NOTES</exclude>
- <exclude>karaf-manual*</exclude>
+ <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>
</excludes>
<fileMode>0644</fileMode>
<directoryMode>0775</directoryMode>
@@ -46,16 +43,16 @@
<!-- Copy over bin/* scripts separately to get the correct file mode -->
<fileSet>
- <directory>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}</directory>
+ <directory>${project.build.directory}/assembly</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>bin/*</include>
+ <include>bin/*</include>
</includes>
<lineEnding>unix</lineEnding>
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
- <directory>${project.build.directory}/dependencies/win/apache-karaf-${karaf.version}</directory>
+ <directory>${project.build.directory}/assembly</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>bin/*</include>
@@ -66,7 +63,7 @@
<!-- Copy README and RELEASE-NOTES from root -->
<fileSet>
- <directory>${basedir}/..</directory>
+ <directory>${project.build.outputDirectory}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>README</include>
@@ -106,16 +103,17 @@
</fileSet>
</fileSets>
+
<files>
<file>
- <source>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/bin/karaf</source>
+ <source>${project.build.directory}/assembly/bin/karaf</source>
<outputDirectory>/bin/</outputDirectory>
<destName>servicemix</destName>
<fileMode>0755</fileMode>
<lineEnding>unix</lineEnding>
</file>
<file>
- <source>${project.build.directory}/dependencies/win/apache-karaf-${karaf.version}/bin/karaf.bat</source>
+ <source>${project.build.directory}/assembly/bin/karaf.bat</source>
<outputDirectory>/bin/</outputDirectory>
<destName>servicemix.bat</destName>
<fileMode>0755</fileMode>
@@ -137,4 +135,4 @@
</file>
</files>
-</component>
+</component>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/30487359/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 1cc662a..1b9f1aa 100644
--- a/assemblies/apache-servicemix/src/main/resources/examples-unix-bin.xml
+++ b/assemblies/apache-servicemix/src/main/resources/examples-unix-bin.xml
@@ -19,7 +19,7 @@
<fileSets>
<!-- Copy over karaf demo to examples folder -->
<fileSet>
- <directory>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/demos</directory>
+ <directory>${project.build.outputDirectory}/examples/karaf</directory>
<outputDirectory>/examples/karaf</outputDirectory>
<lineEnding>unix</lineEnding>
</fileSet>
@@ -83,7 +83,7 @@
<files>
<file>
- <source>${project.build.outputDirectory}/pom.xml</source>
+ <source>${project.build.outputDirectory}/examples/pom.xml</source>
<outputDirectory>/examples/</outputDirectory>
<filtered>true</filtered>
<fileMode>0644</fileMode>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/30487359/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2041cb1..b13545d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -145,6 +145,13 @@
<!-- Apache ActiveMQ -->
<dependency>
<groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-karaf</artifactId>
+ <version>${activemq.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>${activemq.version}</version>
</dependency>
@@ -201,16 +208,31 @@
<scope>import</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
<version>${karaf.version}</version>
- <type>tar.gz</type>
+ <type>kar</type>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>standard</artifactId>
+ <classifier>features</classifier>
+ <version>${karaf.version}</version>
+ <type>xml</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>enterprise</artifactId>
+ <classifier>features</classifier>
+ <version>${karaf.version}</version>
+ <type>xml</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>spring</artifactId>
+ <classifier>features</classifier>
<version>${karaf.version}</version>
- <type>zip</type>
+ <type>xml</type>
</dependency>
<!-- Apache CXF -->
[20/26] servicemix git commit: SM-2822 - Upgrade Maven-bundle-plugin
to version 3.0.1
Posted by ks...@apache.org.
SM-2822 - Upgrade Maven-bundle-plugin to version 3.0.1
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/d0cc5ad7
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/d0cc5ad7
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/d0cc5ad7
Branch: refs/heads/master
Commit: d0cc5ad7dc6cda2b1ef4db8fa2ae1b5865cfe6f7
Parents: 0386b87
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sun Jan 24 21:06:39 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sun Jan 24 21:06:39 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d0cc5ad7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index c61bec2..e0c3f28 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -107,7 +107,7 @@
<cxf.codegen-plugin.version>${cxf.version}</cxf.codegen-plugin.version>
<depends-maven-plugin.version>1.3.1</depends-maven-plugin.version>
- <maven-bundle-plugin.version>3.0.0</maven-bundle-plugin.version>
+ <maven-bundle-plugin.version>3.0.1</maven-bundle-plugin.version>
<maven-archetype-packaging-version>2.0</maven-archetype-packaging-version>
</properties>
[14/26] servicemix git commit: Update ServiceMix version to
7.0.0-SNAPSHOT
Posted by ks...@apache.org.
Update ServiceMix version to 7.0.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/c473f33c
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/c473f33c
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/c473f33c
Branch: refs/heads/master
Commit: c473f33c8efe19117d1875431e94931e6ae277ed
Parents: fa80608
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Fri Jan 15 07:08:22 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Fri Jan 15 07:08:22 2016 +0100
----------------------------------------------------------------------
activemq/activemq-camel/pom.xml | 2 +-
activemq/activemq-service/pom.xml | 2 +-
activemq/pom.xml | 2 +-
activiti/activiti-config/pom.xml | 2 +-
activiti/pom.xml | 2 +-
assemblies/apache-servicemix/pom.xml | 2 +-
assemblies/features/pom.xml | 2 +-
assemblies/features/servicemix-examples/pom.xml | 2 +-
assemblies/features/servicemix-features/pom.xml | 2 +-
assemblies/features/servicemix-internal/pom.xml | 2 +-
assemblies/features/servicemix-kie/pom.xml | 2 +-
assemblies/pom.xml | 2 +-
branding/pom.xml | 2 +-
examples/activemq/activemq-camel-blueprint/pom.xml | 2 +-
examples/activemq/pom.xml | 2 +-
examples/activiti/activiti-camel/pom.xml | 2 +-
examples/activiti/pom.xml | 2 +-
examples/akka/akka-camel/pom.xml | 2 +-
examples/akka/pom.xml | 2 +-
examples/camel/camel-blueprint/pom.xml | 2 +-
examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml | 2 +-
examples/camel/camel-cxf-rest/camel-cxf-rest-route/pom.xml | 2 +-
examples/camel/camel-cxf-rest/camel-cxf-rest-service/pom.xml | 2 +-
examples/camel/camel-cxf-rest/pom.xml | 2 +-
examples/camel/camel-cxf-soap/camel-cxf-soap-client/pom.xml | 2 +-
examples/camel/camel-cxf-soap/camel-cxf-soap-route/pom.xml | 2 +-
examples/camel/camel-cxf-soap/camel-cxf-soap-service/pom.xml | 2 +-
examples/camel/camel-cxf-soap/pom.xml | 2 +-
examples/camel/camel-drools-blueprint/pom.xml | 2 +-
examples/camel/camel-drools/pom.xml | 2 +-
examples/camel/camel-osgi/pom.xml | 2 +-
examples/camel/camel-sql/camel-sql-datasource-derby/pom.xml | 2 +-
examples/camel/camel-sql/camel-sql-datasource-h2/pom.xml | 2 +-
examples/camel/camel-sql/camel-sql-datasource-pgsql/pom.xml | 2 +-
examples/camel/camel-sql/camel-sql-orders/pom.xml | 2 +-
examples/camel/camel-sql/pom.xml | 2 +-
examples/camel/pom.xml | 2 +-
examples/cxf/cxf-jaxrs-blueprint/pom.xml | 2 +-
examples/cxf/cxf-jaxrs/pom.xml | 2 +-
examples/cxf/cxf-jaxws-blueprint/pom.xml | 2 +-
examples/cxf/cxf-osgi/pom.xml | 2 +-
examples/cxf/cxf-ws-addressing/pom.xml | 2 +-
examples/cxf/cxf-ws-rm/pom.xml | 2 +-
examples/cxf/cxf-ws-security-blueprint/pom.xml | 2 +-
examples/cxf/cxf-ws-security-osgi/pom.xml | 2 +-
examples/cxf/cxf-ws-security-signature/pom.xml | 2 +-
examples/cxf/cxf-wsn/cxf-wsn-base/pom.xml | 2 +-
examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml | 2 +-
examples/cxf/cxf-wsn/cxf-wsn-notifier/pom.xml | 2 +-
examples/cxf/cxf-wsn/cxf-wsn-receive/pom.xml | 2 +-
examples/cxf/cxf-wsn/pom.xml | 2 +-
examples/cxf/pom.xml | 2 +-
examples/drools/drools-camel-blueprint/pom.xml | 2 +-
examples/drools/drools-camel-cxf-server/pom.xml | 2 +-
examples/drools/drools-simple/pom.xml | 2 +-
examples/drools/drools-spring/pom.xml | 2 +-
examples/drools/pom.xml | 2 +-
examples/pom.xml | 2 +-
itests/pom.xml | 2 +-
logging/jms-appender/pom.xml | 2 +-
logging/pom.xml | 2 +-
parent/pom.xml | 2 +-
pom.xml | 2 +-
tooling/archetypes/pom.xml | 2 +-
tooling/archetypes/servicemix-cxf-code-first-osgi-bundle/pom.xml | 2 +-
tooling/archetypes/servicemix-cxf-wsdl-first-osgi-bundle/pom.xml | 2 +-
tooling/archetypes/servicemix-osgi-bundle/pom.xml | 2 +-
tooling/pom.xml | 2 +-
68 files changed, 68 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/activemq/activemq-camel/pom.xml
----------------------------------------------------------------------
diff --git a/activemq/activemq-camel/pom.xml b/activemq/activemq-camel/pom.xml
index 4467973..a07d512 100644
--- a/activemq/activemq-camel/pom.xml
+++ b/activemq/activemq-camel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>activemq</artifactId>
<groupId>org.apache.servicemix</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/activemq/activemq-service/pom.xml
----------------------------------------------------------------------
diff --git a/activemq/activemq-service/pom.xml b/activemq/activemq-service/pom.xml
index e50cde1..5dfdc0d 100644
--- a/activemq/activemq-service/pom.xml
+++ b/activemq/activemq-service/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>activemq</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.activemq</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/activemq/pom.xml
----------------------------------------------------------------------
diff --git a/activemq/pom.xml b/activemq/pom.xml
index 8e874f1..2bee5f5 100644
--- a/activemq/pom.xml
+++ b/activemq/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>parent</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/activiti/activiti-config/pom.xml
----------------------------------------------------------------------
diff --git a/activiti/activiti-config/pom.xml b/activiti/activiti-config/pom.xml
index 3cd9a38..bb6be58 100644
--- a/activiti/activiti-config/pom.xml
+++ b/activiti/activiti-config/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>activiti</artifactId>
<groupId>org.apache.servicemix.activiti</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.apache.servicemix.activiti.config</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/activiti/pom.xml
----------------------------------------------------------------------
diff --git a/activiti/pom.xml b/activiti/pom.xml
index 24287b1..71f2087 100644
--- a/activiti/pom.xml
+++ b/activiti/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>parent</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/assemblies/apache-servicemix/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/pom.xml b/assemblies/apache-servicemix/pom.xml
index 6c5b545..4aa3899 100644
--- a/assemblies/apache-servicemix/pom.xml
+++ b/assemblies/apache-servicemix/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>assemblies</artifactId>
<groupId>org.apache.servicemix.assemblies</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/assemblies/features/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/pom.xml b/assemblies/features/pom.xml
index 07670d3..1ef853d 100644
--- a/assemblies/features/pom.xml
+++ b/assemblies/features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>assemblies</artifactId>
<groupId>org.apache.servicemix.assemblies</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.assemblies.features</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/assemblies/features/servicemix-examples/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-examples/pom.xml b/assemblies/features/servicemix-examples/pom.xml
index 18e4692..713d598 100644
--- a/assemblies/features/servicemix-examples/pom.xml
+++ b/assemblies/features/servicemix-examples/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>features</artifactId>
<groupId>org.apache.servicemix.assemblies.features</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.features</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/assemblies/features/servicemix-features/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-features/pom.xml b/assemblies/features/servicemix-features/pom.xml
index 1e4d8ed..957de75 100644
--- a/assemblies/features/servicemix-features/pom.xml
+++ b/assemblies/features/servicemix-features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>features</artifactId>
<groupId>org.apache.servicemix.assemblies.features</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.features</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/assemblies/features/servicemix-internal/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-internal/pom.xml b/assemblies/features/servicemix-internal/pom.xml
index 0d348f6..83eece1 100644
--- a/assemblies/features/servicemix-internal/pom.xml
+++ b/assemblies/features/servicemix-internal/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>features</artifactId>
<groupId>org.apache.servicemix.assemblies.features</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/assemblies/features/servicemix-kie/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-kie/pom.xml b/assemblies/features/servicemix-kie/pom.xml
index aef4f01..bb5c711 100644
--- a/assemblies/features/servicemix-kie/pom.xml
+++ b/assemblies/features/servicemix-kie/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>features</artifactId>
<groupId>org.apache.servicemix.assemblies.features</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.features</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/assemblies/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/pom.xml b/assemblies/pom.xml
index e9c8bd2..f277e72 100644
--- a/assemblies/pom.xml
+++ b/assemblies/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>parent</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/branding/pom.xml
----------------------------------------------------------------------
diff --git a/branding/pom.xml b/branding/pom.xml
index b16a714..0c7854f 100644
--- a/branding/pom.xml
+++ b/branding/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>parent</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/activemq/activemq-camel-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/activemq/activemq-camel-blueprint/pom.xml b/examples/activemq/activemq-camel-blueprint/pom.xml
index 61d033e..f5a9ed4 100644
--- a/examples/activemq/activemq-camel-blueprint/pom.xml
+++ b/examples/activemq/activemq-camel-blueprint/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>activemq-examples</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>activemq-camel-blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/activemq/pom.xml
----------------------------------------------------------------------
diff --git a/examples/activemq/pom.xml b/examples/activemq/pom.xml
index 0b9510d..cbe9ed4 100644
--- a/examples/activemq/pom.xml
+++ b/examples/activemq/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>examples</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.examples</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/activiti/activiti-camel/pom.xml
----------------------------------------------------------------------
diff --git a/examples/activiti/activiti-camel/pom.xml b/examples/activiti/activiti-camel/pom.xml
index 4ead991..8d70914 100644
--- a/examples/activiti/activiti-camel/pom.xml
+++ b/examples/activiti/activiti-camel/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>activiti-examples</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>activiti-camel</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/activiti/pom.xml
----------------------------------------------------------------------
diff --git a/examples/activiti/pom.xml b/examples/activiti/pom.xml
index 387b31a..1c81930 100644
--- a/examples/activiti/pom.xml
+++ b/examples/activiti/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>examples</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.examples</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/akka/akka-camel/pom.xml
----------------------------------------------------------------------
diff --git a/examples/akka/akka-camel/pom.xml b/examples/akka/akka-camel/pom.xml
index a4599ae..23025e3 100644
--- a/examples/akka/akka-camel/pom.xml
+++ b/examples/akka/akka-camel/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>akka-examples</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/akka/pom.xml
----------------------------------------------------------------------
diff --git a/examples/akka/pom.xml b/examples/akka/pom.xml
index 6d4f420..907f175 100644
--- a/examples/akka/pom.xml
+++ b/examples/akka/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>examples</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.examples</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/camel/camel-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-blueprint/pom.xml b/examples/camel/camel-blueprint/pom.xml
index 31fb387..82eb2a7 100644
--- a/examples/camel/camel-blueprint/pom.xml
+++ b/examples/camel/camel-blueprint/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>camel-examples</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>camel-blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml b/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml
index 2ec2423..f981909 100644
--- a/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml
+++ b/examples/camel/camel-cxf-rest/camel-cxf-rest-client/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>camel-cxf-rest</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/camel/camel-cxf-rest/camel-cxf-rest-route/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-cxf-rest/camel-cxf-rest-route/pom.xml b/examples/camel/camel-cxf-rest/camel-cxf-rest-route/pom.xml
index 7f7b4b6..220f50b 100644
--- a/examples/camel/camel-cxf-rest/camel-cxf-rest-route/pom.xml
+++ b/examples/camel/camel-cxf-rest/camel-cxf-rest-route/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>camel-cxf-rest</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/camel/camel-cxf-rest/camel-cxf-rest-service/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-cxf-rest/camel-cxf-rest-service/pom.xml b/examples/camel/camel-cxf-rest/camel-cxf-rest-service/pom.xml
index f92fd91..87ec349 100644
--- a/examples/camel/camel-cxf-rest/camel-cxf-rest-service/pom.xml
+++ b/examples/camel/camel-cxf-rest/camel-cxf-rest-service/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>camel-cxf-rest</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/camel/camel-cxf-rest/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-cxf-rest/pom.xml b/examples/camel/camel-cxf-rest/pom.xml
index 236fbf2..2dac9cc 100644
--- a/examples/camel/camel-cxf-rest/pom.xml
+++ b/examples/camel/camel-cxf-rest/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>camel-examples</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/camel/camel-cxf-soap/camel-cxf-soap-client/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-cxf-soap/camel-cxf-soap-client/pom.xml b/examples/camel/camel-cxf-soap/camel-cxf-soap-client/pom.xml
index 95ea9a2..ba646fd 100644
--- a/examples/camel/camel-cxf-soap/camel-cxf-soap-client/pom.xml
+++ b/examples/camel/camel-cxf-soap/camel-cxf-soap-client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>camel-cxf-soap</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/camel/camel-cxf-soap/camel-cxf-soap-route/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-cxf-soap/camel-cxf-soap-route/pom.xml b/examples/camel/camel-cxf-soap/camel-cxf-soap-route/pom.xml
index 0cda8de..d314cf2 100644
--- a/examples/camel/camel-cxf-soap/camel-cxf-soap-route/pom.xml
+++ b/examples/camel/camel-cxf-soap/camel-cxf-soap-route/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>camel-cxf-soap</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/camel/camel-cxf-soap/camel-cxf-soap-service/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-cxf-soap/camel-cxf-soap-service/pom.xml b/examples/camel/camel-cxf-soap/camel-cxf-soap-service/pom.xml
index 56c9fcb..620eeb5 100644
--- a/examples/camel/camel-cxf-soap/camel-cxf-soap-service/pom.xml
+++ b/examples/camel/camel-cxf-soap/camel-cxf-soap-service/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>camel-cxf-soap</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/camel/camel-cxf-soap/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-cxf-soap/pom.xml b/examples/camel/camel-cxf-soap/pom.xml
index 5bd2aaa..5bf2253 100644
--- a/examples/camel/camel-cxf-soap/pom.xml
+++ b/examples/camel/camel-cxf-soap/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>camel-examples</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/camel/camel-drools-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-drools-blueprint/pom.xml b/examples/camel/camel-drools-blueprint/pom.xml
index 5724ac0..b1e47d2 100644
--- a/examples/camel/camel-drools-blueprint/pom.xml
+++ b/examples/camel/camel-drools-blueprint/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>camel-examples</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/camel/camel-drools/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-drools/pom.xml b/examples/camel/camel-drools/pom.xml
index 6177cce..1fede57 100644
--- a/examples/camel/camel-drools/pom.xml
+++ b/examples/camel/camel-drools/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>camel-examples</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>camel-drools</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/camel/camel-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-osgi/pom.xml b/examples/camel/camel-osgi/pom.xml
index 2e97b41..e54b3b7 100644
--- a/examples/camel/camel-osgi/pom.xml
+++ b/examples/camel/camel-osgi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>camel-examples</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>camel-osgi</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/camel/camel-sql/camel-sql-datasource-derby/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-sql/camel-sql-datasource-derby/pom.xml b/examples/camel/camel-sql/camel-sql-datasource-derby/pom.xml
index 274db10..a3bae9f 100644
--- a/examples/camel/camel-sql/camel-sql-datasource-derby/pom.xml
+++ b/examples/camel/camel-sql/camel-sql-datasource-derby/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>camel-sql</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/camel/camel-sql/camel-sql-datasource-h2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-sql/camel-sql-datasource-h2/pom.xml b/examples/camel/camel-sql/camel-sql-datasource-h2/pom.xml
index ae5e979..37bd714 100644
--- a/examples/camel/camel-sql/camel-sql-datasource-h2/pom.xml
+++ b/examples/camel/camel-sql/camel-sql-datasource-h2/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>camel-sql</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/camel/camel-sql/camel-sql-datasource-pgsql/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-sql/camel-sql-datasource-pgsql/pom.xml b/examples/camel/camel-sql/camel-sql-datasource-pgsql/pom.xml
index f78b44b..6382395 100644
--- a/examples/camel/camel-sql/camel-sql-datasource-pgsql/pom.xml
+++ b/examples/camel/camel-sql/camel-sql-datasource-pgsql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>camel-sql</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/camel/camel-sql/camel-sql-orders/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-sql/camel-sql-orders/pom.xml b/examples/camel/camel-sql/camel-sql-orders/pom.xml
index f20ceac..e1e219e 100644
--- a/examples/camel/camel-sql/camel-sql-orders/pom.xml
+++ b/examples/camel/camel-sql/camel-sql-orders/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>camel-sql</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/camel/camel-sql/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/camel-sql/pom.xml b/examples/camel/camel-sql/pom.xml
index 0e5f638..568fb23 100644
--- a/examples/camel/camel-sql/pom.xml
+++ b/examples/camel/camel-sql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>camel-examples</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/camel/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel/pom.xml b/examples/camel/pom.xml
index 6abcf94..6873246 100644
--- a/examples/camel/pom.xml
+++ b/examples/camel/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>examples</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.examples</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/cxf/cxf-jaxrs-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-jaxrs-blueprint/pom.xml b/examples/cxf/cxf-jaxrs-blueprint/pom.xml
index e58ce01..eee603e 100644
--- a/examples/cxf/cxf-jaxrs-blueprint/pom.xml
+++ b/examples/cxf/cxf-jaxrs-blueprint/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>cxf-jaxrs-blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/cxf/cxf-jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-jaxrs/pom.xml b/examples/cxf/cxf-jaxrs/pom.xml
index bce8893..f1293bd 100644
--- a/examples/cxf/cxf-jaxrs/pom.xml
+++ b/examples/cxf/cxf-jaxrs/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>cxf-jaxrs</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/cxf/cxf-jaxws-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-jaxws-blueprint/pom.xml b/examples/cxf/cxf-jaxws-blueprint/pom.xml
index 4c42b25..ed27e5c 100644
--- a/examples/cxf/cxf-jaxws-blueprint/pom.xml
+++ b/examples/cxf/cxf-jaxws-blueprint/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>cxf-jaxws-blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/cxf/cxf-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-osgi/pom.xml b/examples/cxf/cxf-osgi/pom.xml
index 68bb21d..ff4d273 100644
--- a/examples/cxf/cxf-osgi/pom.xml
+++ b/examples/cxf/cxf-osgi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>cxf-osgi</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/cxf/cxf-ws-addressing/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-addressing/pom.xml b/examples/cxf/cxf-ws-addressing/pom.xml
index f0aed45..e370e21 100644
--- a/examples/cxf/cxf-ws-addressing/pom.xml
+++ b/examples/cxf/cxf-ws-addressing/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>cxf-ws-addressing</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/cxf/cxf-ws-rm/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-rm/pom.xml b/examples/cxf/cxf-ws-rm/pom.xml
index 18d94b6..79dba66 100644
--- a/examples/cxf/cxf-ws-rm/pom.xml
+++ b/examples/cxf/cxf-ws-rm/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>cxf-ws-rm</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/cxf/cxf-ws-security-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-blueprint/pom.xml b/examples/cxf/cxf-ws-security-blueprint/pom.xml
index 8af6a50..1d37b16 100644
--- a/examples/cxf/cxf-ws-security-blueprint/pom.xml
+++ b/examples/cxf/cxf-ws-security-blueprint/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>cxf-ws-security-blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/cxf/cxf-ws-security-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-osgi/pom.xml b/examples/cxf/cxf-ws-security-osgi/pom.xml
index eaa4817..b8acee5 100644
--- a/examples/cxf/cxf-ws-security-osgi/pom.xml
+++ b/examples/cxf/cxf-ws-security-osgi/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>cxf-ws-security-osgi</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/cxf/cxf-ws-security-signature/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-ws-security-signature/pom.xml b/examples/cxf/cxf-ws-security-signature/pom.xml
index 440e877..20bd030 100644
--- a/examples/cxf/cxf-ws-security-signature/pom.xml
+++ b/examples/cxf/cxf-ws-security-signature/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>cxf-ws-security-signature</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/cxf/cxf-wsn/cxf-wsn-base/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-wsn/cxf-wsn-base/pom.xml b/examples/cxf/cxf-wsn/cxf-wsn-base/pom.xml
index 6f6bb71..2e021c9 100644
--- a/examples/cxf/cxf-wsn/cxf-wsn-base/pom.xml
+++ b/examples/cxf/cxf-wsn/cxf-wsn-base/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>cxf-wsn</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml b/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml
index c21ac0d..81a771c 100644
--- a/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml
+++ b/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>cxf-wsn</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/cxf/cxf-wsn/cxf-wsn-notifier/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-wsn/cxf-wsn-notifier/pom.xml b/examples/cxf/cxf-wsn/cxf-wsn-notifier/pom.xml
index 73930d2..8aaabf1 100644
--- a/examples/cxf/cxf-wsn/cxf-wsn-notifier/pom.xml
+++ b/examples/cxf/cxf-wsn/cxf-wsn-notifier/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>cxf-wsn</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/cxf/cxf-wsn/cxf-wsn-receive/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-wsn/cxf-wsn-receive/pom.xml b/examples/cxf/cxf-wsn/cxf-wsn-receive/pom.xml
index 598d09b..3cf8cc7 100644
--- a/examples/cxf/cxf-wsn/cxf-wsn-receive/pom.xml
+++ b/examples/cxf/cxf-wsn/cxf-wsn-receive/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>cxf-wsn</artifactId>
<groupId>org.apache.servicemix.examples</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/cxf/cxf-wsn/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/cxf-wsn/pom.xml b/examples/cxf/cxf-wsn/pom.xml
index c4b0e84..59ea43b 100644
--- a/examples/cxf/cxf-wsn/pom.xml
+++ b/examples/cxf/cxf-wsn/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>cxf</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>cxf-wsn</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/cxf/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cxf/pom.xml b/examples/cxf/pom.xml
index 3451592..1cd4cb0 100644
--- a/examples/cxf/pom.xml
+++ b/examples/cxf/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>examples</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.examples</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/drools/drools-camel-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/drools/drools-camel-blueprint/pom.xml b/examples/drools/drools-camel-blueprint/pom.xml
index 6e4bff4..fd8fe4b 100644
--- a/examples/drools/drools-camel-blueprint/pom.xml
+++ b/examples/drools/drools-camel-blueprint/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>drools</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>drools-camel-blueprint</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/drools/drools-camel-cxf-server/pom.xml
----------------------------------------------------------------------
diff --git a/examples/drools/drools-camel-cxf-server/pom.xml b/examples/drools/drools-camel-cxf-server/pom.xml
index 5e8f3c6..f31e937 100644
--- a/examples/drools/drools-camel-cxf-server/pom.xml
+++ b/examples/drools/drools-camel-cxf-server/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>drools</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>drools-camel-cxf-server</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/drools/drools-simple/pom.xml
----------------------------------------------------------------------
diff --git a/examples/drools/drools-simple/pom.xml b/examples/drools/drools-simple/pom.xml
index d17f57d..6e78969 100644
--- a/examples/drools/drools-simple/pom.xml
+++ b/examples/drools/drools-simple/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>drools</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>drools-simple</artifactId>
<name>Apache ServiceMix :: Examples :: Drools :: Simple</name>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/drools/drools-spring/pom.xml
----------------------------------------------------------------------
diff --git a/examples/drools/drools-spring/pom.xml b/examples/drools/drools-spring/pom.xml
index fb8c55e..e832798 100644
--- a/examples/drools/drools-spring/pom.xml
+++ b/examples/drools/drools-spring/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>drools</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>drools-spring</artifactId>
<name>Apache ServiceMix :: Examples :: Drools :: Spring</name>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/drools/pom.xml
----------------------------------------------------------------------
diff --git a/examples/drools/pom.xml b/examples/drools/pom.xml
index 115c228..3d93bd9 100644
--- a/examples/drools/pom.xml
+++ b/examples/drools/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicemix.examples</groupId>
<artifactId>examples</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>drools</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 2464529..05edf77 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>parent</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index cee06a8..42d9cfc 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>parent</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/logging/jms-appender/pom.xml
----------------------------------------------------------------------
diff --git a/logging/jms-appender/pom.xml b/logging/jms-appender/pom.xml
index 1fc9c82..a2a6b2a 100644
--- a/logging/jms-appender/pom.xml
+++ b/logging/jms-appender/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.logging</groupId>
<artifactId>logging</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>jms-appender</artifactId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/logging/pom.xml
----------------------------------------------------------------------
diff --git a/logging/pom.xml b/logging/pom.xml
index a87e4ff..83b5e15 100644
--- a/logging/pom.xml
+++ b/logging/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>parent</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0841170..847a56f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c169404..a01172f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix</artifactId>
<packaging>pom</packaging>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<name>Apache ServiceMix</name>
<url>http://servicemix.apache.org/</url>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/tooling/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/pom.xml b/tooling/archetypes/pom.xml
index c905328..dd66654 100644
--- a/tooling/archetypes/pom.xml
+++ b/tooling/archetypes/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>tooling</artifactId>
<groupId>org.apache.servicemix.tooling</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.tooling</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/tooling/archetypes/servicemix-cxf-code-first-osgi-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/servicemix-cxf-code-first-osgi-bundle/pom.xml b/tooling/archetypes/servicemix-cxf-code-first-osgi-bundle/pom.xml
index 05bc4ed..6b98808 100644
--- a/tooling/archetypes/servicemix-cxf-code-first-osgi-bundle/pom.xml
+++ b/tooling/archetypes/servicemix-cxf-code-first-osgi-bundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>archetypes</artifactId>
<groupId>org.apache.servicemix.tooling</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.tooling.archetypes</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/tooling/archetypes/servicemix-cxf-wsdl-first-osgi-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/servicemix-cxf-wsdl-first-osgi-bundle/pom.xml b/tooling/archetypes/servicemix-cxf-wsdl-first-osgi-bundle/pom.xml
index 38faeca..f021d83 100644
--- a/tooling/archetypes/servicemix-cxf-wsdl-first-osgi-bundle/pom.xml
+++ b/tooling/archetypes/servicemix-cxf-wsdl-first-osgi-bundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>archetypes</artifactId>
<groupId>org.apache.servicemix.tooling</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.tooling.archetypes</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/tooling/archetypes/servicemix-osgi-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/servicemix-osgi-bundle/pom.xml b/tooling/archetypes/servicemix-osgi-bundle/pom.xml
index c62e891..312f122 100644
--- a/tooling/archetypes/servicemix-osgi-bundle/pom.xml
+++ b/tooling/archetypes/servicemix-osgi-bundle/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>archetypes</artifactId>
<groupId>org.apache.servicemix.tooling</groupId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.tooling.archetypes</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c473f33c/tooling/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/pom.xml b/tooling/pom.xml
index 4d6be72..37448a4 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.servicemix</groupId>
<artifactId>parent</artifactId>
- <version>6.1.1-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
[12/26] servicemix git commit: SM-2803: Refactor the assembly creation
Posted by ks...@apache.org.
SM-2803: Refactor the assembly creation
- Karaf BOM moved before Camel BOM to have higher priority
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/9cbacb4e
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/9cbacb4e
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/9cbacb4e
Branch: refs/heads/master
Commit: 9cbacb4e38cb8db8a56c5836b7cd982278076742
Parents: 5724a97
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Fri Jan 15 06:39:04 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Fri Jan 15 06:39:04 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/9cbacb4e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b13545d..0841170 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -111,7 +111,17 @@
<!-- Managed dependencies -->
<dependencyManagement>
<dependencies>
- <!-- managed dependencies for all the Camel components -->
+
+ <!-- Apache Karaf BOM -->
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>karaf</artifactId>
+ <version>${karaf.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- Apache Camel BOM -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
@@ -120,6 +130,7 @@
<scope>import</scope>
</dependency>
+ <!-- managed dependencies for all the Camel components -->
<dependency>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>apache-camel</artifactId>
@@ -201,13 +212,6 @@
<!-- Apache Karaf -->
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>karaf</artifactId>
- <version>${karaf.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId>
<version>${karaf.version}</version>
[25/26] servicemix git commit: SM-2823: ActivitiExamplesTest fails
accidentally
Posted by ks...@apache.org.
SM-2823: ActivitiExamplesTest fails accidentally
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/db6a819e
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/db6a819e
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/db6a819e
Branch: refs/heads/master
Commit: db6a819e9269d50e80dc2c4218e8363b7a13ebd8
Parents: c03db04
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sun Jan 24 23:38:19 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sun Jan 24 23:38:19 2016 +0100
----------------------------------------------------------------------
.../org/apache/servicemix/itests/ExamplesIntegrationTests.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/db6a819e/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 5e3cb71..3a5513c 100644
--- a/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
+++ b/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
@@ -57,7 +57,7 @@ class ActivitiExamplesTest extends ExamplesIntegrationTests {
@Test
// running the test without uninstalling the feature afterwards, cfr. SM-2244
- def testActivitiCamelExample = testWithFeature(false, "examples-activiti-camel") {
+ def testActivitiCamelExample = testWithFeature(false, "transaction", "examples-activiti-camel") {
val orderId = "001"
camelProducer.send("file:var/activiti-camel/order", new Processor() {
[13/26] servicemix git commit: SM-2803: Refactor the assembly creation
Posted by ks...@apache.org.
SM-2803: Refactor the assembly creation
- Formatting pom headers
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/fa80608b
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/fa80608b
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/fa80608b
Branch: refs/heads/master
Commit: fa80608ba3f7cae9daea1083146fbe0729ca2f17
Parents: 9cbacb4
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Fri Jan 15 06:55:33 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Fri Jan 15 06:55:33 2016 +0100
----------------------------------------------------------------------
assemblies/features/pom.xml | 4 +---
assemblies/features/servicemix-examples/pom.xml | 4 +---
assemblies/features/servicemix-features/pom.xml | 4 +---
assemblies/features/servicemix-internal/pom.xml | 4 +---
assemblies/features/servicemix-kie/pom.xml | 4 +---
assemblies/pom.xml | 4 +---
6 files changed, 6 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/fa80608b/assemblies/features/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/pom.xml b/assemblies/features/pom.xml
index 84fa8b5..07670d3 100644
--- a/assemblies/features/pom.xml
+++ b/assemblies/features/pom.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
http://git-wip-us.apache.org/repos/asf/servicemix/blob/fa80608b/assemblies/features/servicemix-examples/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-examples/pom.xml b/assemblies/features/servicemix-examples/pom.xml
index aed3879..18e4692 100644
--- a/assemblies/features/servicemix-examples/pom.xml
+++ b/assemblies/features/servicemix-examples/pom.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
http://git-wip-us.apache.org/repos/asf/servicemix/blob/fa80608b/assemblies/features/servicemix-features/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-features/pom.xml b/assemblies/features/servicemix-features/pom.xml
index 2613096..1e4d8ed 100644
--- a/assemblies/features/servicemix-features/pom.xml
+++ b/assemblies/features/servicemix-features/pom.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
http://git-wip-us.apache.org/repos/asf/servicemix/blob/fa80608b/assemblies/features/servicemix-internal/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-internal/pom.xml b/assemblies/features/servicemix-internal/pom.xml
index fa1feab..0d348f6 100644
--- a/assemblies/features/servicemix-internal/pom.xml
+++ b/assemblies/features/servicemix-internal/pom.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
http://git-wip-us.apache.org/repos/asf/servicemix/blob/fa80608b/assemblies/features/servicemix-kie/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-kie/pom.xml b/assemblies/features/servicemix-kie/pom.xml
index 2e0ef0f..aef4f01 100644
--- a/assemblies/features/servicemix-kie/pom.xml
+++ b/assemblies/features/servicemix-kie/pom.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
http://git-wip-us.apache.org/repos/asf/servicemix/blob/fa80608b/assemblies/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/pom.xml b/assemblies/pom.xml
index a419fc2..e9c8bd2 100644
--- a/assemblies/pom.xml
+++ b/assemblies/pom.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
[02/26] servicemix git commit: SM-2803: Refactor the assembly creation
Posted by ks...@apache.org.
SM-2803: Refactor the assembly creation
- features refactored to separate modules with packaging 'feature'
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/376b87db
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/376b87db
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/376b87db
Branch: refs/heads/master
Commit: 376b87db43b2a4ad35e28624e5514d2ba8245342
Parents: 8a030bb
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sat Jan 9 01:22:22 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat Jan 9 13:18:18 2016 +0100
----------------------------------------------------------------------
assemblies/features/pom.xml | 44 +++++
assemblies/features/servicemix-examples/pom.xml | 58 ++++++
.../src/main/feature/feature.xml | 189 +++++++++++++++++++
assemblies/features/servicemix-features/pom.xml | 58 ++++++
.../src/main/feature/feature.xml | 140 ++++++++++++++
assemblies/features/servicemix-internal/pom.xml | 59 ++++++
.../src/main/feature/feature.xml | 40 ++++
assemblies/features/servicemix-kie/pom.xml | 58 ++++++
.../servicemix-kie/src/main/feature/feature.xml | 95 ++++++++++
assemblies/pom.xml | 42 +++++
assembly/pom.xml | 75 ++++----
assembly/src/main/descriptors/unix-bin.xml | 27 ---
.../etc/org.apache.karaf.features.cfg | 8 +-
.../src/main/filtered-resources/examples.xml | 187 ------------------
.../src/main/filtered-resources/features.xml | 138 --------------
.../src/main/filtered-resources/internal.xml | 35 ----
drools/pom.xml | 82 --------
drools/src/main/resources/features.xml | 95 ----------
parent/pom.xml | 6 +
pom.xml | 2 +-
20 files changed, 832 insertions(+), 606 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/assemblies/features/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/pom.xml b/assemblies/features/pom.xml
new file mode 100644
index 0000000..84fa8b5
--- /dev/null
+++ b/assemblies/features/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>assemblies</artifactId>
+ <groupId>org.apache.servicemix.assemblies</groupId>
+ <version>6.1.1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.assemblies.features</groupId>
+ <artifactId>features</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache ServiceMix :: Assemblies :: Features</name>
+
+ <modules>
+ <module>servicemix-internal</module>
+ <module>servicemix-features</module>
+ <module>servicemix-kie</module>
+ <module>servicemix-examples</module>
+ </modules>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/assemblies/features/servicemix-examples/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-examples/pom.xml b/assemblies/features/servicemix-examples/pom.xml
new file mode 100644
index 0000000..aed3879
--- /dev/null
+++ b/assemblies/features/servicemix-examples/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>features</artifactId>
+ <groupId>org.apache.servicemix.assemblies.features</groupId>
+ <version>6.1.1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.features</groupId>
+ <artifactId>servicemix-examples</artifactId>
+ <packaging>feature</packaging>
+ <name>Apache ServiceMix :: Assemblies :: Features :: ServiceMix Examples</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>features-generate-descriptor</goal>
+ </goals>
+ <configuration>
+ <addBundlesToPrimaryFeature>false</addBundlesToPrimaryFeature>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/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
new file mode 100644
index 0000000..e5f3b66
--- /dev/null
+++ b/assemblies/features/servicemix-examples/src/main/feature/feature.xml
@@ -0,0 +1,189 @@
+<?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="servicemix-examples-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.1"
+ 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">
+
+ <!--
+ -
+ - Examples
+ -
+ -->
+ <feature name="examples-activemq-camel-blueprint" version="${project.version}" resolver="(obr)">
+ <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 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 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 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>
+ <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-blueprint/${project.version}</bundle>
+ </feature>
+ <feature name="examples-cxf-jaxws-blueprint" version="${project.version}" resolver="(obr)">
+ <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 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 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 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>
+ <bundle dependency="true">mvn:com.h2database/h2/${h2.version}</bundle>
+ <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 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 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 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 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)">
+ <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 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 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 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 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 version="${cxf.version}">cxf-core</feature>
+ <feature version="${cxf.version}">cxf-ws-security</feature>
+ <feature version="${cxf.version}">cxf-ws-rm</feature>
+ <bundle dependency="true">mvn:org.apache.cxf/cxf-bundle-compatible/${cxf.version}</bundle>
+ <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-security-signature/${project.version}</bundle>
+ </feature>
+ <feature name="examples-cxf-ws-rm" version="${project.version}" resolver="(obr)">
+ <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 version="${camel.version}">camel-jetty</feature>
+ <feature version="${camel.version}">camel-jms</feature>
+ <feature version="${camel.version}">camel-jaxb</feature>
+ <feature version="${cxf.version}">cxf-wsn</feature>
+ <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 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 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 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 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 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 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 version="${drools6.version}">kie-aries-blueprint</feature>
+ <feature version="${drools6.version}">kie-camel</feature>
+ <feature version="${camel.version}">camel-xstream</feature>
+ <bundle>mvn:org.apache.servicemix.examples/drools-camel-cxf-server/${project.version}</bundle>
+ </feature>
+
+</features>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/assemblies/features/servicemix-features/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-features/pom.xml b/assemblies/features/servicemix-features/pom.xml
new file mode 100644
index 0000000..2613096
--- /dev/null
+++ b/assemblies/features/servicemix-features/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>features</artifactId>
+ <groupId>org.apache.servicemix.assemblies.features</groupId>
+ <version>6.1.1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.features</groupId>
+ <artifactId>servicemix-features</artifactId>
+ <packaging>feature</packaging>
+ <name>Apache ServiceMix :: Assemblies :: Features :: ServiceMix Features</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>features-generate-descriptor</goal>
+ </goals>
+ <configuration>
+ <addBundlesToPrimaryFeature>false</addBundlesToPrimaryFeature>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/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
new file mode 100644
index 0000000..6ca7098
--- /dev/null
+++ b/assemblies/features/servicemix-features/src/main/feature/feature.xml
@@ -0,0 +1,140 @@
+<?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="servicemix-features-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.1"
+ 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">
+
+ <feature name="jms-appender" version="${project.version}" resolver="(obr)" 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 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>
+ <bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.camel/${project.version}</bundle>
+ <configfile finalname="/etc/org.apache.servicemix.activemq.service.cfg">
+ mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.service/${project.version}/cfg/activemq-service
+ </configfile>
+ </feature>
+
+ <!-- Activiti support -->
+ <feature name="activiti" version="${activiti.version}" resolver="(obr)">
+ <feature version="${jpa.version}">jpa</feature>
+ <feature version="${cxf.version}">cxf-specs</feature>
+ <feature version="${aries.transaction.version}">transaction</feature>
+ <feature version="${camel.version}">camel</feature>
+ <feature version="[3.2,3.3)">spring-orm</feature>
+ <feature version="${drools.version}">drools</feature>
+ <bundle dependency="true">mvn:joda-time/joda-time/${jodatime2.bundle.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s/${json4s.bundle.version}</bundle>
+ <bundle dependency="true">mvn:org.mybatis/mybatis/${mybatis.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle>
+ <bundle dependency="true">mvn:com.h2database/h2/${h2.version}</bundle>
+ <bundle dependency="true">mvn:org.mvel/mvel2/${mvel2.version}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${fasterxml.jackson.version}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${fasterxml.jackson.version}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${fasterxml.jackson.version}</bundle>
+ <bundle>mvn:org.activiti/activiti-engine/${activiti.version}</bundle>
+ <bundle>mvn:org.activiti/activiti-bpmn-converter/${activiti.version}</bundle>
+ <bundle>mvn:org.activiti/activiti-spring/${activiti.version}</bundle>
+ <bundle>mvn:org.activiti/activiti-bpmn-model/${activiti.version}</bundle>
+ <bundle>mvn:org.activiti/activiti-osgi/${activiti.version}</bundle>
+ <bundle>mvn:org.activiti/activiti-process-validation/${activiti.version}</bundle>
+ <bundle>mvn:org.activiti/activiti-camel/${activiti.version}</bundle>
+ <bundle>mvn:org.activiti/activiti-image-generator/${activiti.version}</bundle>
+ <bundle>mvn:org.activiti/activiti-ldap/${activiti.version}</bundle>
+ <bundle>mvn:org.activiti/activiti-jmx/${activiti.version}</bundle>
+ <!--
+ <bundle dependency="true">wrap:mvn:org.tinyjee.jgraphx/jgraphx/1.10.4.1</bundle>
+ <bundle>mvn:org.activiti/activiti-bpmn-layout/${activiti.version}</bundle>
+ <bundle>mvn:org.activiti/activiti-simple-workflow/${activiti.version}</bundle>
+ <bundle dependency="true">wrap:mvn:math.geom2d/javaGeom/0.11.1</bundle>
+ <bundle>mvn:org.activiti/activiti-json-converter/${activiti.version}</bundle>
+ <bundle>mvn:org.activiti/activiti-hazelcast-async-executor/${activiti.version}</bundle>
+ -->
+ <bundle>mvn:org.apache.servicemix.activiti/org.apache.servicemix.activiti.config/${project.version}</bundle>
+ </feature>
+
+ <!-- Akka support -->
+ <feature name="akka" version="${akka.version}" resolver="(obr)">
+ <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>
+ <bundle>mvn:com.typesafe.akka/akka-osgi_2.11/${akka.version}</bundle>
+ <bundle>mvn:com.typesafe.akka/akka-camel_2.11/${akka.version}</bundle>
+ </feature>
+
+ <feature name="swagger-2.10" version="${project.version}" resolver="(obr)">
+ <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>
+ <bundle>mvn:com.google.guava/guava/${google.guava.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version}</bundle>
+ <bundle>mvn:com.fasterxml.jackson.module/jackson-module-scala_2.10/${fasterxml.jackson.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-annotations/${swagger.bundle.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-core/${swagger.core.bundle.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-jaxrs/${swagger.bundle.version}</bundle>
+ <bundle>mvn:com.thoughtworks.paranamer/paranamer/${thoughtworks.paranamer.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s/${json4s.bundle.version}</bundle>
+ <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)">
+ <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>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist.bundle.version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject.bundle.version}</bundle>
+ <bundle dependency='true'>mvn:com.google.guava/guava/${google.guava.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-paranamer/${fasterxml.jackson.version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-scala_2.11/${fasterxml.jackson.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-annotations/${swagger.bundle.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-core_2.11/${swagger.core.bundle.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-jaxrs_2.11/${swagger.bundle.version}</bundle>
+ <bundle dependency='true'>mvn:com.thoughtworks.paranamer/paranamer/${thoughtworks.paranamer.version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s_2.11/${json4s.bundle.version}</bundle>
+ <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)">
+ <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 version="${karaf.version}">webconsole</feature>
+ <feature version="${camel.version}">camel-groovy</feature>
+ <feature version="${camel.version}">camel-script-groovy</feature>
+ <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
+ <bundle dependency="true">mvn:commons-fileupload/commons-fileupload/${commons-fileupload.version}</bundle>
+ <bundle>mvn:org.apache.felix/org.apache.felix.webconsole.plugins.scriptconsole/${felix.webconsole.plugins.scriptconsole.version}</bundle>
+ </feature>
+
+</features>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/assemblies/features/servicemix-internal/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-internal/pom.xml b/assemblies/features/servicemix-internal/pom.xml
new file mode 100644
index 0000000..fa1feab
--- /dev/null
+++ b/assemblies/features/servicemix-internal/pom.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>features</artifactId>
+ <groupId>org.apache.servicemix.assemblies.features</groupId>
+ <version>6.1.1-SNAPSHOT</version>
+ </parent>
+
+
+ <groupId>org.apache.servicemix.features</groupId>
+ <artifactId>servicemix-internal</artifactId>
+ <packaging>feature</packaging>
+ <name>Apache ServiceMix :: Assemblies :: Features :: ServiceMix Internal</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>features-generate-descriptor</goal>
+ </goals>
+ <configuration>
+ <addBundlesToPrimaryFeature>false</addBundlesToPrimaryFeature>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/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
new file mode 100644
index 0000000..bb46eb6
--- /dev/null
+++ b/assemblies/features/servicemix-internal/src/main/feature/feature.xml
@@ -0,0 +1,40 @@
+<?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="servicemix-internal-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.1"
+ 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">
+
+ <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>
+ <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-->
+ <feature name="jaxrs-api">
+ <bundle start-level='10'>
+ mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0/${servicemix.specs.version}
+ </bundle>
+ </feature>
+
+ <!-- workaround for SM-2469 -->
+ <feature name="joda-time">
+ <bundle start-level='10'>mvn:joda-time/joda-time/${jodatime2.bundle.version}</bundle>
+ </feature>
+
+</features>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/assemblies/features/servicemix-kie/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/servicemix-kie/pom.xml b/assemblies/features/servicemix-kie/pom.xml
new file mode 100644
index 0000000..2e0ef0f
--- /dev/null
+++ b/assemblies/features/servicemix-kie/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>features</artifactId>
+ <groupId>org.apache.servicemix.assemblies.features</groupId>
+ <version>6.1.1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.features</groupId>
+ <artifactId>servicemix-kie</artifactId>
+ <packaging>feature</packaging>
+ <name>Apache ServiceMix :: Assemblies :: Features :: ServiceMix KIE</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>features-generate-descriptor</goal>
+ </goals>
+ <configuration>
+ <addBundlesToPrimaryFeature>false</addBundlesToPrimaryFeature>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/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
new file mode 100644
index 0000000..7149ae0
--- /dev/null
+++ b/assemblies/features/servicemix-kie/src/main/feature/feature.xml
@@ -0,0 +1,95 @@
+<?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="servicemix-kie-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.1"
+ 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">
+
+ <feature name="drools6-module" version="${drools6.version}"
+ description="Drools 6 core" start-level="50" resolver="(obr)">
+ <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>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/3.5_1</bundle>
+
+ <bundle>mvn:org.kie/kie-api/${drools6.version}</bundle>
+ <bundle>mvn:org.kie/kie-internal/${drools6.version}</bundle>
+ <bundle>mvn:org.drools/drools-core/${drools6.version}</bundle>
+ <bundle>mvn:org.drools/drools-compiler/${drools6.version}</bundle>
+ <bundle>mvn:org.drools/drools-osgi-integration/${drools6.version}</bundle>
+ </feature>
+
+ <feature name="drools6-jpa" version="${drools6.version}"
+ description="Drools 6 JPA support" start-level="50" resolver="(obr)">
+ <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)">
+ <feature version="${drools6.version}">drools6-module</feature>
+ <feature version="${drools6.version}">drools6-jpa</feature>
+ <!-- commons libs for jbpm -->
+ <bundle dependency="true">mvn:org.jboss.spec.javax.security.jacc/jboss-jacc-api_1.5_spec/1.0.0.Final</bundle>
+ <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/1.8.6_1</bundle>
+ <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle>
+ <!-- jbpm-human -->
+ <bundle>mvn:org.jbpm/jbpm-human-task-core/${drools6.version}</bundle>
+ <bundle>mvn:org.jbpm/jbpm-human-task-workitems/${drools6.version}</bundle>
+ <bundle>mvn:org.jbpm/jbpm-human-task-jpa/${drools6.version}</bundle>
+ <bundle>mvn:org.jbpm/jbpm-human-task-audit/${drools6.version}</bundle>
+ <!-- jbpm engine -->
+ <bundle>mvn:org.jbpm/jbpm-flow-builder/${drools6.version}</bundle>
+ <bundle>mvn:org.jbpm/jbpm-flow/${drools6.version}</bundle>
+ <bundle>mvn:org.jbpm/jbpm-bpmn2/${drools6.version}</bundle>
+ <bundle>mvn:org.jbpm/jbpm-audit/${drools6.version}</bundle>
+ <bundle>mvn:org.jbpm/jbpm-runtime-manager/${drools6.version}</bundle>
+ <bundle>mvn:org.jbpm/jbpm-persistence-jpa/${drools6.version}</bundle>
+ </feature>
+
+ <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)">
+ <feature version="${drools6.version}">jbpm</feature>
+ <feature version="[3.1,4.0)">spring</feature>
+ <feature version="[3.1,4.0)">spring-orm</feature>
+ <bundle>mvn:org.kie/kie-spring/${drools6.version}</bundle>
+ </feature>
+
+ <feature name="kie-camel" version="${drools6.version}"
+ description="KIE Camel support" start-level="50" resolver="(obr)">
+ <feature version="${drools6.version}">kie-spring</feature>
+ <feature version="${drools6.version}">jbpm</feature>
+
+ <feature version="${camel.version}">camel-core</feature>
+ <feature version="${camel.version}">camel-spring</feature>
+ <feature version="${camel.version}">camel-cxf</feature>
+
+ <feature version="${cxf.version}">cxf-specs</feature>
+ <feature version="${cxf.version}">cxf-core</feature>
+ <feature version="${cxf.version}">cxf-jaxrs</feature>
+
+ <bundle>mvn:org.kie/kie-camel/${drools6.version}</bundle>
+ </feature>
+</features>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/assemblies/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/pom.xml b/assemblies/pom.xml
new file mode 100644
index 0000000..b5da26d
--- /dev/null
+++ b/assemblies/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>parent</artifactId>
+ <version>6.1.1-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.servicemix.assemblies</groupId>
+ <artifactId>assemblies</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache ServiceMix :: Assemblies</name>
+
+ <modules>
+ <module>features</module>
+ </modules>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 5cfe5aa..05eb8ec 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -37,6 +37,40 @@
</properties>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.servicemix.features</groupId>
+ <artifactId>servicemix-internal</artifactId>
+ <version>${project.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.features</groupId>
+ <artifactId>servicemix-features</artifactId>
+ <version>${project.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.features</groupId>
+ <artifactId>servicemix-examples</artifactId>
+ <version>${project.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.features</groupId>
+ <artifactId>servicemix-kie</artifactId>
+ <version>${project.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.jaxp-api-1.4</artifactId>
@@ -149,10 +183,10 @@
<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>
- <descriptor>mvn:org.apache.servicemix.drools/features/${version}/xml/features</descriptor>
- <descriptor>file:${project.build.outputDirectory}/internal.xml</descriptor>
- <descriptor>file:${project.build.outputDirectory}/features.xml</descriptor>
- <descriptor>file:${project.build.outputDirectory}/examples.xml</descriptor>
+ <descriptor>mvn:org.apache.servicemix.features/servicemix-internal/${project.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.servicemix.features/servicemix-features/${project.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.servicemix.features/servicemix-kie/${project.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.servicemix.features/servicemix-examples/${project.version}/xml/features</descriptor>
</descriptors>
<features>
<feature>joda-time</feature>
@@ -294,39 +328,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <inherited>false</inherited>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${project.build.outputDirectory}/internal.xml</file>
- <type>xml</type>
- <classifier>internal</classifier>
- </artifact>
- <artifact>
- <file>${project.build.outputDirectory}/features.xml</file>
- <type>xml</type>
- <classifier>features</classifier>
- </artifact>
- <artifact>
- <file>${project.build.outputDirectory}/examples.xml</file>
- <type>xml</type>
- <classifier>examples</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/assembly/src/main/descriptors/unix-bin.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/descriptors/unix-bin.xml b/assembly/src/main/descriptors/unix-bin.xml
index 9648852..22ab142 100644
--- a/assembly/src/main/descriptors/unix-bin.xml
+++ b/assembly/src/main/descriptors/unix-bin.xml
@@ -28,31 +28,4 @@
<componentDescriptor>${project.build.outputDirectory}/examples-unix-bin.xml</componentDescriptor>
</componentDescriptors>
- <files>
- <file>
- <!-- Install the internal features descriptor into the system repository -->
- <source>${project.build.outputDirectory}/internal.xml</source>
- <outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
- <destName>${artifactId}-${version}-internal.xml</destName>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- <file>
- <!-- Install the features descriptor into the system repository -->
- <source>${project.build.outputDirectory}/features.xml</source>
- <outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
- <destName>${artifactId}-${version}-features.xml</destName>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- <file>
- <!-- Install the example features descriptor into the system repository -->
- <source>${project.build.outputDirectory}/examples.xml</source>
- <outputDirectory>system/org/apache/servicemix/${artifactId}/${version}</outputDirectory>
- <destName>${artifactId}-${version}-examples.xml</destName>
- <fileMode>0644</fileMode>
- <lineEnding>unix</lineEnding>
- </file>
- </files>
-
</assembly>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/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 ab83c53..28b52c0 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
@@ -40,10 +40,10 @@ 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.drools/features/${version}/xml/features,\
- mvn:org.apache.servicemix/apache-servicemix/${version}/xml/examples,\
+ 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
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/assembly/src/main/filtered-resources/examples.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/examples.xml b/assembly/src/main/filtered-resources/examples.xml
deleted file mode 100644
index da8eced..0000000
--- a/assembly/src/main/filtered-resources/examples.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?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="servicemix-examples-${version}">
-
- <!--
- -
- - Examples
- -
- -->
- <feature name="examples-activemq-camel-blueprint" version="${version}" resolver="(obr)">
- <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/${version}</bundle>
- </feature>
- <feature name="examples-cxf-osgi" version="${version}" resolver="(obr)">
- <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/${version}</bundle>
- </feature>
- <feature name="examples-cxf-jaxrs" version="${version}" resolver="(obr)">
- <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/${version}</bundle>
- </feature>
- <feature name="examples-cxf-jaxrs-blueprint" version="${version}" resolver="(obr)">
- <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>
- <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-blueprint/${version}</bundle>
- </feature>
- <feature name="examples-cxf-jaxws-blueprint" version="${version}" resolver="(obr)">
- <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/${version}</bundle>
- </feature>
- <feature name="examples-camel-sql-derby" version="${version}" resolver="(obr)">
- <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/${version}</bundle>
- </feature>
- <feature name="examples-camel-sql-pgsql" version="${version}" resolver="(obr)">
- <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/${version}</bundle>
- </feature>
- <feature name="examples-camel-sql-h2" version="${version}" resolver="(obr)">
- <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>
- <bundle dependency="true">mvn:com.h2database/h2/${h2.version}</bundle>
- <bundle>mvn:org.apache.servicemix.examples/camel-sql-datasource-h2/${version}</bundle>
- <bundle>mvn:org.apache.servicemix.examples/camel-sql-orders/${version}</bundle>
- </feature>
- <feature name="examples-camel-osgi" version="${version}" resolver="(obr)">
- <feature version="${camel.version}">camel</feature>
- <bundle>mvn:org.apache.servicemix.examples/camel-osgi/${version}</bundle>
- </feature>
- <feature name="examples-camel-blueprint" version="${version}" resolver="(obr)">
- <feature version="${camel.version}">camel-blueprint</feature>
- <bundle>mvn:org.apache.servicemix.examples/camel-blueprint/${version}</bundle>
- </feature>
- <feature name="examples-camel-drools" version="${version}" resolver="(obr)">
- <feature version="${camel.version}">camel-jms</feature>
- <feature version="${drools.version}">drools</feature>
- <bundle>mvn:org.apache.servicemix.examples/camel-drools/${version}</bundle>
- </feature>
- <feature name="examples-camel-drools-blueprint" version="${version}" resolver="(obr)">
- <feature version="${camel.version}">camel-jms</feature>
- <feature version="${drools.version}">drools</feature>
- <bundle>mvn:org.apache.servicemix.examples/camel-drools-blueprint/${version}</bundle>
- </feature>
- <feature name="examples-camel-cxf-rest" version="${version}" resolver="(obr)">
- <bundle>mvn:org.apache.servicemix.examples/camel-cxf-rest-service/${version}</bundle>
- <bundle>mvn:org.apache.servicemix.examples/camel-cxf-rest-route/${version}</bundle>
- </feature>
- <feature name="examples-camel-cxf-soap" version="${version}" resolver="(obr)">
- <feature version="${camel.version}">camel-jaxb</feature>
- <bundle>mvn:org.apache.servicemix.examples/camel-cxf-soap-service/${version}</bundle>
- <bundle>mvn:org.apache.servicemix.examples/camel-cxf-soap-route/${version}</bundle>
- </feature>
- <feature name="examples-cxf-ws-addressing" version="${version}" resolver="(obr)">
- <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/${version}</bundle>
- </feature>
- <feature name="examples-cxf-ws-security-osgi" version="${version}" resolver="(obr)">
- <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/${version}</bundle>
- </feature>
- <feature name="examples-cxf-ws-security-blueprint" version="${version}" resolver="(obr)">
- <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/${version}</bundle>
- </feature>
- <feature name="examples-cxf-ws-security-signature" version="${version}" resolver="(obr)">
- <feature version="${cxf.version}">cxf-core</feature>
- <feature version="${cxf.version}">cxf-ws-security</feature>
- <feature version="${cxf.version}">cxf-ws-rm</feature>
- <bundle dependency="true">mvn:org.apache.cxf/cxf-bundle-compatible/${cxf.version}</bundle>
- <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-security-signature/${version}</bundle>
- </feature>
- <feature name="examples-cxf-ws-rm" version="${version}" resolver="(obr)">
- <feature version="${cxf.version}">cxf-core</feature>
- <feature version="${cxf.version}">cxf-ws-rm</feature>
- <bundle>mvn:org.apache.servicemix.examples/cxf-ws-rm/${version}</bundle>
- </feature>
- <feature name="examples-cxf-wsn-receive" version="${version}" resolver="(obr)">
- <feature version="${camel.version}">camel-jetty</feature>
- <feature version="${camel.version}">camel-jms</feature>
- <feature version="${camel.version}">camel-jaxb</feature>
- <feature version="${cxf.version}">cxf-wsn</feature>
- <bundle>mvn:org.apache.servicemix.examples/cxf-wsn-base/${version}</bundle>
- <bundle>mvn:org.apache.servicemix.examples/cxf-wsn-receive/${version}</bundle>
- </feature>
- <feature name="examples-cxf-wsn-notifier" version="${version}" resolver="(obr)">
- <feature version="${version}">examples-cxf-wsn-receive</feature>
- <bundle>mvn:org.apache.servicemix.examples/cxf-wsn-notifier/${version}</bundle>
- </feature>
-
- <feature name="examples-activiti-camel" version="${version}" resolver="(obr)">
- <feature version="${camel.version}">camel-core</feature>
- <feature version="${activiti.version}">activiti</feature>
- <bundle>mvn:org.apache.servicemix.examples/activiti-camel/${version}</bundle>
- </feature>
-
- <feature name="examples-akka-camel" version="${version}" resolver="(obr)">
- <feature version="${akka.version}">akka</feature>
- <feature version="${camel.version}">camel-scala</feature>
- <bundle>mvn:org.apache.servicemix.examples/akka-camel/${version}</bundle>
- </feature>
-
- <feature name="examples-drools-simple" version="${version}" resolver="(obr)">
- <feature version="${drools6.version}">drools6-module</feature>
- <bundle>mvn:org.apache.servicemix.examples/drools-simple/${version}</bundle>
- </feature>
-
- <feature name="examples-drools-camel-blueprint" version="${version}" resolver="(obr)">
- <feature version="${drools6.version}">kie-camel</feature>
- <feature version="${drools6.version}">kie-aries-blueprint</feature>
- <bundle>mvn:org.apache.servicemix.examples/drools-camel-blueprint/${version}</bundle>
- </feature>
-
- <feature name="examples-drools-spring" version="${version}" resolver="(obr)">
- <feature version="${drools6.version}">kie-spring</feature>
- <bundle>mvn:org.apache.servicemix.examples/drools-spring/${version}</bundle>
- </feature>
-
- <feature name="examples-drools-camel-cxf-server" version="${version}" resolver="(obr)">
- <feature version="${drools6.version}">kie-aries-blueprint</feature>
- <feature version="${drools6.version}">kie-camel</feature>
- <feature version="${camel.version}">camel-xstream</feature>
- <bundle>mvn:org.apache.servicemix.examples/drools-camel-cxf-server/${version}</bundle>
- </feature>
-
-</features>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/assembly/src/main/filtered-resources/features.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/features.xml b/assembly/src/main/filtered-resources/features.xml
deleted file mode 100644
index 49837ef..0000000
--- a/assembly/src/main/filtered-resources/features.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?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="servicemix-features-${version}">
-
- <feature name="jms-appender" version="${version}" resolver="(obr)" start-level="50">
- <feature version="${activemq.version}">activemq-broker-noweb</feature>
- <bundle>mvn:org.apache.servicemix.logging/jms-appender/${version}</bundle>
- </feature>
-
- <feature name="activemq-service" version="${version}" resolver="(obr)" 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/${version}</bundle>
- <bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.camel/${version}</bundle>
- <configfile finalname="/etc/org.apache.servicemix.activemq.service.cfg">
- mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.service/${project.version}/cfg/activemq-service
- </configfile>
- </feature>
-
- <!-- Activiti support -->
- <feature name="activiti" version="${activiti.version}" resolver="(obr)">
- <feature version="${jpa.version}">jpa</feature>
- <feature version="${cxf.version}">cxf-specs</feature>
- <feature version="${aries.transaction.version}">transaction</feature>
- <feature version="${camel.version}">camel</feature>
- <feature version="[3.2,3.3)">spring-orm</feature>
- <feature version="${drools.version}">drools</feature>
- <bundle dependency="true">mvn:joda-time/joda-time/${jodatime2.bundle.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s/${json4s.bundle.version}</bundle>
- <bundle dependency="true">mvn:org.mybatis/mybatis/${mybatis.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
- <bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons-lang3.version}</bundle>
- <bundle dependency="true">mvn:com.h2database/h2/${h2.version}</bundle>
- <bundle dependency="true">mvn:org.mvel/mvel2/${mvel2.version}</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${fasterxml.jackson.version}</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${fasterxml.jackson.version}</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${fasterxml.jackson.version}</bundle>
- <bundle>mvn:org.activiti/activiti-engine/${activiti.version}</bundle>
- <bundle>mvn:org.activiti/activiti-bpmn-converter/${activiti.version}</bundle>
- <bundle>mvn:org.activiti/activiti-spring/${activiti.version}</bundle>
- <bundle>mvn:org.activiti/activiti-bpmn-model/${activiti.version}</bundle>
- <bundle>mvn:org.activiti/activiti-osgi/${activiti.version}</bundle>
- <bundle>mvn:org.activiti/activiti-process-validation/${activiti.version}</bundle>
- <bundle>mvn:org.activiti/activiti-camel/${activiti.version}</bundle>
- <bundle>mvn:org.activiti/activiti-image-generator/${activiti.version}</bundle>
- <bundle>mvn:org.activiti/activiti-ldap/${activiti.version}</bundle>
- <bundle>mvn:org.activiti/activiti-jmx/${activiti.version}</bundle>
- <!--
- <bundle dependency="true">wrap:mvn:org.tinyjee.jgraphx/jgraphx/1.10.4.1</bundle>
- <bundle>mvn:org.activiti/activiti-bpmn-layout/${activiti.version}</bundle>
- <bundle>mvn:org.activiti/activiti-simple-workflow/${activiti.version}</bundle>
- <bundle dependency="true">wrap:mvn:math.geom2d/javaGeom/0.11.1</bundle>
- <bundle>mvn:org.activiti/activiti-json-converter/${activiti.version}</bundle>
- <bundle>mvn:org.activiti/activiti-hazelcast-async-executor/${activiti.version}</bundle>
- -->
- <bundle>mvn:org.apache.servicemix.activiti/org.apache.servicemix.activiti.config/${project.version}</bundle>
- </feature>
-
- <!-- Akka support -->
- <feature name="akka" version="${akka.version}" resolver="(obr)">
- <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>
- <bundle>mvn:com.typesafe.akka/akka-osgi_2.11/${akka.version}</bundle>
- <bundle>mvn:com.typesafe.akka/akka-camel_2.11/${akka.version}</bundle>
- </feature>
-
- <feature name="swagger-2.10" version="${version}" resolver="(obr)">
- <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>
- <bundle>mvn:com.google.guava/guava/${google.guava.version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${fasterxml.jackson.version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${fasterxml.jackson.version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${fasterxml.jackson.version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${fasterxml.jackson.version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version}</bundle>
- <bundle>mvn:com.fasterxml.jackson.module/jackson-module-scala_2.10/${fasterxml.jackson.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-annotations/${swagger.bundle.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-core/${swagger.core.bundle.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-jaxrs/${swagger.bundle.version}</bundle>
- <bundle>mvn:com.thoughtworks.paranamer/paranamer/${thoughtworks.paranamer.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s/${json4s.bundle.version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections.bundle.version}</bundle>
- </feature>
-
- <feature name="swagger-2.11" version="${version}" resolver="(obr)">
- <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>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist.bundle.version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject.bundle.version}</bundle>
- <bundle dependency='true'>mvn:com.google.guava/guava/${google.guava.version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${fasterxml.jackson.version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${fasterxml.jackson.version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${fasterxml.jackson.version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${fasterxml.jackson.version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-paranamer/${fasterxml.jackson.version}</bundle>
- <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-scala_2.11/${fasterxml.jackson.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-annotations/${swagger.bundle.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-core_2.11/${swagger.core.bundle.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.swagger-jaxrs_2.11/${swagger.bundle.version}</bundle>
- <bundle dependency='true'>mvn:com.thoughtworks.paranamer/paranamer/${thoughtworks.paranamer.version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json4s_2.11/${json4s.bundle.version}</bundle>
- <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)">
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.drools/${drools.bundle.version}</bundle>
- </feature>
-
- <feature name="web-script-console" version="${version}" resolver="(obr)">
- <feature version="${karaf.version}">webconsole</feature>
- <feature version="${camel.version}">camel-groovy</feature>
- <feature version="${camel.version}">camel-script-groovy</feature>
- <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
- <bundle dependency="true">mvn:commons-fileupload/commons-fileupload/${commons-fileupload.version}</bundle>
- <bundle>mvn:org.apache.felix/org.apache.felix.webconsole.plugins.scriptconsole/${felix.webconsole.plugins.scriptconsole.version}</bundle>
- </feature>
-
-</features>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/376b87db/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
deleted file mode 100644
index 1604d0a..0000000
--- a/assembly/src/main/filtered-resources/internal.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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="servicemix-internal-${version}">
- <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>
- <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-->
- <feature name="jaxrs-api">
- <bundle start-level='10'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0/${servicemix.specs.version}</bundle>
- </feature>
-
- <!-- workaround for SM-2469 -->
- <feature name="joda-time">
- <bundle start-level='10'>mvn:joda-time/joda-time/${jodatime2.bundle.version}</bundle>
- </feature>
-
-</features>
[06/26] servicemix git commit: SM-2803: Refactor the assembly creation
Posted by ks...@apache.org.
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/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
new file mode 100644
index 0000000..bb459b2
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/etc/org.apache.karaf.features.obr.cfg
@@ -0,0 +1,38 @@
+################################################################################
+#
+# 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/da7e9421/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.logging.cfg
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.logging.cfg b/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.logging.cfg
new file mode 100644
index 0000000..bd334e5
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.logging.cfg
@@ -0,0 +1,55 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+# Root logger
+log4j.rootLogger=INFO, out, osgi:VmLogAppender
+log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer
+
+# To avoid flooding the log when using DEBUG level on an ssh connection and doing log:tail
+log4j.logger.org.apache.sshd.server.channel.ChannelSession = INFO
+
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
+# use this for source code lines enabled in the logs (beware it impacts performance)
+#log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
+
+# File appender
+log4j.appender.out=org.apache.log4j.RollingFileAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
+# use this for source code lines enabled in the logs (beware it impacts performance)
+#log4j.appender.out.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n
+log4j.appender.out.file=${karaf.data}/log/servicemix.log
+log4j.appender.out.append=true
+log4j.appender.out.maxFileSize=1MB
+log4j.appender.out.maxBackupIndex=10
+
+# Sift appender
+log4j.appender.sift=org.apache.log4j.sift.MDCSiftingAppender
+log4j.appender.sift.key=bundle.name
+log4j.appender.sift.default=servicemix
+log4j.appender.sift.appender=org.apache.log4j.FileAppender
+log4j.appender.sift.appender.layout=org.apache.log4j.PatternLayout
+log4j.appender.sift.appender.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %m%n
+# use this for source code lines enabled in the logs (beware it impacts performance)
+#log4j.appender.sift.appender.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
+log4j.appender.sift.appender.file=${karaf.data}/log/$\\{bundle.name\\}.log
+log4j.appender.sift.appender.append=true
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg b/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
new file mode 100644
index 0000000..d0092d7
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.url.mvn.cfg
@@ -0,0 +1,104 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+#
+# If set to true, the following property will not allow any certificate to be used
+# when accessing Maven repositories through SSL
+#
+#org.ops4j.pax.url.mvn.certificateCheck=
+
+#
+# Path to the local Maven settings file.
+# The repositories defined in this file will be automatically added to the list
+# of default repositories if the 'org.ops4j.pax.url.mvn.repositories' property
+# below is not set.
+# The following locations are checked for the existence of the settings.xml file
+# * 1. looks for the specified url
+# * 2. if not found looks for ${user.home}/.m2/settings.xml
+# * 3. if not found looks for ${maven.home}/conf/settings.xml
+# * 4. if not found looks for ${M2_HOME}/conf/settings.xml
+#
+#org.ops4j.pax.url.mvn.settings=
+
+#
+# Path to the local Maven repository which is used to avoid downloading
+# artifacts when they already exist locally.
+# The value of this property will be extracted from the settings.xml file
+# above, or defaulted to:
+# System.getProperty( "user.home" ) + "/.m2/repository"
+#
+#org.ops4j.pax.url.mvn.localRepository=
+
+#
+# Default this to false. It's just weird to use undocumented repos
+#
+org.ops4j.pax.url.mvn.useFallbackRepositories=false
+
+#
+# Uncomment if you don't wanna use the proxy settings
+# from the Maven conf/settings.xml file
+#
+# org.ops4j.pax.url.mvn.proxySupport=false
+
+#
+# Comma separated list of repositories scanned when resolving an artifact.
+# Those repositories will be checked before iterating through the
+# below list of repositories and even before the local repository
+# A repository url can be appended with zero or more of the following flags:
+# @snapshots : the repository contains snaphots
+# @noreleases : the repository does not contain any released artifacts
+# @id=reponid : the id for the repository, just like in the settings.xml this is optional but recomendet
+#
+# The following property value will add the system folder as a repo.
+#
+org.ops4j.pax.url.mvn.defaultRepositories=\
+ file:${karaf.home}/${karaf.default.repository}@id=system.repository@snapshots,\
+ file:${karaf.data}/kar@id=kar.repository@multi@snapshots,\
+ file:${karaf.base}/${karaf.default.repository}@id=child.system.repository@snapshots,\
+ file:${karaf.home}/local-repo@snapshots@id=system.local-repo
+
+# Use the default local repo (e.g.~/.m2/repository) as a "remote" repo
+#org.ops4j.pax.url.mvn.defaultLocalRepoAsRemote=false
+
+#
+# Comma separated list of repositories scanned when resolving an artifact.
+# The default list includes the following repositories:
+# http://repo1.maven.org/maven2@id=maven.central.repo, \
+# http://repository.springsource.com/maven/bundles/release@id=springsource.release.repo, \
+# http://repository.springsource.com/maven/bundles/external@id=springsource.external.repo, \
+# http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache.snapshots.repo, \
+# http://svn.apache.org/repos/asf/servicemix/m2-repo@id=maven.smx.repo, \
+# http://zodiac.springsource.com/maven/bundles/release@id=gemini, \
+# https://oss.sonatype.org/content/repositories/releases/@id=maven.sonatype.repo
+# To add repositories to the default ones, prepend '+' to the list of repositories
+# to add.
+# A repository url can be appended with zero or more of the following flags:
+# @snapshots : the repository contains snaphots
+# @noreleases : the repository does not contain any released artifacts
+# @id=reponid : the id for the repository, just like in the settings.xml this is optional but recomendet
+#
+org.ops4j.pax.url.mvn.repositories= \
+ http://repo1.maven.org/maven2@id=maven.central.repo, \
+ http://repository.springsource.com/maven/bundles/release@id=springsource.release.repo, \
+ http://repository.springsource.com/maven/bundles/external@id=springsource.external.repo, \
+ http://repository.apache.org/content/groups/snapshots-group@snapshots@noreleases@id=apache.snapshots.repo, \
+ http://svn.apache.org/repos/asf/servicemix/m2-repo@id=maven.smx.repo, \
+ http://zodiac.springsource.com/maven/bundles/release@id=gemini, \
+ https://oss.sonatype.org/content/repositories/releases/@id=maven.sonatype.repo
+
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub b/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub
new file mode 100644
index 0000000..c83c914
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/etc/org.ops4j.pax.web.cfg.empty.stub
@@ -0,0 +1,41 @@
+################################################################################
+#
+# 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 is a stub configuration file for pax-web ssl configuration.
+# More details please refer to
+# http://wiki.ops4j.org/display/paxweb/SSL+Configuration
+# Important Notes: If file named org.ops4j.pax.web.cfg in etc folder,
+# Pax Web will always try to read configuration from
+ this file, so any org.ops4j.pax.web configuration
+ in http feature get ignored, that's why we name this
+ file as org.ops4j.pax.web.empty.stub.
+ If you need this configuration file, rename it to
+ org.ops4j.pax.web before use it.
+#################################################################################
+
+#org.osgi.service.http.secure.enabled=true
+#org.ops4j.pax.web.ssl.keystore=etc/servicemix.jks
+#org.ops4j.pax.web.ssl.password=password
+#org.ops4j.pax.web.ssl.keypassword=password
+#org.osgi.service.http.port.secure=8443
+org.ops4j.pax.web.config.file=etc/jetty.xml
+org.osgi.service.http.port=8181
+javax.servlet.context.tempdir=data/pax-web-jsp
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/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
new file mode 100644
index 0000000..7f8b389
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/etc/system.properties
@@ -0,0 +1,177 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+#
+# The properties defined in this file will be made available through system
+# properties at the very beginning of the Karaf's boot process.
+#
+
+
+# Log level when the pax-logging service is not available
+# This level will only be used while the pax-logging service bundle
+# 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
+
+#
+# Name of this karaf instance.
+#
+karaf.name=root
+
+#
+# Default repository where bundles will be loaded from before using
+# other maven repositories. For the full maven configuration, see
+# the org.ops4j.pax.url.mvn.cfg file.
+#
+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
+
+#
+# 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
+
+#
+# Roles to use when logging into a local Karaf console.
+#
+# 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 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
+
+#
+# Set this empty property to avoid errors when validating xml documents.
+#
+xml.catalog.files=
+
+#
+# Suppress the bell in the console when hitting backspace to 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
+
+#
+# ServiceMix specs options
+#
+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
+# 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.*
+
+#
+# By default, only Karaf shell commands are secured, but additional services can be
+# secured by expanding this filter
+#
+karaf.secured.services = (&(osgi.command.scope=*)(osgi.command.function=*))
+
+#
+# By default, if there's no ACL policy for a certain karaf command, this command is allowed to access
+# without the RBAC. We can change this behavior by enable the following property, which means
+# if a karaf command has no corresponding ACL then access it must have one of the karaf.secured.command.compulsory.roles
+#
+#karaf.secured.command.compulsory.roles=admin
+
+#
+# Security properties
+#
+# To enable OSGi security, uncomment the properties below,
+# install the framework-security feature and restart.
+#
+#java.security.policy=${karaf.etc}/all.policy
+#org.osgi.framework.security=osgi
+#org.osgi.framework.trust.repositories=${karaf.etc}/trustStore.ks
+
+#
+# HA/Lock configuration
+#
+# Karaf uses a lock mechanism to know which instance is the master (HA)
+# The lock can be on the filesystem (default) or on a database.
+#
+# See http://karaf.apache.org/manual/latest/users-guide/failover.html for details.
+#
+# Even using a single instance, Karaf creates the lock file
+# You can specify the location of the lock file using the
+# karaf.lock.dir=/path/to/the/directory/containing/the/lock
+#
+
+#
+# Default port for the OSGI HTTP Service
+#
+org.osgi.service.http.port=8181
+
+#
+# Allow usage of ${servicemix.home} as an alias for ${karaf.home}
+#
+servicemix.home=${karaf.home}
+
+#
+# Activemq configuration
+#
+activemq.port = 61616
+activemq.host = localhost
+activemq.url = tcp://${activemq.host}:${activemq.port}
+
+
+#
+# Activemq JMX configuration
+#
+activemq.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-${karaf.name}
+activemq.jmx.user=smx
+activemq.jmx.password=smx
+
+
+javax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
+javax.xml.transform.TransformerFactory=org.apache.xalan.processor.TransformerFactoryImpl
+
+#
+# CXF Log configuration
+#
+org.apache.cxf.Logger=org.apache.cxf.common.logging.Slf4jLogger
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/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
new file mode 100644
index 0000000..ca4b482
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/etc/users.properties
@@ -0,0 +1,37 @@
+################################################################################
+#
+# 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 file contains the users, groups, and roles.
+# Each line has to be of the format:
+#
+# USER=PASSWORD,ROLE1,ROLE2,...
+# USER=PASSWORD,_g_:GROUP,...
+# _g_\:GROUP=ROLE1,ROLE2,...
+#
+# All users, grousp, and roles entered in this file are available after Karaf startup
+# and modifiable via the JAAS command group. These users reside in a JAAS domain
+# with the name "karaf".
+#
+smx = smx,_g_:admingroup
+_g_\:admingroup = group,admin,manager,viewer,webconsole
+
+# 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
+karaf = karaf,_g_:admingroup
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/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
new file mode 100644
index 0000000..1cc662a
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/examples-unix-bin.xml
@@ -0,0 +1,94 @@
+<?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.
+-->
+<component>
+ <fileSets>
+ <!-- Copy over karaf demo to examples folder -->
+ <fileSet>
+ <directory>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/demos</directory>
+ <outputDirectory>/examples/karaf</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+
+ <!-- Copy over the examples -->
+ <fileSet>
+ <directory>${basedir}/../../examples</directory>
+ <outputDirectory>/examples/</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ <includes>
+ <include>activemq/**</include>
+ <include>activiti/**</include>
+ <include>akka/**</include>
+ <include>camel/**</include>
+ <include>cxf/**</include>
+ <include>drools/**</include>
+ </includes>
+ <excludes>
+ <exclude>pom.xml</exclude>
+ <!-- we need add filtered README.txt, so exclude the raw one here -->
+ <exclude>**/README.txt</exclude>
+ <!-- exclude build output/IDE config/... files -->
+ <exclude>**/target/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/*.i??</exclude>
+ <exclude>**/*.jks</exclude>
+ </excludes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../../examples</directory>
+ <outputDirectory>/examples/</outputDirectory>
+ <lineEnding>keep</lineEnding>
+ <includes>
+ <include>activemq/**/*.jks</include>
+ <include>activiti/**/*.jks</include>
+ <include>akka/**/*.jks</include>
+ <include>camel/**/*.jks</include>
+ <include>cxf/**/*.jks</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../../examples</directory>
+ <outputDirectory>/examples/</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ <filtered>true</filtered>
+ <fileMode>0644</fileMode>
+ <includes>
+ <include>README.txt</include>
+ <include>activemq/**/README.txt</include>
+ <include>activiti/**/README.txt</include>
+ <include>akka/**/README.txt</include>
+ <include>camel/**/README.txt</include>
+ <include>cxf/**/README.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <files>
+ <file>
+ <source>${project.build.outputDirectory}/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/da7e9421/assemblies/apache-servicemix/src/main/resources/licenses/asm.txt
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/licenses/asm.txt b/assemblies/apache-servicemix/src/main/resources/licenses/asm.txt
new file mode 100644
index 0000000..6eff43a
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/licenses/asm.txt
@@ -0,0 +1,30 @@
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/resources/licenses/bsd.txt
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/licenses/bsd.txt b/assemblies/apache-servicemix/src/main/resources/licenses/bsd.txt
new file mode 100644
index 0000000..1568be2
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/licenses/bsd.txt
@@ -0,0 +1,12 @@
+The BSD License
+
+ Copyright (c) <YEAR>, <OWNER>
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ * Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/resources/licenses/cddl-1.0.txt
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/licenses/cddl-1.0.txt b/assemblies/apache-servicemix/src/main/resources/licenses/cddl-1.0.txt
new file mode 100644
index 0000000..4830da9
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/licenses/cddl-1.0.txt
@@ -0,0 +1,385 @@
+
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+
+ 1. Definitions.
+
+ 1.1. ÒContributorÓ means each individual or entity that
+ creates or contributes to the creation of Modifications.
+
+ 1.2. ÒContributor VersionÓ means the combination of the
+ Original Software, prior Modifications used by a
+ Contributor (if any), and the Modifications made by that
+ particular Contributor.
+
+ 1.3. ÒCovered SoftwareÓ means (a) the Original Software, or
+ (b) Modifications, or (c) the combination of files
+ containing Original Software with files containing
+ Modifications, in each case including portions thereof.
+
+ 1.4. ÒExecutableÓ means the Covered Software in any form
+ other than Source Code.
+
+ 1.5. ÒInitial DeveloperÓ means the individual or entity
+ that first makes Original Software available under this
+ License.
+
+ 1.6. ÒLarger WorkÓ means a work which combines Covered
+ Software or portions thereof with code not governed by the
+ terms of this License.
+
+ 1.7. ÒLicenseÓ means this document.
+
+ 1.8. ÒLicensableÓ means having the right to grant, to the
+ maximum extent possible, whether at the time of the initial
+ grant or subsequently acquired, any and all of the rights
+ conveyed herein.
+
+ 1.9. ÒModificationsÓ means the Source Code and Executable
+ form of any of the following:
+
+ A. Any file that results from an addition to,
+ deletion from or modification of the contents of a
+ file containing Original Software or previous
+ Modifications;
+
+ B. Any new file that contains any part of the
+ Original Software or previous Modification; or
+
+ C. Any new file that is contributed or otherwise made
+ available under the terms of this License.
+
+ 1.10. ÒOriginal SoftwareÓ means the Source Code and
+ Executable form of computer software code that is
+ originally released under this License.
+
+ 1.11. ÒPatent ClaimsÓ means any patent claim(s), now owned
+ or hereafter acquired, including without limitation,
+ method, process, and apparatus claims, in any patent
+ Licensable by grantor.
+
+ 1.12. ÒSource CodeÓ means (a) the common form of computer
+ software code in which modifications are made and (b)
+ associated documentation included in or with such code.
+
+ 1.13. ÒYouÓ (or ÒYourÓ) means an individual or a legal
+ entity exercising rights under, and complying with all of
+ the terms of, this License. For legal entities, ÒYouÓ
+ includes any entity which controls, is controlled by, or is
+ under common control with You. For purposes of this
+ definition, ÒcontrolÓ means (a) the power, direct or
+ indirect, to cause the direction or management of such
+ entity, whether by contract or otherwise, or (b) ownership
+ of more than fifty percent (50%) of the outstanding shares
+ or beneficial ownership of such entity.
+
+ 2. License Grants.
+
+ 2.1. The Initial Developer Grant.
+
+ Conditioned upon Your compliance with Section 3.1 below and
+ subject to third party intellectual property claims, the
+ Initial Developer hereby grants You a world-wide,
+ royalty-free, non-exclusive license:
+
+ (a) under intellectual property rights (other than
+ patent or trademark) Licensable by Initial Developer,
+ to use, reproduce, modify, display, perform,
+ sublicense and distribute the Original Software (or
+ portions thereof), with or without Modifications,
+ and/or as part of a Larger Work; and
+
+ (b) under Patent Claims infringed by the making,
+ using or selling of Original Software, to make, have
+ made, use, practice, sell, and offer for sale, and/or
+ otherwise dispose of the Original Software (or
+ portions thereof).
+
+ (c) The licenses granted in Sections 2.1(a) and (b)
+ are effective on the date Initial Developer first
+ distributes or otherwise makes the Original Software
+ available to a third party under the terms of this
+ License.
+
+ (d) Notwithstanding Section 2.1(b) above, no patent
+ license is granted: (1) for code that You delete from
+ the Original Software, or (2) for infringements
+ caused by: (i) the modification of the Original
+ Software, or (ii) the combination of the Original
+ Software with other software or devices.
+
+ 2.2. Contributor Grant.
+
+ Conditioned upon Your compliance with Section 3.1 below and
+ subject to third party intellectual property claims, each
+ Contributor hereby grants You a world-wide, royalty-free,
+ non-exclusive license:
+
+ (a) under intellectual property rights (other than
+ patent or trademark) Licensable by Contributor to
+ use, reproduce, modify, display, perform, sublicense
+ and distribute the Modifications created by such
+ Contributor (or portions thereof), either on an
+ unmodified basis, with other Modifications, as
+ Covered Software and/or as part of a Larger Work; and
+
+
+ (b) under Patent Claims infringed by the making,
+ using, or selling of Modifications made by that
+ Contributor either alone and/or in combination with
+ its Contributor Version (or portions of such
+ combination), to make, use, sell, offer for sale,
+ have made, and/or otherwise dispose of: (1)
+ Modifications made by that Contributor (or portions
+ thereof); and (2) the combination of Modifications
+ made by that Contributor with its Contributor Version
+ (or portions of such combination).
+
+ (c) The licenses granted in Sections 2.2(a) and
+ 2.2(b) are effective on the date Contributor first
+ distributes or otherwise makes the Modifications
+ available to a third party.
+
+ (d) Notwithstanding Section 2.2(b) above, no patent
+ license is granted: (1) for any code that Contributor
+ has deleted from the Contributor Version; (2) for
+ infringements caused by: (i) third party
+ modifications of Contributor Version, or (ii) the
+ combination of Modifications made by that Contributor
+ with other software (except as part of the
+ Contributor Version) or other devices; or (3) under
+ Patent Claims infringed by Covered Software in the
+ absence of Modifications made by that Contributor.
+
+ 3. Distribution Obligations.
+
+ 3.1. Availability of Source Code.
+
+ Any Covered Software that You distribute or otherwise make
+ available in Executable form must also be made available in
+ Source Code form and that Source Code form must be
+ distributed only under the terms of this License. You must
+ include a copy of this License with every copy of the
+ Source Code form of the Covered Software You distribute or
+ otherwise make available. You must inform recipients of any
+ such Covered Software in Executable form as to how they can
+ obtain such Covered Software in Source Code form in a
+ reasonable manner on or through a medium customarily used
+ for software exchange.
+
+ 3.2. Modifications.
+
+ The Modifications that You create or to which You
+ contribute are governed by the terms of this License. You
+ represent that You believe Your Modifications are Your
+ original creation(s) and/or You have sufficient rights to
+ grant the rights conveyed by this License.
+
+ 3.3. Required Notices.
+
+ You must include a notice in each of Your Modifications
+ that identifies You as the Contributor of the Modification.
+ You may not remove or alter any copyright, patent or
+ trademark notices contained within the Covered Software, or
+ any notices of licensing or any descriptive text giving
+ attribution to any Contributor or the Initial Developer.
+
+ 3.4. Application of Additional Terms.
+
+ You may not offer or impose any terms on any Covered
+ Software in Source Code form that alters or restricts the
+ applicable version of this License or the recipientsÕ
+ rights hereunder. You may choose to offer, and to charge a
+ fee for, warranty, support, indemnity or liability
+ obligations to one or more recipients of Covered Software.
+ However, you may do so only on Your own behalf, and not on
+ behalf of the Initial Developer or any Contributor. You
+ must make it absolutely clear that any such warranty,
+ support, indemnity or liability obligation is offered by
+ You alone, and You hereby agree to indemnify the Initial
+ Developer and every Contributor for any liability incurred
+ by the Initial Developer or such Contributor as a result of
+ warranty, support, indemnity or liability terms You offer.
+
+
+ 3.5. Distribution of Executable Versions.
+
+ You may distribute the Executable form of the Covered
+ Software under the terms of this License or under the terms
+ of a license of Your choice, which may contain terms
+ different from this License, provided that You are in
+ compliance with the terms of this License and that the
+ license for the Executable form does not attempt to limit
+ or alter the recipientÕs rights in the Source Code form
+ from the rights set forth in this License. If You
+ distribute the Covered Software in Executable form under a
+ different license, You must make it absolutely clear that
+ any terms which differ from this License are offered by You
+ alone, not by the Initial Developer or Contributor. You
+ hereby agree to indemnify the Initial Developer and every
+ Contributor for any liability incurred by the Initial
+ Developer or such Contributor as a result of any such terms
+ You offer.
+
+ 3.6. Larger Works.
+
+ You may create a Larger Work by combining Covered Software
+ with other code not governed by the terms of this License
+ and distribute the Larger Work as a single product. In such
+ a case, You must make sure the requirements of this License
+ are fulfilled for the Covered Software.
+
+ 4. Versions of the License.
+
+ 4.1. New Versions.
+
+ Sun Microsystems, Inc. is the initial license steward and
+ may publish revised and/or new versions of this License
+ from time to time. Each version will be given a
+ distinguishing version number. Except as provided in
+ Section 4.3, no one other than the license steward has the
+ right to modify this License.
+
+ 4.2. Effect of New Versions.
+
+ You may always continue to use, distribute or otherwise
+ make the Covered Software available under the terms of the
+ version of the License under which You originally received
+ the Covered Software. If the Initial Developer includes a
+ notice in the Original Software prohibiting it from being
+ distributed or otherwise made available under any
+ subsequent version of the License, You must distribute and
+ make the Covered Software available under the terms of the
+ version of the License under which You originally received
+ the Covered Software. Otherwise, You may also choose to
+ use, distribute or otherwise make the Covered Software
+ available under the terms of any subsequent version of the
+ License published by the license steward.
+
+ 4.3. Modified Versions.
+
+ When You are an Initial Developer and You want to create a
+ new license for Your Original Software, You may create and
+ use a modified version of this License if You: (a) rename
+ the license and remove any references to the name of the
+ license steward (except to note that the license differs
+ from this License); and (b) otherwise make it clear that
+ the license contains terms which differ from this License.
+
+
+ 5. DISCLAIMER OF WARRANTY.
+
+ COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN ÒAS ISÓ
+ BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+ INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
+ SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
+ PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
+ PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
+ COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
+ INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
+ ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
+ WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+ ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
+ DISCLAIMER.
+
+ 6. TERMINATION.
+
+ 6.1. This License and the rights granted hereunder will
+ terminate automatically if You fail to comply with terms
+ herein and fail to cure such breach within 30 days of
+ becoming aware of the breach. Provisions which, by their
+ nature, must remain in effect beyond the termination of
+ this License shall survive.
+
+ 6.2. If You assert a patent infringement claim (excluding
+ declaratory judgment actions) against Initial Developer or
+ a Contributor (the Initial Developer or Contributor against
+ whom You assert such claim is referred to as ÒParticipantÓ)
+ alleging that the Participant Software (meaning the
+ Contributor Version where the Participant is a Contributor
+ or the Original Software where the Participant is the
+ Initial Developer) directly or indirectly infringes any
+ patent, then any and all rights granted directly or
+ indirectly to You by such Participant, the Initial
+ Developer (if the Initial Developer is not the Participant)
+ and all Contributors under Sections 2.1 and/or 2.2 of this
+ License shall, upon 60 days notice from Participant
+ terminate prospectively and automatically at the expiration
+ of such 60 day notice period, unless if within such 60 day
+ period You withdraw Your claim with respect to the
+ Participant Software against such Participant either
+ unilaterally or pursuant to a written agreement with
+ Participant.
+
+ 6.3. In the event of termination under Sections 6.1 or 6.2
+ above, all end user licenses that have been validly granted
+ by You or any distributor hereunder prior to termination
+ (excluding licenses granted to You by any distributor)
+ shall survive termination.
+
+ 7. LIMITATION OF LIABILITY.
+
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+ (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
+ INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
+ COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
+ LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+ CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+ LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+ STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+ COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+ INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+ LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
+ INJURY RESULTING FROM SUCH PARTYÕS NEGLIGENCE TO THE EXTENT
+ APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
+ NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+ CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
+ APPLY TO YOU.
+
+ 8. U.S. GOVERNMENT END USERS.
+
+ The Covered Software is a Òcommercial item,Ó as that term is
+ defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of Òcommercial
+ computer softwareÓ (as that term is defined at 48 C.F.R. ¤
+ 252.227-7014(a)(1)) and Òcommercial computer software
+ documentationÓ as such terms are used in 48 C.F.R. 12.212 (Sept.
+ 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+ through 227.7202-4 (June 1995), all U.S. Government End Users
+ acquire Covered Software with only those rights set forth herein.
+ This U.S. Government Rights clause is in lieu of, and supersedes,
+ any other FAR, DFAR, or other clause or provision that addresses
+ Government rights in computer software under this License.
+
+ 9. MISCELLANEOUS.
+
+ This License represents the complete agreement concerning subject
+ matter hereof. If any provision of this License is held to be
+ unenforceable, such provision shall be reformed only to the
+ extent necessary to make it enforceable. This License shall be
+ governed by the law of the jurisdiction specified in a notice
+ contained within the Original Software (except to the extent
+ applicable law, if any, provides otherwise), excluding such
+ jurisdictionÕs conflict-of-law provisions. Any litigation
+ relating to this License shall be subject to the jurisdiction of
+ the courts located in the jurisdiction and venue specified in a
+ notice contained within the Original Software, with the losing
+ party responsible for costs, including, without limitation, court
+ costs and reasonable attorneysÕ fees and expenses. The
+ application of the United Nations Convention on Contracts for the
+ International Sale of Goods is expressly excluded. Any law or
+ regulation which provides that the language of a contract shall
+ be construed against the drafter shall not apply to this License.
+ You agree that You alone are responsible for compliance with the
+ United States export administration regulations (and the export
+ control laws and regulation of any other countries) when You use,
+ distribute or otherwise make available any Covered Software.
+
+ 10. RESPONSIBILITY FOR CLAIMS.
+
+ As between Initial Developer and the Contributors, each party is
+ responsible for claims and damages arising, directly or
+ indirectly, out of its utilization of rights under this License
+ and You agree to work with Initial Developer and Contributors to
+ distribute such responsibility on an equitable basis. Nothing
+ herein is intended or shall be deemed to constitute any admission
+ of liability.
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/resources/licenses/cpl-1.0.txt
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/licenses/cpl-1.0.txt b/assemblies/apache-servicemix/src/main/resources/licenses/cpl-1.0.txt
new file mode 100644
index 0000000..c9990a7
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/licenses/cpl-1.0.txt
@@ -0,0 +1,213 @@
+Common Public License Version 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+ a) in the case of the initial Contributor, the initial code and
+documentation distributed under this Agreement, and
+
+ b) in the case of each subsequent Contributor:
+
+ i) changes to the Program, and
+
+ ii) additions to the Program;
+
+ where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from a
+Contributor if it was added to the Program by such Contributor itself or anyone
+acting on such Contributor's behalf. Contributions do not include additions to
+the Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii) are not
+derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+ a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any, and such
+derivative works, in source code and object code form.
+
+ b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
+Patents to make, use, sell, offer to sell, import and otherwise transfer the
+Contribution of such Contributor, if any, in source code and object code form.
+This patent license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor, such
+addition of the Contribution causes such combination to be covered by the
+Licensed Patents. The patent license shall not apply to any other combinations
+which include the Contribution. No hardware per se is licensed hereunder.
+
+ c) Recipient understands that although each Contributor grants the licenses
+to its Contributions set forth herein, no assurances are provided by any
+Contributor that the Program does not infringe the patent or other intellectual
+property rights of any other entity. Each Contributor disclaims any liability to
+Recipient for claims brought by any other entity based on infringement of
+intellectual property rights or otherwise. As a condition to exercising the
+rights and licenses granted hereunder, each Recipient hereby assumes sole
+responsibility to secure any other intellectual property rights needed, if any.
+For example, if a third party patent license is required to allow Recipient to
+distribute the Program, it is Recipient's responsibility to acquire that license
+before distributing the Program.
+
+ d) Each Contributor represents that to its knowledge it has sufficient
+copyright rights in its Contribution, if any, to grant the copyright license set
+forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its
+own license agreement, provided that:
+
+ a) it complies with the terms and conditions of this Agreement; and
+
+ b) its license agreement:
+
+ i) effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title and
+non-infringement, and implied warranties or conditions of merchantability and
+fitness for a particular purpose;
+
+ ii) effectively excludes on behalf of all Contributors all liability for
+damages, including direct, indirect, special, incidental and consequential
+damages, such as lost profits;
+
+ iii) states that any provisions which differ from this Agreement are offered
+by that Contributor alone and not by any other party; and
+
+ iv) states that source code for the Program is available from such
+Contributor, and informs licensees how to obtain it in a reasonable manner on or
+through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+ a) it must be made available under this Agreement; and
+
+ b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the
+Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore, if
+a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses, damages
+and costs (collectively "Losses") arising from claims, lawsuits and other legal
+actions brought by a third party against the Indemnified Contributor to the
+extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor to
+control, and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may participate in
+any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If that
+Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such
+Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a court
+requires any other Contributor to pay any damages as a result, the Commercial
+Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its exercise of
+rights under this Agreement, including but not limited to the risks and costs of
+program errors, compliance with applicable laws, damage to or loss of data,
+programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable
+law, it shall not affect the validity or enforceability of the remainder of the
+terms of this Agreement, and without further action by the parties hereto, such
+provision shall be reformed to the minimum extent necessary to make such
+provision valid and enforceable.
+
+If Recipient institutes patent litigation against a Contributor with respect to
+a patent applicable to software (including a cross-claim or counterclaim in a
+lawsuit), then any patent licenses granted by that Contributor to such Recipient
+under this Agreement shall terminate as of the date such litigation is filed. In
+addition, if Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
+itself (excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted under
+Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue and
+survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to time.
+No one other than the Agreement Steward has the right to modify this Agreement.
+IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
+as the Agreement Steward to a suitable separate entity. Each new version of the
+Agreement will be given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the Agreement
+under which it was received. In addition, after a new version of the Agreement
+is published, Contributor may elect to distribute the Program (including its
+Contributions) under the new version. Except as expressly stated in Sections
+2(a) and 2(b) above, Recipient receives no rights or licenses to the
+intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial in
+any resulting litigation.
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/resources/licenses/epl-1.0.txt
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/licenses/epl-1.0.txt b/assemblies/apache-servicemix/src/main/resources/licenses/epl-1.0.txt
new file mode 100644
index 0000000..fddc311
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/licenses/epl-1.0.txt
@@ -0,0 +1,71 @@
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+b) its license agreement:
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+b) a copy of this Agreement must be included with each copy of the Program.
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Los
ses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b)
above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/resources/licenses/slf4j-mit.txt
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/licenses/slf4j-mit.txt b/assemblies/apache-servicemix/src/main/resources/licenses/slf4j-mit.txt
new file mode 100644
index 0000000..0bf5791
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/licenses/slf4j-mit.txt
@@ -0,0 +1,21 @@
+ Copyright (c) 2004-2011 QOS.ch
+ All rights reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/resources/setenv-unix
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/setenv-unix b/assemblies/apache-servicemix/src/main/resources/setenv-unix
new file mode 100644
index 0000000..3e3761b
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/setenv-unix
@@ -0,0 +1,18 @@
+#
+# 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.
+#
+
+export JAVA_MAX_PERM_MEM=256M
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/resources/setenv-win
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/setenv-win b/assemblies/apache-servicemix/src/main/resources/setenv-win
new file mode 100644
index 0000000..ba8a743
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/setenv-win
@@ -0,0 +1,18 @@
+rem
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+rem
+
+set JAVA_MAX_PERM_MEM=256M
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/pom.xml b/assemblies/pom.xml
index b5da26d..a419fc2 100644
--- a/assemblies/pom.xml
+++ b/assemblies/pom.xml
@@ -37,6 +37,7 @@
<modules>
<module>features</module>
+ <module>apache-servicemix</module>
</modules>
</project>
\ No newline at end of file
[15/26] servicemix git commit: SM-2768: Upgrade to Apache Karaf 4
Posted by ks...@apache.org.
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>
[24/26] servicemix git commit: SM-2820: Upgrade to Apache Karaf 4.0.4
Posted by ks...@apache.org.
SM-2820: Upgrade to Apache Karaf 4.0.4
- use the wrap feature 'standard'
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/c03db04b
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/c03db04b
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/c03db04b
Branch: refs/heads/master
Commit: c03db04b34fd142b2b2dcac362c2c0c893959d12
Parents: 13a1ebe
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sun Jan 24 23:00:02 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sun Jan 24 23:00:02 2016 +0100
----------------------------------------------------------------------
assemblies/apache-servicemix/pom.xml | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/c03db04b/assemblies/apache-servicemix/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/pom.xml b/assemblies/apache-servicemix/pom.xml
index 1c41e59..b65cc20 100644
--- a/assemblies/apache-servicemix/pom.xml
+++ b/assemblies/apache-servicemix/pom.xml
@@ -214,25 +214,7 @@
<feature>eventadmin</feature>
</startupFeatures>
<bootFeatures>
- <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>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>standard</feature>
<feature>cxf</feature>
<feature>activemq-broker-noweb</feature>
<feature>activemq-service</feature>
[07/26] servicemix git commit: SM-2803: Refactor the assembly creation
Posted by ks...@apache.org.
SM-2803: Refactor the assembly creation
- 'assembly' module moved/renamed to 'assemblies/apache-servicemix'
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/da7e9421
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/da7e9421
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/da7e9421
Branch: refs/heads/master
Commit: da7e9421799717fad19127326c0b8abd1fd23e95
Parents: 376b87d
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sat Jan 9 01:49:29 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Thu Jan 14 22:02:04 2016 +0100
----------------------------------------------------------------------
assemblies/apache-servicemix/pom.xml | 386 +++++++++++++
.../main/appended-resources/META-INF/LICENSE.vm | 40 ++
.../src/main/appended-resources/META-INF/NOTICE | 8 +
.../src/main/descriptors/unix-bin.xml | 31 ++
.../src/main/descriptors/unix-src.xml | 123 +++++
.../etc/org.apache.karaf.features.cfg | 77 +++
.../filtered-resources/etc/overrides.properties | 36 ++
.../src/main/filtered-resources/pom.xml | 202 +++++++
.../filtered-resources/startup-obr.properties | 19 +
.../src/main/resources/common-bin.xml | 60 ++
.../src/main/resources/common-unix-bin.xml | 140 +++++
.../src/main/resources/etc/custom.properties | 125 +++++
.../src/main/resources/etc/jre.properties | 542 +++++++++++++++++++
.../etc/org.apache.activemq.webconsole.cfg | 23 +
.../etc/org.apache.aries.transaction.cfg | 22 +
.../main/resources/etc/org.apache.cxf.wsn.cfg | 24 +
.../etc/org.apache.karaf.features.obr.cfg | 38 ++
.../resources/etc/org.ops4j.pax.logging.cfg | 55 ++
.../resources/etc/org.ops4j.pax.url.mvn.cfg | 104 ++++
.../etc/org.ops4j.pax.web.cfg.empty.stub | 41 ++
.../src/main/resources/etc/system.properties | 177 ++++++
.../src/main/resources/etc/users.properties | 37 ++
.../src/main/resources/examples-unix-bin.xml | 94 ++++
.../src/main/resources/licenses/asm.txt | 30 +
.../src/main/resources/licenses/bsd.txt | 12 +
.../src/main/resources/licenses/cddl-1.0.txt | 385 +++++++++++++
.../src/main/resources/licenses/cpl-1.0.txt | 213 ++++++++
.../src/main/resources/licenses/epl-1.0.txt | 71 +++
.../src/main/resources/licenses/slf4j-mit.txt | 21 +
.../src/main/resources/setenv-unix | 18 +
.../src/main/resources/setenv-win | 18 +
assemblies/pom.xml | 1 +
assembly/pom.xml | 386 -------------
.../main/appended-resources/META-INF/LICENSE.vm | 40 --
.../src/main/appended-resources/META-INF/NOTICE | 8 -
assembly/src/main/descriptors/unix-bin.xml | 31 --
assembly/src/main/descriptors/unix-src.xml | 123 -----
.../etc/org.apache.karaf.features.cfg | 77 ---
.../filtered-resources/etc/overrides.properties | 36 --
assembly/src/main/filtered-resources/pom.xml | 202 -------
.../filtered-resources/startup-obr.properties | 19 -
assembly/src/main/resources/common-bin.xml | 60 --
assembly/src/main/resources/common-unix-bin.xml | 140 -----
.../src/main/resources/etc/custom.properties | 125 -----
assembly/src/main/resources/etc/jre.properties | 542 -------------------
.../etc/org.apache.activemq.webconsole.cfg | 23 -
.../etc/org.apache.aries.transaction.cfg | 22 -
.../main/resources/etc/org.apache.cxf.wsn.cfg | 24 -
.../etc/org.apache.karaf.features.obr.cfg | 38 --
.../resources/etc/org.ops4j.pax.logging.cfg | 49 --
.../resources/etc/org.ops4j.pax.url.mvn.cfg | 104 ----
.../etc/org.ops4j.pax.web.cfg.empty.stub | 41 --
.../src/main/resources/etc/system.properties | 177 ------
.../src/main/resources/etc/users.properties | 37 --
.../src/main/resources/examples-unix-bin.xml | 94 ----
assembly/src/main/resources/licenses/asm.txt | 30 -
assembly/src/main/resources/licenses/bsd.txt | 12 -
.../src/main/resources/licenses/cddl-1.0.txt | 385 -------------
.../src/main/resources/licenses/cpl-1.0.txt | 213 --------
.../src/main/resources/licenses/epl-1.0.txt | 71 ---
.../src/main/resources/licenses/slf4j-mit.txt | 21 -
assembly/src/main/resources/setenv-unix | 18 -
assembly/src/main/resources/setenv-win | 18 -
itests/pom.xml | 10 -
pom.xml | 3 +-
65 files changed, 3174 insertions(+), 3178 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/pom.xml b/assemblies/apache-servicemix/pom.xml
new file mode 100644
index 0000000..fc574d1
--- /dev/null
+++ b/assemblies/apache-servicemix/pom.xml
@@ -0,0 +1,386 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>assemblies</artifactId>
+ <groupId>org.apache.servicemix.assemblies</groupId>
+ <version>6.1.1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>apache-servicemix</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache ServiceMix :: Assemblies :: Default Distribution</name>
+
+ <properties>
+ <examples.directory>../../examples</examples.directory>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.servicemix.features</groupId>
+ <artifactId>servicemix-internal</artifactId>
+ <version>${project.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.features</groupId>
+ <artifactId>servicemix-features</artifactId>
+ <version>${project.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.features</groupId>
+ <artifactId>servicemix-examples</artifactId>
+ <version>${project.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.features</groupId>
+ <artifactId>servicemix-kie</artifactId>
+ <version>${project.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxp-api-1.4</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxb-api-2.2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxws-api-2.2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.activator</artifactId>
+ </dependency>
+
+
+ <!-- Download Karaf assemblies for dependency:unpack-->
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <type>tar.gz</type>
+ </dependency>
+
+ <!--Xerces jar to be included in lib/endorsed -->
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
+
+ <!--xalan jar to be included in lib/endorsed-->
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xalan</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xalan-serializer</artifactId>
+ </dependency>
+
+ <!-- branding -->
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>org.apache.servicemix.branding</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <repositories>
+ <!-- SpringSource EBR is necessary to get some Spring OSGi bundles atm -->
+ <repository>
+ <id>com.springsource.repository.bundles.release</id>
+ <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
+ <url>http://repository.springsource.com/maven/bundles/release</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <build>
+ <resources>
+ <resource>
+ <!-- we need unfiltered copies of these files -->
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/filtered-resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <version>${karaf.version}</version>
+ <executions>
+ <execution>
+ <id>add-features-to-repo</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>features-add-to-repository</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <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>
+ <descriptor>mvn:org.apache.servicemix.features/servicemix-internal/${project.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.servicemix.features/servicemix-features/${project.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.servicemix.features/servicemix-kie/${project.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.servicemix.features/servicemix-examples/${project.version}/xml/features</descriptor>
+ </descriptors>
+ <features>
+ <feature>joda-time</feature>
+ <feature>cxf</feature>
+ <feature>obr</feature>
+ <feature>config</feature>
+ <feature>standard</feature>
+ <feature>package</feature>
+ <feature>kar</feature>
+ <feature>ssh</feature>
+ <feature>management</feature>
+ <feature>eventadmin</feature>
+ <feature>activemq-broker-noweb</feature>
+ <feature>activemq-service</feature>
+ <feature>camel</feature>
+ <feature>camel-cxf</feature>
+ <feature>activemq-camel</feature>
+ <feature>camel-blueprint</feature>
+ <feature>war</feature>
+ <feature>jaxrs-api</feature>
+ <feature>kie-aries-blueprint</feature>
+ <feature>kie-spring</feature>
+ <feature>kie-camel</feature>
+ </features>
+ <includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
+ <repository>${project.build.directory}/features-repo</repository>
+ </configuration>
+ <inherited>false</inherited>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>filter</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>copy-system-folder</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/features-repo</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/system</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-unix</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <type>tar.gz</type>
+ <outputDirectory>${project.build.directory}/dependencies/unix</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-win</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <type>zip</type>
+ <outputDirectory>${project.build.directory}/dependencies/win</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enable-obr</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target name="enable-obr">
+ <echo message="Updating etc/startup.properties in assembly" />
+ <concat destfile="${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/etc/startup.properties" append="true">
+ <string value="${line.separator}" />
+ <fileset file="${project.build.outputDirectory}/startup-obr.properties" />
+ </concat>
+ </target>
+ </configuration>
+ </execution>
+ <execution>
+ <id>increase-perm-mem</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target name="increase-perm-mem">
+ <echo message="Updating bin/setenv in unix assembly" />
+ <concat destfile="${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/bin/setenv" append="true" eol="unix">
+ <fileset file="${project.build.outputDirectory}/setenv-unix" />
+ </concat>
+ <echo message="Updating bin/setenv.bat in windows assembly" />
+ <concat destfile="${project.build.directory}/dependencies/win/apache-karaf-${karaf.version}/bin/setenv.bat" append="true" eol="dos">
+ <fileset file="${project.build.outputDirectory}/setenv-win" />
+ </concat>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unix-bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
+ </descriptors>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ </build>
+
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unix-src</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/descriptors/unix-src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <inherited>false</inherited>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+
+</project>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/appended-resources/META-INF/LICENSE.vm
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/appended-resources/META-INF/LICENSE.vm b/assemblies/apache-servicemix/src/main/appended-resources/META-INF/LICENSE.vm
new file mode 100644
index 0000000..b3f4d8e
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/appended-resources/META-INF/LICENSE.vm
@@ -0,0 +1,40 @@
+##
+## 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.
+##
+## $Date: 2008-03-09 23:17:06 -0700 (Sun, 09 Mar 2008) $ $Rev: 635446 $
+##
+
+========================================================================
+
+Apache ServiceMix includes a number of components and libraries with
+separate copyright notices and license terms. Your use of those
+components are subject to the terms and conditions of the following
+licenses.
+
+#set ( $apacheTxt = "The Apache Software License, Version 2.0" )
+#foreach ( $project in $projects )
+#foreach ( $license in $project.licenses)
+#if ( ! ($apacheTxt == $license.name) )
+
+$project.name #if ($project.url)($project.url)#end $project.artifact
+ License: $license.name #if ($license.url) ($license.url)#end
+
+#end
+#end
+#end
+
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/appended-resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/appended-resources/META-INF/NOTICE b/assemblies/apache-servicemix/src/main/appended-resources/META-INF/NOTICE
new file mode 100644
index 0000000..896541a
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/appended-resources/META-INF/NOTICE
@@ -0,0 +1,8 @@
+This product contains software developed by
+Open Participation Software for Java (http://www.ops4j.org/).
+
+This software contains unmodified binary redistributions for H2 database engine (http://www.h2database.com/),
+which is dual licensed and available under a modified version of the MPL 1.1 (Mozilla Public License)
+or under the (unmodified) EPL 1.0 (Eclipse Public License).
+An original copy of the license agreement can be found at: http://www.h2database.com/html/license.html
+
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml b/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
new file mode 100644
index 0000000..22ab142
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
@@ -0,0 +1,31 @@
+<?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.
+-->
+<assembly>
+ <id>apache-servicemix</id>
+
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <componentDescriptors>
+ <componentDescriptor>${project.build.outputDirectory}/common-bin.xml</componentDescriptor>
+ <componentDescriptor>${project.build.outputDirectory}/common-unix-bin.xml</componentDescriptor>
+ <componentDescriptor>${project.build.outputDirectory}/examples-unix-bin.xml</componentDescriptor>
+ </componentDescriptors>
+
+</assembly>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/descriptors/unix-src.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/descriptors/unix-src.xml b/assemblies/apache-servicemix/src/main/descriptors/unix-src.xml
new file mode 100644
index 0000000..0ba0cd4
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/descriptors/unix-src.xml
@@ -0,0 +1,123 @@
+<?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.
+-->
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <!-- Copy license and other files from root -->
+ <fileSet>
+ <directory>${basedir}/../..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>BUILDING</include>
+ <include>README</include>
+ <include>RELEASE*</include>
+ </includes>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+
+ <!-- Binary Files -->
+ <fileSet>
+ <directory>${basedir}/../..</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>**/*.jpeg</include>
+ <include>**/*.jpg</include>
+ <include>**/*.gif</include>
+ <include>**/*.png</include>
+ <include>**/*.exe</include>
+ <include>**/*.dll</include>
+ <include>**/*.jar</include>
+ <include>**/*.so</include>
+ <include>**/*.ks</include>
+ <include>**/*.ts</include>
+ <include>**/*.keystore</include>
+ <include>**/*.bin</include>
+ <include>**/*.jnilib</include>
+ <include>**/*.cert</include>
+ <include>**/*.jks</include>
+ </includes>
+ <excludes>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Text Files -->
+ <fileSet>
+ <directory>${basedir}/../..</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.jpeg</exclude>
+ <exclude>**/*.jpg</exclude>
+ <exclude>**/*.gif</exclude>
+ <exclude>**/*.png</exclude>
+ <exclude>**/*.exe</exclude>
+ <exclude>**/*.dll</exclude>
+ <exclude>**/*.jar</exclude>
+ <exclude>**/*.so</exclude>
+ <exclude>**/*.ks</exclude>
+ <exclude>**/*.ts</exclude>
+ <exclude>**/*.keystore</exclude>
+ <exclude>**/*.bin</exclude>
+ <exclude>**/*.jnilib</exclude>
+ <exclude>**/*.cert</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/build/**</exclude>
+ <exclude>activemq-data/**</exclude>
+ <exclude>*/activemq-data/**</exclude>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+
+ <exclude>**/surefire*</exclude>
+ <exclude>**/svn-commit*</exclude>
+
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <exclude>**/*.jks</exclude>
+
+ <exclude>**/cobertura.ser</exclude>
+
+ </excludes>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>LICENSE</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>NOTICE</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ </files>
+</assembly>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/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
new file mode 100644
index 0000000..28b52c0
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
@@ -0,0 +1,77 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+#
+# Defines if the startlvl should be respected during feature startup. The default value is true. The default
+# behavior for 2.x is false (!) for this property
+#
+# Be aware that this property is deprecated and will be removed in Karaf 4.0. So, if you need to
+# set this to false, please use this only as a temporary solution!
+#
+#respectStartLvlDuringFeatureStartup=true
+
+
+#
+# Defines if the startlvl should be respected during feature uninstall. The default value is true.
+# If true, means stop bundles respecting the descend order of start level in a certain feature.
+#
+#respectStartLvlDuringFeatureUninstall=true
+
+#
+# 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
+
+#
+# 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
+
+
+#
+# Defines if the boot features are started in asynchronous mode (in a dedicated thread)
+#
+featuresBootAsynchronous=false
+
+
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/filtered-resources/etc/overrides.properties
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/filtered-resources/etc/overrides.properties b/assemblies/apache-servicemix/src/main/filtered-resources/etc/overrides.properties
new file mode 100644
index 0000000..566abcf
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/filtered-resources/etc/overrides.properties
@@ -0,0 +1,36 @@
+#
+# 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.
+#
+
+# workaround for SM-2469
+#
+# some standard features install the version 2.2 of joda-time bundle ans bundles which depend on joda-time
+# wire to this bundle. Later installation of activiti fails, because it needs higher version of joda-time
+# and activiti tries to resolve this bundle via multiple paths. We want to force all features installing
+# joda-time/joda-time bundle with range [2,3) to use exactly the version given below to make sure only one
+# version of joda-time is installed in the system.
+mvn:joda-time/joda-time/${jodatime2.bundle.version};range="[2,3)"
+
+# workaround for SM-2727
+# Camel 2.16.x includes jackson in version 2.6.x but ActiveMQ and CXF still use the version 2.4.x. It makes
+# problems while resolving some bundles (see the issue for details). We should force usage of 2.6.x until
+# ActiveMQ and CXF upgrade to 2.6.x
+mvn:com.fasterxml.jackson.core/jackson-core/${fasterxml.jackson.version};range="[2,3)"
+mvn:com.fasterxml.jackson.core/jackson-databind/${fasterxml.jackson.version};range="[2,3)"
+mvn:com.fasterxml.jackson.core/jackson-annotations/${fasterxml.jackson.version};range="[2,3)"
+mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${fasterxml.jackson.version};range="[2,3)"
+mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version};range="[2,3)"
+mvn:com.fasterxml.jackson.module/jackson-module-scala_2.11/${fasterxml.jackson.version};range="[2,3)"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/filtered-resources/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/filtered-resources/pom.xml b/assemblies/apache-servicemix/src/main/filtered-resources/pom.xml
new file mode 100644
index 0000000..778ef74
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/filtered-resources/pom.xml
@@ -0,0 +1,202 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.servicemix.examples</groupId>
+ <artifactId>examples</artifactId>
+ <packaging>pom</packaging>
+ <version>${project.version}</version>
+ <name>Apache ServiceMix :: Examples</name>
+ <properties>
+ <akka.version>${akka.version}</akka.version>
+ <cxf.version>${cxf.version}</cxf.version>
+ <drools.version>${drools.version}</drools.version>
+ <drools6.version>${drools6.version}</drools6.version>
+ <jaxb.api.version>${jaxb.api.version}</jaxb.api.version>
+ <karaf.version>${karaf.version}</karaf.version>
+ <scala.version>${scala.version}</scala.version>
+ <slf4j.version>${slf4j.version}</slf4j.version>
+ <swagger.version>${swagger.version}</swagger.version>
+ <xerces.version>${xerces.version}</xerces.version>
+
+ <cxf.codegen-plugin.version>${cxf.codegen-plugin.version}</cxf.codegen-plugin.version>
+ <exec-maven-plugin.version>${exec-maven-plugin.version}</exec-maven-plugin.version>
+ <maven-scala-plugin.version>${maven-scala-plugin.version}</maven-scala-plugin.version>
+ </properties>
+ <!-- Managed dependencies -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>${camel.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-security</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>karaf</artifactId>
+ <version>${karaf.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jsr339-api-2.0</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxb-api-${jaxb.api.version}</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-core</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-rm</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-addr</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-ws-policy</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.services.wsn</groupId>
+ <artifactId>cxf-services-wsn-core</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.activiti</groupId>
+ <artifactId>activiti-camel</artifactId>
+ <version>${activiti.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <version>${geronimo-ws-metadata.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
+ <version>${commons-httpclient.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.wordnik</groupId>
+ <artifactId>swagger-jaxrs_2.11</artifactId>
+ <version>${swagger.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven-bundle-plugin.version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>${exec-maven-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
+ <version>${maven-scala-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <version>${cxf.codegen-plugin.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <modules>
+ <module>activemq</module>
+ <module>activiti</module>
+ <module>akka</module>
+ <module>camel</module>
+ <module>cxf</module>
+ <module>drools</module>
+ <module>karaf</module>
+ </modules>
+
+ <repositories>
+ <!-- Required to build the examples in a SNAPSHOT assembly -->
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+</project>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/filtered-resources/startup-obr.properties
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/filtered-resources/startup-obr.properties b/assemblies/apache-servicemix/src/main/filtered-resources/startup-obr.properties
new file mode 100644
index 0000000..d754e01
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/filtered-resources/startup-obr.properties
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+
+# add here bundles you want to install while system startup, e.g.
+# joda-time/joda-time/${jodatime2.bundle.version}/joda-time-${jodatime2.bundle.version}.jar=10
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/resources/common-bin.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/common-bin.xml b/assemblies/apache-servicemix/src/main/resources/common-bin.xml
new file mode 100644
index 0000000..5c549f8
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/common-bin.xml
@@ -0,0 +1,60 @@
+<?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.
+-->
+<component>
+ <fileSets>
+ <fileSet>
+ <outputDirectory>system</outputDirectory>
+ <directory>${project.build.directory}/features-repo</directory>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <outputFileNameMapping>servicemix-version.jar</outputFileNameMapping>
+ <fileMode>0644</fileMode>
+ <includes>
+ <include>org.apache.servicemix:org.apache.servicemix.branding</include>
+ </includes>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <unpack>false</unpack>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activator</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/lib/endorsed</outputDirectory>
+ <fileMode>0644</fileMode>
+ <includes>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2</include>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.2</include>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.saaj-api-1.3</include>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.2</include>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan-serializer</include>
+ <include>xerces:xercesImpl</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</component>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/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
new file mode 100644
index 0000000..4c41195
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
@@ -0,0 +1,140 @@
+<?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.
+-->
+<component>
+ <fileSets>
+ <!-- Cherry-pick files from the expanded Karaf distribution -->
+ <fileSet>
+ <directory>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>**/demos/**</exclude>
+ <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>system/**</exclude>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>README</exclude>
+ <exclude>RELEASE-NOTES</exclude>
+ <exclude>karaf-manual*</exclude>
+ </excludes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0775</directoryMode>
+ </fileSet>
+
+ <!-- Copy over bin/* scripts separately to get the correct file mode -->
+ <fileSet>
+ <directory>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>bin/*</include>
+ </includes>
+ <lineEnding>unix</lineEnding>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/dependencies/win/apache-karaf-${karaf.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>bin/*</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ <fileMode>0755</fileMode>
+ </fileSet>
+
+ <!-- Copy README and RELEASE-NOTES from root -->
+ <fileSet>
+ <directory>${basedir}/..</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>
+
+ <files>
+ <file>
+ <source>${project.build.directory}/dependencies/unix/apache-karaf-${karaf.version}/bin/karaf</source>
+ <outputDirectory>/bin/</outputDirectory>
+ <destName>servicemix</destName>
+ <fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${project.build.directory}/dependencies/win/apache-karaf-${karaf.version}/bin/karaf.bat</source>
+ <outputDirectory>/bin/</outputDirectory>
+ <destName>servicemix.bat</destName>
+ <fileMode>0755</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ <file>
+ <source>${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>LICENSE</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${project.build.directory}/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>NOTICE</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ </files>
+
+</component>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/resources/etc/custom.properties
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/etc/custom.properties b/assemblies/apache-servicemix/src/main/resources/etc/custom.properties
new file mode 100644
index 0000000..6764f76
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/etc/custom.properties
@@ -0,0 +1,125 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+#
+# You can place any customized configuration here.
+# All the values specified here will override the default value.
+#
+
+karaf.systemBundlesStartLevel=50
+
+# javax.transaction is needed to avoid class loader constraint violation when using javax.sql
+# as servicemix is using sun saaj impl bundle, we should ignore the package of saaj
+# as servicemix is using sun jaxb impl bundle, we should ignore the package of jaxb
+org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,org.apache.karaf.jaas.boot.principal,!com.sun.xml.messaging.saaj.*,!com.sun.xml.internal.bind.*,sun.*,com.sun.*,javax.transaction,javax.transaction.*,javax.xml.crypto,javax.xml.crypto.*,org.apache.xalan.processor,org.apache.xpath.jaxp,org.apache.xml.dtm.ref,org.apache.xerces.jaxp.datatype,org.apache.xerces.stax,org.apache.xerces.parsers,org.apache.xerces.jaxp,org.apache.xerces.jaxp.validation,org.apache.xerces.dom
+
+
+org.osgi.framework.system.packages.extra = \
+ org.apache.karaf.branding, \
+ com.sun.org.apache.xalan.internal.xsltc.trax, \
+ com.sun.org.apache.xerces.internal.dom, \
+ com.sun.org.apache.xerces.internal.jaxp, \
+ com.sun.org.apache.xerces.internal.xni, \
+ com.sun.jndi.ldap, \
+ org.apache.xalan.extensions; version="2.7.2", \
+ org.apache.xalan.xsltc.compiler; version="2.7.2", \
+ org.apache.xalan.xsltc.cmdline.getopt; version="2.7.2", \
+ org.apache.xalan.xsltc.util; version="2.7.2", \
+ org.apache.xalan.transformer; version="2.7.2", \
+ org.apache.xalan.xsltc.trax; version="2.7.2", \
+ org.apache.xalan.processor; version="2.7.2", \
+ org.apache.xalan.lib; version="2.7.2", \
+ org.apache.xalan.trace; version="2.7.2", \
+ org.apache.xalan.xsltc.compiler.util; version="2.7.2", \
+ org.apache.xalan.templates; version="2.7.2", \
+ org.apache.xalan.xsltc; version="2.7.2", \
+ org.apache.xalan.xsltc.runtime; version="2.7.2", \
+ org.apache.xalan; version="2.7.2", \
+ org.apache.xalan.xslt; version="2.7.2", \
+ org.apache.xalan.lib.sql; version="2.7.2", \
+ org.apache.xalan.xsltc.runtime.output; version="2.7.2", \
+ org.apache.xalan.xsltc.dom; version="2.7.2", \
+ org.apache.xalan.client; version="2.7.2", \
+ org.apache.xalan.xsltc.cmdline; version="2.7.2", \
+ org.apache.xalan.serialize; version="2.7.2", \
+ org.apache.xalan.res; version="2.7.2", \
+ org.apache.xml.dtm.ref; version="2.7.2", \
+ org.apache.xml.dtm; version="2.7.2", \
+ org.apache.xml.dtm.ref.sax2dtm; version="2.7.2", \
+ org.apache.xml.dtm.ref.dom2dtm; version="2.7.2", \
+ org.apache.xml.res; version="2.7.2", \
+ org.apache.xml.serializer.dom3; version="2.7.2", \
+ org.apache.xml.serializer; version="2.7.2", \
+ org.apache.xml.serializer.utils; version="2.7.2", \
+ org.apache.xml.utils.res; version="2.7.2", \
+ org.apache.xml.utils; version="2.7.2", \
+ org.apache.xpath.functions; version="2.7.2", \
+ org.apache.xpath.jaxp; version="2.7.2", \
+ org.apache.xpath.patterns; version="2.7.2", \
+ org.apache.xpath.objects; version="2.7.2", \
+ org.apache.xpath.res; version="2.7.2", \
+ org.apache.xpath; version="2.7.2", \
+ org.apache.xpath.axes; version="2.7.2", \
+ org.apache.xpath.compiler; version="2.7.2", \
+ org.apache.xpath.operations; version="2.7.2", \
+ org.apache.xpath.domapi; version="2.7.2", \
+ org.apache.html.dom; version="2.11.0", \
+ org.apache.wml.dom; version="2.11.0", \
+ org.apache.wml; version="2.11.0", \
+ org.apache.xerces.parsers; version="2.11.0", \
+ org.apache.xerces.impl.dtd.models; version="2.11.0", \
+ org.apache.xerces.xni.parser; version="2.11.0", \
+ org.apache.xerces.impl.dv.xs; version="2.11.0", \
+ org.apache.xerces.impl.xs.traversers; version="2.11.0", \
+ org.apache.xerces.util; version="2.11.0", \
+ org.apache.xerces.impl.dtd; version="2.11.0", \
+ org.apache.xerces.jaxp.validation; version="2.11.0", \
+ org.apache.xerces.dom3.as; version="2.11.0", \
+ org.apache.xerces.impl.dv; version="2.11.0", \
+ org.apache.xerces.jaxp; version="2.11.0", \
+ org.apache.xerces.jaxp.datatype; version="2.11.0", \
+ org.apache.xerces.impl.xpath.regex; version="2.11.0", \
+ org.apache.xerces.xni; version="2.11.0", \
+ org.apache.xerces.impl.msg; version="2.11.0", \
+ org.apache.xerces.impl.dv.util; version="2.11.0", \
+ org.apache.xerces.impl.xs.util; version="2.11.0", \
+ org.apache.xerces.dom; version="2.11.0", \
+ org.apache.xerces.dom.events; version="2.11.0", \
+ org.apache.xerces.impl.xs.opti; version="2.11.0", \
+ org.apache.xerces.impl; version="2.11.0", \
+ org.apache.xerces.xs; version="2.11.0", \
+ org.apache.xerces.impl.io; version="2.11.0", \
+ org.apache.xerces.xpointer; version="2.11.0", \
+ org.apache.xerces.impl.dv.dtd; version="2.11.0", \
+ org.apache.xerces.xinclude; version="2.11.0", \
+ org.apache.xerces.impl.xpath; version="2.11.0", \
+ org.apache.xerces.xs.datatypes; version="2.11.0", \
+ org.apache.xerces.impl.xs.identity; version="2.11.0", \
+ org.apache.xerces.impl.xs.models; version="2.11.0", \
+ org.apache.xerces.xni.grammars; version="2.11.0", \
+ org.apache.xerces.impl.xs; version="2.11.0", \
+ org.apache.xerces.impl.validation; version="2.11.0", \
+ org.apache.xml.serialize; version="2.11.0", \
+ sun.misc
+
+#
+# Delay console startup until bundles have been properly started
+#
+karaf.delay.console=true
+karaf.startup.message=Please wait while Apache ServiceMix is starting...
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/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
new file mode 100644
index 0000000..0a67bc1
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/etc/jre.properties
@@ -0,0 +1,542 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+#
+# Java platform package export properties.
+#
+
+# Standard package set. Note that:
+# - javax.transaction* is exported with a mandatory attribute
+jre-1.6= \
+ javax.accessibility, \
+ javax.activation;version="1.1", \
+ javax.activity, \
+ javax.annotation;version="1.1", \
+ javax.annotation.processing;version="1.1", \
+ javax.crypto, \
+ javax.crypto.interfaces, \
+ javax.crypto.spec, \
+ javax.imageio, \
+ javax.imageio.event, \
+ javax.imageio.metadata, \
+ javax.imageio.plugins.bmp, \
+ javax.imageio.plugins.jpeg, \
+ javax.imageio.spi, \
+ javax.imageio.stream, \
+ javax.jws;version="2.0", \
+ javax.jws.soap;version="2.0", \
+ javax.lang.model, \
+ javax.lang.model.element, \
+ javax.lang.model.type, \
+ javax.lang.model.util, \
+ javax.management, \
+ javax.management.loading, \
+ javax.management.modelmbean, \
+ javax.management.monitor, \
+ javax.management.openmbean, \
+ javax.management.relation, \
+ javax.management.remote, \
+ javax.management.remote.rmi, \
+ javax.management.timer, \
+ javax.naming, \
+ javax.naming.directory, \
+ javax.naming.event, \
+ javax.naming.ldap, \
+ javax.naming.spi, \
+ javax.net, \
+ javax.net.ssl, \
+ javax.print, \
+ javax.print.attribute, \
+ javax.print.attribute.standard, \
+ javax.print.event, \
+ javax.rmi, \
+ javax.rmi.CORBA, \
+ javax.rmi.ssl, \
+ javax.script, \
+ javax.security.auth, \
+ javax.security.auth.callback, \
+ javax.security.auth.kerberos, \
+ javax.security.auth.login, \
+ javax.security.auth.spi, \
+ javax.security.auth.x500, \
+ javax.security.cert, \
+ javax.security.sasl, \
+ javax.sound.midi, \
+ javax.sound.midi.spi, \
+ javax.sound.sampled, \
+ javax.sound.sampled.spi, \
+ javax.sql, \
+ javax.sql.rowset, \
+ javax.sql.rowset.serial, \
+ javax.sql.rowset.spi, \
+ javax.swing, \
+ javax.swing.border, \
+ javax.swing.colorchooser, \
+ javax.swing.event, \
+ javax.swing.filechooser, \
+ javax.swing.plaf, \
+ javax.swing.plaf.basic, \
+ javax.swing.plaf.metal, \
+ javax.swing.plaf.multi, \
+ javax.swing.plaf.synth, \
+ javax.swing.table, \
+ javax.swing.text, \
+ javax.swing.text.html, \
+ javax.swing.text.html.parser, \
+ javax.swing.text.rtf, \
+ javax.swing.tree, \
+ javax.swing.undo, \
+ javax.tools, \
+ javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
+ javax.xml, \
+ javax.xml.bind;version="2.2.1", \
+ javax.xml.bind.annotation;version="2.2.1", \
+ javax.xml.bind.annotation.adapters;version="2.2.1", \
+ javax.xml.bind.attachment;version="2.2.1", \
+ javax.xml.bind.helpers;version="2.2.1", \
+ javax.xml.bind.util;version="2.2.1", \
+ javax.xml.crypto, \
+ javax.xml.crypto.dom, \
+ javax.xml.crypto.dsig, \
+ javax.xml.crypto.dsig.dom, \
+ javax.xml.crypto.dsig.keyinfo, \
+ javax.xml.crypto.dsig.spec, \
+ javax.xml.datatype, \
+ javax.xml.namespace, \
+ javax.xml.parsers, \
+ javax.xml.soap;version="1.3", \
+ javax.xml.stream;version="1.2", \
+ javax.xml.stream.events;version="1.2", \
+ javax.xml.stream.util;version="1.2", \
+ javax.xml.transform, \
+ javax.xml.transform.dom, \
+ javax.xml.transform.sax, \
+ javax.xml.transform.stax, \
+ javax.xml.transform.stream, \
+ javax.xml.validation, \
+ javax.xml.ws;version="2.2", \
+ javax.xml.ws.handler;version="2.2", \
+ javax.xml.ws.handler.soap;version="2.2", \
+ 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.xpath, \
+ org.ietf.jgss, \
+ org.omg.CORBA, \
+ org.omg.CORBA_2_3, \
+ org.omg.CORBA_2_3.portable, \
+ org.omg.CORBA.DynAnyPackage, \
+ org.omg.CORBA.ORBPackage, \
+ org.omg.CORBA.portable, \
+ org.omg.CORBA.TypeCodePackage, \
+ org.omg.CosNaming, \
+ org.omg.CosNaming.NamingContextExtPackage, \
+ org.omg.CosNaming.NamingContextPackage, \
+ org.omg.Dynamic, \
+ org.omg.DynamicAny, \
+ org.omg.DynamicAny.DynAnyFactoryPackage, \
+ org.omg.DynamicAny.DynAnyPackage, \
+ org.omg.IOP, \
+ org.omg.IOP.CodecFactoryPackage, \
+ org.omg.IOP.CodecPackage, \
+ org.omg.Messaging, \
+ org.omg.PortableInterceptor, \
+ org.omg.PortableInterceptor.ORBInitInfoPackage, \
+ org.omg.PortableServer, \
+ org.omg.PortableServer.CurrentPackage, \
+ org.omg.PortableServer.POAManagerPackage, \
+ org.omg.PortableServer.POAPackage, \
+ org.omg.PortableServer.portable, \
+ org.omg.PortableServer.ServantLocatorPackage, \
+ org.omg.SendingContext, \
+ org.omg.stub.java.rmi, \
+ org.omg.stub.javax.management.remote.rmi, \
+ org.w3c.dom, \
+ org.w3c.dom.bootstrap, \
+ org.w3c.dom.css, \
+ org.w3c.dom.events, \
+ org.w3c.dom.html, \
+ org.w3c.dom.ls, \
+ org.w3c.dom.ranges, \
+ org.w3c.dom.stylesheets, \
+ org.w3c.dom.traversal, \
+ org.w3c.dom.views, \
+ org.w3c.dom.xpath, \
+ org.xml.sax, \
+ org.xml.sax.ext, \
+ org.xml.sax.helpers
+
+# Standard package set. Note that:
+# - javax.transaction* is exported with a mandatory attribute
+jre-1.7= \
+ javax.accessibility, \
+ javax.activation;version="1.1", \
+ javax.activity, \
+ javax.annotation;version="1.1", \
+ javax.annotation.processing;version="1.1", \
+ javax.crypto, \
+ javax.crypto.interfaces, \
+ javax.crypto.spec, \
+ javax.imageio, \
+ javax.imageio.event, \
+ javax.imageio.metadata, \
+ javax.imageio.plugins.bmp, \
+ javax.imageio.plugins.jpeg, \
+ javax.imageio.spi, \
+ javax.imageio.stream, \
+ javax.jws;version="2.0", \
+ javax.jws.soap;version="2.0", \
+ javax.lang.model, \
+ javax.lang.model.element, \
+ javax.lang.model.type, \
+ javax.lang.model.util, \
+ javax.management, \
+ javax.management.loading, \
+ javax.management.modelmbean, \
+ javax.management.monitor, \
+ javax.management.openmbean, \
+ javax.management.relation, \
+ javax.management.remote, \
+ javax.management.remote.rmi, \
+ javax.management.timer, \
+ javax.naming, \
+ javax.naming.directory, \
+ javax.naming.event, \
+ javax.naming.ldap, \
+ javax.naming.spi, \
+ javax.net, \
+ javax.net.ssl, \
+ javax.print, \
+ javax.print.attribute, \
+ javax.print.attribute.standard, \
+ javax.print.event, \
+ javax.rmi, \
+ javax.rmi.CORBA, \
+ javax.rmi.ssl, \
+ javax.script, \
+ javax.security.auth, \
+ javax.security.auth.callback, \
+ javax.security.auth.kerberos, \
+ javax.security.auth.login, \
+ javax.security.auth.spi, \
+ javax.security.auth.x500, \
+ javax.security.cert, \
+ javax.security.sasl, \
+ javax.sound.midi, \
+ javax.sound.midi.spi, \
+ javax.sound.sampled, \
+ javax.sound.sampled.spi, \
+ javax.sql, \
+ javax.sql.rowset, \
+ javax.sql.rowset.serial, \
+ javax.sql.rowset.spi, \
+ javax.swing, \
+ javax.swing.border, \
+ javax.swing.colorchooser, \
+ javax.swing.event, \
+ javax.swing.filechooser, \
+ javax.swing.plaf, \
+ javax.swing.plaf.basic, \
+ javax.swing.plaf.metal, \
+ javax.swing.plaf.multi, \
+ javax.swing.plaf.synth, \
+ javax.swing.table, \
+ javax.swing.text, \
+ javax.swing.text.html, \
+ javax.swing.text.html.parser, \
+ javax.swing.text.rtf, \
+ javax.swing.tree, \
+ javax.swing.undo, \
+ javax.tools, \
+ javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
+ javax.xml, \
+ javax.xml.bind;version="2.2.1", \
+ javax.xml.bind.annotation;version="2.2.1", \
+ javax.xml.bind.annotation.adapters;version="2.2.1", \
+ javax.xml.bind.attachment;version="2.2.1", \
+ javax.xml.bind.helpers;version="2.2.1", \
+ javax.xml.bind.util;version="2.2.1", \
+ javax.xml.crypto, \
+ javax.xml.crypto.dom, \
+ javax.xml.crypto.dsig, \
+ javax.xml.crypto.dsig.dom, \
+ javax.xml.crypto.dsig.keyinfo, \
+ javax.xml.crypto.dsig.spec, \
+ javax.xml.datatype, \
+ javax.xml.namespace, \
+ javax.xml.parsers, \
+ javax.xml.soap;version="1.3", \
+ javax.xml.stream;version="1.2", \
+ javax.xml.stream.events;version="1.2", \
+ javax.xml.stream.util;version="1.2", \
+ javax.xml.transform, \
+ javax.xml.transform.dom, \
+ javax.xml.transform.sax, \
+ javax.xml.transform.stax, \
+ javax.xml.transform.stream, \
+ javax.xml.validation, \
+ javax.xml.ws;version="2.2", \
+ javax.xml.ws.handler;version="2.2", \
+ javax.xml.ws.handler.soap;version="2.2", \
+ 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.xpath, \
+ org.ietf.jgss, \
+ org.omg.CORBA, \
+ org.omg.CORBA_2_3, \
+ org.omg.CORBA_2_3.portable, \
+ org.omg.CORBA.DynAnyPackage, \
+ org.omg.CORBA.ORBPackage, \
+ org.omg.CORBA.portable, \
+ org.omg.CORBA.TypeCodePackage, \
+ org.omg.CosNaming, \
+ org.omg.CosNaming.NamingContextExtPackage, \
+ org.omg.CosNaming.NamingContextPackage, \
+ org.omg.Dynamic, \
+ org.omg.DynamicAny, \
+ org.omg.DynamicAny.DynAnyFactoryPackage, \
+ org.omg.DynamicAny.DynAnyPackage, \
+ org.omg.IOP, \
+ org.omg.IOP.CodecFactoryPackage, \
+ org.omg.IOP.CodecPackage, \
+ org.omg.Messaging, \
+ org.omg.PortableInterceptor, \
+ org.omg.PortableInterceptor.ORBInitInfoPackage, \
+ org.omg.PortableServer, \
+ org.omg.PortableServer.CurrentPackage, \
+ org.omg.PortableServer.POAManagerPackage, \
+ org.omg.PortableServer.POAPackage, \
+ org.omg.PortableServer.portable, \
+ org.omg.PortableServer.ServantLocatorPackage, \
+ org.omg.SendingContext, \
+ org.omg.stub.java.rmi, \
+ org.omg.stub.javax.management.remote.rmi, \
+ org.w3c.dom, \
+ org.w3c.dom.bootstrap, \
+ org.w3c.dom.css, \
+ org.w3c.dom.events, \
+ org.w3c.dom.html, \
+ org.w3c.dom.ls, \
+ org.w3c.dom.ranges, \
+ org.w3c.dom.stylesheets, \
+ org.w3c.dom.traversal, \
+ org.w3c.dom.views, \
+ org.w3c.dom.xpath, \
+ org.xml.sax, \
+ org.xml.sax.ext, \
+ org.xml.sax.helpers
+
+jre-1.8= \
+ javax.accessibility, \
+ javax.activation;version="1.1", \
+ javax.activity, \
+ javax.annotation;version="1.2", \
+ javax.annotation.processing;version="1.2", \
+ javax.crypto, \
+ javax.crypto.interfaces, \
+ javax.crypto.spec, \
+ javax.imageio, \
+ javax.imageio.event, \
+ javax.imageio.metadata, \
+ javax.imageio.plugins.bmp, \
+ javax.imageio.plugins.jpeg, \
+ javax.imageio.spi, \
+ javax.imageio.stream, \
+ javax.jws;version="2.0", \
+ javax.jws.soap;version="2.0", \
+ javax.lang.model, \
+ javax.lang.model.element, \
+ javax.lang.model.type, \
+ javax.lang.model.util, \
+ javax.management, \
+ javax.management.loading, \
+ javax.management.modelmbean, \
+ javax.management.monitor, \
+ javax.management.openmbean, \
+ javax.management.relation, \
+ javax.management.remote, \
+ javax.management.remote.rmi, \
+ javax.management.timer, \
+ javax.naming, \
+ javax.naming.directory, \
+ javax.naming.event, \
+ javax.naming.ldap, \
+ javax.naming.spi, \
+ javax.net, \
+ javax.net.ssl, \
+ javax.print, \
+ javax.print.attribute, \
+ javax.print.attribute.standard, \
+ javax.print.event, \
+ javax.rmi, \
+ javax.rmi.CORBA, \
+ javax.rmi.ssl, \
+ javax.script, \
+ javax.security.auth, \
+ javax.security.auth.callback, \
+ javax.security.auth.kerberos, \
+ javax.security.auth.login, \
+ javax.security.auth.spi, \
+ javax.security.auth.x500, \
+ javax.security.cert, \
+ javax.security.sasl, \
+ javax.sound.midi, \
+ javax.sound.midi.spi, \
+ javax.sound.sampled, \
+ javax.sound.sampled.spi, \
+ javax.sql, \
+ javax.sql.rowset, \
+ javax.sql.rowset.serial, \
+ javax.sql.rowset.spi, \
+ javax.swing, \
+ javax.swing.border, \
+ javax.swing.colorchooser, \
+ javax.swing.event, \
+ javax.swing.filechooser, \
+ javax.swing.plaf, \
+ javax.swing.plaf.basic, \
+ javax.swing.plaf.metal, \
+ javax.swing.plaf.multi, \
+ javax.swing.plaf.synth, \
+ javax.swing.table, \
+ javax.swing.text, \
+ javax.swing.text.html, \
+ javax.swing.text.html.parser, \
+ javax.swing.text.rtf, \
+ javax.swing.tree, \
+ javax.swing.undo, \
+ javax.tools, \
+ javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
+ javax.xml, \
+ javax.xml.bind;version="2.2.1", \
+ javax.xml.bind.annotation;version="2.2.1", \
+ javax.xml.bind.annotation.adapters;version="2.2.1", \
+ javax.xml.bind.attachment;version="2.2.1", \
+ javax.xml.bind.helpers;version="2.2.1", \
+ javax.xml.bind.util;version="2.2.1", \
+ javax.xml.crypto, \
+ javax.xml.crypto.dom, \
+ javax.xml.crypto.dsig, \
+ javax.xml.crypto.dsig.dom, \
+ javax.xml.crypto.dsig.keyinfo, \
+ javax.xml.crypto.dsig.spec, \
+ javax.xml.datatype, \
+ javax.xml.namespace, \
+ javax.xml.parsers, \
+ javax.xml.soap;version="1.3", \
+ javax.xml.stream;version="1.2", \
+ javax.xml.stream.events;version="1.2", \
+ javax.xml.stream.util;version="1.2", \
+ javax.xml.transform, \
+ javax.xml.transform.dom, \
+ javax.xml.transform.sax, \
+ javax.xml.transform.stax, \
+ javax.xml.transform.stream, \
+ javax.xml.validation, \
+ javax.xml.ws;version="2.2", \
+ javax.xml.ws.handler;version="2.2", \
+ javax.xml.ws.handler.soap;version="2.2", \
+ javax.xml.ws.http;version="2.2", \
+ javax.xml.ws.soap;version="2.2", \
+ javax.xml.ws.spi;version="2.2", \
+ javax.xml.ws.wsaddressing;version="2.2", \
+ javax.xml.ws.spi.http;version="2.2", \
+ javax.xml.xpath, \
+ javafx.animation, \
+ javafx.application, \
+ javafx.beans, \
+ javafx.beans.binding, \
+ javafx.beans.property, \
+ javafx.beans.property.adapter, \
+ javafx.beans.value, \
+ javafx.collections, \
+ javafx.concurrent, \
+ javafx.css, \
+ javafx.embed.swing, \
+ javafx.embed.swt, \
+ javafx.event, \
+ javafx.fxml, \
+ javafx.geometry, \
+ javafx.scene, \
+ javafx.scene.canvas, \
+ javafx.scene.chart, \
+ javafx.scene.control, \
+ javafx.scene.control.cell, \
+ javafx.scene.effect, \
+ javafx.scene.image, \
+ javafx.scene.input, \
+ javafx.scene.layout, \
+ javafx.scene.media, \
+ javafx.scene.paint, \
+ javafx.scene.shape, \
+ javafx.scene.text, \
+ javafx.scene.transform, \
+ javafx.scene.web, \
+ javafx.stage, \
+ javafx.util, \
+ javafx.util.converter, \
+ org.ietf.jgss, \
+ org.omg.CORBA, \
+ org.omg.CORBA_2_3, \
+ org.omg.CORBA_2_3.portable, \
+ org.omg.CORBA.DynAnyPackage, \
+ org.omg.CORBA.ORBPackage, \
+ org.omg.CORBA.portable, \
+ org.omg.CORBA.TypeCodePackage, \
+ org.omg.CosNaming, \
+ org.omg.CosNaming.NamingContextExtPackage, \
+ org.omg.CosNaming.NamingContextPackage, \
+ org.omg.Dynamic, \
+ org.omg.DynamicAny, \
+ org.omg.DynamicAny.DynAnyFactoryPackage, \
+ org.omg.DynamicAny.DynAnyPackage, \
+ org.omg.IOP, \
+ org.omg.IOP.CodecFactoryPackage, \
+ org.omg.IOP.CodecPackage, \
+ org.omg.Messaging, \
+ org.omg.PortableInterceptor, \
+ org.omg.PortableInterceptor.ORBInitInfoPackage, \
+ org.omg.PortableServer, \
+ org.omg.PortableServer.CurrentPackage, \
+ org.omg.PortableServer.POAManagerPackage, \
+ org.omg.PortableServer.POAPackage, \
+ org.omg.PortableServer.portable, \
+ org.omg.PortableServer.ServantLocatorPackage, \
+ org.omg.SendingContext, \
+ org.omg.stub.java.rmi, \
+ org.omg.stub.javax.management.remote.rmi, \
+ org.w3c.dom, \
+ org.w3c.dom.bootstrap, \
+ org.w3c.dom.css, \
+ org.w3c.dom.events, \
+ org.w3c.dom.html, \
+ org.w3c.dom.ls, \
+ org.w3c.dom.ranges, \
+ org.w3c.dom.stylesheets, \
+ org.w3c.dom.traversal, \
+ org.w3c.dom.views, \
+ org.w3c.dom.xpath, \
+ org.xml.sax, \
+ org.xml.sax.ext, \
+ org.xml.sax.helpers
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/resources/etc/org.apache.activemq.webconsole.cfg
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/etc/org.apache.activemq.webconsole.cfg b/assemblies/apache-servicemix/src/main/resources/etc/org.apache.activemq.webconsole.cfg
new file mode 100644
index 0000000..16e4adc
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/etc/org.apache.activemq.webconsole.cfg
@@ -0,0 +1,23 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+webconsole.jms.url=${activemq.url}
+webconsole.jmx.url=service:jmx:rmi:///jndi/rmi://localhost:1099/karaf-${karaf.name}
+webconsole.jmx.user=smx
+webconsole.jmx.password=smx
+webconsole.jms.user=smx
+webconsole.jms.password=smx
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/resources/etc/org.apache.aries.transaction.cfg
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/etc/org.apache.aries.transaction.cfg b/assemblies/apache-servicemix/src/main/resources/etc/org.apache.aries.transaction.cfg
new file mode 100644
index 0000000..6083d8c
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/etc/org.apache.aries.transaction.cfg
@@ -0,0 +1,22 @@
+#
+# 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.
+#
+#
+aries.transaction.timeout=600
+aries.transaction.howl.logFileDir=${karaf.data}/txlog/
+aries.transaction.recoverable=true
http://git-wip-us.apache.org/repos/asf/servicemix/blob/da7e9421/assemblies/apache-servicemix/src/main/resources/etc/org.apache.cxf.wsn.cfg
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/etc/org.apache.cxf.wsn.cfg b/assemblies/apache-servicemix/src/main/resources/etc/org.apache.cxf.wsn.cfg
new file mode 100644
index 0000000..c51994d
--- /dev/null
+++ b/assemblies/apache-servicemix/src/main/resources/etc/org.apache.cxf.wsn.cfg
@@ -0,0 +1,24 @@
+#
+# 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.
+#
+#
+cxf.wsn.activemq = vm:localhost
+cxf.wsn.rootUrl = http://0.0.0.0:8182
+cxf.wsn.context = /wsn
+cxf.wsn.activemq.username=smx
+cxf.wsn.activemq.password=smx
[09/26] servicemix git commit: SM-2803: Refactor the assembly creation
Posted by ks...@apache.org.
SM-2803: Refactor the assembly creation
- libraries provided by karaf removed from assembly definition
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/4c070f82
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/4c070f82
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/4c070f82
Branch: refs/heads/master
Commit: 4c070f82038120b647232e415978e179fd71e788
Parents: 3048735
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Thu Jan 14 23:25:49 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Thu Jan 14 23:25:49 2016 +0100
----------------------------------------------------------------------
assemblies/apache-servicemix/pom.xml | 41 --------------------
.../src/main/resources/common-bin.xml | 23 -----------
2 files changed, 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/4c070f82/assemblies/apache-servicemix/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/pom.xml b/assemblies/apache-servicemix/pom.xml
index c1c0f0b..6c5b545 100644
--- a/assemblies/apache-servicemix/pom.xml
+++ b/assemblies/apache-servicemix/pom.xml
@@ -127,47 +127,6 @@
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxp-api-1.4</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-2.2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxws-api-2.2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.activator</artifactId>
- </dependency>
-
- <!--Xerces jar to be included in lib/endorsed -->
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
-
- <!--xalan jar to be included in lib/endorsed-->
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xalan</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xalan-serializer</artifactId>
- </dependency>
-
<!-- branding -->
<dependency>
<groupId>org.apache.servicemix</groupId>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/4c070f82/assemblies/apache-servicemix/src/main/resources/common-bin.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/common-bin.xml b/assemblies/apache-servicemix/src/main/resources/common-bin.xml
index 2c4b999..f8a49f0 100644
--- a/assemblies/apache-servicemix/src/main/resources/common-bin.xml
+++ b/assemblies/apache-servicemix/src/main/resources/common-bin.xml
@@ -27,28 +27,5 @@
</includes>
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- <includes>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activator</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/lib/endorsed</outputDirectory>
- <fileMode>0644</fileMode>
- <includes>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.2</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.saaj-api-1.3</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.2</include>
- <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xalan-serializer</include>
- <include>xerces:xercesImpl</include>
- </includes>
- </dependencySet>
</dependencySets>
</component>
[23/26] servicemix git commit: SM-2768: Upgrade to Apache Karaf 4
Posted by ks...@apache.org.
SM-2768: Upgrade to Apache Karaf 4
- perform some clean-up
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/13a1ebe2
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/13a1ebe2
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/13a1ebe2
Branch: refs/heads/master
Commit: 13a1ebe2e40aeedcd2d30bee469392cf7a8a8220
Parents: a79969d
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sun Jan 24 22:57:50 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sun Jan 24 22:57:50 2016 +0100
----------------------------------------------------------------------
assemblies/apache-servicemix/pom.xml | 25 ++++----------------
.../etc/org.apache.karaf.features.cfg | 1 -
.../filtered-resources/startup-obr.properties | 19 ---------------
.../src/main/feature/feature.xml | 9 +------
4 files changed, 6 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/13a1ebe2/assemblies/apache-servicemix/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/pom.xml b/assemblies/apache-servicemix/pom.xml
index ab8538f..1c41e59 100644
--- a/assemblies/apache-servicemix/pom.xml
+++ b/assemblies/apache-servicemix/pom.xml
@@ -241,12 +241,13 @@
<feature>activemq-camel</feature>
<feature>camel-blueprint</feature>
<feature>war</feature>
- <feature>jaxrs-api</feature>
<feature>camel-xstream</feature>
- <!--<feature>jaxrs-api</feature>-->
- <!--<feature>kie-aries-blueprint</feature>
+ <feature>joda-time</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>
@@ -315,22 +316,6 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>enable-obr</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target name="enable-obr">
- <echo message="Updating etc/startup.properties in assembly" />
- <concat destfile="${project.build.directory}/assembly/etc/startup.properties" append="true">
- <string value="${line.separator}" />
- <fileset file="${project.build.outputDirectory}/startup-obr.properties" />
- </concat>
- </target>
- </configuration>
- </execution>
- <execution>
<id>increase-perm-mem</id>
<phase>prepare-package</phase>
<goals>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/13a1ebe2/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 1fb0375..ade4028 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
@@ -44,7 +44,6 @@ featuresRepositories = \
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
http://git-wip-us.apache.org/repos/asf/servicemix/blob/13a1ebe2/assemblies/apache-servicemix/src/main/filtered-resources/startup-obr.properties
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/filtered-resources/startup-obr.properties b/assemblies/apache-servicemix/src/main/filtered-resources/startup-obr.properties
deleted file mode 100644
index d754e01..0000000
--- a/assemblies/apache-servicemix/src/main/filtered-resources/startup-obr.properties
+++ /dev/null
@@ -1,19 +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.
-#
-
-# add here bundles you want to install while system startup, e.g.
-# joda-time/joda-time/${jodatime2.bundle.version}/joda-time-${jodatime2.bundle.version}.jar=10
http://git-wip-us.apache.org/repos/asf/servicemix/blob/13a1ebe2/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 4b2f9bf..a22ee30 100644
--- a/assemblies/features/servicemix-internal/src/main/feature/feature.xml
+++ b/assemblies/features/servicemix-internal/src/main/feature/feature.xml
@@ -25,15 +25,8 @@
<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-->
- <feature name="jaxrs-api">
- <bundle start-level='10'>
- mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0/${servicemix.specs.version}
- </bundle>
- </feature>
-
<!-- workaround for SM-2469 -->
- <feature name="joda-time">
+ <feature name="joda-time" hidden="true">
<bundle start-level='10'>mvn:joda-time/joda-time/${jodatime2.bundle.version}</bundle>
</feature>
[21/26] servicemix git commit: SM-2820: Upgrade to Apache Karaf 4.0.4
Posted by ks...@apache.org.
SM-2820: Upgrade to Apache Karaf 4.0.4
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/d4b76b5b
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/d4b76b5b
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/d4b76b5b
Branch: refs/heads/master
Commit: d4b76b5b005e151cfe8ba817b69c151d6ca611ab
Parents: d0cc5ad
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sun Jan 24 22:05:00 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sun Jan 24 22:05:00 2016 +0100
----------------------------------------------------------------------
.../etc/org.apache.karaf.features.cfg | 13 +++++++++++++
.../servicemix-features/src/main/feature/feature.xml | 2 +-
parent/pom.xml | 10 +++++-----
3 files changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d4b76b5b/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 d641a04..1fb0375 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
@@ -83,6 +83,19 @@ featuresBoot = \
war
#
+# Resource repositories (OBR) that the features resolver can use
+# to resolve requirements/capabilities
+#
+# The format of the resourceRepositories is
+# resourceRepositories=[xml:url|json:url],...
+# for Instance:
+#
+#resourceRepositories=xml:http://host/path/to/index.xml
+# or
+#resourceRepositories=json:http://host/path/to/index.json
+#
+
+#
# Defines if the boot features are started in asynchronous mode (in a dedicated thread)
#
featuresBootAsynchronous=false
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d4b76b5b/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 950ebe8..f202945 100644
--- a/assemblies/features/servicemix-features/src/main/feature/feature.xml
+++ b/assemblies/features/servicemix-features/src/main/feature/feature.xml
@@ -36,7 +36,7 @@
<!-- Activiti support -->
<feature name="activiti" version="${activiti.version}">
- <feature version="${jpa.version}">jpa</feature>
+ <feature version="${aries.jpa.version}">jpa</feature>
<feature version="${cxf.version}">cxf-specs</feature>
<feature version="${aries.transaction.version}">transaction</feature>
<feature version="${camel.version}">camel</feature>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/d4b76b5b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e0c3f28..6c16047 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,7 +41,8 @@
<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.5</aries.blueprint.core.version>
+ <aries.blueprint.core.version>1.5.0</aries.blueprint.core.version>
+ <aries.jpa.version>2.3.0</aries.jpa.version>
<aries.proxy.version>1.0.4</aries.proxy.version>
<aries.transaction.version>1.3.0</aries.transaction.version>
<aries.util.version>1.1.1</aries.util.version>
@@ -74,15 +75,14 @@
<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.2.0</jpa.version>
<json4s.bundle.version>3.2.11_1</json4s.bundle.version>
- <karaf.version>4.0.3</karaf.version>
+ <karaf.version>4.0.4</karaf.version>
<mvel2.version>2.2.1.Final</mvel2.version>
<mybatis.version>3.2.8</mybatis.version>
<osgi.version>6.0.0</osgi.version>
<pax.exam.version>4.8.0</pax.exam.version>
- <pax.logging.version>1.8.4</pax.logging.version>
- <pax.url.version>2.4.3</pax.url.version>
+ <pax.logging.version>1.8.5</pax.logging.version>
+ <pax.url.version>2.4.5</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>
[26/26] servicemix git commit: SM-2825: Installation of CXF WSN
sample fails
Posted by ks...@apache.org.
SM-2825: Installation of CXF WSN sample fails
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/8288a53d
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/8288a53d
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/8288a53d
Branch: refs/heads/master
Commit: 8288a53d7b20c7f2a36bd8d74fa2c6de1a0b5598
Parents: db6a819
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Jan 25 19:47:01 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Jan 25 19:47:01 2016 +0100
----------------------------------------------------------------------
.../features/servicemix-examples/src/main/feature/feature.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/8288a53d/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 2218368..7e4a390 100644
--- a/assemblies/features/servicemix-examples/src/main/feature/feature.xml
+++ b/assemblies/features/servicemix-examples/src/main/feature/feature.xml
@@ -139,7 +139,7 @@
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-rm/${project.version}</bundle>
</feature>
<feature name="examples-cxf-wsn-receive" version="${project.version}">
- <feature version="${camel.version}">camel-jetty</feature>
+ <feature version="${camel.version}">camel-jetty9</feature>
<feature version="${camel.version}">camel-jms</feature>
<feature version="${camel.version}">camel-jaxb</feature>
<feature version="${cxf.version}">cxf-wsn</feature>
[19/26] servicemix git commit: SM-2807: Upgrade to Apache POM 17
Posted by ks...@apache.org.
SM-2807: Upgrade to Apache POM 17
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/0386b87e
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/0386b87e
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/0386b87e
Branch: refs/heads/master
Commit: 0386b87ede03aad9aae8c69622e93aaccd6bda9d
Parents: 09ac07b
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Sat Jan 23 00:06:35 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Sat Jan 23 00:06:35 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/0386b87e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a01172f..0b1e961 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>15</version>
+ <version>17</version>
<relativePath />
</parent>