[jboss-svn-commits] JBL Code SVN: r28519 - in labs/jbossrules/trunk: drools-api/src/main/java/org/drools/command and 23 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jul 27 23:15:36 EDT 2009
Author: tirelli
Date: 2009-07-27 23:15:34 -0400 (Mon, 27 Jul 2009)
New Revision: 28519
Added:
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/ExecutionResults.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultImpl.java
Removed:
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/result/
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/BatchExecutionCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/ObjectFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/ObjectFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/Parameter.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/ParameterMap.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/ParameterMapAdapter.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/ObjectFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/result/
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/result/
labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/CommandTranslator.java
labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbTransformer.java
labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/ResultTranslator.java
Modified:
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/command/CommandFactory.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/CommandExecutor.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/pipeline/JaxbTransformerProvider.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/pipeline/PipelineFactory.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/QueryResults.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/ExecuteCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/GetGlobalCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/SetGlobalCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/AbortWorkItemCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/SignalEventCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/StartProcessCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/FireAllRulesCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectsCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/InsertElementsCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/InsertObjectCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/QueryCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooWorkingMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/BatchExecutionHelperProviderImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/pipeline/impl/ExecutorStage.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/rule/impl/NativeQueryResults.java
labs/jbossrules/trunk/drools-pipeline/drools-messenger-jms/src/test/java/org/drools/runtime/pipeline/impl/JaxbSimpleJmsMessengerTest.java
labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbFromXmlTransformer.java
labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbToXmlTransformer.java
labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbTransformerProviderImpl.java
labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/test/java/org/drools/runtime/pipeline/impl/JaxbFactTest.java
labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/test/java/org/drools/runtime/pipeline/impl/JaxbGlobalTest.java
labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/test/java/org/drools/runtime/pipeline/impl/JaxbTest.java
labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/src/test/java/org/drools/runtime/pipeline/impl/XStreamBatchExecutionTest.java
Log:
Reversing changes made from revision 28494 to 28498
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/command/CommandFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/command/CommandFactory.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/command/CommandFactory.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -191,8 +191,7 @@
*/
public static Command newStartProcess(String processId,
Map<String, Object> parameters) {
- return getCommandFactoryProvider().newStartProcess( processId,
- parameters );
+ return getCommandFactoryProvider().newStartProcess( processId );
}
public static Command newSignalEvent(String type,
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/CommandExecutor.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/CommandExecutor.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/CommandExecutor.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,7 +1,6 @@
package org.drools.runtime;
import org.drools.command.Command;
-import org.drools.result.ExecutionResults;
/**
* <p>
Copied: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/ExecutionResults.java (from rev 28493, labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/ExecutionResults.java)
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/ExecutionResults.java (rev 0)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/ExecutionResults.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -0,0 +1,21 @@
+package org.drools.runtime;
+
+import java.util.Collection;
+
+/**
+ * <p>
+ * Contains the results for the BatchExecution Command. If the identifier is reference the results of a query, you'll need to cast the vlaue to
+ * QueryResults.
+ * </p>
+ *
+ *
+ */
+public interface ExecutionResults {
+
+ Collection<String> getIdentifiers();
+
+ Object getValue(String identifier);
+
+ Object getFactHandle(String identifier);
+
+}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/pipeline/JaxbTransformerProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/pipeline/JaxbTransformerProvider.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/pipeline/JaxbTransformerProvider.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,6 +1,7 @@
package org.drools.runtime.pipeline;
-import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
/**
*
@@ -8,8 +9,7 @@
*
*/
public interface JaxbTransformerProvider {
- Transformer newJaxbFromXmlTransformer( JAXBContext jaxbCtx );
- Transformer newJaxbFromXmlCommandTransformer( JAXBContext jaxbCtx );
- Transformer newJaxbToXmlTransformer( JAXBContext jaxbCtx );
- Transformer newJaxbToXmlResultTransformer( JAXBContext jaxbCtx );
+ Transformer newJaxbFromXmlTransformer(Unmarshaller unmarshaller);
+
+ Transformer newJaxbToXmlTransformer(Marshaller marshaller);
}
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/pipeline/PipelineFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/pipeline/PipelineFactory.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/pipeline/PipelineFactory.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -3,6 +3,8 @@
import java.util.Properties;
import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
import net.sf.jxls.reader.ReaderBuilder;
import net.sf.jxls.reader.XLSReader;
@@ -477,23 +479,12 @@
* xjcOpts,
* "xsd" );
* </pre>
- * @param jaxbContext
+ * @param unmarshaller
* @return
*/
- public static Transformer newJaxbFromXmlTransformer( JAXBContext jaxbCtx ) {
- return getJaxbPipelineProvider().newJaxbFromXmlTransformer( jaxbCtx );
+ public static Transformer newJaxbFromXmlTransformer(Unmarshaller unmarshaller) {
+ return getJaxbPipelineProvider().newJaxbFromXmlTransformer( unmarshaller );
}
-
- /**
- * Transforms from XML to a BatchExecutionCommand which contains pojos. The pojos will
- * be unmarshalled using the given context.
- *
- * @param jaxbCtx the JAXB context for the embedded pojos.
- * @return
- */
- public static Transformer newJaxbFromXmlCommandTransformer( JAXBContext jaxbCtx ) {
- return getJaxbPipelineProvider().newJaxbFromXmlCommandTransformer( jaxbCtx );
- }
/**
* Transforms from Pojo to XML using JAXB, the resulting XML is set as the propagating object.
@@ -505,23 +496,12 @@
* transformer.setReceiver( receiver );
*
*
- * @param jaxbCtx
+ * @param marshaller
* @return
*/
- public static Transformer newJaxbToXmlTransformer( JAXBContext jaxbCtx ) {
- return getJaxbPipelineProvider().newJaxbToXmlTransformer( jaxbCtx );
+ public static Transformer newJaxbToXmlTransformer(Marshaller marshaller) {
+ return getJaxbPipelineProvider().newJaxbToXmlTransformer( marshaller );
}
-
- /**
- * Transforms from a batch execution result to XML using JAXB; the resulting
- * XML is set as the propagating object.
- *
- * @param jaxbCtx JAXB context for marshalling pojos in the result
- * @return
- */
- public static Transformer newJaxbToXmlResultTransformer( JAXBContext jaxbCtx ) {
- return getJaxbPipelineProvider().newJaxbToXmlResultTransformer( jaxbCtx );
- }
/**
* <p>
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/QueryResults.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/QueryResults.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/rule/QueryResults.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -2,8 +2,6 @@
import java.util.Iterator;
-import org.drools.result.GenericResult;
-
/**
* <p>
* Contains the results of a query. The identifiers is a map of the declarations for the query, only patterns or fields that are bound can
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -19,9 +19,10 @@
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;
import java.io.InputStreamReader;
import java.util.ArrayList;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -34,8 +34,8 @@
import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.io.Resource;
import org.drools.io.ResourceFactory;
-import org.drools.result.ExecutionResults;
import org.drools.rule.Package;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.StatelessKnowledgeSession;
import org.drools.runtime.StatelessKnowledgeSessionResults;
@@ -158,11 +158,15 @@
assertEquals( 30,
stilton.getPrice() );
+
assertNull( result.getValue( "list1" ) );
+
list2 = ( List ) result.getValue( "list2" );
assertEquals( 1, list2.size() );
assertSame( stilton, list2.get( 0 ) );
-
+
+
+
list3 = ( List ) result.getValue( "outList3" );
assertEquals( 1, list3.size() );
assertSame( stilton, list3.get( 0 ) );
@@ -224,6 +228,7 @@
cmds.add( CommandFactory.newQuery( "cheeses", "cheeses" ) );
ExecutionResults batchResult = ksession.execute( CommandFactory.newBatchExecution( cmds ) );
+
org.drools.runtime.rule.QueryResults results = ( org.drools.runtime.rule.QueryResults) batchResult.getValue( "cheeses" );
assertEquals( 3, results.size() );
assertEquals( 2, results.getIdentifiers().length );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -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;
@@ -49,6 +48,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;
@@ -532,7 +532,7 @@
}
- public ExecutionResultsImpl getExecutionResult() {
+ public ExecutionResultImpl getExecutionResult() {
// TODO Auto-generated method stub
return null;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/ExecuteCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/ExecuteCommand.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/ExecuteCommand.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -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.rule.FactHandle;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -51,8 +51,8 @@
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.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/trunk/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -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;
@@ -146,6 +145,7 @@
}
public Command newBatchExecution(List<? extends Command> commands) {
- return new BatchExecutionCommand((List<GenericCommand<?>>) commands);
+ return new BatchExecutionImpl(
+ (List<GenericCommand>) commands);
}
}
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/BatchExecutionCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/BatchExecutionCommand.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/BatchExecutionCommand.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,138 +0,0 @@
-package org.drools.command.runtime;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlType;
-
-import org.drools.command.Command;
-import org.drools.command.Context;
-import org.drools.command.impl.GenericCommand;
-import org.drools.command.impl.KnowledgeCommandContext;
-import org.drools.command.runtime.SetGlobalCommand;
-import org.drools.command.runtime.process.CompleteWorkItemCommand;
-import org.drools.command.runtime.process.AbortWorkItemCommand;
-import org.drools.command.runtime.process.SignalEventCommand;
-import org.drools.command.runtime.rule.FireAllRulesCommand;
-import org.drools.command.runtime.process.StartProcessCommand;
-import org.drools.command.runtime.GetGlobalCommand;
-import org.drools.command.runtime.rule.InsertElementsCommand;
-import org.drools.command.runtime.rule.QueryCommand;
-import org.drools.command.runtime.rule.InsertObjectCommand;
-
-import org.drools.impl.StatefulKnowledgeSessionImpl;
-import org.drools.result.GenericResult;
-
-import org.drools.runtime.pipeline.impl.BasePipelineContext;
-
-import org.drools.runtime.StatefulKnowledgeSession;
-import org.drools.result.ExecutionResults;
-
-import org.drools.reteoo.ReteooWorkingMemory;
-
-
-/**
- * <p>Java class for BatchExecutionCommand complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="BatchExecutionCommand">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <choice maxOccurs="unbounded">
- * <element name="abort-work-item" type="{http://drools.org/drools-5.0/knowledge-session}AbortWorkItemCommand"/>
- * <element name="complete-work-item" type="{http://drools.org/drools-5.0/knowledge-session}CompleteWorkItemCommand"/>
- * <element name="fire-all-rules" type="{http://drools.org/drools-5.0/knowledge-session}FireAllRulesCommand"/>
- * <element name="get-global" type="{http://drools.org/drools-5.0/knowledge-session}GetGlobalCommand"/>
- * <element name="insert" type="{http://drools.org/drools-5.0/knowledge-session}InsertObjectCommand"/>
- * <element name="insert-elements" type="{http://drools.org/drools-5.0/knowledge-session}InsertElementsCommand"/>
- * <element name="query" type="{http://drools.org/drools-5.0/knowledge-session}QueryCommand"/>
- * <element name="set-global" type="{http://drools.org/drools-5.0/knowledge-session}SetGlobalCommand"/>
- * <element name="signal-event" type="{http://drools.org/drools-5.0/knowledge-session}SignalEventCommand"/>
- * <element name="start-process" type="{http://drools.org/drools-5.0/knowledge-session}StartProcessCommand"/>
- * </choice>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "BatchExecutionCommand", propOrder = {
- "commands"
-})
-public class BatchExecutionCommand implements GenericCommand<Void> {
-
- public BatchExecutionCommand(){
- }
-
- public BatchExecutionCommand( List<GenericCommand<?>> commands ){
- this.commands = commands;
- }
-
-
- @XmlElements({
- @XmlElement(name = "set-global", type = SetGlobalCommand.class),
- @XmlElement(name = "complete-work-item", type = CompleteWorkItemCommand.class),
- @XmlElement(name = "abort-work-item", type = AbortWorkItemCommand.class),
- @XmlElement(name = "signal-event", type = SignalEventCommand.class),
- @XmlElement(name = "fire-all-rules", type = FireAllRulesCommand.class),
- @XmlElement(name = "start-process", type = StartProcessCommand.class),
- @XmlElement(name = "get-global", type = GetGlobalCommand.class),
- @XmlElement(name = "insert-elements", type = InsertElementsCommand.class),
- @XmlElement(name = "query", type = QueryCommand.class),
- @XmlElement(name = "insert", type = InsertObjectCommand.class)
- })
- protected List<GenericCommand<?>> commands;
-
- /**
- * Gets the value of the abortWorkItemOrCompleteWorkItemOrFireAllRules property.
- *
- * <p>
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the abortWorkItemOrCompleteWorkItemOrFireAllRules property.
- *
- * <p>
- * For example, to add a new item, do as follows:
- * <pre>
- * getCommand().add(newItem);
- * </pre>
- *
- *
- * <p>
- * Objects of the following type(s) are allowed in the list
- * {@link SetGlobalCommand }
- * {@link CompleteWorkItemCommand }
- * {@link AbortWorkItemCommand }
- * {@link SignalEventCommand }
- * {@link FireAllRulesCommand }
- * {@link StartProcessCommand }
- * {@link GetGlobalCommand }
- * {@link InsertElementsCommand }
- * {@link QueryCommand }
- * {@link InsertObjectCommand }
- *
- *
- */
- public List<GenericCommand<?>> getCommands() {
- if (commands == null) {
- commands = new ArrayList<GenericCommand<?>>();
- }
- return this.commands;
- }
-
-
- public Void execute(Context context) {
- for ( GenericCommand<?> command : commands ) {
- ((GenericCommand)command).execute( context );
- }
- return null;
- }
-}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/GetGlobalCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/GetGlobalCommand.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/GetGlobalCommand.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,31 +1,24 @@
package org.drools.command.runtime;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
+import java.util.Collection;
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.GetGlobalResult;
+import org.drools.reteoo.ReteooWorkingMemory;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
+import org.drools.runtime.impl.ExecutionResultImpl;
import org.drools.runtime.rule.FactHandle;
- at XmlAccessorType( XmlAccessType.NONE )
public class GetGlobalCommand
implements
GenericCommand<Object> {
- @XmlAttribute(required = true)
private String identifier;
- @XmlAttribute(name = "out-identifier")
private String outIdentifier;
- public GetGlobalCommand() {
- }
-
public GetGlobalCommand(String identifier) {
this.identifier = identifier;
}
@@ -46,14 +39,11 @@
StatefulKnowledgeSession ksession = ((KnowledgeCommandContext) context).getStatefulKnowledgesession();
Object object = ksession.getGlobal( identifier );
-
- // Simulation does not provide results.
- 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;
}
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/ObjectFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/ObjectFactory.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/ObjectFactory.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,68 +0,0 @@
-package org.drools.command.runtime;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the org.drools.process.command package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
- * provided in this class.
- *
- */
- at XmlRegistry
-public class ObjectFactory {
-
- private final static QName _BatchExecution_QNAME = new QName("http://drools.org/drools-5.0/knowledge-session", "batch-execution");
-
- /**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.drools.process.command
- *
- */
- public ObjectFactory() {
- }
-
- /**
- * Create an instance of {@link SetGlobalCommand }
- *
- */
- public SetGlobalCommand createSetGlobalCommand() {
- return new SetGlobalCommand();
- }
-
- /**
- * Create an instance of {@link GetGlobalCommand }
- *
- */
- public GetGlobalCommand createGetGlobalCommand() {
- return new GetGlobalCommand();
- }
-
- /**
- * Create an instance of {@link BatchExecutionCommand }
- *
- */
- public BatchExecutionCommand createBatchExecutionCommand() {
- return new BatchExecutionCommand();
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link BatchExecutionCommand }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://drools.org/drools-5.0/knowledge-session", name = "batch-execution")
- public JAXBElement<BatchExecutionCommand> createBatchExecution(BatchExecutionCommand value) {
- return new JAXBElement<BatchExecutionCommand>(_BatchExecution_QNAME, BatchExecutionCommand.class, null, value);
- }
-
-}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/SetGlobalCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/SetGlobalCommand.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/SetGlobalCommand.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,97 +1,70 @@
package org.drools.command.runtime;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-
import org.drools.KnowledgeBase;
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.SetGlobalResult;
+import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.runtime.StatefulKnowledgeSession;
- at XmlAccessorType( XmlAccessType.NONE )
public class SetGlobalCommand
implements
GenericCommand<Void> {
- @XmlAttribute(required = true)
- private String identifier;
+ private String identifier;
+ private Object object;
- @XmlElement
- private Object object;
-
- @XmlAttribute(name = "out-identifier")
- private String outIdentifier;
-
- @XmlAttribute
- private Boolean out;
+ private String outIdentifier;
- public SetGlobalCommand(){
- }
+ private boolean out;
public SetGlobalCommand(String identifier,
Object object) {
- this.identifier = identifier;
- this.object = object;
+ this.identifier = identifier;
+ this.object = object;
}
public Void execute(Context context) {
- StatefulKnowledgeSession ksession = ((KnowledgeCommandContext) context).getStatefulKnowledgesession();
+ StatefulKnowledgeSession ksession = ((KnowledgeCommandContext) context).getStatefulKnowledgesession();
- ksession.setGlobal( this.identifier, this.object );
+ if ( this.out ) {
+ ((StatefulKnowledgeSessionImpl) ksession).session.getExecutionResult().getResults().put( (this.outIdentifier != null) ? this.outIdentifier : this.identifier,
+ object );
+ }
- if ( this.isOut() ) {
- ExecutionResults execRes = (ExecutionResults)((StatefulKnowledgeSessionImpl) ksession).session.getExecutionResult();
- String id = (this.outIdentifier != null) ? this.outIdentifier : this.identifier;
- execRes.getResults().add( new SetGlobalResult( id, object ) );
- }
- return null;
+ ksession.setGlobal( this.identifier,
+ this.object );
+ return null;
}
- public Object getObject() {
- return this.object;
+ public String getIdentifier() {
+ return this.identifier;
}
- public void setObject( Object object ) {
- this.object = object;
+ public Object getObject() {
+ return this.object;
}
public String getOutIdentifier() {
- return this.outIdentifier;
+ return this.outIdentifier;
}
public void setOutIdentifier(String outIdentifier) {
- this.outIdentifier = outIdentifier;
- this.out = true;
+ this.outIdentifier = outIdentifier;
+ this.out = true;
}
- public String getIdentifier() {
- return this.identifier;
- }
-
- public void setIdentifier(String identifier) {
- this.identifier = identifier;
- }
-
public boolean isOut() {
- if (out == null) {
- return false;
- } else {
- return out;
- }
+ return this.out;
}
- public void setOut(Boolean out) {
- this.out = out;
+ public void setOut(boolean out) {
+ this.out = out;
}
public String toString() {
- return "session.setGlobal(" + this.identifier + ", " + this.object + ");";
+ return "session.setGlobal(" + this.identifier + ", " + this.object + ");";
}
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/AbortWorkItemCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/AbortWorkItemCommand.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/AbortWorkItemCommand.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,21 +1,15 @@
package org.drools.command.runtime.process;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-
import org.drools.command.Context;
import org.drools.command.impl.GenericCommand;
import org.drools.command.impl.KnowledgeCommandContext;
import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.runtime.StatefulKnowledgeSession;
- at XmlAccessorType( XmlAccessType.NONE )
public class AbortWorkItemCommand
implements
GenericCommand<Object> {
- @XmlAttribute(required = true)
private long workItemId;
public AbortWorkItemCommand() {
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/ObjectFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/ObjectFactory.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/ObjectFactory.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,61 +0,0 @@
-package org.drools.command.runtime.process;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-
-/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the org.drools.process.command package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
- * provided in this class.
- *
- */
- at XmlRegistry
-public class ObjectFactory {
-
- /**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.drools.process.command
- *
- */
- public ObjectFactory() {
- }
-
- /**
- * Create an instance of {@link AbortWorkItemCommand }
- *
- */
- public AbortWorkItemCommand createAbortWorkItemCommand() {
- return new AbortWorkItemCommand();
- }
-
- /**
- * Create an instance of {@link CompleteWorkItemCommand }
- *
- */
- public CompleteWorkItemCommand createCompleteWorkItemCommand() {
- return new CompleteWorkItemCommand();
- }
-
- /**
- * Create an instance of {@link StartProcessCommand }
- *
- */
- public StartProcessCommand createStartProcessCommand() {
- return new StartProcessCommand();
- }
-
- /**
- * Create an instance of {@link SignalEventCommand }
- *
- */
- public SignalEventCommand createSignalEventCommand() {
- return new SignalEventCommand();
- }
-}
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/Parameter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/Parameter.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/Parameter.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,73 +0,0 @@
-package org.drools.command.runtime.process;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "Parameter", propOrder = {
- "value"
-})
-public class Parameter {
- protected Object value;
- @XmlAttribute(required = true)
- protected String key;
-
- Parameter(){
- }
-
- Parameter( String key, Object value ){
- this.key = key;
- this.value = value;
- }
-
- /**
- * Gets the value of the value property.
- *
- * @return
- * possible object is
- * {@link Object }
- *
- */
- public Object getValue() {
- return value;
- }
-
- /**
- * Sets the value of the value property.
- *
- * @param value
- * allowed object is
- * {@link Object }
- *
- */
- public void setValue(Object value) {
- this.value = value;
- }
-
- /**
- * Gets the value of the key property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getKey() {
- return key;
- }
-
- /**
- * Sets the value of the key property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setKey(String value) {
- this.key = value;
- }
-
-}
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/ParameterMap.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/ParameterMap.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/ParameterMap.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,15 +0,0 @@
-package org.drools.command.runtime.process;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ParameterMap {
-
- private List<Parameter> parameter;
- public List<Parameter> getParameter(){
- if( parameter == null ){
- parameter = new ArrayList<Parameter>();
- }
- return parameter;
- }
-}
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/ParameterMapAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/ParameterMapAdapter.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/ParameterMapAdapter.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,29 +0,0 @@
-package org.drools.command.runtime.process;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-public class ParameterMapAdapter extends XmlAdapter<HashMap<String,Object>,ParameterMap> {
- @Override
- public HashMap<String,Object> marshal( ParameterMap paramList ){
- HashMap<String,Object> paramMap = new HashMap<String,Object>();
- for( Parameter param: paramList.getParameter() ){
- paramMap.put( param.getKey(), param.getValue() );
- }
- return paramMap;
- }
-
- @Override
- public ParameterMap unmarshal( HashMap<String,Object> paramMap ){
- ParameterMap parameterMap = new ParameterMap();
- List<Parameter> paramList = parameterMap.getParameter();
- for( Map.Entry<String,Object> entry: paramMap.entrySet() ){
- paramList.add( new Parameter( entry.getKey(), entry.getValue() ) );
- }
- return parameterMap;
- }
-
-}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/SignalEventCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/SignalEventCommand.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/SignalEventCommand.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,22 +1,14 @@
package org.drools.command.runtime.process;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-
-
import org.drools.command.Context;
import org.drools.command.impl.GenericCommand;
import org.drools.command.impl.KnowledgeCommandContext;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.process.ProcessInstance;
- at XmlAccessorType( XmlAccessType.NONE )
public class SignalEventCommand implements GenericCommand<Object> {
- @XmlAttribute
- private Long processInstanceId;
- @XmlAttribute(required = true)
+ private long processInstanceId = -1;
private String eventType;
private Object event;
@@ -38,14 +30,10 @@
}
public long getProcessInstanceId() {
- if (processInstanceId == null) {
- return -1L;
- } else {
- return processInstanceId;
- }
+ return processInstanceId;
}
- public void setProcessInstanceId(Long processInstanceId) {
+ public void setProcessInstanceId(long processInstanceId) {
this.processInstanceId = processInstanceId;
}
@@ -68,7 +56,7 @@
public Object execute(Context context) {
StatefulKnowledgeSession ksession = ((KnowledgeCommandContext) context).getStatefulKnowledgesession();
- if (getProcessInstanceId() == -1) {
+ if (processInstanceId == -1) {
ksession.signalEvent(eventType, event);
} else {
ProcessInstance processInstance = ksession.getProcessInstance(processInstanceId);
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/StartProcessCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/StartProcessCommand.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/process/StartProcessCommand.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,16 +1,9 @@
package org.drools.command.runtime.process;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
import org.drools.command.Context;
import org.drools.command.impl.GenericCommand;
import org.drools.command.impl.KnowledgeCommandContext;
@@ -18,14 +11,10 @@
import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.runtime.StatefulKnowledgeSession;
- at XmlAccessorType( XmlAccessType.NONE )
public class StartProcessCommand implements GenericCommand<ProcessInstance> {
- @XmlAttribute(required = true)
private String processId;
- @XmlElement(name="parameter")
- @XmlJavaTypeAdapter(ParameterMapAdapter.class)
- private HashMap<String, Object> parameters = new HashMap<String, Object>();
+ private Map<String, Object> parameters = new HashMap<String, Object>();
private List<Object> data = null;
public String getProcessId() {
@@ -37,17 +26,11 @@
}
public Map<String, Object> getParameters() {
- if (parameters == null) {
- parameters = new HashMap<String, Object>();
- }
return parameters;
}
public void setParameters(Map<String, Object> parameters) {
- this.parameters.clear();
- if( parameters != null ){
- this.getParameters().putAll( parameters );
- }
+ this.parameters = parameters;
}
public List<Object> getData() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/FireAllRulesCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/FireAllRulesCommand.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/FireAllRulesCommand.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,9 +1,5 @@
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 org.drools.command.Context;
import org.drools.command.impl.GenericCommand;
import org.drools.command.impl.KnowledgeCommandContext;
@@ -12,12 +8,10 @@
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.rule.AgendaFilter;
- at XmlAccessorType( XmlAccessType.NONE )
public class FireAllRulesCommand
implements
GenericCommand<Integer> {
- @XmlAttribute
private int max = -1;
private AgendaFilter agendaFilter = null;
@@ -36,10 +30,6 @@
return this.max;
}
- public void setMax(int max) {
- this.max = max;
- }
-
public Integer execute(Context context) {
StatefulKnowledgeSession ksession = ((KnowledgeCommandContext) context).getStatefulKnowledgesession();
if ( max != -1 ) {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectCommand.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectCommand.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -4,8 +4,7 @@
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.GetObjectsResult;
+import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.rule.FactHandle;
@@ -33,8 +32,8 @@
Object object = ksession.getObject( factHandle );
- ExecutionResults execRes = (ExecutionResults)((StatefulKnowledgeSessionImpl) ksession).session.getExecutionResult();
- execRes.getResults().add( new GetObjectsResult( this.outIdentifier, object ) );
+ ((StatefulKnowledgeSessionImpl)ksession).session.getExecutionResult().getResults().put( this.outIdentifier,
+ object );
return object;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectsCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectsCommand.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/GetObjectsCommand.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -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/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/InsertElementsCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/InsertElementsCommand.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/InsertElementsCommand.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -4,77 +4,55 @@
import java.util.Collection;
import java.util.List;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-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.reteoo.ReteooWorkingMemory;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.rule.FactHandle;
import com.thoughtworks.xstream.annotations.XStreamImplicit;
- at XmlAccessorType( XmlAccessType.NONE )
public class InsertElementsCommand
implements
GenericCommand<Collection<FactHandle>> {
+ public Iterable objects;
- @XmlElement(name="object", required = true)
- protected List<Object> objects;
-
- @XmlAttribute
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(Iterable objects) {
+ this.objects = objects;
}
- public Iterable<Object> getObjects() {
+ public Iterable 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(Iterable 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;
}
@@ -88,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/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/InsertObjectCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/InsertObjectCommand.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/InsertObjectCommand.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,40 +1,24 @@
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.XmlElement;
-
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 )
public class InsertObjectCommand
implements
GenericCommand<FactHandle> {
- @XmlElement(required = true)
private Object object;
- @XmlAttribute(name = "out-identifier")
private String outIdentifier;
- @XmlAttribute(name = "return-object")
private boolean returnObject = true;
- public InsertObjectCommand() {
- }
-
public InsertObjectCommand(Object object) {
this.object = object;
}
@@ -44,13 +28,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;
@@ -60,10 +45,6 @@
return this.object;
}
- public void setObject( Object object ) {
- this.object = object;
- }
-
public String getOutIdentifier() {
return this.outIdentifier;
}
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/ObjectFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/ObjectFactory.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/ObjectFactory.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,60 +0,0 @@
-package org.drools.command.runtime.rule;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the org.drools.process.command package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
- * provided in this class.
- *
- */
- at XmlRegistry
-public class ObjectFactory {
-
- /**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.drools.process.command
- *
- */
- public ObjectFactory() {
- }
-
- /**
- * Create an instance of {@link InsertElementsCommand }
- *
- */
- public InsertElementsCommand createInsertElementsCommand() {
- return new InsertElementsCommand();
- }
-
- /**
- * Create an instance of {@link FireAllRulesCommand }
- *
- */
- public FireAllRulesCommand createFireAllRulesCommand() {
- return new FireAllRulesCommand();
- }
-
- /**
- * Create an instance of {@link QueryCommand }
- *
- */
- public QueryCommand createQueryCommand() {
- return new QueryCommand();
- }
-
- /**
- * Create an instance of {@link InsertObjectCommand }
- *
- */
- public InsertObjectCommand createInsertObjectCommand() {
- return new InsertObjectCommand();
- }
-}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/QueryCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/QueryCommand.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/command/runtime/rule/QueryCommand.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,44 +1,27 @@
package org.drools.command.runtime.rule;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.Collection;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-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.reteoo.ReteooWorkingMemory;
-
-import org.drools.result.ExecutionResults;
-import org.drools.result.QueryResult;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.rule.FactHandle;
import org.drools.runtime.rule.QueryResults;
import org.drools.runtime.rule.impl.NativeQueryResults;
- at XmlAccessorType( XmlAccessType.NONE )
public class QueryCommand implements GenericCommand<QueryResults> {
-
- @XmlAttribute(name = "out-identifier")
private String outIdentifier;
- @XmlAttribute(required = true)
private String name;
- @XmlElement(name="argument")
- private List<Object> arguments;
-
- public QueryCommand() {
- }
+ private Object[] arguments;
public QueryCommand(String outIdentifier, String name, Object[] arguments) {
this.outIdentifier = outIdentifier;
this.name = name;
- this.arguments = arguments != null ? Arrays.asList( arguments ) : Arrays.asList();
+ this.arguments = arguments;
}
public String getOutIdentifier() {
@@ -55,13 +38,10 @@
public void setName(String name) {
this.name = name;
}
- public List<Object> getArguments() {
- if (this.arguments == null) {
- this.arguments = new ArrayList<Object>();
- }
- return this.arguments;
+ public Object[] getArguments() {
+ return arguments;
}
- public void setArguments(List<Object> arguments) {
+ public void setArguments(Object[] arguments) {
this.arguments = arguments;
}
@@ -70,17 +50,14 @@
QueryResults results = null;
- if ( this.arguments == null || this.arguments.size() == 0 ) {
+ if ( arguments == null || arguments.length == 0 ) {
results = ksession.getQueryResults( name );
} else {
- results = ksession.getQueryResults( name, this.arguments.toArray() );
+ results = ksession.getQueryResults( name, this.arguments );
}
if ( this.outIdentifier != null ) {
- ExecutionResults execRes =
- (ExecutionResults)((StatefulKnowledgeSessionImpl) ksession).session.getExecutionResult();
- QueryResult queryRes = new QueryResult( outIdentifier, results );
- execRes.getResults().add( queryRes );
+ ((StatefulKnowledgeSessionImpl)ksession).session.getExecutionResult().getResults().put( this.outIdentifier, results );
}
return results;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -69,8 +69,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;
@@ -85,9 +83,11 @@
import org.drools.ruleflow.core.RuleFlowProcess;
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;
@@ -1930,11 +1930,11 @@
public void startBatchExecution() {
this.ruleBase.readLock();
this.lock.lock();
- this.batchExecutionResult = new ExecutionResultsImpl();
+ this.batchExecutionResult = new ExecutionResultImpl();
}
- public ExecutionResults getExecutionResult() {
- return (ExecutionResults) this.batchExecutionResult;
+ public ExecutionResultImpl getExecutionResult() {
+ return (ExecutionResultImpl) this.batchExecutionResult;
}
public void endBatchExecution() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -19,7 +19,7 @@
import org.drools.rule.TimeMachine;
import org.drools.runtime.ExitPoint;
import org.drools.runtime.KnowledgeRuntime;
-import org.drools.result.ExecutionResults;
+import org.drools.runtime.impl.ExecutionResultImpl;
import org.drools.runtime.rule.WorkingMemoryEntryPoint;
import org.drools.spi.Activation;
import org.drools.spi.FactHandleFactory;
@@ -134,7 +134,7 @@
public void startBatchExecution();
- public ExecutionResults getExecutionResult();
+ public ExecutionResultImpl getExecutionResult();
public void endBatchExecution();
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -56,7 +56,7 @@
import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.rule.EntryPoint;
import org.drools.rule.Rule;
-import org.drools.result.ExecutionResults;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.CommandExecutor;
import org.drools.runtime.Environment;
import org.drools.runtime.ExitPoint;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -33,7 +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.runtime.ExecutionResults;
import org.drools.runtime.Environment;
import org.drools.runtime.Globals;
import org.drools.runtime.KnowledgeSessionConfiguration;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooWorkingMemory.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooWorkingMemory.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -56,6 +56,7 @@
* @author <a href="mailto:simon at redhillconsulting.com.au">Simon Harris</a>
*/
public class ReteooWorkingMemory extends AbstractWorkingMemory {
+
/**
*
*/
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/BatchExecutionHelperProviderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/BatchExecutionHelperProviderImpl.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/help/impl/BatchExecutionHelperProviderImpl.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -32,13 +32,10 @@
import org.drools.common.InternalFactHandle;
import org.drools.common.DefaultFactHandle;
import org.drools.rule.Declaration;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.help.BatchExecutionHelperProvider;
import org.drools.runtime.impl.BatchExecutionImpl;
-import org.drools.result.ExecutionResults;
-import org.drools.result.ExecutionResultsImpl;
-import org.drools.result.GenericResult;
-import org.drools.result.InsertElementsResult;
-import org.drools.result.InsertObjectResult;
+import org.drools.runtime.impl.ExecutionResultImpl;
import org.drools.runtime.rule.FactHandle;
import org.drools.runtime.rule.QueryResults;
import org.drools.runtime.rule.QueryResultsRow;
@@ -96,9 +93,8 @@
GetObjectCommand.class );
xstream.alias( "get-objects",
GetObjectsCommand.class );
- /*** WL ***/
xstream.alias( "execution-results",
- ExecutionResultsImpl.class );
+ ExecutionResultImpl.class );
xstream.alias( "fire-all-rules",
FireAllRulesCommand.class );
xstream.alias( "query",
@@ -124,7 +120,6 @@
xstream.registerConverter( new SetGlobalConverter( xstream.getMapper() ) );
xstream.registerConverter( new GetGlobalConverter( xstream.getMapper() ) );
xstream.registerConverter( new GetObjectsConverter( xstream.getMapper() ) );
- /** WL **/
xstream.registerConverter( new BatchExecutionResultConverter( xstream.getMapper() ) );
xstream.registerConverter( new QueryResultsConverter( xstream.getMapper() ) );
xstream.registerConverter( new FactHandleConverter(xstream.getMapper()));
@@ -852,7 +847,6 @@
}
}
- /*** WL ***/
public static class BatchExecutionResultConverter extends AbstractCollectionConverter
implements
Converter {
@@ -876,8 +870,7 @@
writer.endNode();
}
- /*=================
- for ( String identifier : ((ExecutionResultsImpl) result).getFactHandles().keySet() ) {
+ for ( String identifier : ((ExecutionResultImpl) result).getFactHandles().keySet() ) {
Object handle = result.getFactHandle( identifier );
if ( handle instanceof FactHandle ) {
@@ -901,36 +894,12 @@
writer.endNode();
}
+
}
- ======================*/
- for ( GenericResult genRes: result.getResults() ){
- String identifier = genRes.getIdentifier();
- if( genRes instanceof InsertObjectResult ){
- FactHandle handle = (FactHandle)((InsertObjectResult)genRes).getFactHandle();
- writer.startNode( "fact-handle" );
- writer.addAttribute( "identifier",
- identifier );
- writer.addAttribute( "externalForm",
- handle.toExternalForm() );
- } else if( genRes instanceof InsertElementsResult ){
- writer.startNode( "fact-handles" );
- writer.addAttribute( "identifier",
- identifier );
- for( FactHandle handle: ((InsertElementsResult)genRes).getHandles() ){
- writer.startNode( "fact-handle" );
- writer.addAttribute( "externalForm",
- handle.toExternalForm() );
- writer.endNode();
- }
- writer.endNode();
- }
- }
}
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext context) {
- return null;
- /**** WL
ExecutionResultImpl result = new ExecutionResultImpl();
Map results = result.getResults();
Map facts = result.getFactHandles();
@@ -967,16 +936,13 @@
}
return result;
- ***/
}
public boolean canConvert(Class clazz) {
return ExecutionResults.class.isAssignableFrom( clazz );
}
}
-
-
public static class QueryResultsConverter extends AbstractCollectionConverter
implements
Converter {
Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultImpl.java (from rev 28493, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultImpl.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultImpl.java (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultImpl.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -0,0 +1,46 @@
+package org.drools.runtime.impl;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.drools.runtime.ExecutionResults;
+
+public class ExecutionResultImpl implements ExecutionResults {
+ Map<String, Object> results = new HashMap<String, Object>();
+ Map<String, Object> facts = new HashMap<String, Object>();
+
+ /* (non-Javadoc)
+ * @see org.drools.batchexecution.BatchExecutionResult#getIdentifiers()
+ */
+ public Collection<String> getIdentifiers() {
+ return this.results.keySet();
+ }
+
+ public Object getValue(String identifier) {
+ return this.results.get( identifier );
+ }
+
+ public Object getFactHandle(String identifier) {
+ return this.facts.get( identifier );
+ }
+
+ /* (non-Javadoc)
+ * @see org.drools.batchexecution.BatchExecutionResult#getResults()
+ */
+ public Map<String, Object> getResults() {
+ return this.results;
+ }
+
+ public void setResults(Map<String, Object> results) {
+ this.results = results;
+ }
+
+ public Map<String, Object> getFactHandles() {
+ return this.facts;
+ }
+
+ public void setFactHandles(Map<String, Object> facts) {
+ this.facts = facts;
+ }
+}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/pipeline/impl/ExecutorStage.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/pipeline/impl/ExecutorStage.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/pipeline/impl/ExecutorStage.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -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;
@@ -17,11 +17,10 @@
PipelineContext context) {
BasePipelineContext kContext = (BasePipelineContext) context;
if ( object instanceof Collection ) {
- object = CommandFactory.newBatchExecution( (List<Command<?>>) object );
+ object = CommandFactory.newBatchExecution( (List<Command>) object );
}
+ ExecutionResults result = kContext.getCommandExecutor().execute( (Command) object );
- ExecutionResults result = kContext.getCommandExecutor().execute( (Command<?>) object );
-
emit( result,
kContext );
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/rule/impl/NativeQueryResults.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/rule/impl/NativeQueryResults.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/rule/impl/NativeQueryResults.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -3,18 +3,15 @@
import java.util.Iterator;
import java.util.Map;
-import org.drools.command.Command;
-import org.drools.result.GenericResult;
import org.drools.rule.Declaration;
import org.drools.runtime.rule.QueryResultsRow;
import org.drools.runtime.rule.QueryResults;
public class NativeQueryResults
implements
- QueryResults {
+ QueryResults {
private org.drools.QueryResults results;
- private Command<?> command;
public NativeQueryResults(org.drools.QueryResults results) {
this.results = results;
@@ -36,14 +33,6 @@
return new QueryResultsIterator( this.results.iterator() );
}
- public void setCommand(Command<?> command){
- this.command = command;
- }
-
- public Command<?> getCommand(){
- return this.command;
- }
-
private class QueryResultsIterator
implements
Iterator {
Modified: labs/jbossrules/trunk/drools-pipeline/drools-messenger-jms/src/test/java/org/drools/runtime/pipeline/impl/JaxbSimpleJmsMessengerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-messenger-jms/src/test/java/org/drools/runtime/pipeline/impl/JaxbSimpleJmsMessengerTest.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-pipeline/drools-messenger-jms/src/test/java/org/drools/runtime/pipeline/impl/JaxbSimpleJmsMessengerTest.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -100,7 +100,8 @@
JAXBContext jaxbCtx = KnowledgeBuilderHelper.newJAXBContext( classNames,
kbase );
- Transformer transformer = PipelineFactory.newJaxbFromXmlTransformer( jaxbCtx );
+ Unmarshaller unmarshaller = jaxbCtx.createUnmarshaller();
+ Transformer transformer = PipelineFactory.newJaxbFromXmlTransformer( unmarshaller );
transformer.setReceiver( insertStage );
Action unwrapObjectStage = PipelineFactory.newJmsUnwrapMessageObject();
@@ -140,7 +141,8 @@
assignAsResult.setReceiver( executeResult );
//transformer = PipelineFactory.newXStreamToXmlTransformer( xstream );
- transformer = PipelineFactory.newJaxbToXmlTransformer( jaxbCtx );
+ Marshaller marshaller = jaxbCtx.createMarshaller();
+ transformer = PipelineFactory.newJaxbToXmlTransformer( marshaller );
transformer.setReceiver( assignAsResult );
KnowledgeRuntimeCommand getObject = PipelineFactory.newStatefulKnowledgeSessionGetObject();
Deleted: labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/CommandTranslator.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/CommandTranslator.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/CommandTranslator.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,216 +0,0 @@
-package org.drools.runtime.pipeline.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-
-import org.drools.command.impl.GenericCommand;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import org.drools.command.runtime.BatchExecutionCommand;
-import org.drools.command.runtime.rule.InsertElementsCommand;
-import org.drools.command.runtime.rule.InsertObjectCommand;
-import org.drools.command.runtime.rule.QueryCommand;
-import org.drools.command.runtime.SetGlobalCommand;
-import org.drools.command.runtime.process.SignalEventCommand;
-import org.drools.command.runtime.process.StartProcessCommand;
-
-/**
- *
- * @author Wolfgang Laun
- */
-public class CommandTranslator {
- private JaxbTransformer jaxbTransformer;
- private Map<Class<?>,CommandTransformer> class2trans;
-
- /**
- * Constructor
- *
- */
- public CommandTranslator( JaxbTransformer jaxbTransformer ){
- class2trans = new HashMap<Class<?>,CommandTransformer>();
- class2trans.put( BatchExecutionCommand.class, new BatchExecutionTransformer() );
- class2trans.put( InsertElementsCommand.class, new InsertElementsTransformer() );
- class2trans.put( InsertObjectCommand.class, new InsertObjectTransformer() );
- class2trans.put( QueryCommand.class, new QueryTransformer() );
- class2trans.put( SetGlobalCommand.class, new SetGlobalTransformer() );
- class2trans.put( SignalEventCommand.class, new SignalEventTransformer() );
- class2trans.put( StartProcessCommand.class, new StartProcessTransformer() );
- this.jaxbTransformer = jaxbTransformer;
- }
-
- /**
- * Transforms a list of XML elements representing Drools command objects
- * to a list of <tt>Command<?></tt> objects. Application objects
- * are unmarshalled, using an <tt>Unmarshaller</tt> object derived from
- * the object's class.
- *
- * @param xmlCmds the list of XML elements representing Drools command objects
- * @return a list of <tt>Command<?></tt> objects
- */
- public void transform( BatchExecutionCommand batchExecution ){
- CommandTransformer ct = class2trans.get( batchExecution.getClass() );
- ct.transform( this, batchExecution );
- }
-
- CommandTransformer getCommandTransformer( Class clazz ){
- return class2trans.get( clazz );
- }
-
- protected Object makeObject( Element element ){
- NamedNodeMap nnmap = element.getAttributes();
- Node typeNode = nnmap.getNamedItem( "xsi:type" );
- String className = typeNode.getNodeValue();
- Object obj = null;
- try {
- Class<?> clazz = Class.forName( className );
- JAXBContext ctxt = jaxbTransformer.getContext();
- Unmarshaller um = ctxt.createUnmarshaller();
- obj = um.unmarshal( element );
- } catch (ClassNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (JAXBException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return obj;
- }
-}
-
-
-/**
- * Abstract base class for all command transformers.
- */
-abstract class CommandTransformer {
- abstract GenericCommand<?> transform( CommandTranslator ct, Object o );
-}
-
-/**
- * Class for transforming a BatchExecution command.
- */
-class BatchExecutionTransformer extends CommandTransformer {
- public GenericCommand<?> transform( CommandTranslator cmdTrans, Object o ){
- BatchExecutionCommand be = (BatchExecutionCommand)o;
- List<GenericCommand<?>> xmlCmds = be.getCommands();
- for( int i = 0; i < xmlCmds.size(); i++ ){
- GenericCommand<?> cmd = xmlCmds.get( i );
- CommandTransformer ct = cmdTrans.getCommandTransformer( cmd.getClass() );
- if( ct != null ){
- xmlCmds.set( i, ct.transform( cmdTrans, cmd ) );
- }
- }
- return be;
- }
-}
-
-
-
-
-/**
- * Class for transforming an InsertElements command.
- */
-class InsertElementsTransformer extends CommandTransformer {
- public GenericCommand<?> transform( CommandTranslator ct, Object o ){
- InsertElementsCommand ie = (InsertElementsCommand)o;
- Iterable<?> ioList = ie.getObjects();
- List<Object> coList = new ArrayList<Object>();
- for( Object io: ioList ){
- System.out.println( io.getClass() );
- Element el = (Element)io;
- Object co = ct.makeObject( el );
- coList.add( co );
- }
- System.out.println( "insert " + coList.size() + " elements" );
- ie.setObjects( coList );
- return ie;
- }
-}
-
-/**
- * Class for transforming a InsertObject command.
- */
-class InsertObjectTransformer extends CommandTransformer {
- public GenericCommand<?> transform( CommandTranslator ct, Object o ){
- InsertObjectCommand io = (InsertObjectCommand)o;
- Element el = (Element)io.getObject();
- Object obj = ct.makeObject( el );
- io.setObject( obj );
- return io;
- }
-}
-
-/**
- * Class for transforming a Query command.
- */
-class QueryTransformer extends CommandTransformer {
- public GenericCommand<?> transform( CommandTranslator ct, Object o ){
- QueryCommand q = (QueryCommand)o;
- List<Object> argList = q.getArguments();
- for( int i = 0; i < argList.size(); i++ ){
- Element el = (Element)argList.get( i );
- Object ao = ct.makeObject( el );
- argList.add( i, ao );
- }
- return q;
- }
-}
-
-/**
- * Class for transforming a SetGlobal command.
- */
-class SetGlobalTransformer extends CommandTransformer {
- public GenericCommand<?> transform( CommandTranslator ct, Object o ){
- SetGlobalCommand sg = (SetGlobalCommand)o;
- Element el = (Element)sg.getObject();
- Object obj = ct.makeObject( el );
- sg.setObject( obj );
- return sg;
- }
-}
-
-/**
- * Class for transforming a SignalEvent command.
- */
-class SignalEventTransformer extends CommandTransformer {
- public GenericCommand<?> transform( CommandTranslator ct, Object o ){
- SignalEventCommand se = (SignalEventCommand)o;
- Object ev = se.getEvent();
- if( ev != null ){
- Object obj = ct.makeObject( (Element)ev );
- se.setEvent( obj );
- }
- return se;
- }
-}
-
-/**
- * Class for transforming a StartProcess command.
- */
-class StartProcessTransformer extends CommandTransformer {
- public GenericCommand<?> transform( CommandTranslator ct, Object o ){
- StartProcessCommand sp = (StartProcessCommand)o;
- // data items
- List<Object> diList = sp.getData();
- for( int i = 0; i < diList.size(); i++ ){
- Element el = (Element)diList.get( i );
- Object obj = ct.makeObject( el );
- diList.add( i, obj );
- }
- // parameters
- Map<String,Object> parMap = sp.getParameters();;
- for( Map.Entry<String, Object> entry: parMap.entrySet() ){
- Element el = (Element)entry.getValue();
- Object obj = ct.makeObject( el );
- entry.setValue( obj );
- }
- return sp;
- }
-}
Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbFromXmlTransformer.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbFromXmlTransformer.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbFromXmlTransformer.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -5,78 +5,59 @@
import java.io.Reader;
import java.io.StringReader;
-import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.Unmarshaller;
import javax.xml.transform.Source;
import org.drools.io.Resource;
-import org.drools.command.runtime.BatchExecutionCommand;
import org.drools.runtime.pipeline.PipelineContext;
import org.drools.runtime.pipeline.Transformer;
-
+import org.drools.runtime.pipeline.impl.BaseEmitter;
+import org.drools.runtime.pipeline.impl.BaseStage;
import org.xml.sax.InputSource;
-public class JaxbFromXmlTransformer extends JaxbTransformer
+public class JaxbFromXmlTransformer extends BaseEmitter
implements
Transformer {
+ private Unmarshaller unmarshaller;
- private CommandTranslator cmdTrans;
-
- public JaxbFromXmlTransformer( JAXBContext jaxbCtx ) {
- super( jaxbCtx );
+ public JaxbFromXmlTransformer(Unmarshaller unmarshaller) {
+ this.unmarshaller = unmarshaller;
}
- public void receive(Object object, PipelineContext context) {
- Unmarshaller unmarshaller;
- try {
- JAXBContext jaxbContext = getPrimaryContext();
- unmarshaller = jaxbContext.createUnmarshaller();
- } catch ( Exception e ) {
- handleException( this,
- object,
- e );
- return;
- }
-
- Object result = null;
- try {
- if ( object instanceof File ) {
- result = unmarshaller.unmarshal( (File) object );
- } else if ( object instanceof InputStream ) {
- result = unmarshaller.unmarshal( (InputStream) object );
- } else if ( object instanceof Reader ) {
- result = unmarshaller.unmarshal( (Reader) object );
- } else if ( object instanceof Source ) {
- result = unmarshaller.unmarshal( (Source) object );
- } else if ( object instanceof InputSource ) {
- result = unmarshaller.unmarshal( (InputSource) object );
- } else if ( object instanceof Resource ) {
- result = unmarshaller.unmarshal( (( Resource ) object).getReader() );
- } else if ( object instanceof String ) {
- result = unmarshaller.unmarshal( new StringReader( ( String ) object ) );
- } else {
- throw new IllegalArgumentException( "signal object must be instance of File, InputStream, Reader, Source, InputSource, Resource, String" );
- }
- } catch ( Exception e ) {
- handleException( this,
- object,
- e );
- }
-
- if ( result instanceof JAXBElement ) {
- result = ((JAXBElement<?>) result).getValue();
- }
-
- if( result instanceof BatchExecutionCommand ){
- if( cmdTrans == null ){
- cmdTrans = new CommandTranslator( this );
- }
- cmdTrans.transform( (BatchExecutionCommand)result );
- }
-
- emit( result,
- context );
+ public void receive(Object object,
+ PipelineContext context) {
+ Object result = null;
+ try {
+ if ( object instanceof File ) {
+ result = this.unmarshaller.unmarshal( (File) object );
+ } else if ( object instanceof InputStream ) {
+ result = this.unmarshaller.unmarshal( (InputStream) object );
+ } else if ( object instanceof Reader ) {
+ result = this.unmarshaller.unmarshal( (Reader) object );
+ } else if ( object instanceof Source ) {
+ result = this.unmarshaller.unmarshal( (Source) object );
+ } else if ( object instanceof InputSource ) {
+ result = this.unmarshaller.unmarshal( (InputSource) object );
+ } else if ( object instanceof Resource ) {
+ result = this.unmarshaller.unmarshal( (( Resource ) object).getReader() );
+ } else if ( object instanceof String ) {
+ result = this.unmarshaller.unmarshal( new StringReader( ( String ) object ) );
+ } else {
+ throw new IllegalArgumentException( "signal object must be instance of File, InputStream, Reader, Source, InputSource, Resource, String" );
+ }
+ } catch ( Exception e ) {
+ handleException( this,
+ object,
+ e );
+ }
+
+ if ( result instanceof JAXBElement ) {
+ result = ((JAXBElement) object).getValue();
+ }
+
+ emit( result,
+ context );
}
}
Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbToXmlTransformer.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbToXmlTransformer.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbToXmlTransformer.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,52 +1,49 @@
package org.drools.runtime.pipeline.impl;
+import java.io.File;
+import java.io.InputStream;
+import java.io.Reader;
import java.io.StringWriter;
-import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.transform.Source;
-import org.drools.result.ExecutionResults;
-import org.drools.process.result.ExecutionResultsType;
+import org.drools.io.Resource;
+import org.drools.runtime.pipeline.JaxbTransformerProvider;
import org.drools.runtime.pipeline.PipelineContext;
import org.drools.runtime.pipeline.Transformer;
-import org.drools.runtime.pipeline.impl.ResultTranslator;
+import org.drools.runtime.pipeline.impl.BaseEmitter;
+import org.drools.runtime.pipeline.impl.BaseStage;
+import org.xml.sax.InputSource;
+public class JaxbToXmlTransformer extends BaseEmitter
+ implements
+ Transformer {
+ private Marshaller marshaller;
-public class JaxbToXmlTransformer extends JaxbTransformer implements Transformer {
+ public JaxbToXmlTransformer(Marshaller marshaller) {
+ this.marshaller = marshaller;
+ }
- ResultTranslator resTrans;
+ public void receive(Object object,
+ PipelineContext context) {
+ Object result = null;
+ try {
+ StringWriter stringWriter = new StringWriter();
+
+ this.marshaller.marshal( object, stringWriter );
- public JaxbToXmlTransformer( JAXBContext jaxbCtx ) {
- super( jaxbCtx );
- }
+ result = stringWriter.getBuffer().toString();
+ } catch ( Exception e ) {
+ handleException( this,
+ object,
+ e );
+ }
+
+ emit( result,
+ context );
+ }
- public void receive(Object object, PipelineContext context) {
-
- Object result = null;
- JAXBContext jaxbCtxt = getPrimaryContext();
- StringWriter stringWriter = new StringWriter();
- try {
- Marshaller marshaller = jaxbCtxt.createMarshaller();
- marshaller.setProperty( Marshaller.JAXB_FORMATTED_OUTPUT, true );
-
- if( object instanceof ExecutionResults ){
- if( resTrans == null ){
- resTrans = new ResultTranslator( this );
- }
- ExecutionResultsType execRes = resTrans.transform( (ExecutionResults)object );
- marshaller.marshal( execRes, stringWriter );
- } else {
- marshaller.marshal( object, stringWriter );
- }
- } catch ( Exception e ) {
- handleException( this,
- object,
- e );
- }
- result = stringWriter.getBuffer().toString();
-
- emit( result,
- context );
- }
-
}
Deleted: labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbTransformer.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbTransformer.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbTransformer.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,85 +0,0 @@
-package org.drools.runtime.pipeline.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-
-import org.drools.process.result.ExecutionResultsType;
-import org.drools.runtime.pipeline.impl.BaseEmitter;
-
-/**
- * @author: Wolfgang Laun
- */
-public class JaxbTransformer extends BaseEmitter {
-
- public final static String COMMAND_PACKAGES =
- "org.drools.command.runtime" + ":" +
- "org.drools.command.runtime.process" + ":" +
- "org.drools.command.runtime.rule";
-
- public final static String RESULT_PACKAGE =
- "org.drools.process.result";
-
- private Map<Object,JAXBContext> class2ctxt;
-
- protected JAXBContext jaxbContext;
- protected JAXBContext jaxbPrimaryContext;
-
- protected JaxbTransformer( JAXBContext jaxbCtx ){
- this.jaxbContext = jaxbCtx;
- this.jaxbPrimaryContext = jaxbCtx;
- class2ctxt = new HashMap<Object,JAXBContext>();
- }
-
- public void addContextForCommands() {
- try {
- jaxbPrimaryContext = getContext( JaxbTransformer.COMMAND_PACKAGES );
- } catch ( Exception e ) {
- handleException( this,
- null,
- e );
- return;
- }
- }
-
- public void addContextForResults() {
- try {
- jaxbPrimaryContext = getContext( ExecutionResultsType.class );
- } catch ( Exception e ) {
- handleException( this,
- null,
- e );
- return;
- }
- }
-
-
- protected JAXBContext getContext(){
- return this.jaxbContext;
- }
-
- protected JAXBContext getPrimaryContext(){
- return this.jaxbPrimaryContext;
- }
-
- protected JAXBContext getContext( Class<?> clazz ) throws JAXBException{
- JAXBContext ctxt = class2ctxt.get( clazz );
- if( ctxt == null ){
- ctxt = JAXBContext.newInstance( clazz );
- class2ctxt.put( clazz, ctxt );
- }
- return ctxt;
- }
-
- protected JAXBContext getContext( String packagePath ) throws JAXBException{
- JAXBContext ctxt = class2ctxt.get( packagePath );
- if( ctxt == null ){
- ctxt = JAXBContext.newInstance( packagePath );
- class2ctxt.put( packagePath, ctxt );
- }
- return ctxt;
- }
-
-}
Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbTransformerProviderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbTransformerProviderImpl.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/JaxbTransformerProviderImpl.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,29 +1,20 @@
+/**
+ *
+ */
package org.drools.runtime.pipeline.impl;
-import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
import org.drools.runtime.pipeline.JaxbTransformerProvider;
import org.drools.runtime.pipeline.Transformer;
public class JaxbTransformerProviderImpl implements JaxbTransformerProvider {
- public Transformer newJaxbFromXmlTransformer( JAXBContext jaxbCtx ) {
- return new JaxbFromXmlTransformer( jaxbCtx );
+ public Transformer newJaxbFromXmlTransformer(Unmarshaller unmarshaller) {
+ return new JaxbFromXmlTransformer( unmarshaller );
}
- public Transformer newJaxbFromXmlCommandTransformer( JAXBContext jaxbCtx ) {
- JaxbFromXmlTransformer trans = new JaxbFromXmlTransformer( jaxbCtx );
- trans.addContextForCommands();
- return trans;
- }
-
- public Transformer newJaxbToXmlTransformer( JAXBContext jaxbCtx ) {
- return new JaxbToXmlTransformer( jaxbCtx );
+ public Transformer newJaxbToXmlTransformer(Marshaller marshaller) {
+ return new JaxbToXmlTransformer( marshaller );
}
-
- public Transformer newJaxbToXmlResultTransformer( JAXBContext jaxbCtx ) {
- JaxbToXmlTransformer trans = new JaxbToXmlTransformer( jaxbCtx );
- trans.addContextForResults();
- return trans;
- }
-
}
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/ResultTranslator.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/ResultTranslator.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/ResultTranslator.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -1,269 +0,0 @@
-package org.drools.runtime.pipeline.impl;
-
-
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.drools.command.Command;
-import org.drools.command.runtime.BatchExecutionCommand;
-import org.drools.command.runtime.rule.InsertElementsCommand;
-import org.drools.command.runtime.rule.InsertObjectCommand;
-import org.drools.command.runtime.rule.QueryCommand;
-import org.drools.command.runtime.GetGlobalCommand;
-import org.drools.result.ExecutionResults;
-import org.drools.result.ExecutionResultsImpl;
-import org.drools.result.GenericResult;
-import org.drools.result.GetGlobalResult;
-import org.drools.result.GetObjectsResult;
-import org.drools.result.InsertElementsResult;
-import org.drools.result.InsertObjectResult;
-import org.drools.result.SetGlobalResult;
-import org.drools.result.QueryResult;
-
-import org.drools.runtime.rule.FactHandle;
-import org.drools.runtime.rule.QueryResults;
-import org.drools.runtime.rule.QueryResultsRow;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import org.drools.process.result.ExecutionResultsType;
-import org.drools.process.result.FactHandleListType;
-import org.drools.process.result.FactObjectListType;
-import org.drools.process.result.GlobalType;
-import org.drools.process.result.InsertResultsType;
-import org.drools.process.result.ObjectFactory;
-import org.drools.process.result.QueryFieldType;
-import org.drools.process.result.QueryResultsType;
-import org.drools.process.result.QueryRowType;
-
-public class ResultTranslator {
- private JaxbTransformer jaxbTransformer;
- private Map<Class<?>,ResultTransformer> class2trans;
- private ObjectFactory objFact;
- private ExecutionResultsType execRes;
-
- /**
- * Constructor.
- *
- * @param jaxbTransformer the <tt>JaxbTransformer</tt>
- */
- public ResultTranslator( JaxbTransformer jaxbTransformer ){
- this.jaxbTransformer = jaxbTransformer;
- class2trans = new HashMap<Class<?>,ResultTransformer>();
- class2trans.put( InsertElementsResult.class, new InsertElementsResultTransformer() );
- class2trans.put( InsertObjectResult.class, new InsertObjectResultTransformer() );
- class2trans.put( GetGlobalResult.class, new GetGlobalResultTransformer() );
- /** @TODO: LATER
- class2trans.put( GetObjectsResult.class, new GetObjectsResultTransformer() );
- class2trans.put( SetGlobalResult.class, new SetGlobalResultTransformer() );
- */
- class2trans.put( QueryResult.class, new QueryResultTransformer() );
-
- objFact = new ObjectFactory();
- }
-
- ObjectFactory getObjFact(){
- return objFact;
- }
-
- void addResult( Object result ){
- execRes.getQueryResultsOrInsertResultsOrGlobalValue().add( result );
- }
-
- ResultTransformer getResultTransformer( Class<?> clazz ){
- return class2trans.get( clazz );
- }
-
-
- Element makeElement( Object obj ) throws JAXBException, ParserConfigurationException {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware( true );
- DocumentBuilder db = dbf.newDocumentBuilder();
- Document doc = db.newDocument();
- 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" );
- xsi.setTextContent( "http://www.w3.org/2001/XMLSchema-instance" );
- el.getAttributes().setNamedItem( xsi );
-
- Node type = doc.createAttributeNS( "http://www.w3.org/2001/XMLSchema-instance", "xsi:type" );
- type.setTextContent( obj.getClass().getName() );
- el.getAttributes().setNamedItem( type );
-
- return el;
- }
-
- public ExecutionResultsType transform( ExecutionResults results ){
- execRes = new ExecutionResultsType();
- for( GenericResult aResult: results.getResults() ){
- ResultTransformer resultTransformer = this.getResultTransformer( aResult.getClass() );
- if( resultTransformer != null ){
- resultTransformer.transform( this, aResult );
- }
- }
- return execRes;
- }
-
-}
-
-/**
- * Abstract base class for all result transformers.
- */
-abstract class ResultTransformer {
- abstract void transform( ResultTranslator rt,
- GenericResult result );
-}
-
-
-class InsertElementsResultTransformer extends ResultTransformer {
- void transform( ResultTranslator rt, GenericResult result ){
- InsertElementsResult insertResult = (InsertElementsResult)result;
- String ident = insertResult.getIdentifier();
-
- ObjectFactory objFact = rt.getObjFact();
- InsertResultsType insResultXml = objFact.createInsertResultsType();
- FactHandleListType fhList = objFact.createFactHandleListType();
- insResultXml.setFactHandles( fhList );
- FactObjectListType foList = null;
- insResultXml.setIdentifier( ident );
-
- List<FactHandle> fhResList = insertResult.getHandles();
- List<Object> obResList = insertResult.getObjects();
-
- if( obResList != null ){
- foList = objFact.createFactObjectListType();
- insResultXml.setFactObjects( foList );
- }
-
- try {
- for( int i = 0; i < fhResList.size(); i++ ){
- fhList.getFactHandle().add( fhResList.get( i ).toExternalForm() );
- if( obResList != null ){
- Object factObj = obResList.get( i );
- foList.getAny().add( rt.makeElement( factObj ) );
- }
- }
- rt.addResult( insResultXml );
- } catch (JAXBException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ParserConfigurationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-}
-
-class InsertObjectResultTransformer extends ResultTransformer {
- void transform( ResultTranslator rt, GenericResult result ){
- InsertObjectResult insertResult = (InsertObjectResult)result;
- String ident = insertResult.getIdentifier();
-
- ObjectFactory objFact = rt.getObjFact();
- InsertResultsType insResultXml = objFact.createInsertResultsType();
- FactHandleListType fhList = objFact.createFactHandleListType();
- insResultXml.setFactHandles( fhList );
- FactObjectListType foList = null;
- insResultXml.setIdentifier( ident );
-
- FactHandle handle = (FactHandle)insertResult.getFactHandle();
- Object object = insertResult.getValue();
-
- if( object != null ){
- foList = objFact.createFactObjectListType();
- insResultXml.setFactObjects( foList );
- }
-
- try {
- fhList.getFactHandle().add( handle.toExternalForm() );
-
- if( object != null ){
- foList.getAny().add( rt.makeElement( object ) );
- }
-
- rt.addResult( insResultXml );
- } catch (JAXBException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ParserConfigurationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-}
-
-
-class GetGlobalResultTransformer extends ResultTransformer {
- void transform( ResultTranslator rt, GenericResult result ){
-
- GetGlobalResult getGlobalResult = (GetGlobalResult)result;
- String identifier = getGlobalResult.getIdentifier();
- try {
- Object globalObject = getGlobalResult.getValue();
- Element el = rt.makeElement( globalObject );
- ObjectFactory objFact = rt.getObjFact();
- GlobalType getGlobalXml = objFact.createGlobalType();
- getGlobalXml.setIdentifier( identifier );
- getGlobalXml.setAny( el );
- rt.addResult( getGlobalXml );
- } catch (JAXBException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ParserConfigurationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
-}
-
-class QueryResultTransformer extends ResultTransformer {
- void transform( ResultTranslator rt, GenericResult result ){
- QueryResult queryResult = (QueryResult)result;
-
- String identifier = queryResult.getIdentifier();
- QueryResults qr = queryResult.getResults();
- String[] idents = qr.getIdentifiers();
- int size = qr.size();
-
- ObjectFactory objFact = rt.getObjFact();
- QueryResultsType queryResXml = objFact.createQueryResultsType();
- queryResXml.setIdentifier( identifier );
- queryResXml.setSize( size );
-
- String[] quids = qr.getIdentifiers();
- for( QueryResultsRow row: qr ){
- QueryRowType queryRowXml = objFact.createQueryRowType();
- queryResXml.getRow().add( queryRowXml );
- for( String quid: quids ){
- QueryFieldType queryFieldXml = objFact.createQueryFieldType();
- queryRowXml.getField().add( queryFieldXml );
- queryFieldXml.setName( quid );
-
- try {
- Element el = rt.makeElement( row.get( quid ) );
- queryFieldXml.setAny( el );
- } catch( Throwable t ){
- queryFieldXml.setValue( row.get( quid ).toString() );
- }
- }
- }
- rt.addResult( queryResXml );
- }
-}
-
-
Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/test/java/org/drools/runtime/pipeline/impl/JaxbFactTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/test/java/org/drools/runtime/pipeline/impl/JaxbFactTest.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/test/java/org/drools/runtime/pipeline/impl/JaxbFactTest.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -64,8 +64,7 @@
JAXBContext jaxbCtx = KnowledgeBuilderHelper.newJAXBContext( classNames,
kbase );
Unmarshaller unmarshaller = jaxbCtx.createUnmarshaller();
-
- Transformer transformer = PipelineFactory.newJaxbFromXmlTransformer( jaxbCtx );
+ Transformer transformer = PipelineFactory.newJaxbFromXmlTransformer( unmarshaller );
transformer.setReceiver( insertStage );
Pipeline pipeline = PipelineFactory.newStatefulKnowledgeSessionPipeline( ksession );
@@ -88,7 +87,7 @@
//transformer = PipelineFactory.newXStreamToXmlTransformer( xstream );
Marshaller marshaller = jaxbCtx.createMarshaller();
- transformer = PipelineFactory.newJaxbToXmlTransformer( jaxbCtx );
+ transformer = PipelineFactory.newJaxbToXmlTransformer( marshaller );
transformer.setReceiver( assignAsResult );
KnowledgeRuntimeCommand getObject = PipelineFactory.newStatefulKnowledgeSessionGetObject();
Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/test/java/org/drools/runtime/pipeline/impl/JaxbGlobalTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/test/java/org/drools/runtime/pipeline/impl/JaxbGlobalTest.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/test/java/org/drools/runtime/pipeline/impl/JaxbGlobalTest.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -63,7 +63,8 @@
JAXBContext jaxbCtx = KnowledgeBuilderHelper.newJAXBContext( classNames,
kbase );
- Transformer transformer = PipelineFactory.newJaxbFromXmlTransformer( jaxbCtx );
+ Unmarshaller unmarshaller = jaxbCtx.createUnmarshaller();
+ Transformer transformer = PipelineFactory.newJaxbFromXmlTransformer( unmarshaller );
transformer.setReceiver(setGlobalStage );
Pipeline pipeline = PipelineFactory.newStatefulKnowledgeSessionPipeline( ksession );
@@ -82,7 +83,8 @@
assignAsResult.setReceiver( executeResult );
//transformer = PipelineFactory.newXStreamToXmlTransformer( xstream );
- transformer = PipelineFactory.newJaxbToXmlTransformer( jaxbCtx );
+ Marshaller marshaller = jaxbCtx.createMarshaller();
+ transformer = PipelineFactory.newJaxbToXmlTransformer( marshaller );
transformer.setReceiver( assignAsResult );
KnowledgeRuntimeCommand getGlobalStage = PipelineFactory.newStatefulKnowledgeSessionGetGlobal( );
Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/test/java/org/drools/runtime/pipeline/impl/JaxbTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/test/java/org/drools/runtime/pipeline/impl/JaxbTest.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-jaxb/src/test/java/org/drools/runtime/pipeline/impl/JaxbTest.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -106,7 +106,8 @@
JAXBContext jaxbCtx = KnowledgeBuilderHelper.newJAXBContext( classNames,
kbase );
- Transformer transformer = PipelineFactory.newJaxbFromXmlTransformer( jaxbCtx );
+ Unmarshaller unmarshaller = jaxbCtx.createUnmarshaller();
+ Transformer transformer = PipelineFactory.newJaxbFromXmlTransformer( unmarshaller );
transformer.setReceiver( insertStage );
Pipeline pipeline = PipelineFactory.newStatefulKnowledgeSessionPipeline( ksession );
@@ -171,7 +172,8 @@
JAXBContext jaxbCtx = KnowledgeBuilderHelper.newJAXBContext( classNames,
kbase );
- Transformer transformer = PipelineFactory.newJaxbFromXmlTransformer( jaxbCtx );
+ Unmarshaller unmarshaller = jaxbCtx.createUnmarshaller();
+ Transformer transformer = PipelineFactory.newJaxbFromXmlTransformer( unmarshaller );
transformer.setReceiver( expression );
Pipeline pipeline = PipelineFactory.newStatefulKnowledgeSessionPipeline( ksession );
Modified: labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/src/test/java/org/drools/runtime/pipeline/impl/XStreamBatchExecutionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/src/test/java/org/drools/runtime/pipeline/impl/XStreamBatchExecutionTest.java 2009-07-28 03:09:43 UTC (rev 28518)
+++ labs/jbossrules/trunk/drools-pipeline/drools-transformer-xstream/src/test/java/org/drools/runtime/pipeline/impl/XStreamBatchExecutionTest.java 2009-07-28 03:15:34 UTC (rev 28519)
@@ -35,7 +35,7 @@
import org.drools.io.ResourceFactory;
import org.drools.process.core.context.variable.VariableScope;
import org.drools.process.instance.context.variable.VariableScopeInstance;
-import org.drools.result.ExecutionResults;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.StatelessKnowledgeSession;
import org.drools.runtime.help.BatchExecutionHelper;
@@ -230,9 +230,6 @@
resultHandler );
String outXml = (String) resultHandler.getObject();
-
- /**** WL: cannot unmarshal ordered data from unordered XML?
-
ExecutionResults result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML( outXml );
Cheese stilton = (Cheese) result.getValue( "outStilton" );
assertEquals( 30,
@@ -257,7 +254,6 @@
assertXMLEqual( expectedXml,
outXml );
- ****/
}
public void testInsertWithReturnObjectFalse() throws Exception {
@@ -291,9 +287,6 @@
String outXml = (String) resultHandler.getObject();
ExecutionResults result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML( outXml );
-
-
- /**** WL same thing
assertNull( result.getValue( "outStilton" ) );
FactHandle factHandle = (FactHandle) result.getFactHandle( "outStilton" );
@@ -308,7 +301,6 @@
assertXMLEqual( expectedXml,
outXml );
- ****/
}
public void testGetObject() throws Exception {
@@ -342,8 +334,6 @@
String outXml = (String) resultHandler.getObject();
ExecutionResults result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML( outXml );
-
- /**** WL same thing
Cheese stilton = (Cheese) result.getValue( "outStilton" );
assertEquals( 30,
stilton.getPrice() );
@@ -360,7 +350,6 @@
stilton = (Cheese) result.getValue( "outStilton" );
assertEquals( 30,
stilton.getPrice() );
- ****/
}
public void testRetractObject() throws Exception {
@@ -393,7 +382,6 @@
resultHandler );
String outXml = (String) resultHandler.getObject();
- /**** WL same thing
ExecutionResults result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML( outXml );
Cheese stilton = (Cheese) result.getValue( "outStilton" );
assertEquals( 30,
@@ -416,7 +404,6 @@
outXml = (String) resultHandler.getObject();
result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML( outXml );
assertNull( result.getValue( "outStilton" ) );
- ****/
}
public void testModifyObject() throws Exception {
@@ -450,8 +437,6 @@
String outXml = (String) resultHandler.getObject();
ExecutionResults result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML( outXml );
-
- /**** WL same thing
Cheese stilton = (Cheese) result.getValue( "outStilton" );
assertEquals( 30,
stilton.getPrice() );
@@ -507,7 +492,7 @@
result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML( outXml );
ModifyCommand.ALLOW_MODIFY_EXPRESSIONS = true;
- ****/
+
}
public void testInsertElements() throws Exception {
@@ -572,7 +557,6 @@
ExecutionResults result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML( outXml );
- /****
List list = (List) result.getValue( "list" );
Cheese stilton25 = new Cheese( "stilton",
30 );
@@ -585,7 +569,6 @@
assertEquals( expectedList,
new HashSet( list ) );
- ****/
}
public void testFactHandleReturn() throws Exception {
@@ -723,7 +706,6 @@
ExecutionResults result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML( outXml );
- /**** WL same thing
List list = (List) result.getValue( "list" );
Cheese stilton25 = new Cheese( "stilton",
30 );
@@ -736,7 +718,6 @@
assertEquals( expectedList,
new HashSet( list ) );
- ****/
}
public void testSetGlobal() throws Exception {
@@ -808,7 +789,7 @@
ExecutionResults result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML( outXml );
Cheese stilton = new Cheese( "stilton",
30 );
- /**** WL same thing
+
assertNull( result.getValue( "list1" ) );
List list2 = (List) result.getValue( "list2" );
@@ -822,7 +803,6 @@
list3.size() );
assertEquals( stilton,
list3.get( 0 ) );
- ****/
}
public void testGetGlobal() throws Exception {
@@ -933,8 +913,6 @@
outXml );
ExecutionResults result = (ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML( outXml );
-
- /**** WL same thing
List list = (List) result.getValue( "list" );
Cheese stilton25 = new Cheese( "stilton",
30 );
@@ -947,7 +925,6 @@
assertEquals( expectedList,
new HashSet( list ) );
- ****/
}
public void testQuery() throws Exception {
@@ -1099,9 +1076,7 @@
list.add( cheddar2 );
set.add( list );
- /**** WL same thing
org.drools.runtime.rule.QueryResults results = (org.drools.runtime.rule.QueryResults) batchResult.getValue( "cheeses" );
-
assertEquals( 2,
results.size() );
assertEquals( 2,
@@ -1115,7 +1090,6 @@
}
assertEquals( set,
newSet );
- ****/
}
public void testManualFireAllRules() throws Exception {
@@ -1165,7 +1139,6 @@
resultHandler );
String outXml = (String) resultHandler.getObject();
- /**** WL same thing
FactHandle factHandle = (FactHandle) ((ExecutionResults) BatchExecutionHelper.newXStreamMarshaller().fromXML( outXml )).getFactHandle( "outBrie" );
String expectedXml = "";
@@ -1218,7 +1191,6 @@
brie10.setOldPrice( 5 );
assertEquals( brie10,
result.getValue( "outBrie" ) );
- ****/
}
public void testProcess() throws SAXException,
@@ -1753,8 +1725,6 @@
ClassLoader cl = ((InternalRuleBase) ((StatefulKnowledgeSessionImpl) ksession).getRuleBase()).getRootClassLoader();
XStream xstream = BatchExecutionHelper.newXStreamMarshaller();
xstream.setClassLoader( cl );
-
- /**** WL same thing
FactHandle factHandle = (FactHandle) ((ExecutionResults) xstream.fromXML( outXml )).getFactHandle( "outStilton" );
String expectedXml = "";
@@ -1771,7 +1741,7 @@
assertXMLEqual( expectedXml,
outXml );
- ****/
+
}
public void testInsertObjectStateful() throws Exception {
More information about the jboss-svn-commits
mailing list