[jboss-svn-commits] JBL Code SVN: r23653 - in labs/jbossrules/trunk: drools-dataloaders/drools-dataloaders-jaxb/src/test/java/org/drools/dataloaders/jaxb and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 31 10:38:08 EDT 2008
Author: tirelli
Date: 2008-10-31 10:38:08 -0400 (Fri, 31 Oct 2008)
New Revision: 23653
Modified:
labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/src/main/java/org/drools/dataloaders/jaxb/DroolsJaxbHelper.java
labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/src/main/java/org/drools/dataloaders/jaxb/DroolsJaxbStatefulSession.java
labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/src/test/java/org/drools/dataloaders/jaxb/DroolsJaxbTest.java
labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/src/main/java/org/drools/dataloaders/smooks/DroolsSmooksStatefulSession.java
labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/src/main/java/org/drools/dataloaders/smooks/DroolsSmooksStatelessSession.java
labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/src/test/java/org/drools/dataloaders/smooks/DroolsSmookStatelessSessionTest.java
labs/jbossrules/trunk/drools-templates/src/main/java/org/drools/template/parser/DefaultGenerator.java
labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/DataProviderCompilerIntegrationTest.java
labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/model/FunctionsRenderTest.java
labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/model/PackageRenderTest.java
labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/model/RuleRenderTest.java
labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/model/SnippetBuilderTest.java
labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/ColumnFactoryTest.java
labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/DefaultGeneratorTest.java
labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/DefaultTemplateContainerTest.java
labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/DefaultTemplateRuleBaseTest.java
labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/RuleTemplateTest.java
Log:
Upgrading to mvel2. Fixing Enabled expression
Modified: labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/src/main/java/org/drools/dataloaders/jaxb/DroolsJaxbHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/src/main/java/org/drools/dataloaders/jaxb/DroolsJaxbHelper.java 2008-10-31 14:35:15 UTC (rev 23652)
+++ labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/src/main/java/org/drools/dataloaders/jaxb/DroolsJaxbHelper.java 2008-10-31 14:38:08 UTC (rev 23653)
@@ -16,12 +16,9 @@
* limitations under the License.
*/
-import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.FilterOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.Reader;
import java.io.StringReader;
Modified: labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/src/main/java/org/drools/dataloaders/jaxb/DroolsJaxbStatefulSession.java
===================================================================
--- labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/src/main/java/org/drools/dataloaders/jaxb/DroolsJaxbStatefulSession.java 2008-10-31 14:35:15 UTC (rev 23652)
+++ labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/src/main/java/org/drools/dataloaders/jaxb/DroolsJaxbStatefulSession.java 2008-10-31 14:38:08 UTC (rev 23653)
@@ -27,9 +27,9 @@
import org.drools.StatefulSession;
import org.drools.runtime.rule.FactHandle;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
-import org.mvel.compiler.ExpressionCompiler;
+import org.mvel2.MVEL;
+import org.mvel2.ParserContext;
+import org.mvel2.compiler.ExpressionCompiler;
public class DroolsJaxbStatefulSession {
private Unmarshaller unmarshaller;
Modified: labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/src/test/java/org/drools/dataloaders/jaxb/DroolsJaxbTest.java
===================================================================
--- labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/src/test/java/org/drools/dataloaders/jaxb/DroolsJaxbTest.java 2008-10-31 14:35:15 UTC (rev 23652)
+++ labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/src/test/java/org/drools/dataloaders/jaxb/DroolsJaxbTest.java 2008-10-31 14:38:08 UTC (rev 23653)
@@ -25,7 +25,6 @@
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.Unmarshaller;
-import javax.xml.transform.stream.StreamSource;
import junit.framework.TestCase;
Modified: labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/src/main/java/org/drools/dataloaders/smooks/DroolsSmooksStatefulSession.java
===================================================================
--- labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/src/main/java/org/drools/dataloaders/smooks/DroolsSmooksStatefulSession.java 2008-10-31 14:35:15 UTC (rev 23652)
+++ labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/src/main/java/org/drools/dataloaders/smooks/DroolsSmooksStatefulSession.java 2008-10-31 14:38:08 UTC (rev 23653)
@@ -12,9 +12,9 @@
import org.milyn.Smooks;
import org.milyn.container.ExecutionContext;
import org.milyn.payload.JavaResult;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
-import org.mvel.compiler.ExpressionCompiler;
+import org.mvel2.MVEL;
+import org.mvel2.ParserContext;
+import org.mvel2.compiler.ExpressionCompiler;
public class DroolsSmooksStatefulSession {
private Smooks smooks;
Modified: labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/src/main/java/org/drools/dataloaders/smooks/DroolsSmooksStatelessSession.java
===================================================================
--- labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/src/main/java/org/drools/dataloaders/smooks/DroolsSmooksStatelessSession.java 2008-10-31 14:35:15 UTC (rev 23652)
+++ labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/src/main/java/org/drools/dataloaders/smooks/DroolsSmooksStatelessSession.java 2008-10-31 14:38:08 UTC (rev 23653)
@@ -2,23 +2,19 @@
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import javax.xml.transform.Source;
-import org.drools.FactHandle;
-import org.drools.StatefulSession;
import org.drools.StatelessSession;
import org.drools.common.InternalRuleBase;
import org.drools.common.InternalStatelessSession;
import org.milyn.Smooks;
import org.milyn.container.ExecutionContext;
import org.milyn.payload.JavaResult;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
-import org.mvel.compiler.ExpressionCompiler;
+import org.mvel2.MVEL;
+import org.mvel2.ParserContext;
+import org.mvel2.compiler.ExpressionCompiler;
public class DroolsSmooksStatelessSession {
private Smooks smooks;
Modified: labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/src/test/java/org/drools/dataloaders/smooks/DroolsSmookStatelessSessionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/src/test/java/org/drools/dataloaders/smooks/DroolsSmookStatelessSessionTest.java 2008-10-31 14:35:15 UTC (rev 23652)
+++ labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/src/test/java/org/drools/dataloaders/smooks/DroolsSmookStatelessSessionTest.java 2008-10-31 14:38:08 UTC (rev 23653)
@@ -5,16 +5,13 @@
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import javax.xml.transform.stream.StreamSource;
import junit.framework.TestCase;
-import org.drools.FactHandle;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.StatefulSession;
import org.drools.StatelessSession;
import org.drools.compiler.PackageBuilder;
import org.milyn.Smooks;
Modified: labs/jbossrules/trunk/drools-templates/src/main/java/org/drools/template/parser/DefaultGenerator.java
===================================================================
--- labs/jbossrules/trunk/drools-templates/src/main/java/org/drools/template/parser/DefaultGenerator.java 2008-10-31 14:35:15 UTC (rev 23652)
+++ labs/jbossrules/trunk/drools-templates/src/main/java/org/drools/template/parser/DefaultGenerator.java 2008-10-31 14:38:08 UTC (rev 23653)
@@ -21,11 +21,11 @@
import java.util.List;
import java.util.Map;
-import org.mvel.templates.CompiledTemplate;
-import org.mvel.templates.SimpleTemplateRegistry;
-import org.mvel.templates.TemplateCompiler;
-import org.mvel.templates.TemplateRegistry;
-import org.mvel.templates.TemplateRuntime;
+import org.mvel2.templates.CompiledTemplate;
+import org.mvel2.templates.SimpleTemplateRegistry;
+import org.mvel2.templates.TemplateCompiler;
+import org.mvel2.templates.TemplateRegistry;
+import org.mvel2.templates.TemplateRuntime;
/**
* @author <a href="mailto:stevearoonie at gmail.com">Steven Williams</a>
Modified: labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/DataProviderCompilerIntegrationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/DataProviderCompilerIntegrationTest.java 2008-10-31 14:35:15 UTC (rev 23652)
+++ labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/DataProviderCompilerIntegrationTest.java 2008-10-31 14:38:08 UTC (rev 23653)
@@ -4,9 +4,6 @@
import java.util.Iterator;
import java.util.List;
-import org.drools.template.DataProvider;
-import org.drools.template.DataProviderCompiler;
-
import junit.framework.TestCase;
public class DataProviderCompilerIntegrationTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/model/FunctionsRenderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/model/FunctionsRenderTest.java 2008-10-31 14:35:15 UTC (rev 23652)
+++ labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/model/FunctionsRenderTest.java 2008-10-31 14:38:08 UTC (rev 23653)
@@ -16,9 +16,6 @@
* limitations under the License.
*/
-import org.drools.template.model.DRLOutput;
-import org.drools.template.model.Functions;
-
import junit.framework.TestCase;
public class FunctionsRenderTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/model/PackageRenderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/model/PackageRenderTest.java 2008-10-31 14:35:15 UTC (rev 23652)
+++ labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/model/PackageRenderTest.java 2008-10-31 14:38:08 UTC (rev 23653)
@@ -16,13 +16,6 @@
* limitations under the License.
*/
-import org.drools.template.model.Condition;
-import org.drools.template.model.Consequence;
-import org.drools.template.model.DRLOutput;
-import org.drools.template.model.Import;
-import org.drools.template.model.Package;
-import org.drools.template.model.Rule;
-
import junit.framework.TestCase;
/**
Modified: labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/model/RuleRenderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/model/RuleRenderTest.java 2008-10-31 14:35:15 UTC (rev 23652)
+++ labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/model/RuleRenderTest.java 2008-10-31 14:38:08 UTC (rev 23653)
@@ -16,11 +16,6 @@
* limitations under the License.
*/
-import org.drools.template.model.Condition;
-import org.drools.template.model.Consequence;
-import org.drools.template.model.DRLOutput;
-import org.drools.template.model.Rule;
-
import junit.framework.TestCase;
/**
Modified: labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/model/SnippetBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/model/SnippetBuilderTest.java 2008-10-31 14:35:15 UTC (rev 23652)
+++ labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/model/SnippetBuilderTest.java 2008-10-31 14:38:08 UTC (rev 23653)
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import org.drools.template.model.SnippetBuilder;
-
import junit.framework.TestCase;
/**
Modified: labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/ColumnFactoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/ColumnFactoryTest.java 2008-10-31 14:35:15 UTC (rev 23652)
+++ labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/ColumnFactoryTest.java 2008-10-31 14:38:08 UTC (rev 23653)
@@ -1,11 +1,5 @@
package org.drools.template.parser;
-import org.drools.template.parser.ArrayColumn;
-import org.drools.template.parser.Column;
-import org.drools.template.parser.ColumnFactory;
-import org.drools.template.parser.LongColumn;
-import org.drools.template.parser.StringColumn;
-
import junit.framework.TestCase;
public class ColumnFactoryTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/DefaultGeneratorTest.java
===================================================================
--- labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/DefaultGeneratorTest.java 2008-10-31 14:35:15 UTC (rev 23652)
+++ labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/DefaultGeneratorTest.java 2008-10-31 14:38:08 UTC (rev 23653)
@@ -3,13 +3,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.template.parser.Column;
-import org.drools.template.parser.DefaultGenerator;
-import org.drools.template.parser.Row;
-import org.drools.template.parser.RuleTemplate;
-import org.drools.template.parser.StringColumn;
-import org.drools.template.parser.TemplateContainer;
-
import junit.framework.TestCase;
public class DefaultGeneratorTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/DefaultTemplateContainerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/DefaultTemplateContainerTest.java 2008-10-31 14:35:15 UTC (rev 23652)
+++ labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/DefaultTemplateContainerTest.java 2008-10-31 14:38:08 UTC (rev 23653)
@@ -4,12 +4,6 @@
import java.util.List;
import java.util.Map;
-import org.drools.template.parser.Column;
-import org.drools.template.parser.DecisionTableParseException;
-import org.drools.template.parser.DefaultTemplateContainer;
-import org.drools.template.parser.RuleTemplate;
-import org.drools.template.parser.TemplateColumn;
-
import junit.framework.TestCase;
public class DefaultTemplateContainerTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/DefaultTemplateRuleBaseTest.java
===================================================================
--- labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/DefaultTemplateRuleBaseTest.java 2008-10-31 14:35:15 UTC (rev 23652)
+++ labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/DefaultTemplateRuleBaseTest.java 2008-10-31 14:38:08 UTC (rev 23653)
@@ -10,13 +10,6 @@
import org.drools.rule.Package;
import org.drools.rule.Rule;
import org.drools.rule.VariableConstraint;
-import org.drools.template.parser.Column;
-import org.drools.template.parser.DefaultGenerator;
-import org.drools.template.parser.DefaultTemplateRuleBase;
-import org.drools.template.parser.LongColumn;
-import org.drools.template.parser.RuleTemplate;
-import org.drools.template.parser.StringColumn;
-import org.drools.template.parser.TemplateContainer;
public class DefaultTemplateRuleBaseTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/RuleTemplateTest.java
===================================================================
--- labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/RuleTemplateTest.java 2008-10-31 14:35:15 UTC (rev 23652)
+++ labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/RuleTemplateTest.java 2008-10-31 14:38:08 UTC (rev 23653)
@@ -5,10 +5,6 @@
import junit.framework.TestCase;
-import org.drools.template.parser.Column;
-import org.drools.template.parser.RuleTemplate;
-import org.drools.template.parser.TemplateColumn;
-import org.drools.template.parser.TemplateContainer;
import org.drools.util.StringUtils;
public class RuleTemplateTest extends TestCase {
More information about the jboss-svn-commits
mailing list