[jboss-svn-commits] JBL Code SVN: r11998 - in labs/jbossrules/contrib/apocrif/jbossrules: src/main/java/apocrif/engine/jbossrules and 3 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Sun May 20 19:42:17 EDT 2007


Author: mark.proctor at jboss.com
Date: 2007-05-20 19:42:17 -0400 (Sun, 20 May 2007)
New Revision: 11998

Added:
   labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/xml/simpleTest.xml
Removed:
   labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/xml/test.xml
Modified:
   labs/jbossrules/contrib/apocrif/jbossrules/.classpath
   labs/jbossrules/contrib/apocrif/jbossrules/src/main/java/apocrif/engine/jbossrules/Rif2DrlTranslator.java
   labs/jbossrules/contrib/apocrif/jbossrules/src/test/java/jbossrules/tests/JBossRulesTest.java
   labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/drl/creditscore1.drl
   labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/drl/creditscore2.drl
   labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/drl/creditscore3.drl
Log:


Modified: labs/jbossrules/contrib/apocrif/jbossrules/.classpath
===================================================================
--- labs/jbossrules/contrib/apocrif/jbossrules/.classpath	2007-05-20 23:28:27 UTC (rev 11997)
+++ labs/jbossrules/contrib/apocrif/jbossrules/.classpath	2007-05-20 23:42:17 UTC (rev 11998)
@@ -10,7 +10,6 @@
 	<classpathentry kind="lib" path="lib/core-3.2.1.v_677_R32x.jar"/>
 	<classpathentry kind="lib" path="lib/drools-compiler-4.0.0.11754MR2.jar"/>
 	<classpathentry kind="lib" path="lib/drools-core-4.0.0.11754MR2.jar"/>
-	<classpathentry kind="lib" path="lib/mvel14-1.2beta16.jar"/>
 	<classpathentry kind="lib" path="lib/xercesImpl-2.4.0.jar"/>
 	<classpathentry kind="lib" path="lib/xml-apis-1.0.b2.jar"/>
 	<classpathentry kind="lib" path="lib/activation.jar"/>
@@ -19,5 +18,6 @@
 	<classpathentry kind="lib" path="lib/jsr173_1.0_api.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_10"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/apocrifcore"/>
+	<classpathentry kind="lib" path="lib/mvel14-1.2beta18.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: labs/jbossrules/contrib/apocrif/jbossrules/src/main/java/apocrif/engine/jbossrules/Rif2DrlTranslator.java
===================================================================
--- labs/jbossrules/contrib/apocrif/jbossrules/src/main/java/apocrif/engine/jbossrules/Rif2DrlTranslator.java	2007-05-20 23:28:27 UTC (rev 11997)
+++ labs/jbossrules/contrib/apocrif/jbossrules/src/main/java/apocrif/engine/jbossrules/Rif2DrlTranslator.java	2007-05-20 23:42:17 UTC (rev 11998)
@@ -195,8 +195,8 @@
 
     public Void visit(ProductionRule rifRule) {
         inConsequence = false;
-        writer.print( "rule " );
-        writer.println( "\"" + rifRule.getName() + "\"" );
+        writer.println( "rule " + "\"" + rifRule.getName() + "\"" );
+        writer.println( "no-loop true");
         writer.println( "when " );
 
         // declare variable

Modified: labs/jbossrules/contrib/apocrif/jbossrules/src/test/java/jbossrules/tests/JBossRulesTest.java
===================================================================
--- labs/jbossrules/contrib/apocrif/jbossrules/src/test/java/jbossrules/tests/JBossRulesTest.java	2007-05-20 23:28:27 UTC (rev 11997)
+++ labs/jbossrules/contrib/apocrif/jbossrules/src/test/java/jbossrules/tests/JBossRulesTest.java	2007-05-20 23:42:17 UTC (rev 11998)
@@ -46,8 +46,8 @@
                                                                                        objectTypeFactory );
 
         String expectedDrlText = readFileAsString( drlFileName );
