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

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

Author: michael.neale at jboss.com
Date: 2008-07-18 02:45:34 -0400 (Fri, 18 Jul 2008)
New Revision: 21103

Modified:
   labs/jbossrules/trunk/drools-guvnor/pom.xml
   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/BRMSPackageBuilderTest.java
Log:
now uses JDT compiler by default

Modified: labs/jbossrules/trunk/drools-guvnor/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/pom.xml	2008-07-18 06:42:12 UTC (rev 21102)
+++ labs/jbossrules/trunk/drools-guvnor/pom.xml	2008-07-18 06:45:34 UTC (rev 21103)
@@ -98,11 +98,11 @@
      <groupId>commons-fileupload</groupId>
      <artifactId>commons-fileupload</artifactId>
    </dependency>
-   
+
    <dependency>
      <groupId>commons-io</groupId>
      <artifactId>commons-io</artifactId>
-   </dependency>   
+   </dependency>
 
 	<dependency>
 		<groupId>emma</groupId>
@@ -132,25 +132,19 @@
 		<artifactId>jboss-seam</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 	</dependency>
-	
-	<dependency>
-		<groupId>javax.persistence</groupId>
-		<artifactId>persistence-api</artifactId>
-		<version>1.0</version>
-	</dependency>
 
 	<dependency>
 		<groupId>javax.transaction</groupId>
 		<artifactId>jta</artifactId>
 		<version>1.0.1B</version>
 	</dependency>
-	
+
       <dependency>
         <groupId>javax.ejb</groupId>
         <artifactId>ejb-api</artifactId>
         <version>3.0</version>
       </dependency>
-      
+
 	 <dependency>
 	  <groupId>org.hibernate</groupId>
 	  <artifactId>hibernate</artifactId>
@@ -204,13 +198,6 @@
 	</dependency>
 
 	<dependency>
-	  <groupId>org.hibernate</groupId>
-	  <artifactId>hibernate-validator</artifactId>
-	  <version>3.0.0.GA</version>
-	</dependency>
-
-
-	<dependency>
 		<groupId>javassist</groupId>
 		<artifactId>javassist</artifactId>
 		<version>3.4.GA</version>
@@ -236,13 +223,8 @@
 		<version>1.2</version>
 		<scope>runtime</scope>
 	</dependency>
-	<!-- NOT needed as we use janino -->
-	<dependency>
-      	<groupId>org.eclipse.jdt</groupId>
-      	<artifactId>core</artifactId>
-      	<scope>provided</scope>
-	</dependency>
 
+
 	<!-- NOT needed due to licencing -->
 	<dependency>
 	        <groupId>org.tmatesoft</groupId>

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	2008-07-18 06:42:12 UTC (rev 21102)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java	2008-07-18 06:45:34 UTC (rev 21103)
@@ -74,7 +74,7 @@
         // the default compiler. This is nominally JANINO but can be overridden by setting drools.dialect.java.compiler to ECLIPSE
         Properties properties = new Properties();
         properties.setProperty( "drools.dialect.java.compiler",
-                                chainedProperties.getProperty( "drools.dialect.java.compiler", "JANINO" ) );
+                                chainedProperties.getProperty( "drools.dialect.java.compiler", "ECLIPSE" ) );
         PackageBuilderConfiguration pkgConf = new PackageBuilderConfiguration( properties );
         pkgConf.setClassLoader( loader );
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/BRMSPackageBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/BRMSPackageBuilderTest.java	2008-07-18 06:42:12 UTC (rev 21102)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/builder/BRMSPackageBuilderTest.java	2008-07-18 06:45:34 UTC (rev 21103)
@@ -62,7 +62,7 @@
         assertFalse(builder.hasErrors());
 
         JavaDialectConfiguration javaConf = ( JavaDialectConfiguration ) builder.getPackageBuilderConfiguration().getDialectConfiguration( "java" );
-        assertEquals(JavaDialectConfiguration.JANINO, javaConf.getCompiler());
+        assertEquals(JavaDialectConfiguration.ECLIPSE, javaConf.getCompiler());
 
         String ruleAtom = "rule foo \n when \n Person() \n then \n System.out.println(42); end";
         builder.addPackageFromDrl( new StringReader(ruleAtom) );
@@ -177,7 +177,7 @@
         assertFalse(builder.hasErrors());
 
         JavaDialectConfiguration javaConf = ( JavaDialectConfiguration ) builder.getPackageBuilderConfiguration().getDialectConfiguration( "java" );
-        assertEquals(JavaDialectConfiguration.JANINO, javaConf.getCompiler());
+        assertEquals(JavaDialectConfiguration.ECLIPSE, javaConf.getCompiler());
     }
 
     public void testEclipseCompiler() throws Exception {