[jboss-svn-commits] JBL Code SVN: r25214 - in labs/jbossrules/trunk/drools-guvnor/src: main/java/org/drools/guvnor/server/builder and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: michael.neale at jboss.com
Date: 2009-02-10 18:32:55 -0500 (Tue, 10 Feb 2009)
New Revision: 25214

Added:
   labs/jbossrules/trunk/drools-guvnor/src/test/resources/eventing-example.jar
Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java
Log:
some tidying up and a test for imports

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt	2009-02-10 22:33:43 UTC (rev 25213)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt	2009-02-10 23:32:55 UTC (rev 25214)
@@ -1 +1 @@
-5.0.0.SNAPSHOT 25199M
\ No newline at end of file
+5.0.0.SNAPSHOT 25212M
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java	2009-02-10 22:33:43 UTC (rev 25213)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java	2009-02-10 23:32:55 UTC (rev 25214)
@@ -131,18 +131,6 @@
 		return loader;
 	}
 
-    /**
-     * This will return the preferred compiler, according to the System property
-     * drools.compiler (JANINO|ECLIPSE) - default is JANINO due to classpath issues
-     * mainly in tomcat, grrr...
-     */
-    static int getPreferredBRMSCompiler() {
-        if (System.getProperty( "drools.dialect.java.compiler", "JANINO" ).equals( "ECLIPSE" )) {
-            return JavaDialectConfiguration.ECLIPSE;
-        } else {
-            return JavaDialectConfiguration.JANINO;
-        }
-    }
 
     /**
      * In the BRMS you should not need to use this, use the getInstance factory method instead.

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java	2009-02-10 22:33:43 UTC (rev 25213)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/ContentPackageAssemblerTest.java	2009-02-10 23:32:55 UTC (rev 25214)
@@ -439,6 +439,37 @@
 
     }
 
+    public void testEventingExample() throws Exception {
+
+        RulesRepository repo = getRepo();
+
+        PackageItem pkg = repo.createPackage( "testEventingExample",
+                                              "" );
+        AssetItem model = pkg.addAsset( "model",
+                                        "qed" );
+        model.updateFormat( AssetFormats.MODEL );
+
+        model.updateBinaryContentAttachment( this.getClass().getResourceAsStream( "/eventing-example.jar" ) );
+        model.checkin( "" );
+
+        //OK I have no idea why I need to put in the .Status import - apparently outside of guvnor you do not. 
+        ServiceImplementation.updateDroolsHeader( "import org.drools.examples.eventing.EventRequest\nimport org.drools.examples.eventing.EventRequest.Status",
+                                                  pkg );
+        AssetItem asset = pkg.addAsset("whee", "");
+        asset.updateFormat(AssetFormats.DRL);
+        asset.updateContent("rule 'zaa'\n  when \n  request: EventRequest( status == EventRequest.Status.ACTIVE )\n   then \n request.setStatus(EventRequest.Status.ACTIVE); \n  end");
+        asset.checkin("");
+
+        ContentPackageAssembler asm = new ContentPackageAssembler( pkg );
+        if (asm.hasErrors()) {
+            for ( ContentAssemblyError err : asm.getErrors() ) {
+                System.err.println(err.errorReport);
+            }
+            fail();
+        }
+
+    }
+
     /**
      * This time, we mix up stuff a bit
      *

Added: labs/jbossrules/trunk/drools-guvnor/src/test/resources/eventing-example.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossrules/trunk/drools-guvnor/src/test/resources/eventing-example.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream