[jboss-svn-commits] JBL Code SVN: r21565 - in labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks: src/main/java/org/drools/dataloaders/smooks and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Aug 15 04:25:04 EDT 2008
Author: mark.proctor at jboss.com
Date: 2008-08-15 04:25:04 -0400 (Fri, 15 Aug 2008)
New Revision: 21565
Modified:
labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/.classpath
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/DroolsSmookStatefulSessionTest.java
Log:
JBRULES-1668 Smooks Data Loader
-minor refactor
Modified: labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/.classpath 2008-08-15 08:23:11 UTC (rev 21564)
+++ labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/.classpath 2008-08-15 08:25:04 UTC (rev 21565)
@@ -19,7 +19,21 @@
<classpathentry kind="var" path="M2_REPO/org/freemarker/freemarker/2.3.9/freemarker-2.3.9.jar"/>
<classpathentry kind="src" path="/drools-compiler"/>
<classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.1-b1/stringtemplate-3.1-b1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/gunit/1.0.1/gunit-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/2.0/maven-model-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.0/maven-artifact-manager-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0.1/antlr-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
<classpathentry kind="var" path="M2_REPO/janino/janino/2.5.10/janino-2.5.10.jar"/>
</classpath>
\ No newline at end of file
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-08-15 08:23:11 UTC (rev 21564)
+++ labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/src/main/java/org/drools/dataloaders/smooks/DroolsSmooksStatefulSession.java 2008-08-15 08:25:04 UTC (rev 21565)
@@ -52,7 +52,7 @@
// preserve the previous classloader, While we make Smooks aware of the Drools classloader
ClassLoader previousClassLoader = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader( ((InternalRuleBase) this.session.getRuleBase()).getCompositePackageClassLoader() );
+ Thread.currentThread().setContextClassLoader( ((InternalRuleBase) this.session.getRuleBase()).getRootClassLoader() );
ExecutionContext executionContext = this.smooks.createExecutionContext();
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-08-15 08:23:11 UTC (rev 21564)
+++ labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/src/main/java/org/drools/dataloaders/smooks/DroolsSmooksStatelessSession.java 2008-08-15 08:25:04 UTC (rev 21565)
@@ -56,7 +56,7 @@
// preserve the previous classloader, While we make Smooks aware of the Drools classloader
ClassLoader previousClassLoader = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader( ((InternalRuleBase) this.session.getRuleBase()).getCompositePackageClassLoader() );
+ Thread.currentThread().setContextClassLoader( ((InternalRuleBase) this.session.getRuleBase()).getRootClassLoader() );
ExecutionContext executionContext = this.smooks.createExecutionContext();
Modified: labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/src/test/java/org/drools/dataloaders/smooks/DroolsSmookStatefulSessionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/src/test/java/org/drools/dataloaders/smooks/DroolsSmookStatefulSessionTest.java 2008-08-15 08:23:11 UTC (rev 21564)
+++ labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/src/test/java/org/drools/dataloaders/smooks/DroolsSmookStatefulSessionTest.java 2008-08-15 08:25:04 UTC (rev 21565)
@@ -20,10 +20,10 @@
import org.milyn.io.StreamUtils;
public class DroolsSmookStatefulSessionTest extends TestCase {
- public void testSmooksNestedIterable() throws Exception {
+ public void testDirectRoot() throws Exception {
PackageBuilder pkgBuilder = new PackageBuilder();
- pkgBuilder.addPackageFromDrl( new InputStreamReader( DroolsSmookStatefulSessionTest.class.getResourceAsStream( "test_SmooksNestedIterable.drl" ) ) );
+ pkgBuilder.addPackageFromDrl( new InputStreamReader( DroolsSmookStatefulSessionTest.class.getResourceAsStream( "test_SmooksDirectRoot.drl" ) ) );
assertFalse( pkgBuilder.hasErrors() );
@@ -32,34 +32,31 @@
StatefulSession session = ruleBase.newStatefulSession();
List list = new ArrayList();
- session.setGlobal( "list", list );
+ session.setGlobal( "list", list );
// Instantiate Smooks with the config...
Smooks smooks = new Smooks( getClass().getResourceAsStream( "smooks-config.xml" ) );
- DroolsSmooksConfiguration conf = new DroolsSmooksConfiguration( "root",
- "children" );
+
+ DroolsSmooksConfiguration conf = new DroolsSmooksConfiguration( "orderItem", null );
//
DroolsSmooksStatefulSession dataLoader = new DroolsSmooksStatefulSession( session,
smooks,
conf );
- Map<FactHandle, Object> handles = dataLoader.insertFilter( new StreamSource( getClass().getResourceAsStream( "SmooksNestedIterable.xml") ) );
+ Map<FactHandle, Object> handles = dataLoader.insertFilter( new StreamSource( getClass().getResourceAsStream( "SmooksDirectRoot.xml") ) );
//
session.fireAllRules();
- assertEquals(2, handles.size() );
- assertEquals(2, list.size());
+ assertEquals(1, handles.size() );
+ assertEquals(1, list.size());
assertEquals( "example.OrderItem", list.get( 0 ).getClass().getName() );
- assertEquals( "example.OrderItem", list.get( 1 ).getClass().getName() );
-
- assertNotSame( list.get( 0 ), list.get( 1 ) );
}
- public void testSmooksDirectRoot() throws Exception {
+ public void testNestedIterable() throws Exception {
PackageBuilder pkgBuilder = new PackageBuilder();
- pkgBuilder.addPackageFromDrl( new InputStreamReader( DroolsSmookStatefulSessionTest.class.getResourceAsStream( "test_SmooksDirectRoot.drl" ) ) );
+ pkgBuilder.addPackageFromDrl( new InputStreamReader( DroolsSmookStatefulSessionTest.class.getResourceAsStream( "test_SmooksNestedIterable.drl" ) ) );
assertFalse( pkgBuilder.hasErrors() );
@@ -68,30 +65,30 @@
StatefulSession session = ruleBase.newStatefulSession();
List list = new ArrayList();
- session.setGlobal( "list", list );
+ session.setGlobal( "list", list );
// Instantiate Smooks with the config...
Smooks smooks = new Smooks( getClass().getResourceAsStream( "smooks-config.xml" ) );
-
- DroolsSmooksConfiguration conf = new DroolsSmooksConfiguration( "orderItem", null );
+ DroolsSmooksConfiguration conf = new DroolsSmooksConfiguration( "root",
+ "children" );
//
DroolsSmooksStatefulSession dataLoader = new DroolsSmooksStatefulSession( session,
smooks,
conf );
- Map<FactHandle, Object> handles = dataLoader.insertFilter( new StreamSource( getClass().getResourceAsStream( "SmooksDirectRoot.xml") ) );
+ Map<FactHandle, Object> handles = dataLoader.insertFilter( new StreamSource( getClass().getResourceAsStream( "SmooksNestedIterable.xml") ) );
//
session.fireAllRules();
- assertEquals(1, handles.size() );
- assertEquals(1, list.size());
+ assertEquals(2, handles.size() );
+ assertEquals(2, list.size());
assertEquals( "example.OrderItem", list.get( 0 ).getClass().getName() );
- }
-
-
-
-
+ assertEquals( "example.OrderItem", list.get( 1 ).getClass().getName() );
+
+ assertNotSame( list.get( 0 ), list.get( 1 ) );
+ }
+
private static byte[] readInputMessage(InputStream stream) {
try {
return StreamUtils.readStream( stream );
More information about the jboss-svn-commits
mailing list