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 22:02:26 UTC
[02/16] servicemix git commit: SM-2803: Refactor the assembly creation
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/8c1e9ae9
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/8c1e9ae9
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/8c1e9ae9
Branch: refs/heads/servicemix-6.x
Commit: 8c1e9ae9845e68b61392cf347d9153a3256011e7
Parents: d29e66c
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:20:09 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/8c1e9ae9/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/8c1e9ae9/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/8c1e9ae9/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/8c1e9ae9/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/8c1e9ae9/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/8c1e9ae9/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/8c1e9ae9/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/8c1e9ae9/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/8c1e9ae9/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/8c1e9ae9/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/8c1e9ae9/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/8c1e9ae9/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/8c1e9ae9/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/8c1e9ae9/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/8c1e9ae9/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/8c1e9ae9/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>