[jboss-svn-commits] JBL Code SVN: r14869 - in labs/jbossrules/trunk: documentation and 23 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Sep 4 13:16:37 EDT 2007


Author: fmeyer
Date: 2007-09-04 13:16:37 -0400 (Tue, 04 Sep 2007)
New Revision: 14869

Removed:
   labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/MVELTest.java
   labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/mvel_test.drl
   labs/jbossrules/trunk/experimental/drools-insurance/src/main/rules/droolspackage.pkg
Modified:
   labs/jbossrules/trunk/documentation/manual/en/master.xml
   labs/jbossrules/trunk/documentation/pom.xml
   labs/jbossrules/trunk/drools-ant/pom.xml
   labs/jbossrules/trunk/drools-ant/src/main/java/org/drools/contrib/DroolsAntTask.java
   labs/jbossrules/trunk/drools-clips/.classpath
   labs/jbossrules/trunk/drools-clips/pom.xml
   labs/jbossrules/trunk/drools-compiler/pom.xml
   labs/jbossrules/trunk/drools-core/pom.xml
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/codehaus/jfdi/interpreter/ClassTypeResolverTest.java
   labs/jbossrules/trunk/drools-decisiontables/pom.xml
   labs/jbossrules/trunk/drools-eclipse/build.properties
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-feature/feature.xml
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test-feature/feature.xml
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/META-INF/MANIFEST.MF
   labs/jbossrules/trunk/drools-eclipse/pom.xml
   labs/jbossrules/trunk/drools-jbrms/pom.xml
   labs/jbossrules/trunk/drools-jsr94/.project
   labs/jbossrules/trunk/drools-jsr94/pom.xml
   labs/jbossrules/trunk/drools-repository/pom.xml
   labs/jbossrules/trunk/drools-server/pom.xml
   labs/jbossrules/trunk/experimental/drools-insurance/redeploy_appserver.sh
   labs/jbossrules/trunk/experimental/drools-insurance/repository_export.zip
   labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/AccessoriesCoverage.java
   labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/Approve.java
   labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/Driver.java
   labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/DriverAdditionalInfo.java
   labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/Policy.java
   labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/Rejection.java
   labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/SupplementalInfo.java
   labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/web/DroolsBusiness.java
   labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/web/InsuranceServlet.java
   labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/InsuranceTestHelper.java
   labs/jbossrules/trunk/pom.xml
Log:
Updating insurance example
Updated version numbers to 4.0.2.Snapshot



Modified: labs/jbossrules/trunk/documentation/manual/en/master.xml
===================================================================
--- labs/jbossrules/trunk/documentation/manual/en/master.xml	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/documentation/manual/en/master.xml	2007-09-04 17:16:37 UTC (rev 14869)
@@ -5,7 +5,7 @@
 
     <subtitle>Drools Documentation</subtitle>
 
-    <releaseinfo>4.0.1.SNAPSHOT</releaseinfo>
+    <releaseinfo>4.0.2.SNAPSHOT</releaseinfo>
 
     <author>
       <firstname>Mark</firstname>

Modified: labs/jbossrules/trunk/documentation/pom.xml
===================================================================
--- labs/jbossrules/trunk/documentation/pom.xml	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/documentation/pom.xml	2007-09-04 17:16:37 UTC (rev 14869)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>drools</artifactId>
     <groupId>org.drools</groupId>
-    <version>4.0.1.SNAPSHOT</version>
+    <version>4.0.2.SNAPSHOT</version>
   </parent>
 
   <artifactId>drools-documentation</artifactId>

Modified: labs/jbossrules/trunk/drools-ant/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-ant/pom.xml	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-ant/pom.xml	2007-09-04 17:16:37 UTC (rev 14869)
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>drools</artifactId>
     <groupId>org.drools</groupId>
-    <version>4.0.1.SNAPSHOT</version>
+    <version>4.0.2.SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

Modified: labs/jbossrules/trunk/drools-ant/src/main/java/org/drools/contrib/DroolsAntTask.java
===================================================================
--- labs/jbossrules/trunk/drools-ant/src/main/java/org/drools/contrib/DroolsAntTask.java	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-ant/src/main/java/org/drools/contrib/DroolsAntTask.java	2007-09-04 17:16:37 UTC (rev 14869)
@@ -54,7 +54,7 @@
     
     public static String BRLFILEEXTENSION = ".brl";
     public static String XMLFILEEXTENSION = ".xml";
-    public static String RULEFLOWFILEEXTENSION = ".rf";
+    public static String RULEFLOWFILEEXTENSION = ".rfm";
     
     private File srcdir;
     private File toFile;

Modified: labs/jbossrules/trunk/drools-clips/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-clips/.classpath	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-clips/.classpath	2007-09-04 17:16:37 UTC (rev 14869)
@@ -5,15 +5,13 @@
   <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2rc4/mvel14-1.2rc4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.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/org/drools/drools-compiler/4.0.1.SNAPSHOT/drools-compiler-4.0.1.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-compiler/4.0.1.SNAPSHOT/drools-compiler-4.0.1.SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/drools/drools-core/4.0.1.SNAPSHOT/drools-core-4.0.1.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-core/4.0.1.SNAPSHOT/drools-core-4.0.1.SNAPSHOT-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.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/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.7/janino-2.5.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2rc4rv913/mvel14-1.2rc4rv913.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-clips/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-clips/pom.xml	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-clips/pom.xml	2007-09-04 17:16:37 UTC (rev 14869)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>drools</artifactId>
     <groupId>org.drools</groupId>
