Author: manaRH Date: 2008-03-27 07:56:20 -0400 (Thu, 27 Mar 2008) New Revision: 7720 Added: branches/Seam_1_2_1_AP/drools/lib/antlr-2.7.6.jar branches/Seam_1_2_1_AP/drools/lib/antlr-3.0ea8.jar branches/Seam_1_2_1_AP/drools/lib/commons-jci-core-1.0-406301.jar branches/Seam_1_2_1_AP/drools/lib/commons-jci-janino-2.4.3.jar branches/Seam_1_2_1_AP/drools/lib/commons-lang-2.1.jar branches/Seam_1_2_1_AP/drools/lib/commons-logging-api-1.0.4.jar branches/Seam_1_2_1_AP/drools/lib/drools-compiler-3.0.5.jar branches/Seam_1_2_1_AP/drools/lib/drools-core-3.0.5.jar branches/Seam_1_2_1_AP/drools/lib/janino-2.4.3.jar branches/Seam_1_2_1_AP/drools/lib/stringtemplate-2.3b6.jar branches/Seam_1_2_1_AP/lib/jbpm-3.1.4.jar Removed: branches/Seam_1_2_1_AP/drools/lib/antlr-runtime-3.0.jar branches/Seam_1_2_1_AP/drools/lib/drools-compiler-4.0.2.jar branches/Seam_1_2_1_AP/drools/lib/drools-core-4.0.2.jar branches/Seam_1_2_1_AP/drools/lib/janino-2.5.10.jar branches/Seam_1_2_1_AP/drools/lib/mvel-1.2.22-java1.4.jar branches/Seam_1_2_1_AP/drools/lib/xpp3_min-1.1.3.4.O.jar branches/Seam_1_2_1_AP/drools/lib/xstream-1.2.2.jar branches/Seam_1_2_1_AP/lib/jbpm-identity.jar branches/Seam_1_2_1_AP/lib/jbpm-jpdl.jar Modified: branches/Seam_1_2_1_AP/.classpath branches/Seam_1_2_1_AP/build.properties branches/Seam_1_2_1_AP/examples/drools/resources/META-INF/application.xml branches/Seam_1_2_1_AP/examples/dvdstore/resources/META-INF/application.xml branches/Seam_1_2_1_AP/examples/dvdstore/resources/hibernate.cfg.xml branches/Seam_1_2_1_AP/examples/dvdstore/resources/jbpm.cfg.xml branches/Seam_1_2_1_AP/examples/numberguess/resources/META-INF/application.xml branches/Seam_1_2_1_AP/examples/seambay/resources/META-INF/application.xml branches/Seam_1_2_1_AP/examples/seamspace/resources/META-INF/application.xml branches/Seam_1_2_1_AP/examples/takeaway/resources/META-INF/application.xml branches/Seam_1_2_1_AP/examples/takeaway/resources/hibernate.cfg.xml branches/Seam_1_2_1_AP/examples/todo/resources/META-INF/application.xml branches/Seam_1_2_1_AP/examples/todo/resources/hibernate.cfg.xml branches/Seam_1_2_1_AP/examples/todo/resources/jbpm.cfg.xml branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml branches/Seam_1_2_1_AP/examples/wiki/build.properties branches/Seam_1_2_1_AP/lib/readme.txt branches/Seam_1_2_1_AP/seam-gen/build-scripts/.classpath branches/Seam_1_2_1_AP/seam-gen/nbproject/project.xml branches/Seam_1_2_1_AP/seam-gen/resources/META-INF/application.xml branches/Seam_1_2_1_AP/seam-ui-cdk/pom.xml branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/DroolsHandler.java branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/ManagedWorkingMemory.java branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/RuleBase.java branches/Seam_1_2_1_AP/src/main/org/jboss/seam/security/RuleBasedIdentity.java Log: Rollback the upgrade of drools/jbpm libraries Modified: branches/Seam_1_2_1_AP/.classpath =================================================================== --- branches/Seam_1_2_1_AP/.classpath 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/.classpath 2008-03-27 11:56:20 UTC (rev 7720) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/main"/> + <classpathentry kind="src" path="examples/itext/src"/> <classpathentry kind="src" path="src/remoting"/> <classpathentry kind="src" path="src/ioc"/> <classpathentry kind="src" path="src/mail"/> @@ -22,20 +23,23 @@ <classpathentry kind="lib" path="lib/jboss-cache-jdk50.jar"/> <classpathentry kind="lib" path="lib/el-api.jar"/> <classpathentry kind="lib" path="lib/el-ri.jar"/> - <classpathentry kind="lib" path="lib/myfaces-api-1.1.4.jar"/> - <classpathentry kind="lib" path="lib/myfaces-impl-1.1.4.jar"/> + <classpathentry kind="lib" path="lib/jsf-api.jar"/> + <classpathentry kind="lib" path="lib/jsf-impl.jar"/> <classpathentry kind="lib" path="lib/ant.jar"/> <classpathentry kind="lib" path="embedded-ejb/conf"/> + <classpathentry kind="lib" path="drools/lib/drools-compiler-3.0.5.jar"/> + <classpathentry kind="lib" path="drools/lib/drools-core-3.0.5.jar"/> <classpathentry kind="lib" path="lib/jsf-facelets.jar"/> <classpathentry kind="lib" path="lib/mail.jar"/> + <classpathentry kind="lib" path="lib/jbpm-3.1.4.jar"/> <classpathentry kind="lib" path="lib/activation.jar"/> <classpathentry kind="lib" path="lib/mail-ra.jar"/> <classpathentry kind="lib" path="lib/spring.jar"/> <classpathentry kind="lib" path="lib/itext-2.0.1.jar"/> <classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/> <classpathentry kind="lib" path="lib/jcaptcha-all-1.0-RC4.jar"/> - <classpathentry kind="lib" path="lib/jbpm-jpdl.jar"/> - <classpathentry kind="lib" path="drools/lib/drools-compiler-4.0.2.jar"/> - <classpathentry kind="lib" path="drools/lib/drools-core-4.0.2.jar"/> + <classpathentry kind="lib" path="lib/jsp-api.jar"/> + <classpathentry kind="lib" path="examples/itext/lib/jfreechart.jar"/> + <classpathentry kind="lib" path="drools/lib/janino-2.4.3.jar"/> <classpathentry kind="output" path="output/classes"/> </classpath> Modified: branches/Seam_1_2_1_AP/build.properties =================================================================== --- branches/Seam_1_2_1_AP/build.properties 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/build.properties 2008-03-27 11:56:20 UTC (rev 7720) @@ -1,2 +1,2 @@ -tomcat.home=C:/Java/apache-tomcat-6.0.10 -jboss.home=G:/jboss-4.2.2.GA +tomcat.home= /home/mnovotny/apps/apache-tomcat-6.0.16 +jboss.home= /home/mnovotny/apps/jboss-4.2.2.GA Added: branches/Seam_1_2_1_AP/drools/lib/antlr-2.7.6.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/antlr-2.7.6.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/Seam_1_2_1_AP/drools/lib/antlr-3.0ea8.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/antlr-3.0ea8.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/Seam_1_2_1_AP/drools/lib/antlr-runtime-3.0.jar =================================================================== (Binary files differ) Added: branches/Seam_1_2_1_AP/drools/lib/commons-jci-core-1.0-406301.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/commons-jci-core-1.0-406301.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/Seam_1_2_1_AP/drools/lib/commons-jci-janino-2.4.3.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/commons-jci-janino-2.4.3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/Seam_1_2_1_AP/drools/lib/commons-lang-2.1.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/commons-lang-2.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/Seam_1_2_1_AP/drools/lib/commons-logging-api-1.0.4.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/commons-logging-api-1.0.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/Seam_1_2_1_AP/drools/lib/drools-compiler-3.0.5.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/drools-compiler-3.0.5.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/Seam_1_2_1_AP/drools/lib/drools-compiler-4.0.2.jar =================================================================== (Binary files differ) Added: branches/Seam_1_2_1_AP/drools/lib/drools-core-3.0.5.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/drools-core-3.0.5.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/Seam_1_2_1_AP/drools/lib/drools-core-4.0.2.jar =================================================================== (Binary files differ) Added: branches/Seam_1_2_1_AP/drools/lib/janino-2.4.3.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/janino-2.4.3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/Seam_1_2_1_AP/drools/lib/janino-2.5.10.jar =================================================================== (Binary files differ) Deleted: branches/Seam_1_2_1_AP/drools/lib/mvel-1.2.22-java1.4.jar =================================================================== (Binary files differ) Added: branches/Seam_1_2_1_AP/drools/lib/stringtemplate-2.3b6.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/drools/lib/stringtemplate-2.3b6.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/Seam_1_2_1_AP/drools/lib/xpp3_min-1.1.3.4.O.jar =================================================================== (Binary files differ) Deleted: branches/Seam_1_2_1_AP/drools/lib/xstream-1.2.2.jar =================================================================== (Binary files differ) Modified: branches/Seam_1_2_1_AP/examples/drools/resources/META-INF/application.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/drools/resources/META-INF/application.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/drools/resources/META-INF/application.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -26,23 +26,35 @@ </module> <module> - <java>jbpm-jpdl.jar</java> + <java>jbpm-3.1.4.jar</java> </module> <module> - <java>drools-compiler-4.0.2.jar</java> + <java>drools-compiler-3.0.5.jar</java> </module> <module> - <java>drools-core-4.0.2.jar</java> + <java>drools-core-3.0.5.jar</java> </module> <module> - <java>antlr-runtime-3.0.jar</java> + <java>antlr-2.7.6.jar</java> </module> <module> - <java>janino-2.5.10.jar</java> + <java>antlr-3.0ea8.jar</java> </module> <module> - <java>mvel-1.2.22-java1.4.jar</java> + <java>commons-jci-core-1.0-406301.jar</java> </module> + <module> + <java>commons-jci-janino-2.4.3.jar</java> + </module> + <module> + <java>commons-lang-2.1.jar</java> + </module> + <module> + <java>janino-2.4.3.jar</java> + </module> + <module> + <java>stringtemplate-2.3b6.jar</java> + </module> </application> \ No newline at end of file Modified: branches/Seam_1_2_1_AP/examples/dvdstore/resources/META-INF/application.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/dvdstore/resources/META-INF/application.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/dvdstore/resources/META-INF/application.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -22,6 +22,6 @@ <java>el-ri.jar</java> </module> <module> - <java>jbpm-jpdl.jar</java> + <java>jbpm-3.1.4.jar</java> </module> </application> Modified: branches/Seam_1_2_1_AP/examples/dvdstore/resources/hibernate.cfg.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/dvdstore/resources/hibernate.cfg.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/dvdstore/resources/hibernate.cfg.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -24,36 +24,29 @@ <!-- uncomment this if you don't have bsh on your --> <!-- classpath. you won't be able to use the --> <!-- script element in process definition files --> + <!-- <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/> + --> <!-- following mapping files have a dependendy on --> - <!-- 'jbpm-identity.jar', mapping files --> + <!-- 'jbpm-identity-{version}.jar', mapping files --> <!-- of the pluggable jbpm identity component. --> - <!-- Uncomment the following 3 lines if you --> - <!-- want to use the jBPM identity mgmgt --> - <!-- component. --> - <!-- identity mappings (begin) === + <!-- comment out the following 3 lines if you don't--> + <!-- want to use the default jBPM identity mgmgt --> + <!-- component --> + + <!-- <mapping resource="org/jbpm/identity/User.hbm.xml"/> <mapping resource="org/jbpm/identity/Group.hbm.xml"/> <mapping resource="org/jbpm/identity/Membership.hbm.xml"/> - ==== identity mappings (end) --> - - <!-- following mapping files have a dependendy on --> - <!-- the JCR API --> - <!-- jcr mappings (begin) === - <mapping resource="org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml"/> - ==== jcr mappings (end) --> + --> - <!-- ###################### --> <!-- # jbpm mapping files # --> <!-- ###################### --> <!-- hql queries and type defs --> <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> - - <!-- graph.action mapping files --> - <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/> <!-- graph.def mapping files --> <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/> @@ -72,7 +65,6 @@ <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/> <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/> <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/> <mapping resource="org/jbpm/graph/node/State.hbm.xml"/> <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/> @@ -121,11 +113,13 @@ <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/> - <!-- job mapping files --> - <mapping resource="org/jbpm/job/Job.hbm.xml"/> - <mapping resource="org/jbpm/job/Timer.hbm.xml"/> - <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/> - <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/> + <!-- msg.db mapping files --> + <mapping resource="org/jbpm/msg/Message.hbm.xml"/> + <mapping resource="org/jbpm/msg/db/TextMessage.hbm.xml"/> + <mapping resource="org/jbpm/command/ExecuteActionCommand.hbm.xml"/> + <mapping resource="org/jbpm/command/ExecuteNodeCommand.hbm.xml"/> + <mapping resource="org/jbpm/command/SignalCommand.hbm.xml"/> + <mapping resource="org/jbpm/command/TaskInstanceEndCommand.hbm.xml"/> <!-- taskmgmt.exe mapping files --> <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/> @@ -133,6 +127,9 @@ <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/> <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/> + <!-- scheduler.exe mapping files --> + <mapping resource="org/jbpm/scheduler/exe/Timer.hbm.xml"/> + <!-- logging mapping files --> <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/> <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/> @@ -141,7 +138,6 @@ <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/> Modified: branches/Seam_1_2_1_AP/examples/dvdstore/resources/jbpm.cfg.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/dvdstore/resources/jbpm.cfg.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/dvdstore/resources/jbpm.cfg.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -10,7 +10,6 @@ </service> <service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" /> <service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" /> - <service name="tx" factory="org.jbpm.tx.TxServiceFactory" /> <service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" /> <service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" /> </jbpm-context> Modified: branches/Seam_1_2_1_AP/examples/numberguess/resources/META-INF/application.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/numberguess/resources/META-INF/application.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/numberguess/resources/META-INF/application.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -19,7 +19,7 @@ <java>jboss-seam.jar</java> </module> <module> - <java>jbpm-jpdl.jar</java> + <java>jbpm-3.1.4.jar</java> </module> <module> <java>el-ri.jar</java> Modified: branches/Seam_1_2_1_AP/examples/seambay/resources/META-INF/application.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/seambay/resources/META-INF/application.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/seambay/resources/META-INF/application.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -20,32 +20,44 @@ <module> <java>jboss-seam.jar</java> </module> + + <module> + <java>drools-compiler-3.0.5.jar</java> + </module> + + <module> + <java>drools-core-3.0.5.jar</java> + </module> - <!-- <module> - <java>el-api.jar</java> + <module> + <java>commons-jci-core-1.0-406301.jar</java> </module> + + <module> + <java>commons-jci-janino-2.4.3.jar</java> + </module> + + <module> + <java>commons-lang-2.1.jar</java> + </module> <module> - <java>el-ri.jar</java> - </module>--> - - <module> - <java>drools-compiler-4.0.2.jar</java> - </module> - <module> - <java>drools-core-4.0.2.jar</java> - </module> - <module> - <java>antlr-runtime-3.0.jar</java> - </module> - <module> - <java>janino-2.5.10.jar</java> - </module> - <module> - <java>mvel-1.2.22-java1.4.jar</java> - </module> + <java>janino-2.4.3.jar</java> + </module> + + <module> + <java>stringtemplate-2.3b6.jar</java> + </module> <module> + <java>antlr-2.7.6.jar</java> + </module> + + <module> + <java>antlr-3.0ea8.jar</java> + </module> + + <module> <java>jcaptcha-all-1.0-RC4.jar</java> </module> Modified: branches/Seam_1_2_1_AP/examples/seamspace/resources/META-INF/application.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/seamspace/resources/META-INF/application.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/seamspace/resources/META-INF/application.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -26,23 +26,43 @@ <java>el-ri.jar</java> </module> - <module> - <java>drools-compiler-4.0.2.jar</java> - </module> - <module> - <java>drools-core-4.0.2.jar</java> - </module> - <module> - <java>antlr-runtime-3.0.jar</java> - </module> - <module> - <java>janino-2.5.10.jar</java> - </module> - <module> - <java>mvel-1.2.22-java1.4.jar</java> - </module> + <module> + <java>drools-compiler-3.0.5.jar</java> + </module> + + <module> + <java>drools-core-3.0.5.jar</java> + </module> <module> + <java>commons-jci-core-1.0-406301.jar</java> + </module> + + <module> + <java>commons-jci-janino-2.4.3.jar</java> + </module> + + <module> + <java>commons-lang-2.1.jar</java> + </module> + + <module> + <java>janino-2.4.3.jar</java> + </module> + + <module> + <java>stringtemplate-2.3b6.jar</java> + </module> + + <module> + <java>antlr-2.7.6.jar</java> + </module> + + <module> + <java>antlr-3.0ea8.jar</java> + </module> + + <module> <java>jcaptcha-all-1.0-RC4.jar</java> </module> Modified: branches/Seam_1_2_1_AP/examples/takeaway/resources/META-INF/application.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/takeaway/resources/META-INF/application.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/takeaway/resources/META-INF/application.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -19,13 +19,13 @@ <java>jboss-seam.jar</java> </module> <!-- JSF 1.2 --> - <module> + <!-- <module> <java>el-api.jar</java> - </module> + </module>--> <module> <java>el-ri.jar</java> </module> <module> - <java>jbpm-jpdl.jar</java> + <java>jbpm-3.1.4.jar</java> </module> </application> Modified: branches/Seam_1_2_1_AP/examples/takeaway/resources/hibernate.cfg.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/takeaway/resources/hibernate.cfg.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/takeaway/resources/hibernate.cfg.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -24,36 +24,29 @@ <!-- uncomment this if you don't have bsh on your --> <!-- classpath. you won't be able to use the --> <!-- script element in process definition files --> + <!-- <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/> + --> <!-- following mapping files have a dependendy on --> - <!-- 'jbpm-identity.jar', mapping files --> + <!-- 'jbpm-identity-{version}.jar', mapping files --> <!-- of the pluggable jbpm identity component. --> - <!-- Uncomment the following 3 lines if you --> - <!-- want to use the jBPM identity mgmgt --> - <!-- component. --> - <!-- identity mappings (begin) === + <!-- comment out the following 3 lines if you don't--> + <!-- want to use the default jBPM identity mgmgt --> + <!-- component --> + + <!-- <mapping resource="org/jbpm/identity/User.hbm.xml"/> <mapping resource="org/jbpm/identity/Group.hbm.xml"/> <mapping resource="org/jbpm/identity/Membership.hbm.xml"/> - ==== identity mappings (end) --> - - <!-- following mapping files have a dependendy on --> - <!-- the JCR API --> - <!-- jcr mappings (begin) === - <mapping resource="org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml"/> - ==== jcr mappings (end) --> + --> - <!-- ###################### --> <!-- # jbpm mapping files # --> <!-- ###################### --> <!-- hql queries and type defs --> <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> - - <!-- graph.action mapping files --> - <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/> <!-- graph.def mapping files --> <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/> @@ -72,7 +65,6 @@ <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/> <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/> <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/> <mapping resource="org/jbpm/graph/node/State.hbm.xml"/> <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/> @@ -121,11 +113,13 @@ <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/> - <!-- job mapping files --> - <mapping resource="org/jbpm/job/Job.hbm.xml"/> - <mapping resource="org/jbpm/job/Timer.hbm.xml"/> - <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/> - <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/> + <!-- msg.db mapping files --> + <mapping resource="org/jbpm/msg/Message.hbm.xml"/> + <mapping resource="org/jbpm/msg/db/TextMessage.hbm.xml"/> + <mapping resource="org/jbpm/command/ExecuteActionCommand.hbm.xml"/> + <mapping resource="org/jbpm/command/ExecuteNodeCommand.hbm.xml"/> + <mapping resource="org/jbpm/command/SignalCommand.hbm.xml"/> + <mapping resource="org/jbpm/command/TaskInstanceEndCommand.hbm.xml"/> <!-- taskmgmt.exe mapping files --> <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/> @@ -133,6 +127,9 @@ <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/> <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/> + <!-- scheduler.exe mapping files --> + <mapping resource="org/jbpm/scheduler/exe/Timer.hbm.xml"/> + <!-- logging mapping files --> <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/> <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/> @@ -141,7 +138,6 @@ <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/> Modified: branches/Seam_1_2_1_AP/examples/todo/resources/META-INF/application.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/todo/resources/META-INF/application.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/todo/resources/META-INF/application.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -19,7 +19,7 @@ <java>jboss-seam.jar</java> </module> <module> - <java>jbpm-jpdl.jar</java> + <java>jbpm-3.1.4.jar</java> </module> <module> <java>el-ri.jar</java> Modified: branches/Seam_1_2_1_AP/examples/todo/resources/hibernate.cfg.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/todo/resources/hibernate.cfg.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/todo/resources/hibernate.cfg.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -13,7 +13,7 @@ <property name="transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> <property name="hbm2ddl.auto">create-drop</property> - <!--property name="transaction.flush_before_completion">true</property--> + <!-- property name="transaction.flush_before_completion">true</property--> <!-- ############################################ --> <!-- # mapping files with external dependencies # --> @@ -24,36 +24,29 @@ <!-- uncomment this if you don't have bsh on your --> <!-- classpath. you won't be able to use the --> <!-- script element in process definition files --> + <!-- <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/> + --> <!-- following mapping files have a dependendy on --> - <!-- 'jbpm-identity.jar', mapping files --> + <!-- 'jbpm-identity-{version}.jar', mapping files --> <!-- of the pluggable jbpm identity component. --> - <!-- Uncomment the following 3 lines if you --> - <!-- want to use the jBPM identity mgmgt --> - <!-- component. --> - <!-- identity mappings (begin) === + <!-- comment out the following 3 lines if you don't--> + <!-- want to use the default jBPM identity mgmgt --> + <!-- component --> + + <!-- <mapping resource="org/jbpm/identity/User.hbm.xml"/> <mapping resource="org/jbpm/identity/Group.hbm.xml"/> <mapping resource="org/jbpm/identity/Membership.hbm.xml"/> - ==== identity mappings (end) --> - - <!-- following mapping files have a dependendy on --> - <!-- the JCR API --> - <!-- jcr mappings (begin) === - <mapping resource="org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml"/> - ==== jcr mappings (end) --> + --> - <!-- ###################### --> <!-- # jbpm mapping files # --> <!-- ###################### --> <!-- hql queries and type defs --> <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> - - <!-- graph.action mapping files --> - <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/> <!-- graph.def mapping files --> <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/> @@ -72,7 +65,6 @@ <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/> <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/> <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/> - <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/> <mapping resource="org/jbpm/graph/node/State.hbm.xml"/> <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/> @@ -121,11 +113,13 @@ <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/> - <!-- job mapping files --> - <mapping resource="org/jbpm/job/Job.hbm.xml"/> - <mapping resource="org/jbpm/job/Timer.hbm.xml"/> - <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/> - <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/> + <!-- msg.db mapping files --> + <mapping resource="org/jbpm/msg/Message.hbm.xml"/> + <mapping resource="org/jbpm/msg/db/TextMessage.hbm.xml"/> + <mapping resource="org/jbpm/command/ExecuteActionCommand.hbm.xml"/> + <mapping resource="org/jbpm/command/ExecuteNodeCommand.hbm.xml"/> + <mapping resource="org/jbpm/command/SignalCommand.hbm.xml"/> + <mapping resource="org/jbpm/command/TaskInstanceEndCommand.hbm.xml"/> <!-- taskmgmt.exe mapping files --> <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/> @@ -133,6 +127,9 @@ <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/> <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/> + <!-- scheduler.exe mapping files --> + <mapping resource="org/jbpm/scheduler/exe/Timer.hbm.xml"/> + <!-- logging mapping files --> <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/> <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/> @@ -141,7 +138,6 @@ <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/> <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/> Modified: branches/Seam_1_2_1_AP/examples/todo/resources/jbpm.cfg.xml =================================================================== --- branches/Seam_1_2_1_AP/examples/todo/resources/jbpm.cfg.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/todo/resources/jbpm.cfg.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -8,7 +8,6 @@ </bean> </factory> </service> - <service name="tx" factory="org.jbpm.tx.TxServiceFactory" /> <service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" /> <service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" /> <service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" /> Modified: branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml =================================================================== --- branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/wiki/Wiki.iml 2008-03-27 11:56:20 UTC (rev 7720) @@ -108,9 +108,9 @@ <library> <CLASSES> <root url="jar://$MODULE_DIR$/../../lib/jsf-impl.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> + </CLASSES> + <JAVADOC /> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> @@ -125,7 +125,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../lib/jcaptcha-all-1.0-RC3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../lib/jcaptcha-all-1.0-RC4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -278,7 +278,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../lib/jbpm-jpdl.jar!/" /> + <root url="jar://$MODULE_DIR$/../../lib/jbpm-3.1.4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -386,7 +386,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../drools/lib/drools-compiler-4.0.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../drools/lib/drools-compiler-3.0.5.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -395,7 +395,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../drools/lib/janino-2.5.10.jar!/" /> + <root url="jar://$MODULE_DIR$/../../drools/lib/commons-jci-core-1.0-406301.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -404,7 +404,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../drools/lib/mvel-1.2.22-java1.4.jar!/" /> + <root url="jar://$MODULE_DIR$/../../drools/lib/janino-2.4.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -413,7 +413,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../drools/lib/antlr-runtime-3.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../drools/lib/commons-logging-api-1.0.4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -422,7 +422,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../../drools/lib/drools-core-4.0.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../drools/lib/commons-lang-2.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -431,6 +431,51 @@ <orderEntry type="module-library"> <library> <CLASSES> + <root url="jar://$MODULE_DIR$/../../drools/lib/commons-jci-janino-2.4.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../drools/lib/antlr-2.7.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../drools/lib/stringtemplate-2.3b6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../drools/lib/antlr-3.0ea8.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../drools/lib/drools-core-3.0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> <root url="jar://$MODULE_DIR$/../../lib/testng-5.5-jdk15.jar!/" /> </CLASSES> <JAVADOC /> @@ -483,30 +528,55 @@ <component name="WebModuleProperties"> <containerElement type="library" level="module"> <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/lib/antlr-runtime-3.0.jar" /> - <url>jar://$MODULE_DIR$/../../drools/lib/antlr-runtime-3.0.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib/antlr-2.7.6.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/antlr-2.7.6.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/lib/mvel-1.2.22-java1.4.jar" /> - <url>jar://$MODULE_DIR$/../../drools/lib/mvel-1.2.22-java1.4.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib/antlr-3.0ea8.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/antlr-3.0ea8.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/lib/drools-compiler-4.0.2.jar" /> - <url>jar://$MODULE_DIR$/../../drools/lib/drools-compiler-4.0.2.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib/commons-jci-core-1.0-406301.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/commons-jci-core-1.0-406301.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/lib/drools-core-4.0.2.jar" /> - <url>jar://$MODULE_DIR$/../../drools/lib/drools-core-4.0.2.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib/commons-jci-janino-2.4.3.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/commons-jci-janino-2.4.3.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/lib/janino-2.5.10.jar" /> - <url>jar://$MODULE_DIR$/../../drools/lib/janino-2.5.10.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib/commons-lang-2.1.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/commons-lang-2.1.jar!/</url> </containerElement> <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib/commons-logging-api-1.0.4.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/commons-logging-api-1.0.4.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib/drools-compiler-3.0.5.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/drools-compiler-3.0.5.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib/drools-core-3.0.5.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/drools-core-3.0.5.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib/janino-2.4.3.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/janino-2.4.3.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> + <attribute name="method" value="1" /> + <attribute name="URI" value="/WEB-INF/lib/stringtemplate-2.3b6.jar" /> + <url>jar://$MODULE_DIR$/../../drools/lib/stringtemplate-2.3b6.jar!/</url> + </containerElement> + <containerElement type="library" level="module"> <attribute name="method" value="0" /> <attribute name="URI" value="/WEB-INF/lib/urlrewrite-3.0.3.jar" /> <url>jar://$MODULE_DIR$/src/etc/WEB-INF/lib/urlrewrite-3.0.3.jar!/</url> @@ -653,8 +723,8 @@ </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/lib/jbpm-jpdl.jar" /> - <url>jar://$MODULE_DIR$/../../lib/jbpm-jpdl.jar!/</url> + <attribute name="URI" value="/WEB-INF/lib/jbpm-3.1.4.jar" /> + <url>jar://$MODULE_DIR$/../../lib/jbpm-3.1.4.jar!/</url> </containerElement> <containerElement type="library" level="module"> <attribute name="method" value="1" /> @@ -686,12 +756,11 @@ <attribute name="URI" value="/WEB-INF/lib/mail.jar" /> <url>jar://$MODULE_DIR$/../../lib/mail.jar!/</url> </containerElement> - <containerElement type="library" level="module"> - <attribute name="method" value="1" /> - <attribute name="URI" value="/WEB-INF/lib/myfaces-api-1.1.4.jar" /> - <url>jar://$MODULE_DIR$/../../lib/myfaces-api-1.1.4.jar!/</url> + <containerElement type="library" level="module"> + <attribute name="URI" value="/WEB-INF/lib/jsf-impl.jar" /> + <url>jar://$MODULE_DIR$/../../lib/jsf-impl.jar!/</url> </containerElement> - <containerElement type="library" level="module"> + <containerElement type="library" level="module"> <attribute name="method" value="1" /> <attribute name="URI" value="/WEB-INF/lib/jsf-impl.jar" /> <url>jar://$MODULE_DIR$/../../lib/jsf-impl.jar!/</url> Modified: branches/Seam_1_2_1_AP/examples/wiki/build.properties =================================================================== --- branches/Seam_1_2_1_AP/examples/wiki/build.properties 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/examples/wiki/build.properties 2008-03-27 11:56:20 UTC (rev 7720) @@ -1,4 +1,4 @@ -jboss.home = /Users/turin/work/local/jboss/jboss-4.0.5.GA +jboss.home= /home/mnovotny/apps/jboss-4.2.2.GA # That stuff doesn't really work for me, PAGE scoped components can't be hot-deployed (CNFE on deserialization of component state) #hotdeploy.classes = **/wiki/core/action/** **/wiki/core/dao/** **/wiki/core/links/** **/wiki/plugin/lastmodified/** **/wiki/plugin/blogdirectory/BlogDirectory* javac.debug = true Added: branches/Seam_1_2_1_AP/lib/jbpm-3.1.4.jar =================================================================== (Binary files differ) Property changes on: branches/Seam_1_2_1_AP/lib/jbpm-3.1.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/Seam_1_2_1_AP/lib/jbpm-identity.jar =================================================================== (Binary files differ) Deleted: branches/Seam_1_2_1_AP/lib/jbpm-jpdl.jar =================================================================== (Binary files differ) Modified: branches/Seam_1_2_1_AP/lib/readme.txt =================================================================== --- branches/Seam_1_2_1_AP/lib/readme.txt 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/lib/readme.txt 2008-03-27 11:56:20 UTC (rev 7720) @@ -4,7 +4,7 @@ The only jars required to run Seam in a full Java EE 5 environment are: - jbpm-jpdl.jar + jbpm-3.1.4.jar thirdparty-all.jar To use Seam with Hibernate3 in a J2EE 1.4 environment, Modified: branches/Seam_1_2_1_AP/seam-gen/build-scripts/.classpath =================================================================== --- branches/Seam_1_2_1_AP/seam-gen/build-scripts/.classpath 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/seam-gen/build-scripts/.classpath 2008-03-27 11:56:20 UTC (rev 7720) @@ -12,12 +12,15 @@ <classpathentry kind="lib" path="lib/jboss-ejb3-all.jar"/> <classpathentry kind="lib" path="lib/jboss-seam.jar"/> <classpathentry kind="lib" path="lib/jboss-seam-debug.jar"/> - <classpathentry kind="lib" path="lib/jbpm-jpdl.jar"/> - <classpathentry kind="lib" path="lib/drools-core-4.0.2.jar"/> - <classpathentry kind="lib" path="lib/drools-compiler-4.0.2.jar"/> - <classpathentry kind="lib" path="lib/drools/janino-2.5.10.jar"/> - <classpathentry kind="lib" path="lib/drools/antlr-runtime-3.0.jar"/> + <classpathentry kind="lib" path="lib/jbpm-3.1.4.jar"/> + <classpathentry kind="lib" path="lib/drools-core-3.0.5.jar"/> + <classpathentry kind="lib" path="lib/drools-compiler-3.0.5.jar"/> + <classpathentry kind="lib" path="lib/janino-2.4.3.jar"/> <classpathentry kind="lib" path="lib/antlr-2.7.6.jar"/> + <classpathentry kind="lib" path="lib/antlr-3.0ea8.jar"/> + <classpathentry kind="lib" path="lib/commons-jci-core-1.0-406301.jar"/> + <classpathentry kind="lib" path="lib/commons-jci-janino-2.4.3.jar"/> + <classpathentry kind="lib" path="lib/stringtemplate-2.3b6.jar"/> <classpathentry kind="lib" path="lib/jgroups.jar"/> <classpathentry kind="lib" path="lib/jsf-facelets.jar"/> <classpathentry kind="lib" path="lib/jstl-1.1.0.jar"/> Modified: branches/Seam_1_2_1_AP/seam-gen/nbproject/project.xml =================================================================== --- branches/Seam_1_2_1_AP/seam-gen/nbproject/project.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/seam-gen/nbproject/project.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -80,7 +80,7 @@ <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1"> <compilation-unit> <package-root>src</package-root> - <classpath mode="compile">lib/ant.jar:lib/commons-beanutils-1.7.0.jar:lib/commons-codec-1.3.jar:lib/commons-collections-3.1.jar:lib/commons-digester-1.6.jar:lib/commons-el-1.0.jar:lib/commons-lang-2.1.jar:lib/el-api.jar:lib/el-ri.jar:lib/hibernate-all.jar:lib/hsqldb.jar:lib/javax.servlet.jsp.jar:lib/jboss-aop-jdk50.jar:lib/jboss-cache-jdk50.jar:lib/jboss-ejb3-all.jar:lib/jboss-seam-debug.jar:lib/jboss-seam-ui.jar:lib/jboss-seam.jar:lib/jbpm-jpdl.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl-1.1.0.jar:lib/mailstuff.jar:lib/jsf-api.jar:lib/jsf-impl.jar:lib/portlet-api-lib.jar:lib/servlet-api.jar:lib/testng-4.5.1-jdk15.jar:lib/thirdparty-all.jar</classpath> + <classpath mode="compile">lib/ant.jar:lib/commons-beanutils-1.7.0.jar:lib/commons-codec-1.3.jar:lib/commons-collections-3.1.jar:lib/commons-digester-1.6.jar:lib/commons-el-1.0.jar:lib/commons-lang-2.1.jar:lib/el-api.jar:lib/el-ri.jar:lib/hibernate-all.jar:lib/hsqldb.jar:lib/javax.servlet.jsp.jar:lib/jboss-aop-jdk50.jar:lib/jboss-cache-jdk50.jar:lib/jboss-ejb3-all.jar:lib/jboss-seam-debug.jar:lib/jboss-seam-ui.jar:lib/jboss-seam.jar:lib/jbpm-3.1.4.jar:lib/jgroups.jar:lib/jsf-facelets.jar:lib/jstl-1.1.0.jar:lib/mailstuff.jar:lib/jsf-api.jar:lib/jsf-impl.jar:lib/portlet-api-lib.jar:lib/servlet-api.jar:lib/testng-4.5.1-jdk15.jar:lib/thirdparty-all.jar</classpath> <source-level>1.5</source-level> </compilation-unit> </java-data> Modified: branches/Seam_1_2_1_AP/seam-gen/resources/META-INF/application.xml =================================================================== --- branches/Seam_1_2_1_AP/seam-gen/resources/META-INF/application.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/seam-gen/resources/META-INF/application.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -27,24 +27,33 @@ <!-- jBPM --> <module> - <java>jbpm-jpdl.jar</java> + <java>jbpm-3.1.4.jar</java> </module> <!-- Drools and dependencies --> - <module> - <java>drools-compiler-4.0.2.jar</java> - </module> - <module> - <java>drools-core-4.0.2.jar</java> - </module> - <module> - <java>antlr-runtime-3.0.jar</java> - </module> - <module> - <java>janino-2.5.10.jar</java> - </module> - <module> - <java>mvel-1.2.22-java1.4.jar</java> - </module> + <module> + <java>drools-core-3.0.5.jar</java> + </module> + <module> + <java>drools-compiler-3.0.5.jar</java> + </module> + <module> + <java>janino-2.4.3.jar</java> + </module> + <module> + <java>antlr-2.7.6.jar</java> + </module> + <module> + <java>antlr-3.0ea8.jar</java> + </module> + <module> + <java>commons-jci-core-1.0-406301.jar</java> + </module> + <module> + <java>commons-jci-janino-2.4.3.jar</java> + </module> + <module> + <java>stringtemplate-2.3b6.jar</java> + </module> </application> Modified: branches/Seam_1_2_1_AP/seam-ui-cdk/pom.xml =================================================================== --- branches/Seam_1_2_1_AP/seam-ui-cdk/pom.xml 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/seam-ui-cdk/pom.xml 2008-03-27 11:56:20 UTC (rev 7720) @@ -112,7 +112,7 @@ <version>transient</version> <scope>system</scope> <systemPath> - ${seam.dir}/lib/jbpm-jpdl.jar + ${seam.dir}/lib/jbpm-3.1.4.jar </systemPath> </dependency> <dependency> Modified: branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/DroolsHandler.java =================================================================== --- branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/DroolsHandler.java 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/DroolsHandler.java 2008-03-27 11:56:20 UTC (rev 7720) @@ -26,6 +26,7 @@ for (String objectName: expressions) { + //TODO: delegate to jBPM instead of to JSF Object object = Expressions.instance().createValueBinding(objectName).getValue(); //Object object = new SeamVariableResolver().resolveVariable(objectName); // assert the object into the rules engine @@ -43,7 +44,7 @@ } //workingMemory.setGlobal( "contextInstance", executionContext.getContextInstance() ); - workingMemory.insert( Actor.instance() ); + workingMemory.assertObject( Actor.instance() ); return workingMemory; } @@ -53,11 +54,11 @@ FactHandle fact = workingMemory.getFactHandle(element); if (fact==null) { - workingMemory.insert(element); + workingMemory.assertObject(element); } else { - workingMemory.update(fact, element); + workingMemory.modifyObject(fact, element); } } } Modified: branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/ManagedWorkingMemory.java =================================================================== --- branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/ManagedWorkingMemory.java 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/ManagedWorkingMemory.java 2008-03-27 11:56:20 UTC (rev 7720) @@ -5,7 +5,7 @@ import java.io.Serializable; import org.drools.RuleBase; -import org.drools.StatefulSession; +import org.drools.WorkingMemory; import org.jboss.seam.Component; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Destroy; @@ -28,7 +28,7 @@ private static final long serialVersionUID = -1746942080571374743L; private String ruleBaseName; - private StatefulSession statefulSession; + private WorkingMemory workingMemory; private ValueBinding<RuleBase> ruleBase; public boolean clearDirty() { @@ -59,9 +59,9 @@ } @Unwrap - public StatefulSession getStatefulSession() + public WorkingMemory getWorkingMemory() { - if (statefulSession==null) + if (workingMemory==null) { RuleBase ruleBase; if (this.ruleBase!=null) @@ -82,15 +82,15 @@ { throw new IllegalStateException("RuleBase not found: " + ruleBaseName); } - statefulSession = ruleBase.newStatefulSession(); + workingMemory = ruleBase.newWorkingMemory(); } - return statefulSession; + return workingMemory; } @Destroy public void destroy() { - statefulSession.dispose(); + workingMemory.dispose(); } public ValueBinding<RuleBase> getRuleBase() { Modified: branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/RuleBase.java =================================================================== --- branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/RuleBase.java 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/src/main/org/jboss/seam/drools/RuleBase.java 2008-03-27 11:56:20 UTC (rev 7720) @@ -35,7 +35,8 @@ @Create public void compileRuleBase() throws Exception { - PackageBuilderConfiguration conf = new PackageBuilderConfiguration(); + PackageBuilderConfiguration conf = new PackageBuilderConfiguration(); + conf.setCompiler(PackageBuilderConfiguration.JANINO); PackageBuilder builder = new PackageBuilder(conf); if (ruleFiles!=null) Modified: branches/Seam_1_2_1_AP/src/main/org/jboss/seam/security/RuleBasedIdentity.java =================================================================== --- branches/Seam_1_2_1_AP/src/main/org/jboss/seam/security/RuleBasedIdentity.java 2008-03-27 11:00:32 UTC (rev 7719) +++ branches/Seam_1_2_1_AP/src/main/org/jboss/seam/security/RuleBasedIdentity.java 2008-03-27 11:56:20 UTC (rev 7720) @@ -9,13 +9,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Enumeration; -import java.util.Iterator; import java.util.List; import org.drools.FactHandle; import org.drools.RuleBase; -import org.drools.StatefulSession; -import org.drools.base.ClassObjectFilter; +import org.drools.WorkingMemory; import org.jboss.seam.Component; import org.jboss.seam.annotations.Install; import org.jboss.seam.annotations.Intercept; @@ -32,14 +30,11 @@ @Startup public class RuleBasedIdentity extends Identity { - - private static final long serialVersionUID = -2798083003251077858L; - public static final String RULES_COMPONENT_NAME = "securityRules"; private static final LogProvider log = Logging.getLogProvider(RuleBasedIdentity.class); - private StatefulSession securityContext; + private WorkingMemory securityContext; private RuleBase securityRules; @@ -59,7 +54,7 @@ if (securityRules != null) { - securityContext = securityRules.newStatefulSession(false); + securityContext = securityRules.newWorkingMemory(false); } if (securityContext == null) @@ -74,7 +69,7 @@ { super.postAuthenticate(); - StatefulSession securityContext = getSecurityContext(); + WorkingMemory securityContext = getSecurityContext(); if (securityContext != null) { @@ -87,12 +82,12 @@ while ( e.hasMoreElements() ) { Principal role = (Principal) e.nextElement(); - securityContext.insert( new Role( role.getName() ) ); + securityContext.assertObject( new Role( role.getName() ) ); } } } - securityContext.insert(getPrincipal()); + securityContext.assertObject(getPrincipal()); } } @@ -107,19 +102,17 @@ @Override public boolean hasPermission(String name, String action, Object...arg) { - StatefulSession securityContext = getSecurityContext(); + WorkingMemory securityContext = getSecurityContext(); if (securityContext == null) return false; - synchronizeContext(); - List<FactHandle> handles = new ArrayList<FactHandle>(); PermissionCheck check = new PermissionCheck(name, action); synchronized( securityContext ) { - handles.add( securityContext.insert(check) ); + handles.add( securityContext.assertObject(check) ); for (int i = 0; i < arg.length; i++) { @@ -129,57 +122,35 @@ { if ( securityContext.getFactHandle(value) == null ) { - handles.add( securityContext.insert(value) ); + handles.add( securityContext.assertObject(value) ); } } } else { - handles.add( securityContext.insert(arg[i]) ); + handles.add( securityContext.assertObject(arg[i]) ); } } securityContext.fireAllRules(); for (FactHandle handle : handles) - securityContext.retract(handle); + securityContext.retractObject(handle); } return check.isGranted(); } - /** - * Overridden version of hasRole() that checks for the existence of the role - * in the security context first. If it is not found there, then the super - * method is invoked instead. - */ @Override - public boolean hasRole(String role) - { - if (securityContext != null) - { - Iterator<Role> iter = securityContext.iterateObjects(new ClassObjectFilter(Role.class)); - - while (iter.hasNext()) - { - Role r = iter.next(); - if (r.getName().equals(role)) return true; - } - } - return super.hasRole(role); - } - - @Override protected void unAuthenticate() { - StatefulSession securityContext = getSecurityContext(); + WorkingMemory securityContext = getSecurityContext(); if (securityContext != null) { - Iterator<Role> iter = securityContext.iterateObjects(new ClassObjectFilter(Role.class)); - while (iter.hasNext()) + for (Role role : (List<Role>) securityContext.getObjects(Role.class)) { - getSecurityContext().retract(securityContext.getFactHandle(iter.next())); + getSecurityContext().retractObject(securityContext.getFactHandle(role)); } } @@ -191,8 +162,13 @@ { if (super.addRole(role)) { - synchronizeContext(); - return true; + WorkingMemory securityContext = getSecurityContext(); + + if (securityContext != null) + { + getSecurityContext().assertObject(new Role(role)); + return true; + } } return false; @@ -201,68 +177,31 @@ @Override public void removeRole(String role) { - super.removeRole(role); - synchronizeContext(); - } - - /** - * Synchronizes the state of the security context with that of the subject - */ - private void synchronizeContext() - { - if (getSecurityContext() != null) - { - - for ( Group sg : getSubject().getPrincipals(Group.class) ) - { - if ( ROLES_GROUP.equals( sg.getName() ) ) - { - Enumeration e = sg.members(); - while (e.hasMoreElements()) - { - Principal role = (Principal) e.nextElement(); + WorkingMemory securityContext = getSecurityContext(); - boolean found = false; - Iterator<Role> iter = getSecurityContext().iterateObjects(new ClassObjectFilter(Role.class)); - while (iter.hasNext()) - { - Role r = iter.next(); - if (r.getName().equals(role.getName())) - { - found = true; - break; - } - } - - if (!found) - { - getSecurityContext().insert(new Role(role.getName())); - } - - } - } - } - } - - Iterator<Role> iter = getSecurityContext().iterateObjects(new ClassObjectFilter(Role.class)); - while (iter.hasNext()) + if (securityContext != null) { - Role r = iter.next(); - if (!super.hasRole(r.getName())) + for (Role r : (List<Role>) getSecurityContext().getObjects(Role.class)) { - FactHandle fh = getSecurityContext().getFactHandle(r); - getSecurityContext().retract(fh); + if (r.getName().equals(role)) + { + FactHandle fh = getSecurityContext().getFactHandle(r); + getSecurityContext().retractObject(fh); + break; + } } } + + super.removeRole(role); } - - public StatefulSession getSecurityContext() + + public WorkingMemory getSecurityContext() { return securityContext; } - public void setSecurityContext(StatefulSession securityContext) + public void setSecurityContext(WorkingMemory securityContext) { this.securityContext = securityContext; } @@ -276,18 +215,5 @@ public void setSecurityRules(RuleBase securityRules) { this.securityRules = securityRules; - } - - @Override - public void logout() - { - // Explicitly destroy the security context - if (securityContext != null) - { - securityContext.dispose(); - securityContext = null; - } - - super.logout(); - } + } }