-        System.out.println( expectedDrlText );
-        System.out.println( actualDrlText );
+//        System.out.println( expectedDrlText );
+//        System.out.println( actualDrlText );
 
         assertEqualsIgnoreWhitespace( expectedDrlText,
                                       actualDrlText );
@@ -56,16 +56,9 @@
     }
 
     public void testCreditscore1() throws Exception {
-        final String XSD_FILE = "src/test/resources/xsd/mismo.xsd";
         final String DRL_FILE = "src/test/resources/drl/creditscore1.drl";
         final String RIF_FILE = "src/test/resources/xml/creditscore1.xml";
-        //final String IMPLICIT_PCK = "mismo2";
 
-        //        File file = new File( "src/test/resources/creditscore.jar" );
-        //        ClassLoader classLoader = new URLClassLoader( new URL[] { file.toURL() } );
-        //        assertTrue( file.exists() );
-        //classLoader.
-
         testParser( RIF_FILE,
                     DRL_FILE,
                     "creditscore",
@@ -74,10 +67,8 @@
     }
 
     public void testCreditscore2() throws Exception {
-        final String XSD_FILE = "src/test/resources/xsd/mismo.xsd";
         final String DRL_FILE = "src/test/resources/drl/creditscore2.drl";
         final String RIF_FILE = "src/test/resources/xml/creditscore2.xml";
-        //final String IMPLICIT_PCK = "mismo";
 
         testParser( RIF_FILE,
                     DRL_FILE,
@@ -87,13 +78,8 @@
     }
 
     public void testCreditscore3() throws Exception {
-        final String XSD_FILE = "src/test/resources/xsd/AUS_v2_4.xsd";
-        //      final String XSD_FILE = "src/test/resources/xsd/CREDIT_RESPONSE_v2_3_1(MXCompliance).xsd";
-
-        final String XML_FILE = "src/test/resources/xml/AUSMXARM.xml";
         final String DRL_FILE = "src/test/resources/drl/creditscore3.drl";
         final String RIF_FILE = "src/test/resources/xml/creditscore3.xml";
-        //final String IMPLICIT_PCK = "mismo";
 
         testParser( RIF_FILE,
                     DRL_FILE,
@@ -103,39 +89,13 @@
     }
 
     public void testMismo() throws Exception {
-        final String XSD_FILE = "src/test/resources/xsd/AUS_v2_4.xsd";
-        //		final String XSD_FILE = "data/xsd/CREDIT_RESPONSE_v2_3_1(MXCompliance).xsd";
-
         final String XML_FILE = "src/test/resources/xml/AUSMXARM.xml";
-        //final String IRL_FILE = "src/test/resources/drl/test.irl";
-        final String RIF_FILE = "src/test/resources/xml/test.xml";
+        final String RIF_FILE = "src/test/resources/xml/simpleTest.xml";
 
-        Ruleset rifRuleset = deserializer.deserialize( new BufferedReader( new FileReader( new File( RIF_FILE ) ) ) );
-        String actualDrlText = new Rif2DrlTranslator( Thread.currentThread().getContextClassLoader() ).translateToString( rifRuleset,
-                                                                                                                          "mismo",
-                                                                                                                          mismo.ObjectFactory.class );
-
-        System.out.println( actualDrlText );
-
         JAXBContextImpl jc = (JAXBContextImpl) JAXBContext.newInstance( "mismo" );
         Unmarshaller unmarshaller = jc.createUnmarshaller();
         LOANAPPLICATION application = (LOANAPPLICATION) unmarshaller.unmarshal( new File( XML_FILE ) );
 
-        //jc.
-        //System.out.println( jc.createJAXBIntrospector().( new QName("mismo", "LOAN_APPLICATION") ) );
-
-        //                for ( Method method : ObjectFactory.class.getMethods() ) {
-        //                    if ( method.getName().startsWith( "create" ) ) {
-        //                        String name = method.getName().substring( 6 );
-        //                        Class clazz = ObjectFactory.class.getClassLoader().loadClass( ObjectFactory.class.getPackage().getName() + "." + name );
-        //                        XmlRootElement xmlRootElement = ( XmlRootElement ) clazz.getAnnotation( XmlRootElement.class );
-        //                        System.out.println( clazz.getName()  + " = " + xmlRootElement.name() );
-        //                    }
-        //                }
-        //                
-//        System.out.println( jc.getGlobalType( new QName( "mismo",
-//                                                         "LOAN_APPLICATION" ) ) );
-
         JBossRulesDriver driver = new JBossRulesDriver( "mismo",
                                                         mismo.ObjectFactory.class,
                                                         Thread.currentThread().getContextClassLoader() );
@@ -145,11 +105,17 @@
         Package pkg = driver.readFromRifXml( reader );
         RuleBase ruleBase = RuleBaseFactory.newRuleBase();
         ruleBase.addPackage( pkg );
+
+        // check values before executing the rule session
+        assertEquals( "B1", application.getREOPROPERTY().getBorrowerID() );
         
         StatelessSession session = ruleBase.newStatelessSession();
         StatelessSessionResult results = session.executeWithResults( new Object[] { application }  );
 
-        //executeDegradedRuleset(XSD_FILE, XML_FILE, IRL_FILE, RIF_FILE, IMPLICIT_PCK );
+        LOANAPPLICATION returnedApplication = ( LOANAPPLICATION ) results.iterateObjects().next();
+        
+        // check vlaues after executing the rule session
+        assertEquals( "B2", returnedApplication.getREOPROPERTY().getBorrowerID() );
     }
 
     private void assertEqualsIgnoreWhitespace(final String expected,

Modified: labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/drl/creditscore1.drl
===================================================================
--- labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/drl/creditscore1.drl	2007-05-20 23:28:27 UTC (rev 11997)
+++ labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/drl/creditscore1.drl	2007-05-20 23:42:17 UTC (rev 11998)
@@ -3,6 +3,7 @@
 import creditscore.Root
 
 rule "Occupancy_Adjustments_1"
+    no-loop true
 when 
     r : Root( division=="wholesale",
               occupancy=="Investors" )

Modified: labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/drl/creditscore2.drl
===================================================================
--- labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/drl/creditscore2.drl	2007-05-20 23:28:27 UTC (rev 11997)
+++ labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/drl/creditscore2.drl	2007-05-20 23:42:17 UTC (rev 11998)
@@ -4,7 +4,7 @@
 import creditscore.Root
 
 rule "Occupancy_Adjustments_1"
-
+    no-loop true
 when 
     r : Root( division=="wholesale",
               occupancy=="Investors" )

Modified: labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/drl/creditscore3.drl
===================================================================
--- labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/drl/creditscore3.drl	2007-05-20 23:28:27 UTC (rev 11997)
+++ labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/drl/creditscore3.drl	2007-05-20 23:42:17 UTC (rev 11998)
@@ -3,6 +3,7 @@
 import creditscore.CreditScore
 
 rule "Credit_Score_Adjustments_0"
+    no-loop true
 when 
     cs : CreditScore( programGroup=="ACMEPowerBuyerGroup",
                       lienType=="FIRST_TD; SECOND_TD",

Copied: labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/xml/simpleTest.xml (from rev 11970, labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/xml/test.xml)
===================================================================
--- labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/xml/simpleTest.xml	                        (rev 0)
+++ labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/xml/simpleTest.xml	2007-05-20 23:42:17 UTC (rev 11998)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Ruleset xmlns:aprif="http://apocrif/pr" xmlns:ns0="mismo" xmlns:xpath="http://www.w3.org/2005/xpath-functions" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <name>IlrContext</name>
+  <ProductionRule>
+    <name>rule 1</name>
+    <declare>
+      <Var type="ns0:LOAN_APPLICATION">loanApplication</Var>
+    </declare>
+    <declare>
+      <Var type="ns0:REO_PROPERTY">reoproperty</Var>
+    </declare>
+
+    <if>
+      <And>
+        <Equal>
+          <Uniterm>
+            <Const type="xsd:QName">aprif:xmlGetter</Const>
+            <Const type="xsd:QName">ns0:REO_PROPERTY</Const>
+            <Const>BorrowerID</Const>
+            <Var type="ns0:REO_PROPERTY">reoproperty</Var>
+          </Uniterm>
+          <Const type="xsd:string">B1</Const>
+        </Equal>
+      </And>
+    </if>
+    <constaints>
+      <And>
+        <Uniterm>
+          <Const type="xsd:QName">aprif:fromGeneratorOp</Const>
+          <Var type="ns0:REO_PROPERTY">reoproperty</Var>
+          <Uniterm>
+            <Const type="xsd:QName">aprif:xmlGetter</Const>
+            <Const type="xsd:QName">ns0:LOAN_APPLICATION</Const>
+            <Const>REO_PROPERTY</Const>
+            <Var type="ns0:LOAN_APPLICATION">loanApplication</Var>
+          </Uniterm>
+        </Uniterm>
+      </And>
+    </constaints>
+    <then>
+      <Uniterm>
+        <Const type="xsd:QName">aprif:xmlSetter</Const>
+        <Const type="xsd:QName">ns0:REOPROPERTY</Const>
+        <Const>BorrowerID</Const>
+        <Var type="ns0:REOPROPERTY">reoproperty</Var>
+        <Const type="xsd:string">B2</Const>
+      </Uniterm>
+    </then>
+  </ProductionRule>
+</Ruleset>
\ No newline at end of file

Deleted: labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/xml/test.xml
===================================================================
--- labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/xml/test.xml	2007-05-20 23:28:27 UTC (rev 11997)
+++ labs/jbossrules/contrib/apocrif/jbossrules/src/test/resources/xml/test.xml	2007-05-20 23:42:17 UTC (rev 11998)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Ruleset xmlns:aprif="http://apocrif/pr" xmlns:ns0="mismo" xmlns:xpath="http://www.w3.org/2005/xpath-functions" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <name>IlrContext</name>
-  <ProductionRule>
-    <name>rule 1</name>
-    <declare>
-      <Var type="ns0:LOAN_APPLICATION">loanApplication</Var>
-    </declare>
-    <declare>
-      <Var type="ns0:REO_PROPERTY">reoproperty</Var>
-    </declare>
-
-    <if>
-      <And>
-        <Equal>
-          <Uniterm>
-            <Const type="xsd:QName">aprif:xmlGetter</Const>
-            <Const type="xsd:QName">ns0:REO_PROPERTY</Const>
-            <Const>BorrowerID</Const>
-            <Var type="ns0:REO_PROPERTY">reoproperty</Var>
-          </Uniterm>
-          <Const type="xsd:string">yyyy</Const>
-        </Equal>
-      </And>
-    </if>
-    <constaints>
-      <And>
-        <Uniterm>
-          <Const type="xsd:QName">aprif:fromGeneratorOp</Const>
-          <Var type="ns0:REO_PROPERTY">reoproperty</Var>
-          <Uniterm>
-            <Const type="xsd:QName">aprif:xmlGetter</Const>
-            <Const type="xsd:QName">ns0:LOAN_APPLICATION</Const>
-            <Const>REO_PROPERTY</Const>
-            <Var type="ns0:LOAN_APPLICATION">loanApplication</Var>
-          </Uniterm>
-        </Uniterm>
-      </And>
-    </constaints>
-    <then>
-      <Uniterm>
-        <Const type="xsd:QName">aprif:xmlSetter</Const>
-        <Const type="xsd:QName">ns0:REOPROPERTY</Const>
-        <Const>BorrowerID</Const>
-        <Var type="ns0:REOPROPERTY">reoproperty</Var>
-        <Const type="xsd:string">xxxx</Const>
-      </Uniterm>
-    </then>
-  </ProductionRule>
-</Ruleset>
\ No newline at end of file




More information about the jboss-svn-commits mailing list