-	  <version>4.0.1.SNAPSHOT</version>
+	  <version>4.0.2.SNAPSHOT</version>
   </parent>${project.version}
 
   <artifactId>drools-clips</artifactId>

Modified: labs/jbossrules/trunk/drools-compiler/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/pom.xml	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-compiler/pom.xml	2007-09-04 17:16:37 UTC (rev 14869)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>drools</artifactId>
     <groupId>org.drools</groupId>
-	  <version>4.0.1.SNAPSHOT</version>
+	  <version>4.0.2.SNAPSHOT</version>
   </parent>
 
   <artifactId>drools-compiler</artifactId>

Modified: labs/jbossrules/trunk/drools-core/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-core/pom.xml	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-core/pom.xml	2007-09-04 17:16:37 UTC (rev 14869)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>drools</artifactId>
     <groupId>org.drools</groupId>
-    <version>4.0.1.SNAPSHOT</version>
+    <version>4.0.2.SNAPSHOT</version>
   </parent>
 
   <artifactId>drools-core</artifactId>

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java	2007-09-04 17:16:37 UTC (rev 14869)
@@ -121,7 +121,7 @@
     public Package(final String name,
                    ClassLoader parentClassLoader) {
         this.name = name;
-        this.imports = new HashSet( 2 );
+        this.imports = new HashSet();
         this.staticImports = Collections.EMPTY_SET;
         this.rules = new LinkedHashMap();
         this.ruleFlows = Collections.EMPTY_MAP;

Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/codehaus/jfdi/interpreter/ClassTypeResolverTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/codehaus/jfdi/interpreter/ClassTypeResolverTest.java	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/codehaus/jfdi/interpreter/ClassTypeResolverTest.java	2007-09-04 17:16:37 UTC (rev 14869)
@@ -111,7 +111,7 @@
         assertEquals( SecondClass.AlternativeKey.class,
                       resolver.resolveType( "org.drools.SecondClass.AlternativeKey" ) );
     }
