[jboss-svn-commits] JBL Code SVN: r35049 - in labs/jbossrules/branches/diega_esteban_jpm_integration_r34940: drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence and 20 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Sep 7 19:58:57 EDT 2010
Author: diegoll
Date: 2010-09-07 19:58:55 -0400 (Tue, 07 Sep 2010)
New Revision: 35049
Added:
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/common/InternalKnowledgeRuntime.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/impl/InternalKnowledgeBase.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManager.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManagerFactory.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/process/instance/impl/WorkItemImpl.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/runtime/rule/impl/InternalAgenda.java
Removed:
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/spi/Action.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/spi/ReturnValueEvaluator.java
Modified:
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-container/drools-spring/pom.xml
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/JPASingleSessionCommandServiceFactoryTest.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/management/KnowledgeSessionMonitoring.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/marshalling/impl/DefaultMarshaller.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/marshalling/impl/InputMarshaller.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/marshalling/impl/MarshallerReaderContext.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/runtime/rule/impl/AgendaImpl.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/ExternalSpreadsheetCompiler.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/InputType.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/SpreadsheetCompiler.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/ActionType.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/DecisionTableParser.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/DefaultRuleSheetListener.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/RuleMatrixSheetListener.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/RuleSheetListener.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/RuleSheetParserUtil.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/csv/CsvLineParser.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/csv/CsvParser.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/xls/ExcelParser.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/xls/NullSheetListener.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/xls/PropertiesSheetListener.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/Cheese.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/ExternalSpreadsheetCompilerIntegrationTest.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/ExternalSpreadsheetCompilerUnitTest.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/Person.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetIntegrationTest.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/PropertiesSheetListenerTest.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleSheetParserUtilTest.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParseLargeTest.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParseTest.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RulesheetUtil.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/csv/CsvLineParserTest.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/csv/CsvParserTest.java
labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/xls/ExcelParserTest.java
Log:
[JBRULES-2616] merged with trunk rev35043
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-container/drools-spring/pom.xml
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-container/drools-spring/pom.xml 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-container/drools-spring/pom.xml 2010-09-07 23:58:55 UTC (rev 35049)
@@ -27,15 +27,14 @@
<dependency>
<groupId>org.drools</groupId>
+ <artifactId>drools-flow-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.drools</groupId>
<artifactId>drools-compiler</artifactId>
</dependency>
- <!--dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-server-spring</artifactId>
- <version>${project.version}</version>
- </dependency-->
-
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-decisiontables</artifactId>
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/JPASingleSessionCommandServiceFactoryTest.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/JPASingleSessionCommandServiceFactoryTest.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-container/drools-spring/src/test/java/org/drools/container/spring/beans/persistence/JPASingleSessionCommandServiceFactoryTest.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -32,6 +32,7 @@
import org.drools.KnowledgeBaseFactory;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.ProcessBuilder;
+import org.drools.compiler.ProcessBuilderImpl;
import org.drools.core.util.DroolsStreamUtils;
import org.drools.persistence.jpa.KnowledgeStoreService;
import org.drools.process.core.Work;
@@ -341,7 +342,7 @@
Node.CONNECTION_DEFAULT_TYPE );
PackageBuilder packageBuilder = new PackageBuilder();
- ProcessBuilder processBuilder = new ProcessBuilder( packageBuilder );
+ ProcessBuilderImpl processBuilder = new ProcessBuilderImpl( packageBuilder );
processBuilder.buildProcess( process,
null );
@@ -459,7 +460,7 @@
Node.CONNECTION_DEFAULT_TYPE );
PackageBuilder packageBuilder = new PackageBuilder();
- ProcessBuilder processBuilder = new ProcessBuilder( packageBuilder );
+ ProcessBuilderImpl processBuilder = new ProcessBuilderImpl( packageBuilder );
processBuilder.buildProcess( process,
null );
@@ -591,7 +592,7 @@
Node.CONNECTION_DEFAULT_TYPE );
PackageBuilder packageBuilder = new PackageBuilder();
- ProcessBuilder processBuilder = new ProcessBuilder( packageBuilder );
+ ProcessBuilderImpl processBuilder = new ProcessBuilderImpl( packageBuilder );
processBuilder.buildProcess( process,
null );
return packageBuilder.getPackage();
@@ -664,7 +665,7 @@
Node.CONNECTION_DEFAULT_TYPE );
PackageBuilder packageBuilder = new PackageBuilder();
- ProcessBuilder processBuilder = new ProcessBuilder( packageBuilder );
+ ProcessBuilderImpl processBuilder = new ProcessBuilderImpl( packageBuilder );
processBuilder.buildProcess( process,
null );
return packageBuilder.getPackage();
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -79,6 +79,7 @@
import org.drools.impl.StatelessKnowledgeSessionImpl;
import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.rule.Declaration;
+import org.drools.runtime.process.InternalProcessRuntime;
import org.drools.runtime.process.NodeInstance;
import org.drools.runtime.process.NodeInstanceContainer;
import org.drools.spi.Activation;
@@ -118,7 +119,10 @@
public WorkingMemoryLogger(final WorkingMemory workingMemory) {
workingMemory.addEventListener( (WorkingMemoryEventListener) this );
workingMemory.addEventListener( (AgendaEventListener) this );
- ((InternalWorkingMemory) workingMemory).getProcessRuntime().addEventListener( (ProcessEventListener) this );
+ InternalProcessRuntime processRuntime = ((InternalWorkingMemory) workingMemory).getProcessRuntime();
+ if (processRuntime != null) {
+ processRuntime.addEventListener( (ProcessEventListener) this );
+ }
workingMemory.addEventListener( (RuleBaseEventListener) this );
}
@@ -126,9 +130,12 @@
if (session instanceof StatefulKnowledgeSessionImpl) {
WorkingMemoryEventManager eventManager = ((StatefulKnowledgeSessionImpl) session).session;
eventManager.addEventListener( (WorkingMemoryEventListener) this );
- eventManager.addEventListener( (AgendaEventListener) this );
- ((StatefulKnowledgeSessionImpl) session).session.addEventListener( (ProcessEventListener) this );
eventManager.addEventListener( (RuleBaseEventListener) this );
+ eventManager.addEventListener( (RuleBaseEventListener) this );
+ InternalProcessRuntime processRuntime = ((StatefulKnowledgeSessionImpl) session).session.getProcessRuntime();
+ if (processRuntime != null) {
+ processRuntime.addEventListener( (ProcessEventListener) this );
+ }
} else if (session instanceof StatelessKnowledgeSessionImpl) {
((StatelessKnowledgeSessionImpl) session).workingMemoryEventSupport.addEventListener( this );
((StatelessKnowledgeSessionImpl) session).agendaEventSupport.addEventListener( this );
@@ -139,8 +146,11 @@
((StatefulKnowledgeSessionImpl)((KnowledgeCommandContext)((CommandBasedStatefulKnowledgeSession) session).getCommandService().getContext()).getStatefulKnowledgesession()).session;
eventManager.addEventListener( (WorkingMemoryEventListener) this );
eventManager.addEventListener( (AgendaEventListener) this );
- eventManager.addEventListener( (ProcessEventListener) this );
+ InternalProcessRuntime processRuntime = eventManager.getProcessRuntime();
eventManager.addEventListener( (RuleBaseEventListener) this );
+ if (processRuntime != null) {
+ processRuntime.addEventListener( (ProcessEventListener) this );
+ }
} else {
throw new IllegalArgumentException("Not supported session in logger: " + session.getClass());
}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -227,7 +227,7 @@
}
public KnowledgeRuntime getKnowledgeRuntime() {
- return new StatefulKnowledgeSessionImpl( (ReteooWorkingMemory) this.workingMemory );
+ return ((ReteooWorkingMemory) this.workingMemory).getKnowledgeRuntime();
}
public Activation getActivation() {
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -28,6 +28,7 @@
import org.drools.common.InternalFactHandle;
import org.drools.reteoo.LeftTuple;
import org.drools.rule.Declaration;
+import org.drools.runtime.KnowledgeRuntime;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.Tuple;
import org.mvel2.CompileException;
@@ -67,6 +68,7 @@
private Map globals;
private WorkingMemory workingMemory;
+ private KnowledgeRuntime kruntime;
private Map localVariables;
@@ -111,6 +113,7 @@
previousDeclarations = (Map<String, Declaration>) in.readObject();
globals = (Map) in.readObject();
workingMemory = (WorkingMemory) in.readObject();
+ kruntime = (KnowledgeRuntime) in.readObject();
localVariables = (Map) in.readObject();
}
@@ -122,6 +125,7 @@
out.writeObject(previousDeclarations);
out.writeObject(globals);
out.writeObject(workingMemory);
+ out.writeObject(kruntime);
out.writeObject(localVariables);
}
@@ -194,6 +198,26 @@
}
}
+ public void setContext(final Tuple tuple,
+ final Object object,
+ final KnowledgeRuntime kruntime,
+ final Map<String, Object> variables ) {
+ if (tuple != null) {
+ this.tupleObjects = ((LeftTuple) tuple).toFactHandles();
+ }
+ this.object = object;
+ this.kruntime = kruntime;
+ if (variables == null) {
+ if (this.localVariables == null) {
+ this.localVariables = new HashMap();
+ } else {
+ this.localVariables.clear();
+ }
+ } else {
+ this.localVariables = variables;
+ }
+ }
+
private Object getTupleObjectFor(Declaration declaration) {
int i = declaration.getPattern().getOffset();
return ( i < this.tupleObjects.length ) ? this.tupleObjects[i].getObject() : null;
@@ -216,7 +240,13 @@
}
public Object getValue(final String identifier) {
- return this.workingMemory.getGlobal(identifier);
+ if (this.workingMemory != null) {
+ return this.workingMemory.getGlobal(identifier);
+ }
+ if (this.kruntime != null) {
+ return this.kruntime.getGlobal(identifier);
+ }
+ return null;
}
public Object getLocalValue(final String identifier) {
Deleted: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,135 +0,0 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.drools.base.mvel;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.Serializable;
-import java.util.List;
-
-import org.drools.rule.MVELDialectRuntimeData;
-import org.drools.rule.Package;
-import org.drools.WorkingMemory;
-import org.drools.spi.Action;
-import org.drools.spi.KnowledgeHelper;
-import org.drools.spi.ProcessContext;
-import org.mvel2.MVEL;
-import org.mvel2.compiler.CompiledExpression;
-import org.mvel2.debug.DebugTools;
-import org.mvel2.integration.impl.SimpleValueResolver;
-
-public class MVELAction
- implements
- Action,
- MVELCompileable,
- Externalizable {
- private static final long serialVersionUID = 510l;
-
- private MVELCompilationUnit unit;
- private String id;
-
- private Serializable expr;
- private DroolsMVELFactory prototype;
- private List<String> variableNames;
-
- public MVELAction() {
- }
-
- public MVELAction(final MVELCompilationUnit unit,
- final String id) {
- this.unit = unit;
- this.id = id;
- }
-
- public void setVariableNames(List<String> variableNames) {
- this.variableNames = variableNames;
- }
-
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- id = in.readUTF();
- unit = ( MVELCompilationUnit ) in.readObject();
- variableNames = (List<String>) in.readObject();
-// expr = (Serializable)in.readObject();
-// prototype = (DroolsMVELFactory)in.readObject();
- }
-
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeUTF( id );
- out.writeObject( unit );
- out.writeObject(variableNames);
-// out.writeObject(expr);
-// out.writeObject(prototype);
- }
-
- public void compile(ClassLoader classLoader) {
- expr = unit.getCompiledExpression( classLoader );
- prototype = unit.getFactory( );
- }
-
- public String getDialect() {
- return id;
- }
-
- public void execute(final KnowledgeHelper knowledgeHelper, final WorkingMemory workingMemory, ProcessContext context) throws Exception {
- // must clone to avoid concurrency problems
- DroolsMVELFactory factory = (DroolsMVELFactory) this.prototype.clone();
-
- factory.addResolver("context", new SimpleValueResolver(context));
- factory.addResolver("kcontext", new SimpleValueResolver(context));
- if (variableNames != null) {
- for (String variableName: variableNames) {
- factory.addResolver(
- variableName, new SimpleValueResolver(context.getVariable(variableName)));
- }
- }
-
- factory.setContext( null,
- knowledgeHelper,
- null,
- workingMemory,
- null );
-
- Package pkg = workingMemory.getRuleBase().getPackage( "MAIN" );
- if ( pkg != null ) {
- MVELDialectRuntimeData data = ( MVELDialectRuntimeData ) pkg.getDialectRuntimeRegistry().getDialectData( id );
- factory.setNextFactory( data.getFunctionFactory() );
- }
-
- CompiledExpression compexpr = (CompiledExpression) this.expr;
-
- if ( MVELDebugHandler.isDebugMode() ) {
- if ( MVELDebugHandler.verbose ) {
- System.out.println( DebugTools.decompile( compexpr ) );
- }
- MVEL.executeDebugger( compexpr,
- null,
- factory );
- } else {
- MVEL.executeExpression( compexpr,
- null,
- factory );
- }
-
- }
-
- public Serializable getCompExpr() {
- return expr;
- }
-
-}
Deleted: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,146 +0,0 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.drools.base.mvel;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.Serializable;
-import java.util.List;
-
-import org.drools.rule.MVELDialectRuntimeData;
-import org.drools.rule.Package;
-import org.drools.WorkingMemory;
-import org.drools.spi.ProcessContext;
-import org.drools.spi.ReturnValueEvaluator;
-import org.mvel2.MVEL;
-import org.mvel2.compiler.CompiledExpression;
-import org.mvel2.debug.DebugTools;
-import org.mvel2.integration.impl.SimpleValueResolver;
-
-public class MVELReturnValueEvaluator
- implements
- ReturnValueEvaluator,
- MVELCompileable,
- Externalizable {
- private static final long serialVersionUID = 510l;
-
- private MVELCompilationUnit unit;
- private String id;
-
- private Serializable expr;
- private DroolsMVELFactory prototype;
- private List<String> variableNames;
-
- public MVELReturnValueEvaluator() {
- }
-
- public MVELReturnValueEvaluator(final MVELCompilationUnit unit,
- final String id) {
- this.unit = unit;
- this.id = id;
- }
-
- public void setVariableNames(List<String> variableNames) {
- this.variableNames = variableNames;
- }
-
- public void readExternal(ObjectInput in) throws IOException,
- ClassNotFoundException {
- id = in.readUTF();
- unit = (MVELCompilationUnit) in.readObject();
- variableNames = (List<String>) in.readObject();
- // expr = (Serializable)in.readObject();
- // prototype = (DroolsMVELFactory)in.readObject();
- }
-
- public void writeExternal(ObjectOutput out) throws IOException {
- out.writeUTF( id );
- out.writeObject( unit );
- out.writeObject(variableNames);
- // out.writeObject(expr);
- // out.writeObject(prototype);
- }
-
- public void compile(ClassLoader classLoader) {
- expr = unit.getCompiledExpression( classLoader );
- prototype = unit.getFactory();
- }
-
- public String getDialect() {
- return this.id;
- }
-
- public Object evaluate(final WorkingMemory workingMemory,
- ProcessContext context) throws Exception {
- DroolsMVELFactory factory = (DroolsMVELFactory) this.prototype.clone();
-
- factory.addResolver("context", new SimpleValueResolver(context));
- factory.addResolver("kcontext", new SimpleValueResolver(context));
- if (variableNames != null) {
- for (String variableName: variableNames) {
- factory.addResolver(
- variableName, new SimpleValueResolver(context.getVariable(variableName)));
- }
- }
-
- factory.setContext( null,
- null,
- null,
- workingMemory,
- null );
-
- // do we have any functions for this namespace?
- Package pkg = workingMemory.getRuleBase().getPackage( "MAIN" );
- if ( pkg != null ) {
- MVELDialectRuntimeData data = (MVELDialectRuntimeData) pkg.getDialectRuntimeRegistry().getDialectData( this.id );
- factory.setNextFactory( data.getFunctionFactory() );
- }
-
- CompiledExpression compexpr = (CompiledExpression) this.expr;
-
- Object value;
- if ( MVELDebugHandler.isDebugMode() ) {
- if ( MVELDebugHandler.verbose ) {
- System.out.println( DebugTools.decompile( compexpr ) );
- }
- value = MVEL.executeDebugger( compexpr,
- null,
- factory );
- } else {
- value = MVEL.executeExpression( compexpr,
- null,
- factory );
- }
-
- if ( !(value instanceof Boolean) ) {
- throw new RuntimeException( "Constraints must return boolean values" );
- }
- return ((Boolean) value).booleanValue();
-
- }
-
- public Serializable getCompExpr() {
- return expr;
- }
-
- public String toString() {
- return this.unit.getExpression();
- }
-
-}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/command/impl/CommandBasedStatefulKnowledgeSession.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -40,13 +40,13 @@
import org.drools.command.runtime.SetGlobalCommand;
import org.drools.command.runtime.UnregisterChannelCommand;
import org.drools.command.runtime.UnregisterExitPointCommand;
+import org.drools.command.runtime.process.AbortProcessInstanceCommand;
import org.drools.command.runtime.process.AbortWorkItemCommand;
import org.drools.command.runtime.process.CompleteWorkItemCommand;
import org.drools.command.runtime.process.GetProcessEventListenersCommand;
import org.drools.command.runtime.process.GetProcessInstanceCommand;
import org.drools.command.runtime.process.GetProcessInstancesCommand;
import org.drools.command.runtime.process.RegisterWorkItemHandlerCommand;
-import org.drools.command.runtime.process.AbortProcessInstanceCommand;
import org.drools.command.runtime.process.SignalEventCommand;
import org.drools.command.runtime.process.StartProcessCommand;
import org.drools.command.runtime.rule.AgendaGroupSetFocusCommand;
@@ -72,15 +72,13 @@
import org.drools.event.process.ProcessEventListener;
import org.drools.event.rule.AgendaEventListener;
import org.drools.event.rule.WorkingMemoryEventListener;
-import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.rule.EntryPoint;
import org.drools.runtime.Calendars;
import org.drools.runtime.Channel;
-import org.drools.runtime.CommandExecutor;
import org.drools.runtime.Environment;
-import org.drools.runtime.ExecutionResults;
import org.drools.runtime.ExitPoint;
import org.drools.runtime.Globals;
+import org.drools.runtime.KnowledgeSessionConfiguration;
import org.drools.runtime.ObjectFilter;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.process.ProcessInstance;
@@ -463,5 +461,10 @@
// TODO: implement thiss
return null;
}
+
+ public KnowledgeSessionConfiguration getSessionConfiguration() {
+ // TODO: implement this
+ return null;
+ }
}
\ No newline at end of file
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -201,7 +201,7 @@
private Map<InternalFactHandle, PropagationContext> modifyContexts;
- private KnowledgeRuntime kruntime;
+ private InternalKnowledgeRuntime kruntime;
private Map<String, ExitPoint> exitPoints;
@@ -376,8 +376,6 @@
this.opCounter = new AtomicLong( 0 );
this.lastIdleTimestamp = new AtomicLong( -1 );
- this.processRuntime = createProcessRuntime();
-
initManagementBeans();
}
@@ -1772,11 +1770,12 @@
}
}
- public void setKnowledgeRuntime(KnowledgeRuntime kruntime) {
+ public void setKnowledgeRuntime(InternalKnowledgeRuntime kruntime) {
this.kruntime = kruntime;
+ this.processRuntime = createProcessRuntime();
}
- public KnowledgeRuntime getKnowledgeRuntime() {
+ public InternalKnowledgeRuntime getKnowledgeRuntime() {
return this.kruntime;
}
Copied: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/common/InternalKnowledgeRuntime.java (from rev 35044, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalKnowledgeRuntime.java)
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/common/InternalKnowledgeRuntime.java (rev 0)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/common/InternalKnowledgeRuntime.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -0,0 +1,25 @@
+package org.drools.common;
+
+import java.util.Queue;
+
+import org.drools.runtime.KnowledgeRuntime;
+import org.drools.runtime.process.InternalProcessRuntime;
+import org.drools.time.TimerService;
+
+public interface InternalKnowledgeRuntime extends KnowledgeRuntime {
+
+ TimerService getTimerService();
+
+ void startOperation();
+
+ void endOperation();
+
+ Queue<WorkingMemoryAction> getActionQueue();
+
+ void executeQueuedActions();
+
+ void queueWorkingMemoryAction(WorkingMemoryAction action);
+
+ InternalProcessRuntime getProcessRuntime();
+
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -144,9 +144,9 @@
*/
public PartitionTaskManager getPartitionTaskManager( RuleBasePartitionId partitionId );
- public void setKnowledgeRuntime(KnowledgeRuntime kruntime);
+ public void setKnowledgeRuntime(InternalKnowledgeRuntime kruntime);
- public KnowledgeRuntime getKnowledgeRuntime();
+ public InternalKnowledgeRuntime getKnowledgeRuntime();
/**
* @deprecated Use {@link #getChannels()} instead.
Copied: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/impl/InternalKnowledgeBase.java (from rev 35044, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/InternalKnowledgeBase.java)
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/impl/InternalKnowledgeBase.java (rev 0)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/impl/InternalKnowledgeBase.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -0,0 +1,10 @@
+package org.drools.impl;
+
+import org.drools.KnowledgeBase;
+import org.drools.RuleBase;
+
+public interface InternalKnowledgeBase extends KnowledgeBase {
+
+ RuleBase getRuleBase();
+
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -21,6 +21,7 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -80,7 +81,7 @@
public class KnowledgeBaseImpl
implements
- KnowledgeBase,
+ InternalKnowledgeBase,
Externalizable {
public RuleBase ruleBase;
@@ -238,14 +239,13 @@
}
public Process getProcess(String processId) {
- Process p = null;
- for( Package pkg : this.ruleBase.getPackages() ) {
- p = pkg.getRuleFlows().get( processId );
- if( p != null ) break;
- }
- return p;
+ return ((InternalRuleBase) this.ruleBase).getProcess(processId);
}
+ public Collection<Process> getProcesses() {
+ return Arrays.asList(((InternalRuleBase) this.ruleBase).getProcesses());
+ }
+
public Rule getRule(String packageName,
String ruleName) {
return this.ruleBase.getPackage( packageName ).getRule( ruleName );
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -22,6 +22,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Queue;
import org.drools.FactException;
import org.drools.KnowledgeBase;
@@ -36,10 +37,12 @@
import org.drools.common.AbstractWorkingMemory;
import org.drools.common.InternalAgenda;
import org.drools.common.InternalFactHandle;
+import org.drools.common.InternalKnowledgeRuntime;
import org.drools.common.InternalWorkingMemory;
import org.drools.common.InternalWorkingMemoryEntryPoint;
import org.drools.common.ObjectStore;
import org.drools.common.ObjectTypeConfigurationRegistry;
+import org.drools.common.WorkingMemoryAction;
import org.drools.event.ActivationCancelledEvent;
import org.drools.event.ActivationCreatedEvent;
import org.drools.event.AfterActivationFiredEvent;
@@ -72,6 +75,7 @@
import org.drools.runtime.ExecutionResults;
import org.drools.runtime.ExitPoint;
import org.drools.runtime.Globals;
+import org.drools.runtime.KnowledgeSessionConfiguration;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.impl.ExecutionResultImpl;
import org.drools.runtime.process.InternalProcessRuntime;
@@ -88,13 +92,16 @@
import org.drools.runtime.rule.impl.NativeQueryResults;
import org.drools.spi.Activation;
import org.drools.time.SessionClock;
+import org.drools.time.TimerService;
public class StatefulKnowledgeSessionImpl
implements
StatefulKnowledgeSession,
- InternalWorkingMemoryEntryPoint {
+ InternalWorkingMemoryEntryPoint,
+ InternalKnowledgeRuntime {
+
public ReteooWorkingMemory session;
- public KnowledgeBaseImpl kbase;
+ public KnowledgeBase kbase;
public StatefulKnowledgeSessionImpl(ReteooWorkingMemory session) {
this( session,
@@ -105,7 +112,7 @@
KnowledgeBase kbase) {
this.session = session;
this.session.setKnowledgeRuntime( this );
- this.kbase = (KnowledgeBaseImpl) kbase;
+ this.kbase = kbase;
}
public int getId() {
@@ -718,7 +725,7 @@
}
public RuleBase getRuleBase() {
- return this.kbase.ruleBase;
+ return ((KnowledgeBaseImpl) this.kbase).ruleBase;
}
public QueryResults getQueryResults(String query) {
@@ -794,5 +801,37 @@
arguments,
listener );
}
+
+ public KnowledgeSessionConfiguration getSessionConfiguration() {
+ return this.session.getSessionConfiguration();
+ }
+ public TimerService getTimerService() {
+ return this.session.getTimerService();
+ }
+
+ public void startOperation() {
+ this.session.startOperation();
+ }
+
+ public void endOperation() {
+ this.session.endOperation();
+ }
+
+ public void executeQueuedActions() {
+ this.session.executeQueuedActions();
+ }
+
+ public Queue<WorkingMemoryAction> getActionQueue() {
+ return this.session.getActionQueue();
+ }
+
+ public InternalProcessRuntime getProcessRuntime() {
+ return this.session.getProcessRuntime();
+ }
+
+ public void queueWorkingMemoryAction(WorkingMemoryAction action) {
+ this.session.queueWorkingMemoryAction(action);
+ }
+
}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/impl/StatelessKnowledgeSessionImpl.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -51,6 +51,7 @@
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.StatelessKnowledgeSession;
import org.drools.runtime.impl.ExecutionResultImpl;
+import org.drools.runtime.process.InternalProcessRuntime;
import org.drools.runtime.rule.AgendaFilter;
public class StatelessKnowledgeSessionImpl
@@ -131,7 +132,10 @@
wm.setKnowledgeRuntime( ksession );
wm.setAgendaEventSupport( this.agendaEventSupport );
wm.setWorkingMemoryEventSupport( this.workingMemoryEventSupport );
- wm.getProcessRuntime().setProcessEventSupport( this.processEventSupport );
+ InternalProcessRuntime processRuntime = wm.getProcessRuntime();
+ if (processRuntime != null) {
+ processRuntime.setProcessEventSupport( this.processEventSupport );
+ }
final InternalFactHandle handle = wm.getFactHandleFactory().newFactHandle( InitialFactImpl.getInstance(),
wm.getObjectTypeConfigurationRegistry().getObjectTypeConf( EntryPoint.DEFAULT,
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/management/KnowledgeSessionMonitoring.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/management/KnowledgeSessionMonitoring.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/management/KnowledgeSessionMonitoring.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -70,12 +70,16 @@
this.agendaStats = new AgendaStats();
this.processStats = new ProcessStats();
this.ksession.addEventListener( agendaStats );
- this.ksession.getProcessRuntime().addEventListener( processStats );
+ if (ksession.getProcessRuntime() != null) {
+ this.ksession.getProcessRuntime().addEventListener( processStats );
+ }
}
public void dispose() {
this.ksession.removeEventListener( agendaStats );
- this.ksession.getProcessRuntime().removeEventListener( processStats );
+ if (ksession.getProcessRuntime() != null) {
+ this.ksession.getProcessRuntime().removeEventListener( processStats );
+ }
}
/* (non-Javadoc)
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/marshalling/impl/DefaultMarshaller.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/marshalling/impl/DefaultMarshaller.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/marshalling/impl/DefaultMarshaller.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -98,7 +98,7 @@
if ( ((SessionConfiguration) config).isKeepReference() ) {
((ReteooRuleBase)((KnowledgeBaseImpl)this.kbase).ruleBase).addStatefulSession( session );
}
- return new StatefulKnowledgeSessionImpl( session );
+ return (StatefulKnowledgeSession) session.getKnowledgeRuntime();
}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/marshalling/impl/InputMarshaller.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/marshalling/impl/InputMarshaller.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/marshalling/impl/InputMarshaller.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -46,6 +46,7 @@
import org.drools.core.util.ObjectHashMap;
import org.drools.core.util.ObjectHashSet;
import org.drools.impl.EnvironmentFactory;
+import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.marshalling.ObjectMarshallingStrategy;
import org.drools.reteoo.BetaMemory;
import org.drools.reteoo.BetaNode;
@@ -201,6 +202,8 @@
config,
agenda,
environment );
+ session.setKnowledgeRuntime(new StatefulKnowledgeSessionImpl(session));
+
initialFactHandle.setEntryPoint( session.getEntryPoints().get( EntryPoint.DEFAULT.getEntryPointId() ) );
// RuleFlowGroups need to reference the session
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/marshalling/impl/MarshallerReaderContext.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/marshalling/impl/MarshallerReaderContext.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/marshalling/impl/MarshallerReaderContext.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -33,12 +33,14 @@
import org.drools.reteoo.LeftTuple;
import org.drools.reteoo.RightTuple;
import org.drools.rule.EntryPoint;
+import org.drools.runtime.KnowledgeRuntime;
import org.drools.spi.PropagationContext;
public class MarshallerReaderContext extends ObjectInputStream {
public final MarshallerReaderContext stream;
public final InternalRuleBase ruleBase;
public InternalWorkingMemory wm;
+ public KnowledgeRuntime kruntime;
public final Map<Integer, BaseNode> sinks;
public Map<Integer, InternalFactHandle> handles;
Copied: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManager.java (from rev 35044, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManager.java)
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManager.java (rev 0)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManager.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -0,0 +1,143 @@
+/**
+ * Copyright 2010 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.drools.process.instance.impl;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.drools.WorkingMemory;
+import org.drools.runtime.process.ProcessInstance;
+import org.drools.process.instance.WorkItem;
+import org.drools.process.instance.WorkItemManager;
+import org.drools.runtime.process.WorkItemHandler;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class DefaultWorkItemManager implements WorkItemManager, Externalizable {
+
+ private static final long serialVersionUID = 510l;
+
+ private long workItemCounter;
+ private Map<Long, WorkItem> workItems = new ConcurrentHashMap<Long, WorkItem>();
+ private WorkingMemory workingMemory;
+ private Map<String, WorkItemHandler> workItemHandlers = new HashMap<String, WorkItemHandler>();
+
+ public DefaultWorkItemManager(WorkingMemory workingMemory) {
+ this.workingMemory = workingMemory;
+ }
+
+ @SuppressWarnings("unchecked")
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ workItemCounter = in.readLong();
+ workItems = (Map<Long, WorkItem>)in.readObject();
+ workingMemory = (WorkingMemory)in.readObject();
+ workItemHandlers = (Map<String, WorkItemHandler>) in.readObject();
+ }
+
+ public void writeExternal(ObjectOutput out) throws IOException {
+ out.writeLong(workItemCounter);
+ out.writeObject(workItems);
+ out.writeObject(workingMemory);
+ out.writeObject(workItemHandlers);
+ }
+
+ public void internalExecuteWorkItem(WorkItem workItem) {
+ ((WorkItemImpl) workItem).setId(++workItemCounter);
+ internalAddWorkItem(workItem);
+ WorkItemHandler handler = (WorkItemHandler) this.workItemHandlers.get(workItem.getName());
+ if (handler != null) {
+ handler.executeWorkItem(workItem, this);
+ } else {
+ System.err.println("Could not find work item handler for " + workItem.getName());
+ }
+ }
+
+ public void internalAddWorkItem(WorkItem workItem) {
+ workItems.put(new Long(workItem.getId()), workItem);
+ // fix to reset workItemCounter after deserialization
+ if (workItem.getId() > workItemCounter) {
+ workItemCounter = workItem.getId();
+ }
+ }
+
+ public void internalAbortWorkItem(long id) {
+ WorkItemImpl workItem = (WorkItemImpl) workItems.get(new Long(id));
+ // work item may have been aborted
+ if (workItem != null) {
+ WorkItemHandler handler = (WorkItemHandler) this.workItemHandlers.get(workItem.getName());
+ if (handler != null) {
+ handler.abortWorkItem(workItem, this);
+ } else {
+ System.err.println("Could not find work item handler for " + workItem.getName());
+ }
+ workItems.remove(workItem.getId());
+ }
+ }
+
+ public Set<WorkItem> getWorkItems() {
+ return new HashSet<WorkItem>(workItems.values());
+ }
+
+ public WorkItem getWorkItem(long id) {
+ return workItems.get(id);
+ }
+
+ public void completeWorkItem(long id, Map<String, Object> results) {
+ WorkItem workItem = (WorkItem) workItems.get(new Long(id));
+ // work item may have been aborted
+ if (workItem != null) {
+ ((org.drools.process.instance.WorkItem) workItem).setResults(results);
+ ProcessInstance processInstance = ( ProcessInstance ) workingMemory.getProcessInstance(workItem.getProcessInstanceId());
+ ((org.drools.process.instance.WorkItem) workItem).setState(WorkItem.COMPLETED);
+ // process instance may have finished already
+ if (processInstance != null) {
+ processInstance.signalEvent("workItemCompleted", workItem);
+ }
+ workItems.remove(new Long(id));
+ workingMemory.fireAllRules();
+ }
+ }
+
+ public void abortWorkItem(long id) {
+ WorkItemImpl workItem = (WorkItemImpl) workItems.get(new Long(id));
+ // work item may have been aborted
+ if (workItem != null) {
+ ProcessInstance processInstance = ( ProcessInstance ) workingMemory.getProcessInstance(workItem.getProcessInstanceId());
+ workItem.setState(WorkItem.ABORTED);
+ // process instance may have finished already
+ if (processInstance != null) {
+ processInstance.signalEvent("workItemAborted", workItem);
+ }
+ workItems.remove(new Long(id));
+ workingMemory.fireAllRules();
+ }
+ }
+
+ public void registerWorkItemHandler(String workItemName, WorkItemHandler handler) {
+ this.workItemHandlers.put(workItemName, handler);
+ }
+
+}
Copied: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManagerFactory.java (from rev 35044, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManagerFactory.java)
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManagerFactory.java (rev 0)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManagerFactory.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -0,0 +1,40 @@
+/**
+ * Copyright 2010 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.drools.process.instance.impl;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+import org.drools.WorkingMemory;
+import org.drools.process.instance.WorkItemManager;
+import org.drools.process.instance.WorkItemManagerFactory;
+
+public class DefaultWorkItemManagerFactory implements WorkItemManagerFactory, Externalizable {
+
+ public WorkItemManager createWorkItemManager(WorkingMemory workingMemory) {
+ return new DefaultWorkItemManager(workingMemory);
+ }
+
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ }
+
+ public void writeExternal(ObjectOutput out) throws IOException {
+ }
+
+}
Copied: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/process/instance/impl/WorkItemImpl.java (from rev 35044, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/WorkItemImpl.java)
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/process/instance/impl/WorkItemImpl.java (rev 0)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/process/instance/impl/WorkItemImpl.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -0,0 +1,129 @@
+/**
+ * Copyright 2010 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.drools.process.instance.impl;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.drools.process.instance.WorkItem;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class WorkItemImpl implements WorkItem, Serializable {
+
+ private static final long serialVersionUID = 510l;
+
+ private long id;
+ private String name;
+ private int state = 0;
+ private Map<String, Object> parameters = new HashMap<String, Object>();
+ private Map<String, Object> results = new HashMap<String, Object>();
+ private long processInstanceId;
+
+ public void setId(long id) {
+ this.id = id;
+ }
+
+ public long getId() {
+ return id;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setState(int state) {
+ this.state = state;
+ }
+
+ public int getState() {
+ return state;
+ }
+
+ public void setParameters(Map<String, Object> parameters) {
+ this.parameters = parameters;
+ }
+
+ public void setParameter(String name, Object value) {
+ this.parameters.put(name, value);
+ }
+
+ public Object getParameter(String name) {
+ return parameters.get(name);
+ }
+
+ public Map<String, Object> getParameters() {
+ return parameters;
+ }
+
+ public void setResults(Map<String, Object> results) {
+ if (results != null) {
+ this.results = results;
+ }
+ }
+
+ public void setResult(String name, Object value) {
+ results.put(name, value);
+ }
+
+ public Object getResult(String name) {
+ return results.get(name);
+ }
+
+ public Map<String, Object> getResults() {
+ return results;
+ }
+
+ public void setProcessInstanceId(long processInstanceId) {
+ this.processInstanceId = processInstanceId;
+ }
+
+ public long getProcessInstanceId() {
+ return processInstanceId;
+ }
+
+ public String toString() {
+ StringBuilder b = new StringBuilder("WorkItem ");
+ b.append(id);
+ b.append(" [name=");
+ b.append(name);
+ b.append(", state=");
+ b.append(state);
+ b.append(", processInstanceId=");
+ b.append(processInstanceId);
+ b.append(", parameters{");
+ for (Iterator<Map.Entry<String, Object>> iterator = parameters.entrySet().iterator(); iterator.hasNext(); ) {
+ Map.Entry<String, Object> entry = iterator.next();
+ b.append(entry.getKey());
+ b.append("=");
+ b.append(entry.getValue());
+ if (iterator.hasNext()) {
+ b.append(", ");
+ }
+ }
+ b.append("}]");
+ return b.toString();
+ }
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -388,6 +388,7 @@
executor,
sessionConfig,
environment );
+ session.setKnowledgeRuntime(new StatefulKnowledgeSessionImpl(session));
executor.setCommandExecutor( new CommandExecutor( session ) );
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -39,10 +39,10 @@
import org.drools.concurrent.RetractObject;
import org.drools.concurrent.UpdateObject;
import org.drools.impl.EnvironmentFactory;
-import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.marshalling.Marshaller;
import org.drools.marshalling.MarshallerFactory;
import org.drools.runtime.Environment;
+import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.spi.AgendaFilter;
import org.drools.spi.FactHandleFactory;
import org.drools.spi.RuleBaseUpdateListener;
@@ -108,11 +108,11 @@
public void writeExternal(ObjectOutput out) throws IOException {
// all we do is create marshall to a byte[] and write to the stream
- StatefulKnowledgeSessionImpl ksession = new StatefulKnowledgeSessionImpl( this );
+ StatefulKnowledgeSession ksession = (StatefulKnowledgeSession) getKnowledgeRuntime();
Marshaller marshaller = MarshallerFactory.newMarshaller( ksession.getKnowledgeBase() );
ByteArrayOutputStream stream = new ByteArrayOutputStream();
- marshaller.marshall( stream, ksession );
+ marshaller.marshall( stream, (StatefulKnowledgeSession) getKnowledgeRuntime() );
stream.close();
byte[] bytes = stream.toByteArray();
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/runtime/rule/impl/AgendaImpl.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/runtime/rule/impl/AgendaImpl.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/runtime/rule/impl/AgendaImpl.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -16,18 +16,17 @@
package org.drools.runtime.rule.impl;
-import org.drools.common.InternalAgenda;
import org.drools.runtime.rule.ActivationGroup;
-import org.drools.runtime.rule.Agenda;
import org.drools.runtime.rule.AgendaGroup;
import org.drools.runtime.rule.RuleFlowGroup;
public class AgendaImpl
implements
- Agenda {
- private InternalAgenda agenda;
+ InternalAgenda {
+
+ private org.drools.common.InternalAgenda agenda;
- public AgendaImpl(InternalAgenda agenda) {
+ public AgendaImpl(org.drools.common.InternalAgenda agenda) {
super();
this.agenda = agenda;
}
@@ -61,5 +60,26 @@
} else {
return null;
}
- }
+ }
+
+ public org.drools.common.InternalAgenda getAgenda() {
+ return this.agenda;
+ }
+
+ public void activateRuleFlowGroup(String name) {
+ this.agenda.activateRuleFlowGroup(name);
+ }
+
+ public void activateRuleFlowGroup(String name, long processInstanceId, String nodeInstanceId) {
+ this.agenda.activateRuleFlowGroup(name, processInstanceId, nodeInstanceId);
+ }
+
+ public void deactivateRuleFlowGroup(String name) {
+ this.agenda.deactivateRuleFlowGroup(name);
+ }
+
+ public boolean isRuleActiveInRuleFlowGroup(
+ String ruleflowGroupName, String ruleName, long processInstanceId) {
+ return this.agenda.isRuleActiveInRuleFlowGroup(ruleflowGroupName, ruleName, processInstanceId);
+ }
}
Copied: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/runtime/rule/impl/InternalAgenda.java (from rev 35044, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/runtime/rule/impl/InternalAgenda.java)
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/runtime/rule/impl/InternalAgenda.java (rev 0)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/runtime/rule/impl/InternalAgenda.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -0,0 +1,35 @@
+package org.drools.runtime.rule.impl;
+
+import org.drools.runtime.rule.Agenda;
+
+public interface InternalAgenda extends Agenda {
+
+ public boolean isRuleActiveInRuleFlowGroup(String ruleflowGroupName, String ruleName, long processInstanceId);
+
+ /**
+ * Activates the <code>RuleFlowGroup</code> with the given name.
+ * All activations in the given <code>RuleFlowGroup</code> are added to the agenda.
+ * As long as the <code>RuleFlowGroup</code> remains active,
+ * its activations are automatically added to the agenda.
+ */
+ public void activateRuleFlowGroup(String name);
+
+ /**
+ * Activates the <code>RuleFlowGroup</code> with the given name.
+ * All activations in the given <code>RuleFlowGroup</code> are added to the agenda.
+ * As long as the <code>RuleFlowGroup</code> remains active,
+ * its activations are automatically added to the agenda.
+ * The given processInstanceId and nodeInstanceId define the process context
+ * in which this <code>RuleFlowGroup</code> is used.
+ */
+ public void activateRuleFlowGroup(String name, long processInstanceId, String nodeInstanceId);
+
+ /**
+ * Deactivates the <code>RuleFlowGroup</code> with the given name.
+ * All activations in the given <code>RuleFlowGroup</code> are removed from the agenda.
+ * As long as the <code>RuleFlowGroup</code> remains deactive,
+ * its activations are not added to the agenda
+ */
+ public void deactivateRuleFlowGroup(String name);
+
+}
Deleted: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/spi/Action.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/spi/Action.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/spi/Action.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,25 +0,0 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.drools.spi;
-
-import org.drools.WorkingMemory;
-
-public interface Action {
-
- void execute(final KnowledgeHelper knowledgeHelper, final WorkingMemory workingMemory, ProcessContext context) throws Exception;
-
-}
Deleted: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/spi/ReturnValueEvaluator.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/spi/ReturnValueEvaluator.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-core/src/main/java/org/drools/spi/ReturnValueEvaluator.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,24 +0,0 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.drools.spi;
-
-import org.drools.WorkingMemory;
-
-public interface ReturnValueEvaluator {
-
- public Object evaluate(WorkingMemory workingMemory, ProcessContext processContext) throws Exception;
-}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/ExternalSpreadsheetCompiler.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/ExternalSpreadsheetCompiler.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/ExternalSpreadsheetCompiler.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/InputType.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/InputType.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/InputType.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable;
+
import java.util.List;
import org.drools.decisiontable.parser.DecisionTableParser;
@@ -70,4 +70,4 @@
new CsvLineParser() );
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/SpreadsheetCompiler.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/SpreadsheetCompiler.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/SpreadsheetCompiler.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable;
+
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
@@ -157,4 +157,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/ActionType.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/ActionType.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/ActionType.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable.parser;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable.parser;
+
import java.util.Map;
import org.drools.template.parser.DecisionTableParseException;
@@ -200,4 +200,4 @@
content );
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/DecisionTableParser.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/DecisionTableParser.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/DecisionTableParser.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable.parser;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable.parser;
+
import java.io.InputStream;
/**
@@ -29,4 +29,4 @@
* Parse an input stream, store the resulting rulebase.
*/
public void parseFile(InputStream inStream);
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/DefaultRuleSheetListener.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/DefaultRuleSheetListener.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/DefaultRuleSheetListener.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable.parser;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable.parser;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -589,4 +589,4 @@
return value == null || "".equals( value.trim() );
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/RuleMatrixSheetListener.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/RuleMatrixSheetListener.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/RuleMatrixSheetListener.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable.parser;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable.parser;
+
import java.util.ArrayList;
import java.util.List;
@@ -199,4 +199,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/RuleSheetListener.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/RuleSheetListener.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/RuleSheetListener.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable.parser;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,10 +14,13 @@
* limitations under the License.
*/
+package org.drools.decisiontable.parser;
+
import java.util.Properties;
import org.drools.template.model.Package;
import org.drools.template.parser.DataListener;
+
/**
* @author <a href="mailto:stevearoonie at gmail.com"> Steven Williams</a>
*
@@ -39,4 +40,4 @@
*/
public abstract Package getRuleSet();
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/RuleSheetParserUtil.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/RuleSheetParserUtil.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/RuleSheetParserUtil.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable.parser;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable.parser;
+
import java.util.LinkedList;
import java.util.List;
import java.util.StringTokenizer;
@@ -120,4 +120,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/csv/CsvLineParser.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/csv/CsvLineParser.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/csv/CsvLineParser.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable.parser.csv;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable.parser.csv;
+
import java.util.ArrayList;
import java.util.List;
@@ -167,4 +167,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/csv/CsvParser.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/csv/CsvParser.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/csv/CsvParser.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable.parser.csv;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable.parser.csv;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@ -140,4 +140,4 @@
return startMergeCol;
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/xls/ExcelParser.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/xls/ExcelParser.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/xls/ExcelParser.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable.parser.xls;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable.parser.xls;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
@@ -181,4 +181,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/xls/NullSheetListener.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/xls/NullSheetListener.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/xls/NullSheetListener.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable.parser.xls;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable.parser.xls;
+
import org.drools.template.parser.DataListener;
/**
@@ -43,4 +43,4 @@
final int mergedColstart) {
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/xls/PropertiesSheetListener.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/xls/PropertiesSheetListener.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/xls/PropertiesSheetListener.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable.parser.xls;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable.parser.xls;
+
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/Cheese.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/Cheese.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/Cheese.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable;
+
public class Cheese {
private String type;
private int price;
@@ -42,4 +42,4 @@
this.price = price;
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/ExternalSpreadsheetCompilerIntegrationTest.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/ExternalSpreadsheetCompilerIntegrationTest.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/ExternalSpreadsheetCompilerIntegrationTest.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable;
+
import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
@@ -32,6 +32,7 @@
import org.drools.rule.Package;
import org.drools.template.parser.DataListener;
import org.drools.template.parser.TemplateDataListener;
+
/**
* @author <a href="mailto:stevearoonie at gmail.com">Steven Williams</a> Some basic unit tests for converter utility.
* Note that some of this may still use the drools 2.x syntax, as it is not compiled, only tested that it
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/ExternalSpreadsheetCompilerUnitTest.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/ExternalSpreadsheetCompilerUnitTest.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/ExternalSpreadsheetCompilerUnitTest.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable;
+
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/Person.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/Person.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/Person.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable;
+
public class Person {
private String name;
private String likes;
@@ -90,4 +90,4 @@
public String toString() {
return "[Person name='" + this.name + "']";
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable;
+
import java.io.InputStream;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -125,4 +125,4 @@
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetIntegrationTest.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetIntegrationTest.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetIntegrationTest.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable;
+
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
@@ -115,4 +115,4 @@
launcher.executeExample() );
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/PropertiesSheetListenerTest.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/PropertiesSheetListenerTest.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/PropertiesSheetListenerTest.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable.parser;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable.parser;
+
import java.util.Properties;
import junit.framework.TestCase;
@@ -85,4 +85,4 @@
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleSheetParserUtilTest.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleSheetParserUtilTest.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleSheetParserUtilTest.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable.parser;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable.parser;
+
import java.util.List;
import junit.framework.TestCase;
@@ -108,4 +108,4 @@
assertNotNull( e.getMessage() );
}
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParseLargeTest.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParseLargeTest.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParseLargeTest.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable.parser;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable.parser;
+
import junit.framework.TestCase;
/**
@@ -75,4 +75,4 @@
// return this.endTimer - this.startTimer;
// }
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParseTest.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParseTest.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RuleWorksheetParseTest.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable.parser;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable.parser;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
@@ -166,4 +166,4 @@
return RulesheetUtil.getRuleSheetListener( stream );
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RulesheetUtil.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RulesheetUtil.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/RulesheetUtil.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable.parser;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable.parser;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
@@ -47,4 +47,4 @@
stream.close();
return listener;
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/csv/CsvLineParserTest.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/csv/CsvLineParserTest.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/csv/CsvLineParserTest.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable.parser.csv;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable.parser.csv;
+
import java.util.List;
import junit.framework.TestCase;
@@ -67,4 +67,4 @@
list.get( 2 ) );
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/csv/CsvParserTest.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/csv/CsvParserTest.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/csv/CsvParserTest.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable.parser.csv;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable.parser.csv;
+
import java.util.HashMap;
import java.util.Map;
@@ -128,4 +128,4 @@
return "R" + row + "C" + column;
}
}
-}
\ No newline at end of file
+}
Modified: labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/xls/ExcelParserTest.java
===================================================================
--- labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/xls/ExcelParserTest.java 2010-09-07 23:32:35 UTC (rev 35048)
+++ labs/jbossrules/branches/diega_esteban_jpm_integration_r34940/drools-decisiontables/src/test/java/org/drools/decisiontable/parser/xls/ExcelParserTest.java 2010-09-07 23:58:55 UTC (rev 35049)
@@ -1,5 +1,3 @@
-package org.drools.decisiontable.parser.xls;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,6 +14,8 @@
* limitations under the License.
*/
+package org.drools.decisiontable.parser.xls;
+
import java.util.List;
import java.util.Map;
@@ -152,4 +152,4 @@
}
-}
\ No newline at end of file
+}
More information about the jboss-svn-commits
mailing list