Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

SWITCHYARD-1825: Upgrade KIE/Drools/jBPM from 6.0.0.CR5 to 6.0.0.Final

  • Loading branch information...
commit d84c40c11b3e1066056eaa24b8ef815008e69082 1 parent c28ee53
@errantepiphany errantepiphany authored kcbabo committed
View
2  bpm/src/main/java/org/switchyard/component/bpm/exchange/BPMExchangeHandler.java
@@ -52,8 +52,8 @@
import org.switchyard.ServiceDomain;
import org.switchyard.common.lang.Strings;
import org.switchyard.component.bpm.BPMConstants;
-import org.switchyard.component.bpm.BPMOperationType;
import org.switchyard.component.bpm.BPMMessages;
+import org.switchyard.component.bpm.BPMOperationType;
import org.switchyard.component.bpm.config.model.BPMComponentImplementationModel;
import org.switchyard.component.bpm.runtime.BPMProcessEventListener;
import org.switchyard.component.bpm.runtime.BPMRuntimeEnvironment;
View
4 bpm/src/main/java/org/switchyard/component/bpm/runtime/BPMRuntimeEnvironment.java
@@ -22,9 +22,9 @@
import org.kie.api.runtime.Environment;
import org.kie.api.runtime.KieSession;
import org.kie.api.runtime.KieSessionConfiguration;
-// SWITCHYARD-1755: internal api usage still required (until jbpm services usage is resolved)
+import org.kie.api.runtime.manager.RegisterableItemsFactory;
+//SWITCHYARD-1755: internal api usage still required (until jbpm services usage is resolved)
import org.kie.internal.runtime.manager.Mapper;
-import org.kie.internal.runtime.manager.RegisterableItemsFactory;
import org.kie.internal.runtime.manager.RuntimeEnvironment;
import org.kie.internal.task.api.UserGroupCallback;
View
36 common/knowledge/pom.xml
@@ -87,42 +87,6 @@
<artifactId>kie-internal</artifactId>
</dependency>
<dependency>
- <groupId>org.kie.commons</groupId>
- <artifactId>kie-commons-cdi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.kie.commons</groupId>
- <artifactId>kie-commons-data</artifactId>
- </dependency>
- <dependency>
- <groupId>org.kie.commons</groupId>
- <artifactId>kie-commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.kie.commons</groupId>
- <artifactId>kie-commons-regex</artifactId>
- </dependency>
- <dependency>
- <groupId>org.kie.commons</groupId>
- <artifactId>kie-commons-validation</artifactId>
- </dependency>
- <dependency>
- <groupId>org.kie.commons</groupId>
- <artifactId>kie-nio2-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.kie.commons</groupId>
- <artifactId>kie-nio2-fs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.kie.commons</groupId>
- <artifactId>kie-nio2-jgit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.kie.commons</groupId>
- <artifactId>kie-nio2-model</artifactId>
- </dependency>
- <dependency>
<groupId>org.mvel</groupId>
<artifactId>mvel2</artifactId>
</dependency>
View
5 common/knowledge/src/main/java/org/switchyard/component/common/knowledge/util/Environments.java
@@ -17,8 +17,7 @@
import java.util.List;
import java.util.Map;
-// SWITCHYARD-1755: core impl class usage still required (public APIs insufficient)
-import org.drools.core.impl.EnvironmentFactory;
+import org.kie.api.KieServices;
import org.kie.api.marshalling.ObjectMarshallingStrategy;
import org.kie.api.runtime.Environment;
import org.kie.api.runtime.EnvironmentName;
@@ -44,7 +43,7 @@
* @return the Environment
*/
public static Environment getEnvironment(Map<String, Object> overrides) {
- Environment env = EnvironmentFactory.newEnvironment();
+ Environment env = KieServices.Factory.get().newEnvironment();
// set the object marshalling strategies
List<ObjectMarshallingStrategy> new_oms = new ArrayList<ObjectMarshallingStrategy>();
new_oms.add(new SerializerObjectMarshallingStrategy(SerializerFactory.create(FormatType.JSON, null, true)));
View
9 common/knowledge/src/main/java/org/switchyard/component/common/knowledge/util/Listeners.java
@@ -23,6 +23,7 @@
import org.kie.api.event.rule.DefaultAgendaEventListener;
import org.kie.api.event.rule.MatchCreatedEvent;
import org.kie.api.event.rule.RuleFlowGroupActivatedEvent;
+import org.kie.api.event.rule.RuleRuntimeEventListener;
import org.kie.api.event.rule.WorkingMemoryEventListener;
import org.kie.api.runtime.KieRuntime;
import org.kie.api.runtime.KieSession;
@@ -38,6 +39,7 @@
*
* @author David Ward &lt;<a href="mailto:dward@jboss.org">dward@jboss.org</a>&gt; &copy; 2012 Red Hat Inc.
*/
+@SuppressWarnings("deprecation")
public final class Listeners {
private static final Class<?>[][] PARMAMETER_TYPES = new Class<?>[][]{
@@ -156,9 +158,12 @@ public static void registerListener(EventListener listener, KieRuntimeEventManag
getInternalWorkingMemory((CommandBasedStatefulKnowledgeSession)manager).addEventListener(droolsListener);
}
}*/
- // WORKING MEMORY
- if (listener instanceof WorkingMemoryEventListener) {
+ // RULE RUNTIME / WORKING MEMORY
+ if (listener instanceof RuleRuntimeEventListener) {
// current (kie)
+ manager.addEventListener((RuleRuntimeEventListener)listener);
+ } else if (listener instanceof WorkingMemoryEventListener) {
+ // deprecated (kie)
manager.addEventListener((WorkingMemoryEventListener)listener);
}/* else if (listener instanceof org.drools.core.event.WorkingMemoryEventListener) {
// legacy (drools)
View
2  rules/src/main/java/org/switchyard/component/rules/exchange/RulesExchangeHandler.java
@@ -164,7 +164,7 @@ public void handleOperation(Exchange exchange, KnowledgeOperation operation) thr
entryPoint.insert(fact);
}
} else {
- throw RulesMessages.MESSAGES.unknownEntryPoint(entryPoint.toString());
+ throw RulesMessages.MESSAGES.unknownEntryPoint(key);
}
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.