[jboss-svn-commits] JBL Code SVN: r31281 - in labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz: drools-api/src/main/java/org/drools/runtime and 17 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jan 28 10:44:56 EST 2010
Author: lucazamador
Date: 2010-01-28 10:44:55 -0500 (Thu, 28 Jan 2010)
New Revision: 31281
Added:
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/result/ExecutionResults.java
Removed:
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-api/src/main/java/org/drools/result/
Modified:
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-api/src/main/java/org/drools/runtime/CommandExecutor.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/ExecuteCommand.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/KnowledgeContextResolveFromContextCommand.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/impl/KnowledgeCommandContext.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/GetGlobalCommand.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectCommand.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectsCommand.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/rule/InsertElementsCommand.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/rule/InsertObjectCommand.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/result/ExecutionResultsImpl.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/pipeline/impl/ExecutorStage.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsJaxbDataFormat.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsProducer.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/main/java/org/drools/pipeline/camel/BatchExecutorProcessor.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointTest.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithMarshallersTest.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelProxyEndpointTest.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbToXmlTransformer.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/ResultTranslator.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-vsm/src/main/java/org/drools/vsm/local/ServiceManagerLocalClient.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-vsm/src/main/java/org/drools/vsm/remote/ServiceManagerRemoteClient.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-vsm/src/main/java/org/drools/vsm/remote/StatefulKnowledgeSessionRemoteClient.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-vsm/src/test/java/org/drools/vsm/ServiceManagerTestBase.java
Log:
jaxb luane rollback
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-api/src/main/java/org/drools/runtime/CommandExecutor.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-api/src/main/java/org/drools/runtime/CommandExecutor.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-api/src/main/java/org/drools/runtime/CommandExecutor.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -1,7 +1,6 @@
package org.drools.runtime;
import org.drools.command.Command;
-import org.drools.result.ExecutionResults;
/**
* <p>
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -19,7 +19,7 @@
import org.drools.concurrent.Future;
import org.drools.io.ResourceFactory;
import org.drools.rule.Package;
-import org.drools.result.ExecutionResults;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.StatelessKnowledgeSession;
import org.drools.runtime.impl.ExecutionResultImpl;
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -35,7 +35,7 @@
import org.drools.io.Resource;
import org.drools.io.ResourceFactory;
import org.drools.rule.Package;
-import org.drools.result.ExecutionResults;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.StatelessKnowledgeSession;
import org.drools.runtime.StatelessKnowledgeSessionResults;
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -40,7 +40,6 @@
import org.drools.process.instance.WorkItemManager;
import org.drools.process.instance.event.SignalManager;
import org.drools.process.instance.timer.TimerManager;
-import org.drools.result.ExecutionResultsImpl;
import org.drools.reteoo.LIANodePropagation;
import org.drools.reteoo.PartitionTaskManager;
import org.drools.rule.Rule;
@@ -50,6 +49,7 @@
import org.drools.runtime.ExitPoint;
import org.drools.runtime.KnowledgeRuntime;
import org.drools.runtime.ObjectFilter;
+import org.drools.runtime.impl.ExecutionResultImpl;
import org.drools.spi.Activation;
import org.drools.spi.AgendaFilter;
import org.drools.spi.AsyncExceptionHandler;
@@ -539,12 +539,12 @@
}
- public ExecutionResultsImpl getExecutionResult() {
+ public ExecutionResultImpl getExecutionResult() {
// TODO Auto-generated method stub
return null;
}
- public void startBatchExecution(ExecutionResultsImpl results) {
+ public void startBatchExecution(ExecutionResultImpl results) {
// TODO Auto-generated method stub
}
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/ExecuteCommand.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/ExecuteCommand.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/ExecuteCommand.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -7,7 +7,7 @@
import org.drools.common.InternalFactHandle;
import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.reteoo.ReteooWorkingMemory;
-import org.drools.result.ExecutionResults;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.impl.ExecutionResultImpl;
import org.drools.runtime.rule.FactHandle;
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/KnowledgeContextResolveFromContextCommand.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/KnowledgeContextResolveFromContextCommand.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/KnowledgeContextResolveFromContextCommand.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -4,8 +4,8 @@
import org.drools.builder.KnowledgeBuilder;
import org.drools.command.impl.GenericCommand;
import org.drools.command.impl.KnowledgeCommandContext;
-import org.drools.result.ExecutionResultsImpl;
import org.drools.runtime.StatefulKnowledgeSession;
+import org.drools.runtime.impl.ExecutionResultImpl;
public class KnowledgeContextResolveFromContextCommand
implements
@@ -34,7 +34,7 @@
(KnowledgeBuilder) context.get( this.kbuilderIdentifier ),
(KnowledgeBase) context.get( this.kbaseIdentifier ),
(StatefulKnowledgeSession) context.get( this.statefulKsessionName ),
- (ExecutionResultsImpl) context.get( this.kresults ) );
+ (ExecutionResultImpl) context.get( this.kresults ) );
return ((GenericCommand) command).execute( kcContext );
}
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -52,11 +52,10 @@
import org.drools.event.rule.AgendaEventListener;
import org.drools.event.rule.WorkingMemoryEventListener;
import org.drools.impl.StatefulKnowledgeSessionImpl;
-import org.drools.result.ExecutionResults;
import org.drools.rule.EntryPoint;
import org.drools.runtime.Calendars;
import org.drools.runtime.Environment;
-
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.ExitPoint;
import org.drools.runtime.Globals;
import org.drools.runtime.ObjectFilter;
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -6,7 +6,6 @@
import org.drools.command.Command;
import org.drools.command.CommandFactoryProvider;
import org.drools.command.Setter;
-import org.drools.command.runtime.BatchExecutionCommand;
import org.drools.command.runtime.GetGlobalCommand;
import org.drools.command.runtime.SetGlobalCommand;
import org.drools.command.runtime.process.AbortWorkItemCommand;
@@ -148,8 +147,7 @@
}
public Command newBatchExecution(List<? extends Command> commands) {
-// return new BatchExecutionImpl(
-// (List<GenericCommand>) commands);
- return new BatchExecutionCommand((List<GenericCommand<?>>) commands);
+ return new BatchExecutionImpl(
+ (List<GenericCommand>) commands);
}
}
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/impl/KnowledgeCommandContext.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/impl/KnowledgeCommandContext.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/impl/KnowledgeCommandContext.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -4,7 +4,7 @@
import org.drools.builder.KnowledgeBuilder;
import org.drools.command.Context;
import org.drools.command.ContextManager;
-import org.drools.result.ExecutionResults;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.impl.ExecutionResultImpl;
import org.drools.runtime.pipeline.impl.ServiceManagerPipelineImpl;
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/GetGlobalCommand.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/GetGlobalCommand.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/GetGlobalCommand.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -4,9 +4,8 @@
import org.drools.command.impl.GenericCommand;
import org.drools.command.impl.KnowledgeCommandContext;
import org.drools.impl.StatefulKnowledgeSessionImpl;
-import org.drools.result.ExecutionResults;
-import org.drools.result.GetGlobalResult;
import org.drools.runtime.StatefulKnowledgeSession;
+import org.drools.runtime.impl.ExecutionResultImpl;
public class GetGlobalCommand
implements
@@ -40,12 +39,11 @@
StatefulKnowledgeSession ksession = ((KnowledgeCommandContext) context).getStatefulKnowledgesession();
Object object = ksession.getGlobal( identifier );
- ExecutionResults execRes = (ExecutionResults)((StatefulKnowledgeSessionImpl) ksession).session.getExecutionResult();
- if( execRes != null ) {
- String id = (this.outIdentifier != null) ? this.outIdentifier : this.identifier;
- execRes.getResults().add( new GetGlobalResult( id, object ) );
+ ExecutionResultImpl results = (ExecutionResultImpl) ((StatefulKnowledgeSessionImpl) ksession).session.getExecutionResult();
+ if ( results != null ) {
+ results.getResults().put( (this.outIdentifier != null) ? this.outIdentifier : this.identifier,
+ object );
}
-
return object;
}
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectCommand.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectCommand.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectCommand.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -1,14 +1,20 @@
package org.drools.command.runtime.rule;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+
import org.drools.command.Context;
import org.drools.command.impl.GenericCommand;
import org.drools.command.impl.KnowledgeCommandContext;
+import org.drools.common.DisconnectedFactHandle;
import org.drools.impl.StatefulKnowledgeSessionImpl;
-import org.drools.result.ExecutionResults;
-import org.drools.result.GetObjectsResult;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.rule.FactHandle;
+ at XmlRootElement(name="get-object")
+ at XmlAccessorType(XmlAccessType.NONE)
public class GetObjectCommand
implements
GenericCommand<Object> {
@@ -16,13 +22,13 @@
private FactHandle factHandle;
private String outIdentifier;
- public GetObjectCommand() {
- }
+ public GetObjectCommand() { }
public GetObjectCommand(FactHandle factHandle) {
this.factHandle = factHandle;
}
+ @XmlAttribute(name="out-identifier", required=true)
public String getOutIdentifier() {
return outIdentifier;
}
@@ -31,14 +37,21 @@
this.outIdentifier = outIdentifier;
}
- public Object execute(Context context) {
+ @XmlAttribute(name="factHandle", required=true)
+ public void setFactHandleString(String factHandleString) {
+ factHandle = new DisconnectedFactHandle(factHandleString);
+ }
+
+ public Object execute(Context context) {
StatefulKnowledgeSession ksession = ((KnowledgeCommandContext) context).getStatefulKnowledgesession();
Object object = ksession.getObject( factHandle );
- ExecutionResults execRes = (ExecutionResults)((StatefulKnowledgeSessionImpl) ksession).session.getExecutionResult();
- execRes.getResults().add( new GetObjectsResult( this.outIdentifier, object ) );
-
+ if (this.outIdentifier != null) {
+ ((StatefulKnowledgeSessionImpl)ksession).session.getExecutionResult()
+ .getResults().put( this.outIdentifier, object );
+ }
+
return object;
}
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectsCommand.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectsCommand.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectsCommand.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -10,8 +10,6 @@
import org.drools.command.impl.KnowledgeCommandContext;
import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.impl.StatefulKnowledgeSessionImpl.ObjectStoreWrapper;
-import org.drools.result.ExecutionResults;
-import org.drools.result.GetObjectsResult;
import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.runtime.ObjectFilter;
import org.drools.runtime.StatefulKnowledgeSession;
@@ -45,17 +43,16 @@
Collection col = null;
if ( filter != null ) {
+
col = ksession.getObjects( this.filter );
} else {
col = ksession.getObjects( );
}
if ( this.outIdentifier != null ) {
-
List objects = new ArrayList( col );
- ExecutionResults execRes = (ExecutionResults)((StatefulKnowledgeSessionImpl) ksession).session.getExecutionResult();
- execRes.getResults().add( new GetObjectsResult( this.outIdentifier, objects ) );
+ ((StatefulKnowledgeSessionImpl)ksession).session.getExecutionResult().getResults().put( this.outIdentifier, objects );
}
return col;
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/rule/InsertElementsCommand.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/rule/InsertElementsCommand.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/rule/InsertElementsCommand.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -4,72 +4,55 @@
import java.util.Collection;
import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
import org.drools.command.Context;
import org.drools.command.impl.GenericCommand;
import org.drools.command.impl.KnowledgeCommandContext;
import org.drools.impl.StatefulKnowledgeSessionImpl;
-import org.drools.result.ExecutionResults;
-import org.drools.result.InsertElementsResult;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.rule.FactHandle;
- at XmlAccessorType( XmlAccessType.NONE )
public class InsertElementsCommand
implements
GenericCommand<Collection<FactHandle>> {
- @XmlElement(name="object", required = true)
- protected List<Object> objects;
+ private static final long serialVersionUID = 1L;
- @XmlAttribute
+ public Collection<?> objects;
+
private String outIdentifier;
- @XmlAttribute
- private Boolean returnObject = true;
+ private boolean returnObject = true;
public InsertElementsCommand() {
- this.objects = new ArrayList<Object>();
+ this.objects = new ArrayList();
}
- public InsertElementsCommand(Iterable<Object> objects) {
- this();
- for( Object obj: objects ){
- this.objects.add( obj );
- }
+ public InsertElementsCommand(Collection<?> objects) {
+ this.objects = objects;
}
- public Iterable<Object> getObjects() {
+ public Collection<?> getObjects() {
return this.objects;
}
- public void setObjects(Iterable<Object> objects) {
- this.objects = new ArrayList<Object>();
- for( Object obj: objects ){
- this.objects.add( obj );
- }
+ public void setObjects(List<?> objects) {
+ this.objects = objects;
}
public Collection<FactHandle> execute(Context context) {
StatefulKnowledgeSession ksession = ((KnowledgeCommandContext) context).getStatefulKnowledgesession();
-
List<FactHandle> handles = new ArrayList<FactHandle>();
for ( Object object : objects ) {
handles.add( ksession.insert( object ) );
}
if ( outIdentifier != null ) {
- ExecutionResults execRes = ((StatefulKnowledgeSessionImpl)ksession).session.getExecutionResult();
- InsertElementsResult insRes = new InsertElementsResult( outIdentifier );
if ( this.returnObject ) {
- insRes.setObjects( objects );
+ ((StatefulKnowledgeSessionImpl)ksession).session.getExecutionResult().getResults().put( this.outIdentifier,
+ objects );
}
- insRes.setHandles( handles );
- execRes.getResults().add( insRes );
+ ((StatefulKnowledgeSessionImpl)ksession).session.getExecutionResult().getFactHandles().put( this.outIdentifier,
+ handles );
}
return handles;
}
@@ -83,14 +66,10 @@
}
public boolean isReturnObject() {
- if (returnObject == null) {
- return true;
- } else {
- return returnObject;
- }
+ return returnObject;
}
- public void setReturnObject(Boolean returnObject) {
+ public void setReturnObject(boolean returnObject) {
this.returnObject = returnObject;
}
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/rule/InsertObjectCommand.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/rule/InsertObjectCommand.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/command/runtime/rule/InsertObjectCommand.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -1,39 +1,37 @@
package org.drools.command.runtime.rule;
-import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
import org.drools.command.Context;
import org.drools.command.impl.GenericCommand;
import org.drools.command.impl.KnowledgeCommandContext;
-import org.drools.common.InternalFactHandle;
import org.drools.impl.StatefulKnowledgeSessionImpl;
-
-import org.drools.result.ExecutionResults;
-import org.drools.result.InsertObjectResult;
-
import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.rule.FactHandle;
- at XmlAccessorType( XmlAccessType.NONE )
+ at XmlRootElement(name="insert")
+ at XmlAccessorType(XmlAccessType.NONE)
public class InsertObjectCommand
implements
GenericCommand<FactHandle> {
- @XmlElement(required = true)
- private Object object;
+ private static final long serialVersionUID = 1L;
- @XmlAttribute(name = "out-identifier")
+ @XmlElement
+ private Object object;
+
+ @XmlAttribute(name="out-identifier", required=true)
private String outIdentifier;
- @XmlAttribute(name = "return-object")
private boolean returnObject = true;
-
+
public InsertObjectCommand() {
- }
+ }
public InsertObjectCommand(Object object) {
this.object = object;
@@ -44,13 +42,14 @@
FactHandle factHandle = ksession.insert( object );
ReteooWorkingMemory session = ((StatefulKnowledgeSessionImpl)ksession).session;
+
if ( outIdentifier != null ) {
- ExecutionResults execRes = ((StatefulKnowledgeSessionImpl)ksession).session.getExecutionResult();
- InsertObjectResult insRes = new InsertObjectResult( outIdentifier, factHandle );
if ( this.returnObject ) {
- insRes.setObject( object );
+ session.getExecutionResult().getResults().put( this.outIdentifier,
+ object );
}
- execRes.getResults().add( insRes );
+ session.getExecutionResult().getFactHandles().put( this.outIdentifier,
+ factHandle );
}
return factHandle;
@@ -59,7 +58,7 @@
public Object getObject() {
return this.object;
}
-
+
public void setObject( Object object ) {
this.object = object;
}
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -76,8 +76,6 @@
import org.drools.process.instance.WorkItemManager;
import org.drools.process.instance.event.SignalManager;
import org.drools.process.instance.timer.TimerManager;
-import org.drools.result.ExecutionResults;
-import org.drools.result.ExecutionResultsImpl;
import org.drools.reteoo.EntryPointNode;
import org.drools.reteoo.InitialFactHandle;
import org.drools.reteoo.InitialFactHandleDummyObject;
@@ -95,9 +93,11 @@
import org.drools.runtime.Calendars;
import org.drools.runtime.Environment;
import org.drools.runtime.EnvironmentName;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.ExitPoint;
import org.drools.runtime.Globals;
import org.drools.runtime.KnowledgeRuntime;
+import org.drools.runtime.impl.ExecutionResultImpl;
import org.drools.runtime.process.EventListener;
import org.drools.runtime.process.WorkItemHandler;
import org.drools.spi.Activation;
@@ -2009,14 +2009,14 @@
return partitionManager.getPartitionTaskManager( partitionId );
}
- public void startBatchExecution(ExecutionResultsImpl results) {
+ public void startBatchExecution(ExecutionResultImpl results) {
this.ruleBase.readLock();
this.lock.lock();
this.batchExecutionResult = results;
}
- public ExecutionResultsImpl getExecutionResult() {
- return (ExecutionResultsImpl) this.batchExecutionResult;
+ public ExecutionResultImpl getExecutionResult() {
+ return (ExecutionResultImpl) this.batchExecutionResult;
}
public void endBatchExecution() {
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -13,7 +13,6 @@
import org.drools.event.WorkingMemoryEventSupport;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.ProcessInstanceManager;
-import org.drools.result.ExecutionResultsImpl;
import org.drools.reteoo.LIANodePropagation;
import org.drools.reteoo.PartitionTaskManager;
import org.drools.rule.Rule;
@@ -21,6 +20,7 @@
import org.drools.runtime.Calendars;
import org.drools.runtime.ExitPoint;
import org.drools.runtime.KnowledgeRuntime;
+import org.drools.runtime.impl.ExecutionResultImpl;
import org.drools.runtime.rule.WorkingMemoryEntryPoint;
import org.drools.spi.Activation;
import org.drools.spi.FactHandleFactory;
@@ -136,9 +136,9 @@
public SessionConfiguration getSessionConfiguration();
- public void startBatchExecution(ExecutionResultsImpl results);
+ public void startBatchExecution(ExecutionResultImpl results);
- public ExecutionResultsImpl getExecutionResult();
+ public ExecutionResultImpl getExecutionResult();
public void endBatchExecution();
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -59,8 +59,7 @@
import org.drools.runtime.Calendars;
import org.drools.runtime.CommandExecutor;
import org.drools.runtime.Environment;
-import org.drools.result.ExecutionResults;
-import org.drools.result.ExecutionResultsImpl;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.ExitPoint;
import org.drools.runtime.Globals;
import org.drools.runtime.StatefulKnowledgeSession;
@@ -813,13 +812,13 @@
}
public ExecutionResults execute(Context context, Command command) {
- ExecutionResultsImpl results = null;
+ ExecutionResultImpl results = null;
if ( context != null ) {
- results = ( ExecutionResultsImpl ) ((KnowledgeCommandContext)context).getExecutionResults();
+ results = ( ExecutionResultImpl ) ((KnowledgeCommandContext)context).getExecutionResults();
}
if ( results == null ) {
- results = new ExecutionResultsImpl();
+ results = new ExecutionResultImpl();
}
try {
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -33,8 +33,7 @@
import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.reteoo.ReteooWorkingMemory.WorkingMemoryReteAssertAction;
import org.drools.rule.EntryPoint;
-import org.drools.result.ExecutionResults;
-import org.drools.result.ExecutionResultsImpl;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.Environment;
import org.drools.runtime.Globals;
import org.drools.runtime.KnowledgeSessionConfiguration;
@@ -237,7 +236,7 @@
null );
try {
- ((StatefulKnowledgeSessionImpl) ksession).session.startBatchExecution( new ExecutionResultsImpl() );
+ ((StatefulKnowledgeSessionImpl) ksession).session.startBatchExecution( new ExecutionResultImpl() );
((GenericCommand) command).execute( context );
// did the user take control of fireAllRules, if not we will auto execute
Copied: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/result/ExecutionResults.java (from rev 31277, labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/result/ExecutionResults.java)
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/result/ExecutionResults.java (rev 0)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/result/ExecutionResults.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -0,0 +1,15 @@
+package org.drools.result;
+
+import java.util.List;
+
+public interface ExecutionResults {
+
+ List<GenericResult> getResults();
+
+ Object getValue( String identifier );
+
+ Object getFactHandle( String identifier );
+
+ List<String> getIdentifiers();
+
+}
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/result/ExecutionResultsImpl.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/result/ExecutionResultsImpl.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/result/ExecutionResultsImpl.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -5,6 +5,8 @@
import java.util.List;
import java.util.Map;
+import org.drools.runtime.ExecutionResults;
+
public class ExecutionResultsImpl implements ExecutionResults {
private List<GenericResult> results;
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/pipeline/impl/ExecutorStage.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/pipeline/impl/ExecutorStage.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/pipeline/impl/ExecutorStage.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -5,7 +5,7 @@
import org.drools.command.Command;
import org.drools.command.CommandFactory;
-import org.drools.result.ExecutionResults;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.pipeline.KnowledgeRuntimeCommand;
import org.drools.runtime.pipeline.PipelineContext;
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsJaxbDataFormat.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsJaxbDataFormat.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsJaxbDataFormat.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -24,14 +24,11 @@
import org.drools.impl.StatelessKnowledgeSessionImpl;
import org.drools.io.Resource;
import org.drools.io.ResourceFactory;
-import org.drools.process.result.ExecutionResultsType;
-import org.drools.result.ExecutionResults;
import org.drools.reteoo.ReteooRuleBase;
import org.drools.runtime.CommandExecutor;
import org.drools.runtime.impl.ExecutionResultAdapter;
import org.drools.runtime.pipeline.PipelineContext;
import org.drools.runtime.pipeline.impl.CommandTranslator;
-import org.drools.runtime.pipeline.impl.ResultTranslator;
import org.drools.runtime.pipeline.impl.ServiceManagerPipelineContextImpl;
import org.drools.vsm.ServiceManager;
import org.drools.vsm.local.ServiceManagerLocalClient;
@@ -49,7 +46,6 @@
public class DroolsJaxbDataFormat implements DataFormat {
private CommandTranslator cmdTranslator;
- private ResultTranslator resTranslator;
private Unmarshaller unmarshaller;
private Marshaller marshaller;
@@ -62,27 +58,17 @@
this.marshaller.setAdapter(new ExecutionResultAdapter());
this.cmdTranslator = new CommandTranslator(unmarshaller);
- this.resTranslator = new ResultTranslator(marshaller);
}
public void marshal(Exchange exchange, Object graph, OutputStream stream)
throws Exception {
Object body = exchange.getIn().getBody();
-
- if (body instanceof ExecutionResults) {
- ExecutionResultsType execRes = resTranslator.transform( (ExecutionResults)body );
- try {
- this.marshaller.marshal( execRes, stream );
- } catch (Exception e) {
- e.printStackTrace();
- }
- } else {
- try {
- this.marshaller.marshal(body, stream);
- } catch (Exception e) {
- e.printStackTrace();
- }
+
+ try {
+ this.marshaller.marshal(body, stream);
+ } catch (Exception e) {
+ e.printStackTrace();
}
stream.flush();
@@ -145,7 +131,7 @@
payload = cmdTranslator.transform((BatchExecutionCommand) payload);
}
-// context.getProperties().put("jaxb-context", jaxbCtx);
+ // context.getProperties().put("jaxb-context", jaxbCtx);
exchange.setProperty("drools-context", context);
return payload;
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsProducer.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsProducer.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/main/java/org/drools/camel/component/DroolsProducer.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -21,7 +21,7 @@
import org.apache.camel.impl.DefaultProducer;
import org.drools.command.Command;
import org.drools.runtime.CommandExecutor;
-import org.drools.result.ExecutionResults;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.pipeline.ResultHandler;
import org.drools.vsm.ServiceManager;
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/main/java/org/drools/pipeline/camel/BatchExecutorProcessor.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/main/java/org/drools/pipeline/camel/BatchExecutorProcessor.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/main/java/org/drools/pipeline/camel/BatchExecutorProcessor.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -18,7 +18,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.drools.result.ExecutionResults;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.pipeline.PipelineContext;
import org.drools.runtime.pipeline.PipelineFactory;
import org.drools.runtime.pipeline.impl.ExecutorStage;
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointTest.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointTest.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointTest.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -21,7 +21,7 @@
import org.drools.command.runtime.rule.InsertObjectCommand;
import org.drools.common.DisconnectedFactHandle;
import org.drools.pipeline.camel.Person;
-import org.drools.result.ExecutionResults;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.rule.FactHandle;
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithJaxbTest.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -10,7 +10,7 @@
import org.drools.command.runtime.rule.InsertObjectCommand;
import org.drools.io.ResourceFactory;
import org.drools.pipeline.camel.Person;
-import org.drools.result.ExecutionResults;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.rule.FactHandle;
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithMarshallersTest.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithMarshallersTest.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelEndpointWithMarshallersTest.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -16,10 +16,13 @@
package org.drools.camel.component;
import org.apache.camel.builder.RouteBuilder;
+import org.drools.command.CommandFactory;
+import org.drools.command.runtime.rule.GetObjectCommand;
import org.drools.command.runtime.rule.InsertObjectCommand;
+import org.drools.common.DisconnectedFactHandle;
import org.drools.common.InternalFactHandle;
import org.drools.pipeline.camel.Person;
-import org.drools.result.ExecutionResults;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.help.BatchExecutionHelper;
import org.drools.runtime.rule.FactHandle;
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelProxyEndpointTest.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelProxyEndpointTest.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/CamelProxyEndpointTest.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -19,7 +19,7 @@
import org.drools.command.CommandFactory;
import org.drools.command.runtime.rule.InsertObjectCommand;
import org.drools.pipeline.camel.Person;
-import org.drools.result.ExecutionResults;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.rule.FactHandle;
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-camel/src/test/java/org/drools/camel/component/DroolsCamelTestSupport.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -19,6 +19,7 @@
import javax.naming.Context;
+import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
import org.custommonkey.xmlunit.Diff;
import org.custommonkey.xmlunit.XMLAssert;
@@ -29,6 +30,7 @@
import org.drools.builder.ResourceType;
import org.drools.definition.KnowledgePackage;
import org.drools.io.ResourceFactory;
+import org.drools.runtime.KnowledgeRuntime;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.vsm.ServiceManager;
import org.drools.vsm.local.ServiceManagerLocalClient;
@@ -36,7 +38,7 @@
import org.slf4j.LoggerFactory;
public abstract class DroolsCamelTestSupport extends ContextTestSupport {
- protected static final Logger LOG = LoggerFactory.getLogger(DroolsCamelTestSupport.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(DroolsCamelTestSupport.class);
protected ServiceManager serviceManager;
public void setServiceManager(ServiceManager serviceManager) {
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -66,9 +66,7 @@
"org.drools.command.runtime.rule.InsertObjectCommand",
"org.drools.runtime.impl.BatchExecutionImpl",
"org.drools.runtime.impl.ExecutionResultImpl",
- "org.drools.common.DefaultFactHandle",
- "org.drools.process.result.ExecutionResultsType"
-
+ "org.drools.common.DefaultFactHandle"
};
public String[] addXsdModel(Resource resource,
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbToXmlTransformer.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbToXmlTransformer.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbToXmlTransformer.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -31,7 +31,7 @@
if( object instanceof ExecutionResults ){
if( resTrans == null ){
- resTrans = new ResultTranslator( null );
+ resTrans = new ResultTranslator( this );
}
ExecutionResultsType execRes = resTrans.transform( (ExecutionResults)object );
marshaller.marshal( execRes, stringWriter );
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/ResultTranslator.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/ResultTranslator.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/ResultTranslator.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -35,8 +35,7 @@
import org.w3c.dom.Node;
public class ResultTranslator {
-
- private Marshaller marshaller;
+ private JaxbTransformer jaxbTransformer;
private Map<Class<?>,ResultTransformer> class2trans;
private ObjectFactory objFact;
private ExecutionResultsType execRes;
@@ -44,10 +43,10 @@
/**
* Constructor.
*
- * @param marshaller the <tt>marshaller</tt>
+ * @param jaxbTransformer the <tt>JaxbTransformer</tt>
*/
- public ResultTranslator( Marshaller marshaller ){
- this.marshaller = marshaller;
+ public ResultTranslator( JaxbTransformer jaxbTransformer ){
+ this.jaxbTransformer = jaxbTransformer;
class2trans = new HashMap<Class<?>,ResultTransformer>();
class2trans.put( InsertElementsResult.class, new InsertElementsResultTransformer() );
class2trans.put( InsertObjectResult.class, new InsertObjectResultTransformer() );
@@ -79,7 +78,9 @@
dbf.setNamespaceAware( true );
DocumentBuilder db = dbf.newDocumentBuilder();
Document doc = db.newDocument();
- marshaller.marshal( obj, doc );
+ JAXBContext ctxt = jaxbTransformer.getContext();
+ Marshaller m = ctxt.createMarshaller();
+ m.marshal( obj, doc );
Element el = doc.getDocumentElement();
Node xsi = doc.createAttributeNS( "http://www.w3.org/2000/xmlns/", "xmlns:xsi" );
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-vsm/src/main/java/org/drools/vsm/local/ServiceManagerLocalClient.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-vsm/src/main/java/org/drools/vsm/local/ServiceManagerLocalClient.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-vsm/src/main/java/org/drools/vsm/local/ServiceManagerLocalClient.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -15,7 +15,7 @@
import org.drools.persistence.jpa.impl.JPAKnowledgeServiceProviderImpl;
import org.drools.runtime.CommandExecutor;
import org.drools.runtime.Environment;
-import org.drools.result.ExecutionResults;
+import org.drools.runtime.ExecutionResults;
import org.drools.vsm.HumanTaskServiceProvider;
import org.drools.vsm.ServiceManager;
import org.drools.vsm.ServiceManagerData;
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-vsm/src/main/java/org/drools/vsm/remote/ServiceManagerRemoteClient.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-vsm/src/main/java/org/drools/vsm/remote/ServiceManagerRemoteClient.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-vsm/src/main/java/org/drools/vsm/remote/ServiceManagerRemoteClient.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -20,7 +20,7 @@
import org.drools.persistence.jpa.JPAKnowledgeServiceProvider;
import org.drools.runtime.CommandExecutor;
import org.drools.runtime.Environment;
-import org.drools.result.ExecutionResults;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.vsm.GenericConnector;
import org.drools.vsm.HumanTaskServiceProvider;
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-vsm/src/main/java/org/drools/vsm/remote/StatefulKnowledgeSessionRemoteClient.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-vsm/src/main/java/org/drools/vsm/remote/StatefulKnowledgeSessionRemoteClient.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-vsm/src/main/java/org/drools/vsm/remote/StatefulKnowledgeSessionRemoteClient.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -16,7 +16,7 @@
import org.drools.event.rule.WorkingMemoryEventListener;
import org.drools.runtime.Calendars;
import org.drools.runtime.Environment;
-import org.drools.result.ExecutionResults;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.ExitPoint;
import org.drools.runtime.Globals;
import org.drools.runtime.ObjectFilter;
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-vsm/src/test/java/org/drools/vsm/ServiceManagerTestBase.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-vsm/src/test/java/org/drools/vsm/ServiceManagerTestBase.java 2010-01-28 15:39:53 UTC (rev 31280)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-vsm/src/test/java/org/drools/vsm/ServiceManagerTestBase.java 2010-01-28 15:44:55 UTC (rev 31281)
@@ -9,7 +9,7 @@
import org.drools.builder.ResourceType;
import org.drools.command.runtime.rule.FireAllRulesCommand;
import org.drools.io.ResourceFactory;
-import org.drools.result.ExecutionResults;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
More information about the jboss-svn-commits
mailing list