-
+    
     public void testResolveObjectFromImportMultipleClassesDifferentPackages() throws Exception {
         final ClassTypeResolver resolver = new ClassTypeResolver( new HashSet(), Thread.currentThread().getContextClassLoader() );
         resolver.addImport( "org.drools.Cheese" );

Modified: labs/jbossrules/trunk/drools-decisiontables/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/pom.xml	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-decisiontables/pom.xml	2007-09-04 17:16:37 UTC (rev 14869)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>drools</artifactId>
     <groupId>org.drools</groupId>
-	<version>4.0.1.SNAPSHOT</version>
+	<version>4.0.2.SNAPSHOT</version>
   </parent>
 
   <artifactId>drools-decisiontables</artifactId>

Modified: labs/jbossrules/trunk/drools-eclipse/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/build.properties	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-eclipse/build.properties	2007-09-04 17:16:37 UTC (rev 14869)
@@ -1,6 +1,6 @@
 #product=/plugin or feature id/path/to/.product
 runPackager=true
-droolsVersion=4.0.1.SNAPSHOT
+droolsVersion=4.0.2.SNAPSHOT
 
 # The prefix that will be used in the generated archive.
 archivePrefix=

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-feature/feature.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-feature/feature.xml	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-feature/feature.xml	2007-09-04 17:16:37 UTC (rev 14869)
@@ -2,7 +2,7 @@
 <feature
       id="org.drools.eclipse.feature"
       label="JBossRules Feature"
-      version="4.0.1.SNAPSHOT"
+      version="4.0.2.SNAPSHOT"
       provider-name="JBoss, Inc.">
 
    <description url="http://www.example.com/description">
@@ -43,7 +43,7 @@
          id="org.drools.eclipse"
          download-size="0"
          install-size="0"
-         version="4.0.1.SNAPSHOT"
+         version="4.0.2.SNAPSHOT"
          unpack="false"/>
 
 </feature>

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/META-INF/MANIFEST.MF	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/META-INF/MANIFEST.MF	2007-09-04 17:16:37 UTC (rev 14869)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Drools Eclipse Plug-in
 Bundle-SymbolicName: org.drools.eclipse;singleton:=true
-Bundle-Version: 4.0.1.SNAPSHOT
+Bundle-Version: 4.0.2.SNAPSHOT
 Bundle-Activator: org.drools.eclipse.DroolsEclipsePlugin
 Bundle-Vendor: krisv,mic
 Bundle-Localization: plugin

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/META-INF/MANIFEST.MF	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/META-INF/MANIFEST.MF	2007-09-04 17:16:37 UTC (rev 14869)
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: JBoss Rules Eclipse Test fragment
 Bundle-SymbolicName: org.drools.eclipse.test
-Bundle-Version: 4.0.1.SNAPSHOT
+Bundle-Version: 4.0.2.SNAPSHOT
 Bundle-Vendor: krisv,mic
-Fragment-Host: org.drools.eclipse;bundle-version="4.0.1.SNAPSHOT"
+Fragment-Host: org.drools.eclipse;bundle-version="4.0.2.SNAPSHOT"
 Bundle-Localization: plugin
 Require-Bundle: org.junit
 Bundle-ClassPath: .

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test-feature/feature.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test-feature/feature.xml	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test-feature/feature.xml	2007-09-04 17:16:37 UTC (rev 14869)
@@ -2,7 +2,7 @@
 <feature
       id="org.drools.eclipse.test-feature"
       label="JBossRules Feature"
-      version="4.0.1.SNAPSHOT"
+      version="4.0.2.SNAPSHOT"
       provider-name="JBoss, Inc.">
 
    <description url="http://www.example.com/description">
@@ -21,6 +21,6 @@
          id="org.drools.eclipse.test"
          download-size="0"
          install-size="0"
-         version="4.0.1.SNAPSHOT"/>
+         version="4.0.2.SNAPSHOT"/>
 
 </feature>

Modified: labs/jbossrules/trunk/drools-eclipse/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/pom.xml	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-eclipse/pom.xml	2007-09-04 17:16:37 UTC (rev 14869)
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>drools</artifactId>
     <groupId>org.drools</groupId>
-    <version>4.0.1.SNAPSHOT</version>
+    <version>4.0.2.SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

Modified: labs/jbossrules/trunk/drools-jbrms/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/pom.xml	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-jbrms/pom.xml	2007-09-04 17:16:37 UTC (rev 14869)
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>drools</artifactId>
     <groupId>org.drools</groupId>
-	  <version>4.0.1.SNAPSHOT</version>
+	  <version>4.0.2.SNAPSHOT</version>
   </parent>
 
   <artifactId>drools-jbrms</artifactId>

Modified: labs/jbossrules/trunk/drools-jsr94/.project
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/.project	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-jsr94/.project	2007-09-04 17:16:37 UTC (rev 14869)
@@ -4,6 +4,7 @@
   <projects>
     <project>drools-decisiontables</project>
     <project>drools-core</project>
+    <project>drools-decisiontables</project>
     <project>drools-compiler</project>
   </projects>
   <buildSpec>

Modified: labs/jbossrules/trunk/drools-jsr94/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/pom.xml	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-jsr94/pom.xml	2007-09-04 17:16:37 UTC (rev 14869)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>drools</artifactId>
     <groupId>org.drools</groupId>
-	<version>4.0.1.SNAPSHOT</version>
+	<version>4.0.2.SNAPSHOT</version>
   </parent>
 
   <artifactId>drools-jsr94</artifactId>

Modified: labs/jbossrules/trunk/drools-repository/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-repository/pom.xml	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-repository/pom.xml	2007-09-04 17:16:37 UTC (rev 14869)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>drools</artifactId>
     <groupId>org.drools</groupId>
-	  <version>4.0.1.SNAPSHOT</version>
+	  <version>4.0.2.SNAPSHOT</version>
   </parent>
 
   <artifactId>drools-repository</artifactId>

Modified: labs/jbossrules/trunk/drools-server/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-server/pom.xml	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/drools-server/pom.xml	2007-09-04 17:16:37 UTC (rev 14869)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>drools</artifactId>
     <groupId>org.drools</groupId>
-	  <version>4.0.1.SNAPSHOT</version>
+	  <version>4.0.2.SNAPSHOT</version>
   </parent>
 
   <artifactId>drools-server</artifactId>

Modified: labs/jbossrules/trunk/experimental/drools-insurance/redeploy_appserver.sh
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/redeploy_appserver.sh	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/experimental/drools-insurance/redeploy_appserver.sh	2007-09-04 17:16:37 UTC (rev 14869)
@@ -1,4 +1,4 @@
-mvn -o  package 
+mvn -o package -Dmaven.test.skip 
 cp ./target/*.war /usr/local/share/jetty-6.1.0/webapps
 
 

Modified: labs/jbossrules/trunk/experimental/drools-insurance/repository_export.zip
===================================================================
(Binary files differ)

Modified: labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/AccessoriesCoverage.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/AccessoriesCoverage.java	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/AccessoriesCoverage.java	2007-09-04 17:16:37 UTC (rev 14869)
@@ -11,6 +11,7 @@
     public double getArmorValue() {
         return armorValue;
     }
+
     public void setArmorValue(double armorValue) {
         this.armorValue = armorValue;
     }
@@ -18,18 +19,23 @@
     public double getSoundSystemValue() {
         return soundSystemValue;
     }
+
     public void setSoundSystemValue(double soundSystemValue) {
         this.soundSystemValue = soundSystemValue;
     }
+
     public double getAlarmSystemValue() {
         return alarmSystemValue;
     }
+
     public void setAlarmSystemValue(double alarmSystemValue) {
         this.alarmSystemValue = alarmSystemValue;
     }
+
     public int getDriverId() {
         return driverId;
     }
+
     public void setDriverId(int driverId) {
         this.driverId = driverId;
     }

Modified: labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/Approve.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/Approve.java	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/Approve.java	2007-09-04 17:16:37 UTC (rev 14869)
@@ -2,23 +2,23 @@
 
 /**
  * This is a simple fact class to mark something as approved.
+ *
  * @author Michael Neale
- *
  */
 public class Approve {
 
-	private String reason;
+    private String reason;
 
-	public Approve(String reason) {
-		this.reason = reason;
-	}
+    public Approve(String reason) {
+        this.reason = reason;
+    }
 
-	public String getReason() {
-		return reason;
-	}
+    public String getReason() {
+        return reason;
+    }
 
-	public void setReason(String reason) {
-		this.reason = reason;
-	}
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
 
 }

Modified: labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/Driver.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/Driver.java	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/Driver.java	2007-09-04 17:16:37 UTC (rev 14869)
@@ -14,10 +14,10 @@
     public static final int SINGLE = 0;
     public static final int MARRIED = 1;
 
-    private int     id;
+    private int id;
 
-    private String  name;
-    private Date    birhDate;
+    private String name;
+    private Date birhDate;
     private int licenceYears;
 
     private int priorClaims;
@@ -25,14 +25,14 @@
     private boolean hasChildren;
     private int genre;
 
-    private double  insuranceFactor = 1.0;
+    private double insuranceFactor = 1.0;
 
-    public double getInsuranceFactor(){
+    public double getInsuranceFactor() {
         return insuranceFactor;
     }
 
     public void setInsuranceFactor(double factor) {
-    	updateInsuranceFactor(factor);
+        updateInsuranceFactor(factor);
     }
 
     public void updateInsuranceFactor(double factor) {

Modified: labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/DriverAdditionalInfo.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/DriverAdditionalInfo.java	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/DriverAdditionalInfo.java	2007-09-04 17:16:37 UTC (rev 14869)
@@ -2,24 +2,24 @@
 
 public class DriverAdditionalInfo {
 
-    public static final int STREET             = 0;
-    public static final int GARAGE             = 1;
-    public static final int PUBLICPARKING      = 2;
+    public static final int STREET = 0;
+    public static final int GARAGE = 1;
+    public static final int PUBLICPARKING = 2;
 
-    public static final int RENTEDHOME         = 0;
-    public static final int OWNHOME            = 1;
+    public static final int RENTEDHOME = 0;
+    public static final int OWNHOME = 1;
 
-    public static final int UNEMPLOYED         = 0;
-    public static final int STUDENT            = 1;
+    public static final int UNEMPLOYED = 0;
+    public static final int STUDENT = 1;
     public static final int GOVERNMENTEMPLOYEE = 2;
-    public static final int PRIVATEEMPLOYEE    = 3;
-    public static final int BUSINESSOWNER      = 4;
+    public static final int PRIVATEEMPLOYEE = 3;
+    public static final int BUSINESSOWNER = 4;
 
-    private int             driverId;
-    private int         dayVehiclePlace;
-    private int         nightVehiclePlace;
-    private int         jobStatus;
-    private int         residenceStatus;
+    private int driverId;
+    private int dayVehiclePlace;
+    private int nightVehiclePlace;
+    private int jobStatus;
+    private int residenceStatus;
 
     public int getDayVehiclePlace() {
         return dayVehiclePlace;

Deleted: labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/MVELTest.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/MVELTest.java	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/MVELTest.java	2007-09-04 17:16:37 UTC (rev 14869)
@@ -1,97 +0,0 @@
-package org.acme.insurance.base;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStreamReader;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Reader;
-import java.io.Serializable;
-import java.io.StringReader;
-import java.util.HashMap;
-
-import junit.framework.TestCase;
-
-import org.drools.RuleBase;
-import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
-import org.drools.compiler.DroolsParserException;
-import org.drools.compiler.PackageBuilder;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.rule.Package;
-import org.mvel.MVEL;
-
-public class MVELTest extends TestCase {
-    public void testHelloWorld() throws Exception {
-
-        String tempFile = "/Users/michaelneale/foo3.pkg";
-
-        // read in the source
-
-        final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "mvel_test.drl" ) );
-
-
-
-
- /* uncomment the block below to create a binary package to use the next time you run it */
-//        Package pkg = loadPackage( reader );
-//
-//
-//
-//        FileOutputStream out = new FileOutputStream(tempFile);
-//        ObjectOutputStream obj = new ObjectOutputStream( out );
-//        obj.writeObject( pkg );
-//        obj.close();
-
-
-
-        ObjectInputStream in = new ObjectInputStream( new FileInputStream(tempFile) );
-        Package pkg2 = (Package) in.readObject();
-        // end of serialization block
-
-
-        RuleBase ruleBase = RuleBaseFactory.newRuleBase();
-
-        ruleBase.addPackage( pkg2 );
-
-        final WorkingMemory workingMemory = ruleBase.newStatefulSession();
-
-
-
-
-
-
-
-        workingMemory.insert( new Driver() );
-
-        workingMemory.fireAllRules();
-
-    }
-
-
-
-
-
-    private Package loadPackage(final Reader reader) throws DroolsParserException, Exception {
-
-        PackageBuilder builder = new PackageBuilder();
-        builder.addPackage( new PackageDescr("org.acme.insuranceXXS") );
-        builder.addPackageFromDrl( new StringReader("import org.acme.insurance.base.Approve\n" +
-                "import org.acme.insurance.base.Driver")  );
-
-        builder.addPackageFromDrl( reader );
-
-
-
-        final Package pkg = builder.getPackage();
-        //assertTrue(pkg.isValid());
-        return pkg;
-    }
-
-    protected RuleBase getRuleBase() throws Exception {
-
-        return RuleBaseFactory.newRuleBase( RuleBase.RETEOO,
-                                            null );
-    }
-}

Modified: labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/Policy.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/Policy.java	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/Policy.java	2007-09-04 17:16:37 UTC (rev 14869)
@@ -2,47 +2,55 @@
 
 /**
  * This represents a policy that a driver is applying for.
- *
+ * <p/>
  * Obviously in the real world, there are actuaries to mess things up, but lets just pretend there is
  * some simple base price and discount that we can calculate with relatively simple rules !
- *
  */
 public class Policy {
 
     private int driverId;
 
-	private boolean approved = false;
-	private int discountPercent = 0;
-	private double basePrice;
+    private boolean approved = false;
+    private int discountPercent = 0;
+    private double basePrice;
     private double insurancePrice;
 
-	public double getInsurancePrice() {
+    public double getInsurancePrice() {
         return insurancePrice;
     }
+
     public void setInsurancePrice(double insurancePrice) {
         this.insurancePrice = insurancePrice;
     }
+
     public boolean isApproved() {
-		return approved;
-	}
-	public void setApproved(boolean approved) {
-		this.approved = approved;
-	}
+        return approved;
+    }
+
+    public void setApproved(boolean approved) {
+        this.approved = approved;
+    }
+
     public double getBasePrice() {
         return basePrice;
     }
+
     public void setBasePrice(double basePrice) {
         this.basePrice = basePrice;
     }
+
     public int getDiscountPercent() {
         return discountPercent;
     }
+
     public void setDiscountPercent(int discountPercent) {
         this.discountPercent = discountPercent;
     }
+
     public int getDriverId() {
         return driverId;
     }
+
     public void setDriverId(int driverId) {
         this.driverId = driverId;
     }

Modified: labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/Rejection.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/Rejection.java	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/Rejection.java	2007-09-04 17:16:37 UTC (rev 14869)
@@ -2,18 +2,18 @@
 
 public class Rejection {
 
-	private String reason;
+    private String reason;
 
-	public Rejection(String reason) {
-		this.reason = reason;
-	}
+    public Rejection(String reason) {
+        this.reason = reason;
+    }
 
-	public String getReason() {
-		return reason;
-	}
+    public String getReason() {
+        return reason;
+    }
 
-	public void setReason(String reason) {
-		this.reason = reason;
-	}
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
 
 }

Modified: labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/SupplementalInfo.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/SupplementalInfo.java	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/SupplementalInfo.java	2007-09-04 17:16:37 UTC (rev 14869)
@@ -2,7 +2,7 @@
 
 public class SupplementalInfo {
 
-    private int     driverId;
+    private int driverId;
 
     private boolean extraCar;
     private boolean extraAssistence;

Deleted: labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/mvel_test.drl
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/mvel_test.drl	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/base/mvel_test.drl	2007-09-04 17:16:37 UTC (rev 14869)
@@ -1,9 +0,0 @@
-rule "Quick approval - safe driver, any policy type"
-
-	dialect "mvel"
-	when
-		Driver( )
-	then
-	insert(new Approve(" Safe and mature "));
-	System.out.println("yeah");
-end
\ No newline at end of file

Modified: labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/web/DroolsBusiness.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/web/DroolsBusiness.java	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/web/DroolsBusiness.java	2007-09-04 17:16:37 UTC (rev 14869)
@@ -1,168 +1,164 @@
 package org.acme.insurance.web;
 
+import org.acme.insurance.base.*;
+import org.drools.RuleBase;
+import org.drools.RuleBaseFactory;
+import org.drools.StatefulSession;
+import org.drools.agent.RuleAgent;
+import org.drools.compiler.PackageBuilder;
+
+import javax.servlet.http.HttpServletRequest;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import javax.servlet.http.HttpServletRequest;
+public class DroolsBusiness {
 
-import org.acme.insurance.base.AccessoriesCoverage;
-import org.acme.insurance.base.Driver;
-import org.acme.insurance.base.DriverAdditionalInfo;
-import org.acme.insurance.base.Policy;
-import org.acme.insurance.base.SupplementalInfo;
-import org.drools.RuleBase;
-import org.drools.RuleBaseFactory;
-import org.drools.StatefulSession;
-import org.drools.agent.RuleAgent;
-import org.drools.compiler.PackageBuilder;
+    private DriverAdditionalInfo driverAdit = new DriverAdditionalInfo();
+    private SupplementalInfo suppinfo = new SupplementalInfo();
+    private AccessoriesCoverage accessCov = new AccessoriesCoverage();
+    private Driver driverMale = new Driver();
+    private SimpleDateFormat df = new java.text.SimpleDateFormat("dd/MM/yyyy");
+    private Date defaultBirthday;
+    private Policy policy = new Policy();
 
-public class DroolsBusiness {
+    private RuleBase rulebase;
+    private StatefulSession session;
 
-	private DriverAdditionalInfo driverAdit = new DriverAdditionalInfo();
-	private SupplementalInfo suppinfo = new SupplementalInfo();
-	private AccessoriesCoverage accessCov = new AccessoriesCoverage();
-	private Driver driverMale = new Driver();
-	private SimpleDateFormat df = new java.text.SimpleDateFormat("dd/MM/yyyy");
-	private Date defaultBirthday;
-	private Policy policy = new Policy();
+    public boolean isApproved() {
+        return policy.isApproved();
+    }
 
-	private RuleBase rulebase;
-	private StatefulSession session;
+    public double getBasePrice() {
+        return policy.getBasePrice();
+    }
 
-	public boolean isApproved() {
-		return policy.isApproved();
-	}
+    public double getRiskFactor() {
+        return driverMale.getInsuranceFactor();
+    }
 
-	public double getBasePrice() {
-		return policy.getBasePrice();
-	}
+    public double getInsurancePrice() {
+        return policy.getInsurancePrice();
+    }
 
-	public double getRiskFactor() {
-		return driverMale.getInsuranceFactor();
-	}
+    public RuleBase loadRuleBaseFromRuleAgent() {
 
-	public double getInsurancePrice() {
-		return policy.getInsurancePrice();
-	}
+        RuleAgent agent = RuleAgent
+                .newRuleAgent("/brmsdeployedrules.properties");
+        RuleBase rulebase = agent.getRuleBase();
+        return rulebase;
+    }
 
-	public RuleBase loadRuleBaseFromRuleAgent() {
-		RuleAgent agent = RuleAgent
-				.newRuleAgent("/brmsdeployedrules.properties");
-		RuleBase rulebase = agent.getRuleBase();
-		return rulebase;
-	}
+    private RuleBase loadRuleBaseFromDRL() throws Exception {
 
-	private RuleBase loadRuleBaseFromDRL() throws Exception {
+        PackageBuilder builder = new PackageBuilder();
+        builder.addPackageFromDrl(getTechnicalRules("/approval/insurancefactor.drl"));
+        builder.addPackageFromDrl(getTechnicalRules("/approval/approval.drl"));
+        builder.addPackageFromDrl(getTechnicalRules("/approval/calculateInsurance.drl"));
+        builder.addPackageFromDrl(getTechnicalRules("/approval/marginalage.drl"));
+        builder.addRuleFlow(getTechnicalRules("/approval/insurance-process.rfm"));
 
-		PackageBuilder builder = new PackageBuilder();
-		builder.addPackageFromDrl(getTechnicalRules("/approval/insurancefactor.drl"));
-		builder.addPackageFromDrl(getTechnicalRules("/approval/approval.drl"));
-		builder.addPackageFromDrl(getTechnicalRules("/approval/calculateInsurance.drl"));
-		builder.addPackageFromDrl(getTechnicalRules("/approval/marginalage.drl"));
-        builder.addRuleFlow( getTechnicalRules( "/approval/insurance-process.rfm" ) );
-        
         RuleBase ruleBase = RuleBaseFactory.newRuleBase();
-		ruleBase.addPackage(builder.getPackage());
-		return ruleBase;
-	}
+        ruleBase.addPackage(builder.getPackage());
+        return ruleBase;
+    }
 
-	private Reader getTechnicalRules(String name) {
+    private Reader getTechnicalRules(String name) {
 
-		InputStream stream = this.getClass().getResourceAsStream(name);
+        InputStream stream = this.getClass().getResourceAsStream(name);
 
-		return new InputStreamReader(stream);
-	}
+        return new InputStreamReader(stream);
+    }
 
-	protected void setUp() throws Exception {
+    protected void setUp() throws Exception {
 
-		rulebase = loadRuleBaseFromDRL();
-		session = rulebase.newStatefulSession();
+        rulebase = loadRuleBaseFromRuleAgent();
+        //rulebase = loadRuleBaseFromDRL();
 
-		session.setFocus("risk assessment");
+        session = rulebase.newStatefulSession();
 
-		SimpleDateFormat df = new java.text.SimpleDateFormat("dd/MM/yyyy");
-		defaultBirthday = df.parse("18/09/1983");
+        session.startProcess("insuranceProcess");
 
-	}
+        SimpleDateFormat df = new java.text.SimpleDateFormat("dd/MM/yyyy");
+        defaultBirthday = df.parse("18/09/1983");
 
-	public void execute(HttpServletRequest request) throws Exception {
+    }
 
-		setUp();
+    public void execute(HttpServletRequest request) throws Exception {
 
-		defaultBirthday = df
-				.parse(Integer.parseInt(request
-						.getParameter("data_nascimento_dia"))
-						+ "/"
-						+ Integer.parseInt(request
-								.getParameter("data_nascimento_mes"))
-						+ "/"
-						+ Integer.parseInt(request
-								.getParameter("data_nascimento_ano")));
+        setUp();
 
-		policy.setBasePrice(500.00);
+        defaultBirthday = df
+                .parse(Integer.parseInt(request
+                        .getParameter("data_nascimento_dia"))
+                        + "/"
+                        + Integer.parseInt(request
+                        .getParameter("data_nascimento_mes"))
+                        + "/"
+                        + Integer.parseInt(request
+                        .getParameter("data_nascimento_ano")));
 
-		driverMale.setBirhDate(defaultBirthday);
+        policy.setBasePrice(500.00);
 
-		driverMale.setId(400);
-		driverMale.setGenre(Integer.parseInt(request.getParameter("sexo")));
-		driverMale.setMaritalState(Integer.parseInt(request
-				.getParameter("estadoCivil")));
-		driverMale.setHasChildren(Boolean.parseBoolean(request
-				.getParameter("temFilhos")));
-		driverMale.setPriorClaims(Integer.parseInt(request
-				.getParameter("sinistros")));
-		driverMale.setLicenceYears(Integer.parseInt(request
-				.getParameter("habilitacao")));
+        driverMale.setBirhDate(defaultBirthday);
 
-		driverAdit.setDriverId(driverMale.getId());
-		driverAdit.setDayVehiclePlace(Integer.parseInt(request
-				.getParameter("garagemDia")));
-		driverAdit.setNightVehiclePlace(Integer.parseInt(request
-				.getParameter("garagemNoite")));
-		driverAdit.setJobStatus(Integer.parseInt(request
-				.getParameter("profissao")));
-		driverAdit.setResidenceStatus(Integer.parseInt(request
-				.getParameter("condicaoImovel")));
+        driverMale.setId(400);
+        driverMale.setGenre(Integer.parseInt(request.getParameter("sexo")));
+        driverMale.setMaritalState(Integer.parseInt(request
+                .getParameter("estadoCivil")));
+        driverMale.setHasChildren(Boolean.parseBoolean(request
+                .getParameter("temFilhos")));
+        driverMale.setPriorClaims(Integer.parseInt(request
+                .getParameter("sinistros")));
+        driverMale.setLicenceYears(Integer.parseInt(request
+                .getParameter("habilitacao")));
 
-		suppinfo.setDriverId(driverMale.getId());
-		suppinfo.setExtraAssistence(Boolean.parseBoolean(request
-				.getParameter("assistencia24h")));
-		suppinfo.setExtraCar(Boolean.parseBoolean(request
-				.getParameter("carroReserva")));
-		suppinfo.setGlassCoverage(Boolean.parseBoolean(request
-				.getParameter("vidros")));
-		suppinfo.setNonRelatedExpenses(Boolean.parseBoolean(request
-				.getParameter("despExtra")));
+        driverAdit.setDriverId(driverMale.getId());
+        driverAdit.setDayVehiclePlace(Integer.parseInt(request
+                .getParameter("garagemDia")));
+        driverAdit.setNightVehiclePlace(Integer.parseInt(request
+                .getParameter("garagemNoite")));
+        driverAdit.setJobStatus(Integer.parseInt(request
+                .getParameter("profissao")));
+        driverAdit.setResidenceStatus(Integer.parseInt(request
+                .getParameter("condicaoImovel")));
 
-		accessCov.setDriverId(driverMale.getId());
+        suppinfo.setDriverId(driverMale.getId());
+        suppinfo.setExtraAssistence(Boolean.parseBoolean(request
+                .getParameter("assistencia24h")));
+        suppinfo.setExtraCar(Boolean.parseBoolean(request
+                .getParameter("carroReserva")));
+        suppinfo.setGlassCoverage(Boolean.parseBoolean(request
+                .getParameter("vidros")));
+        suppinfo.setNonRelatedExpenses(Boolean.parseBoolean(request
+                .getParameter("despExtra")));
 
-		accessCov.setAlarmSystemValue(Double.parseDouble(request
-				.getParameter("sistemaSom")));
-		accessCov.setArmorValue(Double.parseDouble(request
-				.getParameter("blindagem")));
-		accessCov.setSoundSystemValue(Double.parseDouble(request
-				.getParameter("sistemaSom")));
+        accessCov.setDriverId(driverMale.getId());
 
-		policy.setApproved(false);
+        accessCov.setAlarmSystemValue(Double.parseDouble(request
+                .getParameter("sistemaSom")));
+        accessCov.setArmorValue(Double.parseDouble(request
+                .getParameter("blindagem")));
+        accessCov.setSoundSystemValue(Double.parseDouble(request
+                .getParameter("sistemaSom")));
 
-		session.insert(policy);
-		session.insert(driverMale);
-		session.insert(driverAdit);
-		session.insert(suppinfo);
-		session.insert(accessCov);
+        policy.setApproved(false);
 
-		session.setFocus("risk assessment");
+        session.insert(policy);
+        session.insert(driverMale);
+        session.insert(driverAdit);
+        session.insert(suppinfo);
+        session.insert(accessCov);
 
-		session.fireAllRules();
+        session.fireAllRules();
 
-		System.out.println("Insurance Factor: "
-				+ driverMale.getInsuranceFactor());
-		System.out.println("Is Approved     : " + policy.isApproved());
-		System.out.println("Insurance Price :" + policy.getInsurancePrice());
+        System.out.println("Insurance Factor: "
+                + driverMale.getInsuranceFactor());
+        System.out.println("Is Approved     : " + policy.isApproved());
+        System.out.println("Insurance Price :" + policy.getInsurancePrice());
 
-	}
+    }
 
 }

Modified: labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/web/InsuranceServlet.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/web/InsuranceServlet.java	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/experimental/drools-insurance/src/main/java/org/acme/insurance/web/InsuranceServlet.java	2007-09-04 17:16:37 UTC (rev 14869)
@@ -1,68 +1,56 @@
 package org.acme.insurance.web;
 
-import java.io.IOException;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 /**
  * Servlet implementation class for Servlet: InsuranceServlet
- *
  */
 public class InsuranceServlet extends javax.servlet.http.HttpServlet implements
-		javax.servlet.Servlet {
-	static final long serialVersionUID = 1L;
+        javax.servlet.Servlet {
+    static final long serialVersionUID = 1L;
 
-	/*
-	 * (non-Java-doc)
-	 *
-	 * @see javax.servlet.http.HttpServlet#HttpServlet()
-	 */
-	public InsuranceServlet() {
-		super();
-	}
+    public InsuranceServlet() {
+        super();
+    }
 
-	protected void doGet(HttpServletRequest request,
-			HttpServletResponse response) throws ServletException, IOException {
+    protected void doGet(HttpServletRequest request,
+                         HttpServletResponse response) throws ServletException, IOException {
 
-		DroolsBusiness business = new DroolsBusiness();
-		try {
-			business.execute(request);
+        DroolsBusiness business = new DroolsBusiness();
+        try {
+            business.execute(request);
 
-			String redirectURL = "index.jsp";
-			redirectURL += "?calculo=sim";
-			redirectURL += "&aprovado=" + business.isApproved();
-			redirectURL += "&fatorrisco=" + business.getRiskFactor();
-			redirectURL += "&base=" + business.getBasePrice();
-			redirectURL += "&valor=" + business.getInsurancePrice();
-			redirectURL += "&estadoCivil=" + request.getParameter("estadoCivil");
-			redirectURL += "&temFilhos=" + request.getParameter("temFilhos");
-			redirectURL += "&sinistros=" + request.getParameter("sinistros");
-			redirectURL += "&habilitacao=" + request.getParameter("habilitacao");
-			redirectURL += "&garagemDia=" + request.getParameter("garagemDia");
-			redirectURL += "&garagemNoite=" + request.getParameter("garagemNoite");
-			redirectURL += "&profissao=" + request.getParameter("profissao");
-			redirectURL += "&condicaoImovel=" + request.getParameter("condicaoImovel");
-			redirectURL += "&assistencia24h=" + request.getParameter("assistencia24h");
-			redirectURL += "&carroReserva=" + request.getParameter("carroReserva");
-			redirectURL += "&vidros=" + request.getParameter("vidros");
-			redirectURL += "&despExtra=" + request.getParameter("despExtra");
-			redirectURL += "&sistemaSom=" + request.getParameter("sistemaSom");
-			redirectURL += "&blindagem=" + request.getParameter("blindagem");
-			redirectURL += "&sistemaSom=" + request.getParameter("sistemaSom");
-			redirectURL += "&data_nascimento_dia=" + request.getParameter("data_nascimento_dia");
-			redirectURL += "&data_nascimento_mes=" + request.getParameter("data_nascimento_mes");
-			redirectURL += "&data_nascimento_ano=" + request.getParameter("data_nascimento_ano");
+            String redirectURL = "index.jsp";
+            redirectURL += "?calculo=sim";
+            redirectURL += "&aprovado=" + business.isApproved();
+            redirectURL += "&fatorrisco=" + business.getRiskFactor();
+            redirectURL += "&base=" + business.getBasePrice();
+            redirectURL += "&valor=" + business.getInsurancePrice();
+            redirectURL += "&estadoCivil=" + request.getParameter("estadoCivil");
+            redirectURL += "&temFilhos=" + request.getParameter("temFilhos");
+            redirectURL += "&sinistros=" + request.getParameter("sinistros");
+            redirectURL += "&habilitacao=" + request.getParameter("habilitacao");
+            redirectURL += "&garagemDia=" + request.getParameter("garagemDia");
+            redirectURL += "&garagemNoite=" + request.getParameter("garagemNoite");
+            redirectURL += "&profissao=" + request.getParameter("profissao");
+            redirectURL += "&condicaoImovel=" + request.getParameter("condicaoImovel");
+            redirectURL += "&assistencia24h=" + request.getParameter("assistencia24h");
+            redirectURL += "&carroReserva=" + request.getParameter("carroReserva");
+            redirectURL += "&vidros=" + request.getParameter("vidros");
+            redirectURL += "&despExtra=" + request.getParameter("despExtra");
+            redirectURL += "&alarme=" + request.getParameter("alarme");
+            redirectURL += "&blindagem=" + request.getParameter("blindagem");
+            redirectURL += "&sistemaSom=" + request.getParameter("sistemaSom");
+            redirectURL += "&data_nascimento_dia=" + request.getParameter("data_nascimento_dia");
+            redirectURL += "&data_nascimento_mes=" + request.getParameter("data_nascimento_mes");
+            redirectURL += "&data_nascimento_ano=" + request.getParameter("data_nascimento_ano");
 
-			response.sendRedirect(redirectURL);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	protected void doPost(HttpServletRequest request,
-			HttpServletResponse response) throws ServletException, IOException {
-		// TODO Auto-generated method stub
-	}
+            response.sendRedirect(redirectURL);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }
\ No newline at end of file

Deleted: labs/jbossrules/trunk/experimental/drools-insurance/src/main/rules/droolspackage.pkg
===================================================================
(Binary files differ)

Modified: labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/InsuranceTestHelper.java
===================================================================
--- labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/InsuranceTestHelper.java	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/experimental/drools-insurance/src/test/java/org/acme/insurance/test/InsuranceTestHelper.java	2007-09-04 17:16:37 UTC (rev 14869)
@@ -16,7 +16,7 @@
 
     public StatefulSession getSession() {
         try {
-            rulebase = loadRuleBaseFromRuleAgent();
+            //rulebase = loadRuleBaseFromRuleAgent();
             rulebase = loadRuleBaseFromDRL();
 
             session = rulebase.newStatefulSession();
@@ -30,6 +30,9 @@
     }
 
     public RuleBase loadRuleBaseFromRuleAgent() {
+
+
+
         RuleAgent agent = RuleAgent.newRuleAgent( "/brmsdeployedrules.properties" );
         RuleBase rulebase = agent.getRuleBase();
         return rulebase;
@@ -46,6 +49,8 @@
                                    getTechnicalRules( "/approval/acme.dsl" ) );
         builder.addRuleFlow( getTechnicalRules( "/approval/insurance-process.rfm" ) );
 
+        
+
         RuleBase ruleBase = RuleBaseFactory.newRuleBase();
         ruleBase.addPackage( builder.getPackage() );
         return ruleBase;

Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml	2007-09-04 16:05:26 UTC (rev 14868)
+++ labs/jbossrules/trunk/pom.xml	2007-09-04 17:16:37 UTC (rev 14869)
@@ -7,7 +7,7 @@
   <artifactId>drools</artifactId>
   <packaging>pom</packaging>
   <name>Drools</name>
-  <version>4.0.1.SNAPSHOT</version>
+  <version>4.0.2.SNAPSHOT</version>
   <description>A rule production system</description>
   <url>http://www.jboss.com/products/rules</url>
 




More information about the jboss-svn-commits mailing list