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 2015/05/27 00:14:07 UTC

[2/3] servicemix git commit: M-2497: Add features for Drools 6.2 (closes #27)

M-2497: Add features for Drools 6.2 (closes #27)

Thanks to Grzegorz Halajko for the pull request!!!


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

Branch: refs/heads/master
Commit: f644027aa779cb390459160e541181ee3d8d76db
Parents: c928d62
Author: Grzegorz Halajko <gh...@linuxpolska.pl>
Authored: Tue May 26 22:16:32 2015 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Tue May 26 23:21:08 2015 +0200

----------------------------------------------------------------------
 drools/src/main/resources/features.xml | 83 +++++++++++------------------
 1 file changed, 30 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/f644027a/drools/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/drools/src/main/resources/features.xml b/drools/src/main/resources/features.xml
index e99be6c..06b931d 100644
--- a/drools/src/main/resources/features.xml
+++ b/drools/src/main/resources/features.xml
@@ -1,11 +1,11 @@
 <?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
+    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
+    the License. You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
@@ -19,53 +19,43 @@
           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="kie" version="${drools6.version}" description="KIE API"
-             start-level="50">
-        <bundle>mvn:org.kie/kie-api/${drools6.version}</bundle>
-        <bundle>mvn:org.kie/kie-internal/${drools6.version}</bundle>
-    </feature>
+    <repository>mvn:org.apache.servicemix/apache-servicemix/${version}/xml/internal</repository>
 
-    <feature name="drools6-commons" version="${drools6.version}"
-             description="Drools 6 Commons" start-level="50">
+    <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>
-    </feature>
+        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/3.5_1</bundle>
 
-    <feature name="drools6-module" version="${drools6.version}"
-             description="Drools 6 core" start-level="50">
-        <feature version="${drools6.version}">drools6-commons</feature>
-        <feature version="${drools6.version}">kie</feature>
+        <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="kie-aries-blueprint" version="${drools6.version}"
-             description="Drools 6 KIE Blueprint support" start-level="50">
-        <feature version="${drools6.version}">kie</feature>
-        <feature version="${drools6.version}">drools6-jpa</feature>
-        <feature version="${drools6.version}">jbpm</feature>
-        <feature version="${drools6.version}">jbpm-human-task</feature>
-        <bundle>mvn:org.kie/kie-aries-blueprint/${drools6.version}</bundle>
-    </feature>
-
     <feature name="drools6-jpa" version="${drools6.version}"
-             description="Drools 6 JPA support" start-level="50">
+             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">
+    <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>
-        <feature version="${drools6.version}">jbpm-commons</feature>
-        <feature version="${drools6.version}">jbpm-human-task</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>
@@ -74,39 +64,26 @@
         <bundle>mvn:org.jbpm/jbpm-persistence-jpa/${drools6.version}</bundle>
     </feature>
 
-    <feature name="jbpm-human-task" version="${drools6.version}"
-             description="jBPM human task support" start-level="50">
-        <feature version="${drools6.version}">jbpm-commons</feature>
-        <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/1.9.13</bundle>
-        <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>
-    </feature>
-
-    <feature name="jbpm-commons" version="${drools6.version}"
-             description="jBPM Commons" start-level="50">
-        <feature version="[4.2,5.0)">hibernate</feature>
-        <bundle dependency="true">
-            mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/1.8.6_1
-        </bundle>
+    <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">
-        <feature version="${drools6.version}">kie</feature>
-        <feature version="${drools6.version}">drools6-jpa</feature>
+             description="KIE Spring support" start-level="50" resolver="(obr)">
         <feature version="${drools6.version}">jbpm</feature>
-        <feature version="${drools6.version}">jbpm-human-task</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">
+             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>
@@ -117,4 +94,4 @@
 
         <bundle>mvn:org.kie/kie-camel/${drools6.version}</bundle>
     </feature>
-</features>
+</features>
\ No newline at end of file