[seam-commits] Seam SVN: r10170 - in trunk: examples and 3 other directories.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2009-03-16 05:40:44 -0400 (Mon, 16 Mar 2009)
New Revision: 10170

Modified:
   trunk/build/root.pom.xml
   trunk/examples/build.xml
   trunk/examples/drools/resources/numberguess.drl
   trunk/src/main/org/jboss/seam/drools/RuleBase.java
   trunk/src/main/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java
Log:
JBSEAM-4011

Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml	2009-03-16 05:39:52 UTC (rev 10169)
+++ trunk/build/root.pom.xml	2009-03-16 09:40:44 UTC (rev 10170)
@@ -34,13 +34,19 @@
       <name>JBoss Snapshot Repository</name>
       <url>http://snapshots.jboss.org/maven2</url>
     </repository>
+  <!--  <repository>
+      <snapshots />
+      <id>maven_repo</id>
+      <name>Apache Maven Repository</name>
+      <url>http://repo1.maven.org/maven2</url>
+    </repository> -->    
   </repositories>
   
   <!-- Externalize some version numbers here -->
   <properties>
     <version.richfaces>3.3.0.GA</version.richfaces>
     <version.wicket>1.3-SNAPSHOT</version.wicket>
-    <version.drools>4.0.4</version.drools>
+    <version.drools>5.0.0.CR1</version.drools>
   </properties>
 
   <dependencyManagement>

Modified: trunk/examples/build.xml
===================================================================
--- trunk/examples/build.xml	2009-03-16 05:39:52 UTC (rev 10169)
+++ trunk/examples/build.xml	2009-03-16 09:40:44 UTC (rev 10170)
@@ -305,9 +305,10 @@
 		<include name="antlr-runtime.jar" if="drools.lib" />
 		<include name="core.jar" if="drools.lib" />
 		<include name="janino.jar" if="drools.lib" />
-		<include name="mvel14.jar" if="drools.lib" />
+		<include name="mvel2.jar" if="drools.lib" />
 		<include name="drools-core.jar" if="drools.lib" />
 		<include name="drools-compiler.jar" if="drools.lib" />
+		<include name="drools-api.jar" if="drools.lib" />
 	</fileset>
 
 	<!-- Dependencies for using Spring with Cglib -->

Modified: trunk/examples/drools/resources/numberguess.drl
===================================================================
--- trunk/examples/drools/resources/numberguess.drl	2009-03-16 05:39:52 UTC (rev 10169)
+++ trunk/examples/drools/resources/numberguess.drl	2009-03-16 09:40:44 UTC (rev 10170)
@@ -3,7 +3,7 @@
 import org.jboss.seam.drools.Decision
 
 global Decision decision
-global int randomNumber
+global Integer randomNumber
 global Game game
 
 rule High

Modified: trunk/src/main/org/jboss/seam/drools/RuleBase.java
===================================================================
--- trunk/src/main/org/jboss/seam/drools/RuleBase.java	2009-03-16 05:39:52 UTC (rev 10169)
+++ trunk/src/main/org/jboss/seam/drools/RuleBase.java	2009-03-16 09:40:44 UTC (rev 10170)
@@ -8,7 +8,7 @@
 import org.drools.compiler.DroolsError;
 import org.drools.compiler.PackageBuilder;
 import org.drools.compiler.PackageBuilderConfiguration;
-import org.drools.compiler.RuleError;
+import org.drools.compiler.RuleBuildError;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.Create;
 import org.jboss.seam.annotations.Scope;
@@ -68,9 +68,9 @@
                log.error("errors parsing rules in: " + ruleFile);               
                for ( DroolsError error: builder.getErrors().getErrors() )
                {
-                  if (error instanceof RuleError)
+                  if (error instanceof RuleBuildError)
                   {
-                     RuleError ruleError = (RuleError) error;
+                     RuleBuildError ruleError = (RuleBuildError) error;
                      log.error( ruleError.getMessage() + " (" + ruleFile + ':' + ruleError.getLine() + ')' );                     
                   }
                   else

Modified: trunk/src/main/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java	2009-03-16 05:39:52 UTC (rev 10169)
+++ trunk/src/main/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java	2009-03-16 09:40:44 UTC (rev 10170)
@@ -15,7 +15,7 @@
 import org.drools.FactHandle;
 import org.drools.RuleBase;
 import org.drools.StatefulSession;
-import org.drools.base.ClassObjectFilter;
+import org.drools.ClassObjectFilter;
 import org.jboss.seam.Component;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.Seam;
@@ -232,7 +232,7 @@
                   Principal role = (Principal) e.nextElement();
    
                   boolean found = false;
-                  Iterator<Role> iter = getSecurityContext().iterateObjects(new ClassObjectFilter(Role.class)); 
+                  Iterator<Role> iter = (Iterator<Role>) getSecurityContext().iterateObjects(new ClassObjectFilter(Role.class)); 
                   while (iter.hasNext()) 
                   {
                      Role r = iter.next();
@@ -252,7 +252,7 @@
             }
          }    
          
-         Iterator<Role> iter = getSecurityContext().iterateObjects(new ClassObjectFilter(Role.class)); 
+         Iterator<Role> iter = (Iterator<Role>) getSecurityContext().iterateObjects(new ClassObjectFilter(Role.class)); 
          while (iter.hasNext()) 
          {
             Role r = iter.next();