[seam-commits] Seam SVN: r10274 - in trunk: examples and 11 other directories.

Author: manaRH Date: 2009-04-02 08:10:40 -0400 (Thu, 02 Apr 2009) New Revision: 10274 Modified: trunk/build/root.pom.xml trunk/examples/build.xml trunk/examples/drools/resources/numberguess.drl trunk/seam-gen/build-scripts/deployed-jars-ear.list trunk/seam-gen/build-scripts/deployed-jars-war.list trunk/seam-gen/icefaces/build-scripts/deployed-jars-ear.list trunk/seam-gen/icefaces/build-scripts/deployed-jars-war.list trunk/seam-gen/icefaces/ide-project-files/eclipse/.classpath trunk/seam-gen/icefaces/ide-project-files/idea/module.iml trunk/seam-gen/ide-project-files/eclipse/.classpath trunk/seam-gen/ide-project-files/idea/module.iml trunk/seam-gen/ide-project-files/netbeans/project.xml trunk/seam-gen/ivy/ivy.xml trunk/src/main/org/jboss/seam/drools/RuleBase.java trunk/src/main/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java Log: rolling back changes for JBSEAM-4011 for 2.1.2 release Modified: trunk/build/root.pom.xml =================================================================== --- trunk/build/root.pom.xml 2009-04-02 11:22:34 UTC (rev 10273) +++ trunk/build/root.pom.xml 2009-04-02 12:10:40 UTC (rev 10274) @@ -33,20 +33,14 @@ <id>snapshots.jboss.org</id> <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> --> + </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>5.0.0.CR1</version.drools> + <version.drools>4.0.4</version.drools> </properties> <dependencyManagement> Modified: trunk/examples/build.xml =================================================================== --- trunk/examples/build.xml 2009-04-02 11:22:34 UTC (rev 10273) +++ trunk/examples/build.xml 2009-04-02 12:10:40 UTC (rev 10274) @@ -315,10 +315,9 @@ <include name="antlr-runtime.jar" if="drools.lib" /> <include name="core.jar" if="drools.lib" /> <include name="janino.jar" if="drools.lib" /> - <include name="mvel2.jar" if="drools.lib" /> + <include name="mvel14.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-04-02 11:22:34 UTC (rev 10273) +++ trunk/examples/drools/resources/numberguess.drl 2009-04-02 12:10:40 UTC (rev 10274) @@ -3,7 +3,7 @@ import org.jboss.seam.drools.Decision global Decision decision -global Integer randomNumber +global int randomNumber global Game game rule High Modified: trunk/seam-gen/build-scripts/deployed-jars-ear.list =================================================================== --- trunk/seam-gen/build-scripts/deployed-jars-ear.list 2009-04-02 11:22:34 UTC (rev 10273) +++ trunk/seam-gen/build-scripts/deployed-jars-ear.list 2009-04-02 12:10:40 UTC (rev 10274) @@ -1,12 +1,11 @@ antlr-runtime.jar core.jar -drools-api.jar drools-compiler.jar drools-core.jar groovy-all.jar janino.jar jboss-el.jar jbpm-jpdl.jar -mvel2.jar +mvel14.jar richfaces-api.jar jboss-seam-remoting.jar Modified: trunk/seam-gen/build-scripts/deployed-jars-war.list =================================================================== --- trunk/seam-gen/build-scripts/deployed-jars-war.list 2009-04-02 11:22:34 UTC (rev 10273) +++ trunk/seam-gen/build-scripts/deployed-jars-war.list 2009-04-02 12:10:40 UTC (rev 10274) @@ -2,7 +2,6 @@ commons-beanutils.jar commons-digester.jar core.jar -drools-api.jar drools-compiler.jar drools-core.jar janino.jar @@ -12,7 +11,7 @@ jbpm-jpdl.jar jsf-facelets.jar jxl.jar -mvel2.jar +mvel14.jar richfaces-api.jar richfaces-impl.jar richfaces-ui.jar Modified: trunk/seam-gen/icefaces/build-scripts/deployed-jars-ear.list =================================================================== --- trunk/seam-gen/icefaces/build-scripts/deployed-jars-ear.list 2009-04-02 11:22:34 UTC (rev 10273) +++ trunk/seam-gen/icefaces/build-scripts/deployed-jars-ear.list 2009-04-02 12:10:40 UTC (rev 10274) @@ -3,7 +3,6 @@ commons-digester.jar commons-fileupload.jar core.jar -drools-api.jar drools-compiler.jar drools-core.jar groovy-all.jar @@ -13,4 +12,4 @@ janino.jar jboss-el.jar jbpm-jpdl.jar -mvel2.jar +mvel14.jar Modified: trunk/seam-gen/icefaces/build-scripts/deployed-jars-war.list =================================================================== --- trunk/seam-gen/icefaces/build-scripts/deployed-jars-war.list 2009-04-02 11:22:34 UTC (rev 10273) +++ trunk/seam-gen/icefaces/build-scripts/deployed-jars-war.list 2009-04-02 12:10:40 UTC (rev 10274) @@ -4,7 +4,6 @@ commons-digester.jar commons-fileupload.jar core.jar -drools-api.jar drools-compiler.jar drools-core.jar icefaces.jar @@ -15,4 +14,4 @@ jboss-seam.jar jboss-seam-*.jar jbpm-jpdl.jar -mvel2.jar +mvel14.jar Modified: trunk/seam-gen/icefaces/ide-project-files/eclipse/.classpath =================================================================== --- trunk/seam-gen/icefaces/ide-project-files/eclipse/.classpath 2009-04-02 11:22:34 UTC (rev 10273) +++ trunk/seam-gen/icefaces/ide-project-files/eclipse/.classpath 2009-04-02 12:10:40 UTC (rev 10274) @@ -24,8 +24,7 @@ <classpathentry kind="lib" path="lib/testng.jar"/> <classpathentry kind="lib" path="lib/jboss-el.jar"/> <classpathentry kind="lib" path="lib/el-api.jar"/> - <classpathentry kind="lib" path="lib/mvel2.jar"/> - <classpathentry kind="lib" path="lib/drools-api.jar"/> + <classpathentry kind="lib" path="lib/mvel14.jar"/> <classpathentry kind="lib" path="lib/drools-core.jar"/> <classpathentry kind="lib" path="lib/drools-compiler.jar"/> <classpathentry kind="lib" path="lib/janino.jar"/> Modified: trunk/seam-gen/icefaces/ide-project-files/idea/module.iml =================================================================== --- trunk/seam-gen/icefaces/ide-project-files/idea/module.iml 2009-04-02 11:22:34 UTC (rev 10273) +++ trunk/seam-gen/icefaces/ide-project-files/idea/module.iml 2009-04-02 12:10:40 UTC (rev 10274) @@ -241,7 +241,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/mvel2.jar!/" /> + <root url="jar://$MODULE_DIR$/lib/mvel14.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -250,15 +250,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/drools-api.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/lib/drools-core.jar!/" /> </CLASSES> <JAVADOC /> Modified: trunk/seam-gen/ide-project-files/eclipse/.classpath =================================================================== --- trunk/seam-gen/ide-project-files/eclipse/.classpath 2009-04-02 11:22:34 UTC (rev 10273) +++ trunk/seam-gen/ide-project-files/eclipse/.classpath 2009-04-02 12:10:40 UTC (rev 10274) @@ -23,8 +23,7 @@ <classpathentry kind="lib" path="lib/testng.jar"/> <classpathentry kind="lib" path="lib/jboss-el.jar"/> <classpathentry kind="lib" path="lib/el-api.jar"/> - <classpathentry kind="lib" path="lib/mvel2.jar"/> - <classpathentry kind="lib" path="lib/drools-api.jar"/> + <classpathentry kind="lib" path="lib/mvel14.jar"/> <classpathentry kind="lib" path="lib/drools-core.jar"/> <classpathentry kind="lib" path="lib/drools-compiler.jar"/> <classpathentry kind="lib" path="lib/janino.jar"/> Modified: trunk/seam-gen/ide-project-files/idea/module.iml =================================================================== --- trunk/seam-gen/ide-project-files/idea/module.iml 2009-04-02 11:22:34 UTC (rev 10273) +++ trunk/seam-gen/ide-project-files/idea/module.iml 2009-04-02 12:10:40 UTC (rev 10274) @@ -236,7 +236,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/mvel2.jar!/" /> + <root url="jar://$MODULE_DIR$/lib/mvel14.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -245,15 +245,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/drools-api.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/lib/drools-core.jar!/" /> </CLASSES> <JAVADOC /> Modified: trunk/seam-gen/ide-project-files/netbeans/project.xml =================================================================== --- trunk/seam-gen/ide-project-files/netbeans/project.xml 2009-04-02 11:22:34 UTC (rev 10273) +++ trunk/seam-gen/ide-project-files/netbeans/project.xml 2009-04-02 12:10:40 UTC (rev 10274) @@ -96,18 +96,18 @@ <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2"> <compilation-unit> <package-root>src/main</package-root> - <classpath mode="compile">lib/hibernate-validator.jar:lib/hibernate.jar:lib/hibernate-annotations.jar:lib/hibernate-commons-annotations.jar:lib/hibernate-entitymanager.jar:lib/jboss-seam.jar:lib/jboss-seam-debug.jar:lib/jboss-cache.jar:lib/jbpm-jpdl.jar:lib/antlr.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl.jar:lib/jsf-api.jar:lib/servlet-api.jar:lib/jboss-el.jar:lib/el-api.jar:lib/mvel2.jar:lib/drools-api.jar:lib/drools-core.jar:lib/drools-compiler.jar:lib/janino.jar:lib/antlr-runtime.jar:lib/mail.jar:lib/persistence-api.jar:lib/ejb-api.jar:lib/jsr250-api.jar:lib/jta.jar:lib/core.jar:lib/jboss-embedded-api.jar:lib/hibernate-search.jar:lib/richfaces-api.jar:lib/richfaces-ui.jar:lib/@driverJar@:lib/lucene-core.jar</classpath> + <classpath mode="compile">lib/hibernate-validator.jar:lib/hibernate.jar:lib/hibernate-annotations.jar:lib/hibernate-commons-annotations.jar:lib/hibernate-entitymanager.jar:lib/jboss-seam.jar:lib/jboss-seam-debug.jar:lib/jboss-cache.jar:lib/jbpm-jpdl.jar:lib/antlr.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl.jar:lib/jsf-api.jar:lib/servlet-api.jar:lib/jboss-el.jar:lib/el-api.jar:lib/mvel14.jar:lib/drools-core.jar:lib/drools-compiler.jar:lib/janino.jar:lib/antlr-runtime.jar:lib/mail.jar:lib/persistence-api.jar:lib/ejb-api.jar:lib/jsr250-api.jar:lib/jta.jar:lib/core.jar:lib/jboss-embedded-api.jar:lib/hibernate-search.jar:lib/richfaces-api.jar:lib/richfaces-ui.jar:lib/@driverJar@:lib/lucene-core.jar</classpath> <source-level>1.5</source-level> </compilation-unit> <compilation-unit> <package-root>src/hot</package-root> - <classpath mode="compile">lib/hibernate-validator.jar:lib/hibernate.jar:lib/hibernate-annotations.jar:lib/hibernate-commons-annotations.jar:lib/hibernate-entitymanager.jar:lib/jboss-seam.jar:lib/jboss-seam-debug.jar:lib/jboss-cache.jar:lib/jbpm-jpdl.jar:lib/antlr.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl.jar:lib/jsf-api.jar:lib/servlet-api.jar:lib/jboss-el.jar:lib/el-api.jar:lib/mvel2.jar:lib/drools-api.jar:lib/drools-core.jar:lib/drools-compiler.jar:lib/janino.jar:lib/antlr-runtime.jar:lib/mail.jar:lib/persistence-api.jar:lib/ejb-api.jar:lib/jsr250-api.jar:lib/jta.jar:lib/core.jar:lib/jboss-embedded-api.jar:lib/hibernate-search.jar:lib/richfaces-api.jar:lib/richfaces-ui.jar:lib/@driverJar@:lib/lucene-core.jar</classpath> + <classpath mode="compile">lib/hibernate-validator.jar:lib/hibernate.jar:lib/hibernate-annotations.jar:lib/hibernate-commons-annotations.jar:lib/hibernate-entitymanager.jar:lib/jboss-seam.jar:lib/jboss-seam-debug.jar:lib/jboss-cache.jar:lib/jbpm-jpdl.jar:lib/antlr.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl.jar:lib/jsf-api.jar:lib/servlet-api.jar:lib/jboss-el.jar:lib/el-api.jar:lib/mvel14.jar:lib/drools-core.jar:lib/drools-compiler.jar:lib/janino.jar:lib/antlr-runtime.jar:lib/mail.jar:lib/persistence-api.jar:lib/ejb-api.jar:lib/jsr250-api.jar:lib/jta.jar:lib/core.jar:lib/jboss-embedded-api.jar:lib/hibernate-search.jar:lib/richfaces-api.jar:lib/richfaces-ui.jar:lib/@driverJar@:lib/lucene-core.jar</classpath> <source-level>1.5</source-level> </compilation-unit> <compilation-unit> <package-root>src/test</package-root> <unit-tests/> - <classpath mode="compile">bootstrap:lib/hibernate-validator.jar:lib/hibernate.jar:lib/hibernate-annotations.jar:lib/hibernate-commons-annotations.jar:lib/hibernate-entitymanager.jar:lib/jboss-seam.jar:lib/jboss-seam-debug.jar:lib/jboss-cache.jar:lib/jbpm-jpdl.jar:lib/antlr.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl.jar:lib/jsf-api.jar:lib/servlet-api.jar:lib/testng.jar:lib/jboss-el.jar:lib/el-api.jar:lib/mvel2.jar:lib/drools-api.jar:lib/drools-core.jar:lib/drools-compiler.jar:lib/janino.jar:lib/antlr-runtime.jar:lib/mail.jar:lib/persistence-api.jar:lib/ejb-api.jar:lib/jsr250-api.jar:lib/jta.jar:lib/core.jar:lib/jboss-embedded-api.jar:lib/hibernate-search.jar:lib/richfaces-api.jar:lib/@driverJar@:lib/lucene-core.jar</classpath> + <classpath mode="compile">bootstrap:lib/hibernate-validator.jar:lib/hibernate.jar:lib/hibernate-annotations.jar:lib/hibernate-commons-annotations.jar:lib/hibernate-entitymanager.jar:lib/jboss-seam.jar:lib/jboss-seam-debug.jar:lib/jboss-cache.jar:lib/jbpm-jpdl.jar:lib/antlr.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl.jar:lib/jsf-api.jar:lib/servlet-api.jar:lib/testng.jar:lib/jboss-el.jar:lib/el-api.jar:lib/mvel14.jar:lib/drools-core.jar:lib/drools-compiler.jar:lib/janino.jar:lib/antlr-runtime.jar:lib/mail.jar:lib/persistence-api.jar:lib/ejb-api.jar:lib/jsr250-api.jar:lib/jta.jar:lib/core.jar:lib/jboss-embedded-api.jar:lib/hibernate-search.jar:lib/richfaces-api.jar:lib/@driverJar@:lib/lucene-core.jar</classpath> <source-level>1.5</source-level> </compilation-unit> </java-data> Modified: trunk/seam-gen/ivy/ivy.xml =================================================================== --- trunk/seam-gen/ivy/ivy.xml 2009-04-02 11:22:34 UTC (rev 10273) +++ trunk/seam-gen/ivy/ivy.xml 2009-04-02 12:10:40 UTC (rev 10274) @@ -47,16 +47,13 @@ <dependency org="net.sourceforge.jexcelapi" name="jxl" rev="2.6.8-seam"> <artifact name="jxl" type="jar"/> </dependency> - <dependency org="org.antlr" name="antlr-runtime" rev="3.1.1"> + <dependency org="org.antlr" name="antlr-runtime" rev="3.0"> <artifact name="antlr-runtime" type="jar"/> </dependency> - <dependency org="org.drools" name="drools-api" rev="5.0.0.CR1"> - <artifact name="drools-api" type="jar"/> - </dependency> - <dependency org="org.drools" name="drools-compiler" rev="5.0.0.CR1"> + <dependency org="org.drools" name="drools-compiler" rev="4.0.4"> <artifact name="drools-compiler" type="jar"/> </dependency> - <dependency org="org.drools" name="drools-core" rev="5.0.0.CR1"> + <dependency org="org.drools" name="drools-core" rev="4.0.4"> <artifact name="drools-core" type="jar"/> </dependency> <dependency org="org.eclipse.jdt" name="core" rev="3.2.3.v_686_R32x"> @@ -114,8 +111,8 @@ <dependency org="org.jbpm" name="jbpm-jpdl" rev="3.2.2"> <artifact name="jbpm-jpdl" type="jar"/> </dependency> - <dependency org="org.mvel" name="mvel2" rev="2.0.8pre1"> - <artifact name="mvel2" type="jar"/> + <dependency org="org.mvel" name="mvel14" rev="1.2.21"> + <artifact name="mvel14" type="jar"/> </dependency> <dependency org="org.richfaces.framework" name="richfaces-api" rev="${richfaces.version}"> <artifact name="richfaces-api" type="jar"/> Modified: trunk/src/main/org/jboss/seam/drools/RuleBase.java =================================================================== --- trunk/src/main/org/jboss/seam/drools/RuleBase.java 2009-04-02 11:22:34 UTC (rev 10273) +++ trunk/src/main/org/jboss/seam/drools/RuleBase.java 2009-04-02 12:10:40 UTC (rev 10274) @@ -8,7 +8,7 @@ import org.drools.compiler.DroolsError; import org.drools.compiler.PackageBuilder; import org.drools.compiler.PackageBuilderConfiguration; -import org.drools.compiler.RuleBuildError; +import org.drools.compiler.RuleError; 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 RuleBuildError) + if (error instanceof RuleError) { - RuleBuildError ruleError = (RuleBuildError) error; + RuleError ruleError = (RuleError) 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-04-02 11:22:34 UTC (rev 10273) +++ trunk/src/main/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java 2009-04-02 12:10:40 UTC (rev 10274) @@ -15,7 +15,7 @@ import org.drools.FactHandle; import org.drools.RuleBase; import org.drools.StatefulSession; -import org.drools.ClassObjectFilter; +import org.drools.base.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 = (Iterator<Role>) getSecurityContext().iterateObjects(new ClassObjectFilter(Role.class)); + Iterator<Role> iter = getSecurityContext().iterateObjects(new ClassObjectFilter(Role.class)); while (iter.hasNext()) { Role r = iter.next(); @@ -252,7 +252,7 @@ } } - Iterator<Role> iter = (Iterator<Role>) getSecurityContext().iterateObjects(new ClassObjectFilter(Role.class)); + Iterator<Role> iter = getSecurityContext().iterateObjects(new ClassObjectFilter(Role.class)); while (iter.hasNext()) { Role r = iter.next();