[jboss-svn-commits] JBL Code SVN: r32212 - in labs/jbossrules/branches/drools_server_camel_lucaz_baunax: drools-core/src/main/java/org/drools/impl and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Mar 25 14:41:53 EDT 2010
Author: lucazamador
Date: 2010-03-25 14:41:52 -0400 (Thu, 25 Mar 2010)
New Revision: 32212
Removed:
labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/runtime/impl/BatchExecutionImpl.java
Modified:
labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java
labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java
labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/runtime/help/impl/BatchExecutionHelperProviderImpl.java
labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/xml/jaxb/util/DroolsJaxbContextHelper.java
labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java
Log:
BatchExecutionImpl replaced by BatchExecutionCommand
Modified: labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java 2010-03-25 17:59:12 UTC (rev 32211)
+++ labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/command/impl/CommandFactoryProviderImpl.java 2010-03-25 18:41:52 UTC (rev 32212)
@@ -7,6 +7,7 @@
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;
@@ -16,14 +17,12 @@
import org.drools.command.runtime.rule.FireAllRulesCommand;
import org.drools.command.runtime.rule.GetObjectCommand;
import org.drools.command.runtime.rule.GetObjectsCommand;
-import org.drools.command.runtime.rule.InsertElementsCommand;
import org.drools.command.runtime.rule.InsertObjectCommand;
import org.drools.command.runtime.rule.ModifyCommand;
import org.drools.command.runtime.rule.QueryCommand;
import org.drools.command.runtime.rule.RetractCommand;
import org.drools.command.runtime.rule.ModifyCommand.SetterImpl;
import org.drools.runtime.ObjectFilter;
-import org.drools.runtime.impl.BatchExecutionImpl;
import org.drools.runtime.rule.FactHandle;
public class CommandFactoryProviderImpl implements CommandFactoryProvider {
@@ -148,7 +147,6 @@
}
public Command newBatchExecution(List<? extends Command> commands) {
- return new BatchExecutionImpl(
- (List<GenericCommand>) commands);
+ return new BatchExecutionCommand((List<GenericCommand<?>>) commands);
}
}
Modified: labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java 2010-03-25 17:59:12 UTC (rev 32211)
+++ labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java 2010-03-25 18:41:52 UTC (rev 32212)
@@ -2,13 +2,9 @@
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.IdentityHashMap;
-import java.util.Iterator;
import java.util.Map;
-import java.util.Map.Entry;
-import org.drools.RuleBaseConfiguration;
import org.drools.SessionConfiguration;
import org.drools.agent.KnowledgeAgent;
import org.drools.base.MapGlobalResolver;
@@ -16,9 +12,9 @@
import org.drools.command.impl.ContextImpl;
import org.drools.command.impl.GenericCommand;
import org.drools.command.impl.KnowledgeCommandContext;
+import org.drools.command.runtime.BatchExecutionCommand;
import org.drools.command.runtime.rule.FireAllRulesCommand;
import org.drools.common.InternalRuleBase;
-import org.drools.common.InternalWorkingMemory;
import org.drools.event.AgendaEventSupport;
import org.drools.event.RuleFlowEventSupport;
import org.drools.event.WorkingMemoryEventSupport;
@@ -33,14 +29,12 @@
import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.reteoo.ReteooWorkingMemory.WorkingMemoryReteAssertAction;
import org.drools.rule.EntryPoint;
-import org.drools.runtime.ExecutionResults;
import org.drools.runtime.Environment;
+import org.drools.runtime.ExecutionResults;
import org.drools.runtime.Globals;
import org.drools.runtime.KnowledgeSessionConfiguration;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.StatelessKnowledgeSession;
-import org.drools.runtime.StatelessKnowledgeSessionResults;
-import org.drools.runtime.impl.BatchExecutionImpl;
import org.drools.runtime.impl.ExecutionResultImpl;
import org.drools.runtime.rule.AgendaFilter;
@@ -243,8 +237,8 @@
boolean autoFireAllRules = true;
if ( command instanceof FireAllRulesCommand ) {
autoFireAllRules = false;
- } else if ( command instanceof BatchExecutionImpl ) {
- for ( Command nestedCmd : ((BatchExecutionImpl) command).getCommands() ) {
+ } else if ( command instanceof BatchExecutionCommand ) {
+ for ( Command nestedCmd : ((BatchExecutionCommand) command).getCommands() ) {
if ( nestedCmd instanceof FireAllRulesCommand ) {
autoFireAllRules = false;
break;
Modified: labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/runtime/help/impl/BatchExecutionHelperProviderImpl.java
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/runtime/help/impl/BatchExecutionHelperProviderImpl.java 2010-03-25 17:59:12 UTC (rev 32211)
+++ labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/runtime/help/impl/BatchExecutionHelperProviderImpl.java 2010-03-25 18:41:52 UTC (rev 32212)
@@ -13,6 +13,7 @@
import org.drools.command.Command;
import org.drools.command.CommandFactory;
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;
@@ -27,14 +28,11 @@
import org.drools.command.runtime.rule.ModifyCommand;
import org.drools.command.runtime.rule.QueryCommand;
import org.drools.command.runtime.rule.RetractCommand;
-import org.drools.command.runtime.rule.ModifyCommand.SetterImpl;
-import org.drools.common.DisconnectedFactHandle;
-import org.drools.common.InternalFactHandle;
import org.drools.common.DefaultFactHandle;
+import org.drools.common.DisconnectedFactHandle;
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.runtime.impl.ExecutionResultImpl;
import org.drools.runtime.rule.FactHandle;
import org.drools.runtime.rule.QueryResults;
@@ -64,12 +62,12 @@
ElementNames names = new XmlElementNames();
// xstream.setMode( XStream.NO_REFERENCES );
- xstream.processAnnotations( BatchExecutionImpl.class );
- xstream.addImplicitCollection( BatchExecutionImpl.class,
+ xstream.processAnnotations( BatchExecutionCommand.class );
+ xstream.addImplicitCollection( BatchExecutionCommand.class,
"commands" );
xstream.alias( "batch-execution",
- BatchExecutionImpl.class );
+ BatchExecutionCommand.class );
xstream.alias( "insert",
InsertObjectCommand.class );
xstream.alias( "modify",
Deleted: labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/runtime/impl/BatchExecutionImpl.java
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/runtime/impl/BatchExecutionImpl.java 2010-03-25 17:59:12 UTC (rev 32211)
+++ labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/runtime/impl/BatchExecutionImpl.java 2010-03-25 18:41:52 UTC (rev 32212)
@@ -1,42 +0,0 @@
-package org.drools.runtime.impl;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.drools.command.Context;
-import org.drools.command.impl.GenericCommand;
-
- at XmlRootElement
-public class BatchExecutionImpl implements GenericCommand<Void> {
-
- private static final long serialVersionUID = 1L;
-
- private List<GenericCommand> commands;
-
- private String lookup;
-
- public BatchExecutionImpl() {
- }
-
- public BatchExecutionImpl(List<GenericCommand> commands) {
- this.commands = commands;
- }
-
- public BatchExecutionImpl(List<GenericCommand> commands, String lookup) {
- this.commands = commands;
- this.lookup = lookup;
- }
-
- public List<GenericCommand> getCommands() {
- return commands;
- }
-
- public Void execute(Context context) {
- for ( GenericCommand command : commands ) {
- ((GenericCommand)command).execute( context );
- }
- return null;
- }
-
-}
Modified: labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/xml/jaxb/util/DroolsJaxbContextHelper.java
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/xml/jaxb/util/DroolsJaxbContextHelper.java 2010-03-25 17:59:12 UTC (rev 32211)
+++ labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-core/src/main/java/org/drools/xml/jaxb/util/DroolsJaxbContextHelper.java 2010-03-25 18:41:52 UTC (rev 32212)
@@ -18,8 +18,10 @@
import java.util.List;
import java.util.Map;
+
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
+
import org.drools.command.runtime.BatchExecutionCommand;
import org.drools.command.runtime.GetGlobalCommand;
import org.drools.command.runtime.SetGlobalCommand;
@@ -30,12 +32,11 @@
import org.drools.command.runtime.rule.InsertElementsCommand;
import org.drools.command.runtime.rule.InsertObjectCommand;
import org.drools.command.runtime.rule.ModifyCommand;
-import org.drools.command.runtime.rule.ModifyCommand.SetterImpl;
import org.drools.command.runtime.rule.QueryCommand;
import org.drools.command.runtime.rule.RetractCommand;
+import org.drools.command.runtime.rule.ModifyCommand.SetterImpl;
import org.drools.common.DefaultFactHandle;
import org.drools.common.DisconnectedFactHandle;
-import org.drools.runtime.impl.BatchExecutionImpl;
import org.drools.runtime.impl.ExecutionResultImpl;
import org.drools.runtime.rule.impl.FlatQueryResults;
@@ -58,7 +59,7 @@
AbortWorkItemCommand.class.getName(),
SignalEventCommand.class.getName(),
StartProcessCommand.class.getName(),
- BatchExecutionImpl.class.getName(),
+ BatchExecutionCommand.class.getName(),
ExecutionResultImpl.class.getName(),
DefaultFactHandle.class.getName(),
JaxbListWrapper.class.getName(),
Modified: labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java 2010-03-25 17:59:12 UTC (rev 32211)
+++ labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-pipeline/drools-transformer-jaxb/src/main/java/org/drools/runtime/pipeline/impl/DroolsJaxbHelperProviderImpl.java 2010-03-25 18:41:52 UTC (rev 32212)
@@ -58,7 +58,6 @@
import org.drools.io.Resource;
import org.drools.lang.descr.PackageDescr;
import org.drools.rule.builder.dialect.java.JavaDialect;
-import org.drools.runtime.impl.BatchExecutionImpl;
import org.drools.runtime.impl.ExecutionResultImpl;
import org.drools.runtime.rule.impl.FlatQueryResults;
import org.drools.xml.jaxb.util.JaxbListWrapper;
@@ -91,7 +90,7 @@
AbortWorkItemCommand.class.getName(),
SignalEventCommand.class.getName(),
StartProcessCommand.class.getName(),
- BatchExecutionImpl.class.getName(),
+ BatchExecutionCommand.class.getName(),
ExecutionResultImpl.class.getName() ,
DefaultFactHandle.class.getName(),
JaxbListWrapper.class.getName(),
More information about the jboss-svn-commits
mailing list