Author: chris.laprun(a)jboss.com Date: 2008-06-18 18:01:58 -0400 (Wed, 18 Jun 2008) New Revision: 11086 Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml branches/JBoss_Portal_Branch_2_7/cms/build.xml branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublish.java branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java branches/JBoss_Portal_Branch_2_7/core-cms/build.xml branches/JBoss_Portal_Branch_2_7/core-management/build.xml branches/JBoss_Portal_Branch_2_7/core/build.xml branches/JBoss_Portal_Branch_2_7/workflow/build.xml branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadService.java branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/test/PortalCMSPublish.java branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_7/wsrp/build.xml branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml Log: - Started upgrading jBPM to 3.2.2. - Might not work yet (mostly synchronization commit) - More generification. - Minor documentation. - Started fixing wsrp tests. More work needed to upgrade to PC 2.0.0 Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-06-18 20:53:27 UTC (rev 11085) +++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-06-18 22:01:58 UTC (rev 11086) @@ -49,7 +49,7 @@ <componentref name="jboss-portal/modules/common" version="1.2.0"/> <componentref name="jboss-portal/modules/web" version="1.2.0"/> - <componentref name="jboss-portal/modules/test" version="1.0.1"/> + <componentref name="jboss-portal/modules/test" version="1.1.0"/> <componentref name="jboss-portal/modules/portlet" version="trunk-SNAPSHOT"/> <componentref name="jboss-portal/modules/identity" version="1.0-SNAPSHOT"/> <componentref name="antlr" version="2.7.6.ga"/> @@ -117,7 +117,7 @@ <componentref name="sun-servlet" version="2.4"/> <componentref name="sun-jaxb" version="2.0"/> <componentref name="xdoclet" version="1.2.3"/> - <componentref name="jbpm/jaronly" version="3.1.2"/> + <componentref name="jbpm/jpdl" version="3.2.2"/> <componentref name="freemarker" version="2.3.9"/> <componentref name="wutka-dtdparser" version="1.2.1"/> <componentref name="portals-bridges" version="1.0.3"/> @@ -127,8 +127,8 @@ <componentref name="jboss/web" version="2.1.0.GA"/> <!-- For the presentation branch only, not the mainstream branch --> - <componentref name="gwt" version="1.4.60"/> - <componentref name="mygwt" version="0.3.0"/> + <!-- <componentref name="gwt" version="1.4.60"/> + <componentref name="mygwt" version="0.3.0"/> --> </build> Modified: branches/JBoss_Portal_Branch_2_7/cms/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/cms/build.xml 2008-06-18 20:53:27 UTC (rev 11085) +++ branches/JBoss_Portal_Branch_2_7/cms/build.xml 2008-06-18 22:01:58 UTC (rev 11086) @@ -23,13 +23,13 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <!DOCTYPE project [ - <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> - <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> - <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"> - <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> - <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> - <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent"> - ]> + <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> + <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> + <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"> + <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> + <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> + <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent"> + ]> <!-- $Id$ --> @@ -45,14 +45,7 @@ <project default="main" name="JBoss Portal"> - <!--+====================================================================+--> - <!--| Setup |--> - <!--| |--> - <!--| Include the common build elements. |--> - <!--| |--> - <!--| This defines several different targets, properties and paths. |--> - <!--| It also sets up the basic extention tasks amoung other things. |--> - <!--+====================================================================+--> + <!--+====================================================================+--><!--| Setup |--><!--| |--><!--| Include the common build elements. |--><!--| |--><!--| This defines several different targets, properties and paths. |--><!--| It also sets up the basic extention tasks amoung other things. |--><!--+====================================================================+--> &buildmagic; &modules; @@ -92,20 +85,20 @@ <path refid="jboss.portal/modules/test.classpath"/> <path refid="jboss.portal/modules/portlet.classpath"/> <path refid="jboss.portal/modules/identity.classpath"/> - <path refid="apache.logging.classpath"/> - <path refid="apache.xerces.classpath"/> - <path refid="apache.log4j.classpath"/> - <path refid="apache.collections.classpath"/> - <path refid="apache.lucene.classpath"/> - <path refid="apache.ant.classpath"/> + <path refid="apache.logging.classpath"/> + <path refid="apache.xerces.classpath"/> + <path refid="apache.log4j.classpath"/> + <path refid="apache.collections.classpath"/> + <path refid="apache.lucene.classpath"/> + <path refid="apache.ant.classpath"/> <path refid="jboss.jbossxb.classpath"/> - <path refid="jboss.cache.classpath"/> + <path refid="jboss.cache.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="jboss.microcontainer.classpath"/> <path refid="hibernate.hibernate.classpath"/> <path refid="ehcache.ehcache.classpath"/> - <path refid="jbossas/core.libs.classpath"/> - <path refid="jakarta.io.classpath"/> + <path refid="jbossas/core.libs.classpath"/> + <path refid="jakarta.io.classpath"/> <path refid="junit.junit.classpath"/> <path refid="jackrabbit.jackrabbit.classpath"/> <path refid="slf4j.slf4j.classpath"/> @@ -115,10 +108,10 @@ <!-- cms optimization integration --> <path refid="jgroups.jgroups.classpath"/> <path refid="sun.servlet.classpath"/> - <!-- jbpm integration --> - <path refid="jbpm.jaronly.classpath"/> + <!-- jbpm integration --> + <path refid="jbpm.jpdl.classpath"/> </path> - + <path id="javac.classpath"> <pathelement location="${build.classes}"/> </path> @@ -132,11 +125,11 @@ <path refid="jboss.portal-jems.classpath"/> <path refid="jboss.portal-search.classpath"/> <!-- fine grained security integration --> - <path refid="jboss.portal-security.classpath"/> + <path refid="jboss.portal-security.classpath"/> <!-- clustered testcases related --> - <path refid="jboss.portal-api.classpath"/> - <!-- workflow integration --> - <path refid="jboss.portal-workflow.classpath"/> + <path refid="jboss.portal-api.classpath"/> + <!-- workflow integration --> + <path refid="jboss.portal-workflow.classpath"/> </path> @@ -202,17 +195,17 @@ <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-index-filters.jar"/> <fileset dir="${nekohtml.nekohtml.lib}" includes="nekohtml.jar"/> - + <!-- cms optimization integration --> <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/> - <fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/> - - <fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/> + <fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/> + + <fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/> </jar> - + <copy todir="${build.resources}/test/jcr/"> <fileset dir="${source.bin}" includes="ziptest.zip"/> - <fileset dir="${source.bin}" includes="prueba.zip"/> + <fileset dir="${source.bin}" includes="prueba.zip"/> <fileset dir="${source.bin}" includes="headerpage.html"/> <fileset dir="${source.bin}" includes="headerpage_good.html"/> </copy> @@ -221,25 +214,24 @@ <!-- generates artifacts used for tests, requires output to be previously run --> - <target name="package-tests" depends="init"> - <jar jarfile="${build.lib}/test-cms-cluster.sar" manifest="${build.etc}/portal-cms-lib-sar.mf"> - <fileset dir="${build.resources}/portal-cms-sar"/> - <fileset dir="${build.lib}" includes="portal-cms-lib.jar"/> - <fileset dir="${jcr.jcr.root}/lib" includes="jcr-1.0.jar"/> - <fileset dir="${apache.collections.root}/lib" includes="commons-collections.jar"/> - <fileset dir="${apache.lucene.root}/lib" includes="lucene.jar"/> + <target name="package-tests" depends="init"> + <jar jarfile="${build.lib}/test-cms-cluster.sar" manifest="${build.etc}/portal-cms-lib-sar.mf"> + <fileset dir="${build.resources}/portal-cms-sar"/> + <fileset dir="${build.lib}" includes="portal-cms-lib.jar"/> + <fileset dir="${jcr.jcr.root}/lib" includes="jcr-1.0.jar"/> + <fileset dir="${apache.collections.root}/lib" includes="commons-collections.jar"/> + <fileset dir="${apache.lucene.root}/lib" includes="lucene.jar"/> - <!-- cms optimization integration --> - <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/> - <fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/> - - <fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/> + <!-- cms optimization integration --> + <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/> + <fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/> - <!-- add the jboss-service.xml and hibernate configuration --> - <fileset dir="${build.resources}/test/cms/clustering/sar"/> - - <!-- add dependencies --> - <!-- + <fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/> + + <!-- add the jboss-service.xml and hibernate configuration --> + <fileset dir="${build.resources}/test/cms/clustering/sar"/> + + <!-- add dependencies --> <!-- <fileset dir="${jboss.portal-core.lib}" includes="portal-core-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/> <fileset dir="${jboss.portal-jems.lib}" includes="portal-jems-lib.jar"/> @@ -248,61 +240,58 @@ <fileset dir="${jboss.portlet-api.lib}" includes="portal-api-lib.jar"/> <fileset dir="${jboss.portal-security.lib}" includes="portal-security-lib.jar"/> --> - <fileset dir="${jboss.portal-core-cms.lib}" includes="portal-core-cms-lib.jar"/> - <fileset dir="${jboss.portal/modules/identity.lib}" includes="portal-identity-lib.jar"/> - <fileset dir="${jboss.portal/modules/identity.lib}" includes="portal-identity-sso-lib.jar"/> - <fileset dir="${jboss.portal-workflow.lib}" includes="portal-workflow-lib.jar"/> - </jar> - <jar jarfile="${build.lib}/test-cms-cluster.war"> - <fileset dir="${build.resources}/test/cms/clustering/test-cms-clustering-war"/> - <fileset dir="${build.classes}" includes="org/jboss/portal/test/cms/clustering/**"/> - </jar> - </target> - - <target name="deploy-tests" + <fileset dir="${jboss.portal-core-cms.lib}" includes="portal-core-cms-lib.jar"/> + <fileset dir="${jboss.portal/modules/identity.lib}" includes="portal-identity-lib.jar"/> + <fileset dir="${jboss.portal/modules/identity.lib}" includes="portal-identity-sso-lib.jar"/> + <fileset dir="${jboss.portal-workflow.lib}" includes="portal-workflow-lib.jar"/> + </jar> + <jar jarfile="${build.lib}/test-cms-cluster.war"> + <fileset dir="${build.resources}/test/cms/clustering/test-cms-clustering-war"/> + <fileset dir="${build.classes}" includes="org/jboss/portal/test/cms/clustering/**"/> + </jar> + </target> + + <target name="deploy-tests" description="Deploy." depends="output"> - - <!-- deploying the test datasources --> - <copy file="${build.resources}/test/cms/clustering/datasource/ports01-ds.xml" todir="${jboss.home}/server/ports-01/deploy" overwrite="true"/> - <copy file="${build.resources}/test/cms/clustering/datasource/ports02-ds.xml" todir="${jboss.home}/server/ports-02/deploy" overwrite="true"/> - <!-- install test sars needed for the testsuite framework --> - <!-- + <!-- deploying the test datasources --> + <copy file="${build.resources}/test/cms/clustering/datasource/ports01-ds.xml" + todir="${jboss.home}/server/ports-01/deploy" overwrite="true"/> + <copy file="${build.resources}/test/cms/clustering/datasource/ports02-ds.xml" + todir="${jboss.home}/server/ports-02/deploy" overwrite="true"/> + + <!-- install test sars needed for the testsuite framework --><!-- <copy file="${jboss.portal-portlet.lib}/test.sar" todir="${jboss.home}/server/ports-01/deploy"/> <copy file="${jboss.portal-portlet.lib}/test.sar" todir="${jboss.home}/server/ports-02/deploy"/> --> - - <!-- - <copy file="${jboss.portal-test.lib}/portal-test.sar" todir="${jboss.home}/server/ports-01/deploy"/> - <copy file="${jboss.portal-test.lib}/portal-test.sar" todir="${jboss.home}/server/ports-02/deploy"/> - --> - - <copy file="${build.lib}/test-cms-cluster.sar" todir="${jboss.home}/server/ports-01/deploy"/> + + <!-- + <copy file="${jboss.portal-test.lib}/portal-test.sar" todir="${jboss.home}/server/ports-01/deploy"/> + <copy file="${jboss.portal-test.lib}/portal-test.sar" todir="${jboss.home}/server/ports-02/deploy"/> + --> + + <copy file="${build.lib}/test-cms-cluster.sar" todir="${jboss.home}/server/ports-01/deploy"/> <copy file="${build.lib}/test-cms-cluster.sar" todir="${jboss.home}/server/ports-02/deploy"/> - </target> - - <target name="undeploy-tests" + </target> + + <target name="undeploy-tests" description="UnDeploy." - depends="output"> - <!-- install test sars needed for the testsuite framework --> - <!-- + depends="output"> + <!-- install test sars needed for the testsuite framework --> <!-- <delete file="${jboss.home}/server/ports-01/deploy/test.sar"/> <delete file="${jboss.home}/server/ports-02/deploy/test.sar"/> - --> - <!-- + --> <!-- <delete file="${jboss.home}/server/ports-01/deploy/portal-test.sar"/> <delete file="${jboss.home}/server/ports-02/deploy/portal-test.sar"/> --> - - <delete file="${jboss.home}/server/ports-01/deploy/test-cms-cluster.sar"/> - <delete file="${jboss.home}/server/ports-02/deploy/test-cms-cluster.sar"/> - </target> - <!-- ================================================================== --> - <!-- Cleaning --> - <!-- ================================================================== --> + <delete file="${jboss.home}/server/ports-01/deploy/test-cms-cluster.sar"/> + <delete file="${jboss.home}/server/ports-02/deploy/test-cms-cluster.sar"/> + </target> + <!-- ================================================================== --><!-- Cleaning --><!-- ================================================================== --> + <!-- Clean up all build output --> <target name="clean" depends="_default:clean"> <!-- Add module specific elements here. --> @@ -331,107 +320,106 @@ <!-- Test. --> <!-- ================================================================== --> <target name="clustered-tests" depends="init"> - <execute-tests> - <x-sysproperty> - <sysproperty key="test.root" value="${build.lib}"/> - <sysproperty key="test.uri" value="/test/redirect/"/> - </x-sysproperty> - <x-test> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.clustering.FileUpdateTest"/> - </x-test> - <x-classpath> - <path refid="apache.logging.classpath"/> - <path refid="jboss.jbossxb.classpath"/> - <path refid="jboss.cache.classpath"/> - <path refid="apache.xerces.classpath"/> - <path refid="oswego.concurrent.classpath"/> - <path refid="jboss.microcontainer.classpath"/> - <path refid="hibernate.hibernate.classpath"/> - <path refid="ehcache.ehcache.classpath"/> - <path refid="jbossas/core.libs.classpath"/> - <path refid="apache.log4j.classpath"/> - <path refid="jakarta.io.classpath"/> - <path refid="apache.collections.classpath"/> - <path refid="apache.lucene.classpath"/> - <path refid="junit.junit.classpath"/> - <path refid="slf4j.slf4j.classpath"/> - <path refid="sun.jaf.classpath"/> - <path refid="xdoclet.xdoclet.classpath"/> - <path refid="jcr.jcr.classpath"/> - <path refid="dom4j.dom4j.classpath"/> - <path refid="antlr.antlr.classpath"/> - <path refid="asm.asm.classpath"/> - <path refid="cglib.cglib.classpath"/> - <path refid="apache.httpclient.classpath"/> - <path refid="jboss.portal/modules/common.classpath"/> - <path refid="jboss.portal/modules/test.classpath"/> - <pathelement location="${jboss.portal/modules/test.lib}/portal-test-jboss-lib.jar"/> - <path refid="jboss.portal-server.classpath"/> - <path refid="jboss.portal-jems.classpath"/> - <pathelement location="${build.lib}/portal-cms-lib.jar"/> - <pathelement location="${build.resources}/portal-cms-sar"/> - <pathelement location="${build.resources}/test"/> - <pathelement location="${build.resources}/hibernate"/> - <pathelement location="${jboss.portal/modules/test.resources}"/> - <!-- jbosscachepersistence manager integration --> - <path refid="jackrabbit.jackrabbit.classpath"/> - <path refid="jboss.cache.classpath"/> - <path refid="jgroups.jgroups.classpath"/> - <!-- for clustering related --> - <pathelement location="${source.java}"/> - <pathelement location="${build.classes}"/> - <pathelement location="${build.resources}"/> - <path refid="library.classpath"/> - <path refid="dependentmodule.classpath"/> - <path refid="jboss.remoting.classpath"/> - <path refid="apache.httpclient.classpath"/> - <path refid="jboss.serialization.classpath"/> - <path refid="apache.codec.classpath"/> - </x-classpath> - </execute-tests> + <execute-tests> + <x-sysproperty> + <sysproperty key="test.root" value="${build.lib}"/> + <sysproperty key="test.uri" value="/test/redirect/"/> + </x-sysproperty> + <x-test> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.clustering.FileUpdateTest"/> + </x-test> + <x-classpath> + <path refid="apache.logging.classpath"/> + <path refid="jboss.jbossxb.classpath"/> + <path refid="jboss.cache.classpath"/> + <path refid="apache.xerces.classpath"/> + <path refid="oswego.concurrent.classpath"/> + <path refid="jboss.microcontainer.classpath"/> + <path refid="hibernate.hibernate.classpath"/> + <path refid="ehcache.ehcache.classpath"/> + <path refid="jbossas/core.libs.classpath"/> + <path refid="apache.log4j.classpath"/> + <path refid="jakarta.io.classpath"/> + <path refid="apache.collections.classpath"/> + <path refid="apache.lucene.classpath"/> + <path refid="junit.junit.classpath"/> + <path refid="slf4j.slf4j.classpath"/> + <path refid="sun.jaf.classpath"/> + <path refid="xdoclet.xdoclet.classpath"/> + <path refid="jcr.jcr.classpath"/> + <path refid="dom4j.dom4j.classpath"/> + <path refid="antlr.antlr.classpath"/> + <path refid="asm.asm.classpath"/> + <path refid="cglib.cglib.classpath"/> + <path refid="apache.httpclient.classpath"/> + <path refid="jboss.portal/modules/common.classpath"/> + <path refid="jboss.portal/modules/test.classpath"/> + <pathelement location="${jboss.portal/modules/test.lib}/portal-test-jboss-lib.jar"/> + <path refid="jboss.portal-server.classpath"/> + <path refid="jboss.portal-jems.classpath"/> + <pathelement location="${build.lib}/portal-cms-lib.jar"/> + <pathelement location="${build.resources}/portal-cms-sar"/> + <pathelement location="${build.resources}/test"/> + <pathelement location="${build.resources}/hibernate"/> + <pathelement location="${jboss.portal/modules/test.resources}"/> + <!-- jbosscachepersistence manager integration --> + <path refid="jackrabbit.jackrabbit.classpath"/> + <path refid="jboss.cache.classpath"/> + <path refid="jgroups.jgroups.classpath"/> + <!-- for clustering related --> + <pathelement location="${source.java}"/> + <pathelement location="${build.classes}"/> + <pathelement location="${build.resources}"/> + <path refid="library.classpath"/> + <path refid="dependentmodule.classpath"/> + <path refid="jboss.remoting.classpath"/> + <path refid="apache.httpclient.classpath"/> + <path refid="jboss.serialization.classpath"/> + <path refid="apache.codec.classpath"/> + </x-classpath> + </execute-tests> </target> <target name="tests" depends="init"> <execute-tests> <x-sysproperty> - <!-- + <!-- <jvmarg value="-Xdebug"/> <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/> - --> - <!-- + --> <!-- prefer IPv4 when running test with jdk1.5 on linux. This supposedly is a java bug as per jgroups page. --> - <jvmarg value="-Djava.net.preferIPv4Stack=true"/> + <jvmarg value="-Djava.net.preferIPv4Stack=true"/> </x-sysproperty> <x-test> <test todir="${test.reports}" name="org.jboss.portal.test.cms.JackrabbitTestCase"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRepositoryBootStrap"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRegEx"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRepositoryUtil"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRepositoryBootStrap"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRegEx"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRepositoryUtil"/> <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileCreate"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileUpdate"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileArchiveUpload"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileGetVersion"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileGet"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileGetList"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileCopy"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileCreateFailed"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileDelete"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestSearch"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileUpdate"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileArchiveUpload"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileGetVersion"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileGet"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileGetList"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileCopy"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileCreateFailed"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileDelete"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestSearch"/> <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderCopy"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderCreate"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderDelete"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderGet"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderUpdate"/> - - <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestReadAccess"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestWriteAccess"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestManageAccess"/> - - <test todir="${test.reports}" name="org.jboss.portal.test.cms.workflow.TestApprovedPublish"/> - <test todir="${test.reports}" name="org.jboss.portal.test.cms.workflow.TestDeniedPublish"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderCreate"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderDelete"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderGet"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderUpdate"/> + + <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestReadAccess"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestWriteAccess"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestManageAccess"/> + + <test todir="${test.reports}" name="org.jboss.portal.test.cms.workflow.TestApprovedPublish"/> + <test todir="${test.reports}" name="org.jboss.portal.test.cms.workflow.TestDeniedPublish"/> </x-test> <x-classpath> <path refid="apache.logging.classpath"/> @@ -447,7 +435,7 @@ <path refid="jakarta.io.classpath"/> <path refid="apache.collections.classpath"/> <path refid="apache.lucene.classpath"/> - <path refid="junit.junit.classpath"/> + <path refid="junit.junit.classpath"/> <path refid="slf4j.slf4j.classpath"/> <path refid="sun.jaf.classpath"/> <path refid="xdoclet.xdoclet.classpath"/> @@ -471,24 +459,24 @@ <pathelement location="${jboss.portal/modules/test.resources}"/> <!-- jbosscachepersistence manager integration --> <path refid="jackrabbit.jackrabbit.classpath"/> - <path refid="nekohtml.nekohtml.classpath"/> - <path refid="jboss.cache.classpath"/> - <path refid="jgroups.jgroups.classpath"/> - <!-- fine grained security integration --> - <path refid="jboss.portal/modules/identity.classpath"/> - <path refid="jboss.portal-security.classpath"/> - <!-- workflow integration --> - <path refid="jbpm.jaronly.classpath"/> - <path refid="beanshell.beanshell.classpath"/> - <path refid="jboss.portal-workflow.classpath"/> + <path refid="nekohtml.nekohtml.classpath"/> + <path refid="jboss.cache.classpath"/> + <path refid="jgroups.jgroups.classpath"/> + <!-- fine grained security integration --> + <path refid="jboss.portal/modules/identity.classpath"/> + <path refid="jboss.portal-security.classpath"/> + <!-- workflow integration --> + <path refid="jbpm.jpdl.classpath"/> + <path refid="beanshell.beanshell.classpath"/> + <path refid="jboss.portal-workflow.classpath"/> </x-classpath> </execute-tests> </target> <target name="reports" depends="init"> <mkdir dir="${build.reports}"/> - <mkdir dir="${build.reports}/html"/> - <property name="test.reports" value="${module.output}/tests"/> + <mkdir dir="${build.reports}/html"/> + <property name="test.reports" value="${module.output}/tests"/> <junitreport todir="${build.reports}"> <fileset dir="${test.reports}"> <include name="TEST-*.xml"/> @@ -497,14 +485,14 @@ </junitreport> </target> <target name="reports-noframes" depends="init"> - <mkdir dir="${build.reports}"/> - <mkdir dir="${build.reports}/html"/> - <property name="test.reports" value="${module.output}/tests"/> - <junitreport todir="${build.reports}"> - <fileset dir="${test.reports}"> - <include name="TEST-*.xml"/> - </fileset> - <report format="noframes" todir="${build.reports}/html"/> - </junitreport> - </target> + <mkdir dir="${build.reports}"/> + <mkdir dir="${build.reports}/html"/> + <property name="test.reports" value="${module.output}/tests"/> + <junitreport todir="${build.reports}"> + <fileset dir="${test.reports}"> + <include name="TEST-*.xml"/> + </fileset> + <report format="noframes" todir="${build.reports}/html"/> + </junitreport> + </target> </project> Modified: branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublish.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublish.java 2008-06-18 20:53:27 UTC (rev 11085) +++ branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublish.java 2008-06-18 22:01:58 UTC (rev 11086) @@ -38,27 +38,28 @@ * Called when content is added to the CMS, and needs to be approved by the managers before it can be published to go * live * - * @param content - * @return returns the process id of the workflow process set in motion + * @param content the content to be approved + * @return the process id of the workflow process set in motion + * @throws WorkflowException if an error occured during the approval process */ public long requestApproval(Content content) throws WorkflowException; /** * Called when a manager either approves or rejects the publishing of a specific content to go live * - * @param processId + * @param processId the id of the approval process we are interested in * @param manager userId of the manager * @param approved true if approved, false if rejected */ public void processManagerResponse(long processId, String manager, boolean approved) throws WorkflowException; - - /** - * Called when a manager either approves the publishing of a specific content to go live, but at the same time - * adds his/her own modifications to the original content + + /** + * Called when a manager either approves the publishing of a specific content to go live, but at the same time adds + * his/her own modifications to the original content * - * @param processId - * @param manager userId of the manager - * @param approved true if approved, false if rejected + * @param processId the process id of the workflow we're interesting in + * @param manager userId of the manager + * @param modifiedContent modified content */ public void processManagerResponse(long processId, String manager, String modifiedContent) throws WorkflowException; @@ -69,7 +70,7 @@ * @return * @throws WorkflowException */ - public Collection getPendingQueue(String filePath) throws WorkflowException; + public Collection<Content> getPendingQueue(String filePath) throws WorkflowException; /** * Retrieves a queue of unapproved content for everything in the CMS. @@ -77,7 +78,7 @@ * @return * @throws WorkflowException */ - public Collection getAllPendingInQueue() throws WorkflowException; + public Collection<Content> getAllPendingInQueue() throws WorkflowException; /** * Returns role names of Roles that are designated to be Managers in this workflow. Managers approve/deny all content @@ -85,5 +86,5 @@ * * @return a Set of role names */ - public Set getManagers(); + public Set<String> getManagers(); } Modified: branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java 2008-06-18 20:53:27 UTC (rev 11085) +++ branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java 2008-06-18 22:01:58 UTC (rev 11086) @@ -75,7 +75,7 @@ private String processName = null; private String managerRoles = null; private String[] managers = null; - private Set managerSet = null; + private Set<String> managerSet = null; private boolean overwrite = false; private String from = null; private String subject = null; @@ -156,7 +156,7 @@ //process managers that can serve as approvers/rejecters StringTokenizer st = new StringTokenizer(this.managerRoles, ","); this.managers = new String[st.countTokens()]; - this.managerSet = new HashSet(); + this.managerSet = new HashSet<String>(); for (int i = 0; i < managers.length; i++) { this.managers[i] = st.nextToken(); @@ -164,10 +164,10 @@ } this.membershipModule = (MembershipModule)identityServiceController.getIdentityContext(). - getObject(IdentityContext.TYPE_MEMBERSHIP_MODULE); + getObject(IdentityContext.TYPE_MEMBERSHIP_MODULE); this.userModule = (UserModule)identityServiceController.getIdentityContext(). - getObject(IdentityContext.TYPE_USER_MODULE); + getObject(IdentityContext.TYPE_USER_MODULE); } /** @@ -256,7 +256,7 @@ /** @param identityServiceController */ public void setIdentityServiceController( - IdentityServiceController identityServiceController) + IdentityServiceController identityServiceController) { this.identityServiceController = identityServiceController; } @@ -357,13 +357,6 @@ return processId; } - /** - * Called when a manager either approves or rejects the publishing of a specific content to go live - * - * @param processId - * @param manager userId of the manager - * @param approved true if approved, false if rejected - */ public void processManagerResponse(long processId, String manager, boolean approved) throws WorkflowException { JbpmContext jbpmContext = null; @@ -436,15 +429,7 @@ IOTools.safeClose(jbpmContext); } } - - /** - * Called when a manager either approves the publishing of a specific content to go live, but at the same time - * adds his/her own modifications to the original content - * - * @param processId - * @param manager userId of the manager - * @param approved true if approved, false if rejected - */ + public void processManagerResponse(long processId, String manager, String modifiedContent) throws WorkflowException { JbpmContext jbpmContext = null; @@ -463,28 +448,28 @@ return; } - processInstance.getContextInstance().setVariable("approved", new Boolean(true)); + processInstance.getContextInstance().setVariable("approved", true); processInstance.getContextInstance().setVariable("modifiedContent", modifiedContent); - Collection allTasks = processInstance.getTaskMgmtInstance().getTaskInstances(); + @SuppressWarnings("unchecked") + Collection<TaskInstance> allTasks = processInstance.getTaskMgmtInstance().getTaskInstances(); if (allTasks != null) { - for (Iterator itr = allTasks.iterator(); itr.hasNext();) + for (TaskInstance currentTask : allTasks) { - TaskInstance cour = (TaskInstance)itr.next(); - if (this.isManager(manager, cour.getActorId())) + if (this.isManager(manager, currentTask.getActorId())) { isManager = true; - log.debug("Manager=" + cour.getActorId() + "(" + processId + ")"); + log.debug("Manager=" + currentTask.getActorId() + "(" + processId + ")"); //check and make sure this task instance is not marked for deletion - if (cour.getVariable(processInstance.getId() + ":" + cour.getId()) != null) + if (currentTask.getVariable(processInstance.getId() + ":" + currentTask.getId()) != null) { continue; } - - cour.start(); - cour.end("approval"); + + currentTask.start(); + currentTask.end("approval"); break; } } @@ -503,8 +488,7 @@ if (!isManager) { - WorkflowException we = new WorkflowException("You are not authorized to Approve/Deny content publish requests"); - throw we; + throw new WorkflowException("You are not authorized to Approve/Deny content publish requests"); } IOTools.safeClose(jbpmContext); } @@ -517,9 +501,9 @@ * @return * @throws WorkflowException */ - public Collection getPendingQueue(String filePath) throws WorkflowException + public Collection<Content> getPendingQueue(String filePath) throws WorkflowException { - Collection pendingQueue = new ArrayList(); + Collection<Content> pendingQueue = new ArrayList<Content>(); JbpmContext jbpmContext = null; try { @@ -527,17 +511,18 @@ GraphSession graphSession = jbpmContext.getGraphSession(); ProcessDefinition processDef = graphSession.findLatestProcessDefinition(this.processName); - List processInstances = graphSession.findProcessInstances(processDef.getId()); + @SuppressWarnings("unchecked") + List<ProcessInstance> processInstances = graphSession.findProcessInstances(processDef.getId()); + if (processInstances != null) { - for (int i = 0; i < processInstances.size(); i++) + for (ProcessInstance processInstance : processInstances) { - ProcessInstance cour = (ProcessInstance)processInstances.get(i); //iterate through a list of currently pending approval tasks - if (!cour.hasEnded()) + if (!processInstance.hasEnded()) { - Content content = (Content)cour.getContextInstance().getVariable("content"); + Content content = (Content)processInstance.getContextInstance().getVariable("content"); //apply proper criteria to extract pending content only for the specified file if (content != null) @@ -547,7 +532,7 @@ if (criteriaPath.trim().equals(filePath.trim())) { - content.setProcessId(String.valueOf(cour.getId())); + content.setProcessId(String.valueOf(processInstance.getId())); pendingQueue.add(content); } } @@ -568,9 +553,9 @@ * @return * @throws WorkflowException */ - public Collection getAllPendingInQueue() throws WorkflowException + public Collection<Content> getAllPendingInQueue() throws WorkflowException { - Collection pendingQueue = new ArrayList(); + Collection<Content> pendingQueue = new ArrayList<Content>(); JbpmContext jbpmContext = null; try { @@ -578,22 +563,23 @@ GraphSession graphSession = jbpmContext.getGraphSession(); ProcessDefinition processDef = graphSession.findLatestProcessDefinition(this.processName); - List processInstances = graphSession.findProcessInstances(processDef.getId()); + @SuppressWarnings("unchecked") + List<ProcessInstance> processInstances = graphSession.findProcessInstances(processDef.getId()); + if (processInstances != null) { - for (int i = 0; i < processInstances.size(); i++) + for (ProcessInstance processInstance : processInstances) { - ProcessInstance cour = (ProcessInstance)processInstances.get(i); //iterate through a list of currently pending approval tasks - if (!cour.hasEnded()) + if (!processInstance.hasEnded()) { - Content content = (Content)cour.getContextInstance().getVariable("content"); + Content content = (Content)processInstance.getContextInstance().getVariable("content"); //apply proper criteria to extract pending content only for the specified file if (content != null) { - content.setProcessId(String.valueOf(cour.getId())); + content.setProcessId(String.valueOf(processInstance.getId())); pendingQueue.add(content); } } @@ -608,7 +594,7 @@ } /** @return */ - public Set getManagers() + public Set<String> getManagers() { return this.managerSet; } @@ -626,7 +612,7 @@ boolean isManager = false; Set userRoles = this.membershipModule.getRoles( - this.userModule.findUserByUserName(user)); + this.userModule.findUserByUserName(user)); if (userRoles != null) { for (Iterator itr = userRoles.iterator(); itr.hasNext();) Modified: branches/JBoss_Portal_Branch_2_7/core/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-06-18 20:53:27 UTC (rev 11085) +++ branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-06-18 22:01:58 UTC (rev 11086) @@ -121,7 +121,7 @@ <path refid="qdox.qdox.classpath"/> <pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/> <!-- jbpm integration --> - <path refid="jbpm.jaronly.classpath"/> + <path refid="jbpm.jpdl.classpath"/> <path refid="sun.jaxb.classpath"/> </path> @@ -344,7 +344,7 @@ <fileset dir="${portals.bridges.lib}" includes="portals-bridges-common.jar"/> <fileset dir="${tagsoup.tagsoup.lib}" includes="tagsoup.jar"/> <fileset dir="${jboss/backport.concurrent.lib}" includes="jboss-backport-concurrent.jar"/> - <fileset dir="${jbpm.jaronly.lib}" includes="jbpm.jar,jbpm-identity.jar"/> + <fileset dir="${jbpm.jpdl.lib}" includes="jbpm.jar,jbpm-identity.jar"/> </copy> <copy todir="${build.resources}/jboss-portal/lib" failonerror="false"> Modified: branches/JBoss_Portal_Branch_2_7/core-cms/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/build.xml 2008-06-18 20:53:27 UTC (rev 11085) +++ branches/JBoss_Portal_Branch_2_7/core-cms/build.xml 2008-06-18 22:01:58 UTC (rev 11086) @@ -23,13 +23,13 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <!DOCTYPE project [ - <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> - <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> - <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"> - <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> - <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> - <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent"> - ]> + <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> + <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> + <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"> + <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> + <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> + <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent"> + ]> <!--+======================================================================+--> <!--| JBoss Portal (The OpenSource Portal) Build File |--> @@ -117,8 +117,8 @@ <path refid="trove.trove.classpath"/> <path refid="qdox.qdox.classpath"/> <pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/> - <!-- jbpm integration --> - <path refid="jbpm.jaronly.classpath"/> + <!-- jbpm integration --> + <path refid="jbpm.jpdl.classpath"/> </path> <!-- Configure modules --> @@ -132,7 +132,7 @@ <path refid="jboss.portal-security.classpath"/> <path refid="jboss.portal-theme.classpath"/> <path refid="jboss.portal-core.classpath"/> - <path refid="jboss.portal-workflow.classpath"/> + <path refid="jboss.portal-workflow.classpath"/> <path refid="jboss.portal-core-admin.classpath"/> </path> @@ -159,11 +159,11 @@ <path refid="ehcache.ehcache.classpath"/> <path refid="hibernate.hibernate.classpath"/> </path> - + <path id="aop.classpath"> <pathelement path="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/> - <pathelement path="${jboss.aop.lib}/jboss-aop.jar"/> - <path refid="javassist.javassist.classpath"/> + <pathelement path="${jboss.aop.lib}/jboss-aop.jar"/> + <path refid="javassist.javassist.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="trove.trove.classpath"/> <path refid="qdox.qdox.classpath"/> @@ -177,16 +177,16 @@ classpathref="explode.task.classpath"/> </target> - + <target name="configure-explode"> <path id="explode.task.classpath"> <pathelement location="${project.tools}/lib/explode.jar"/> <path refid="apache.ant.classpath"/> </path> - <taskdef - name="explode" - classname="org.jboss.portal.common.ant.Explode" - classpathref="explode.task.classpath"/> + <taskdef + name="explode" + classname="org.jboss.portal.common.ant.Explode" + classpathref="explode.task.classpath"/> </target> <!--+====================================================================+--> @@ -213,23 +213,23 @@ <!--| the output which is ment to be released or used by external |--> <!--| modules. |--> <!--+====================================================================+--> - - <target name="explode" depends="init"> - <explode - file="${build.lib}/portal-cms.sar" - todir="${build.lib}" - name="portal-cms-exploded.sar" - /> - </target> - - <target name="explode-ha" depends="init"> - <explode - file="${build.lib}/portal-cms-ha.sar" - todir="${build.lib}" - name="portal-cms-ha-exploded.sar" - /> + + <target name="explode" depends="init"> + <explode + file="${build.lib}/portal-cms.sar" + todir="${build.lib}" + name="portal-cms-exploded.sar" + /> </target> + <target name="explode-ha" depends="init"> + <explode + file="${build.lib}/portal-cms-ha.sar" + todir="${build.lib}" + name="portal-cms-ha-exploded.sar" + /> + </target> + <target name="artifacts" description="Generate all target output." depends="compile"> @@ -253,13 +253,13 @@ <fileset dir="${jcr.jcr.lib}" includes="jcr-1.0.jar"/> <fileset dir="${apache.collections.lib}" includes="commons-collections.jar"/> <fileset dir="${apache.lucene.lib}" includes="lucene.jar"/> - <fileset dir="${apache.ant.lib}" includes="ant.jar"/> - + <fileset dir="${apache.ant.lib}" includes="ant.jar"/> + <!-- cms indexing integration --> <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-index-filters.jar"/> <fileset dir="${nekohtml.nekohtml.lib}" includes="nekohtml.jar"/> - + <!-- cms optimization integration - this contains a clustered cache enabled version --> <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/> <fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/> @@ -272,46 +272,46 @@ <fileset dir="${build.resources}/portal-cms-war"/> </copy> </target> - - + + <!-- Build the portal-cms-ha.sar --> <target name="output-ha" depends="artifacts"> - <copy todir="${build.resources}/portal-cms-ha.sar"> - <fileset dir="${build.resources}/portal-cms" excludes="**/*.xml"/> - </copy> + <copy todir="${build.resources}/portal-cms-ha.sar"> + <fileset dir="${build.resources}/portal-cms" excludes="**/*.xml"/> + </copy> - <copy todir="${build.resources}/portal-cms-ha.sar"> - <filterset> - <filtersfile file="../build/etc/clustered.properties"/> - </filterset> - <fileset dir="${build.resources}/portal-cms" includes="**/*.xml"/> - </copy> + <copy todir="${build.resources}/portal-cms-ha.sar"> + <filterset> + <filtersfile file="../build/etc/clustered.properties"/> + </filterset> + <fileset dir="${build.resources}/portal-cms" includes="**/*.xml"/> + </copy> - <implode - dir="${build.resources}/portal-cms-ha.sar" - tofile="${build.lib}/portal-cms-ha.sar"/> - - </target> + <implode + dir="${build.resources}/portal-cms-ha.sar" + tofile="${build.lib}/portal-cms-ha.sar"/> + </target> + <!-- Build the portal-cms.sar --> <target name="output" depends="artifacts"> - <!-- Build configurations --> + <!-- Build configurations --> <copy todir="${build.resources}/portal-cms.sar"> - <fileset dir="${build.resources}/portal-cms" excludes="**/*.xml"/> - </copy> - - <copy todir="${build.resources}/portal-cms.sar"> - <filterset> - <filtersfile file="../build/etc/single.properties"/> - </filterset> - <fileset dir="${build.resources}/portal-cms" includes="**/*.xml"/> + <fileset dir="${build.resources}/portal-cms" excludes="**/*.xml"/> </copy> + + <copy todir="${build.resources}/portal-cms.sar"> + <filterset> + <filtersfile file="../build/etc/single.properties"/> + </filterset> + <fileset dir="${build.resources}/portal-cms" includes="**/*.xml"/> + </copy> <!-- Build archives --> <implode - dir="${build.resources}/portal-cms.sar" - tofile="${build.lib}/portal-cms.sar"/> - </target> + dir="${build.resources}/portal-cms.sar" + tofile="${build.lib}/portal-cms.sar"/> + </target> <!-- create artifacts for running the portlet tests (except TCK) target output should have already been executed --> <target name="package-tests" depends="init"> @@ -359,45 +359,45 @@ <require file="${jboss.home}/server/${portal.deploy.dir}"/> <copy file="${build.lib}/portal-cms.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> </target> - + <target name="deploy-ha" description="Deploy high availability." depends="output-ha"> - <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> - <copy file="${build.lib}/portal-cms-ha.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}"/> + <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> + <copy file="${build.lib}/portal-cms-ha.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}"/> </target> - - <target name="deploy-explode" - description="Deploy." - depends="output,explode"> - <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar/portal-cms.sar" overwrite="true"> - <fileset dir="${build.lib}/portal-cms-exploded.sar"/> - </copy> - </target> - - <target name="deploy-ha-explode" description="Deploy." depends="output-ha,explode-ha"> - <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> - <copy todir="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar/portal-cms-ha.sar" overwrite="true"> - <fileset dir="${build.lib}/portal-cms-ha-exploded.sar"/> - </copy> - </target> - + + <target name="deploy-explode" + description="Deploy." + depends="output,explode"> + <require file="${jboss.home}/server/${portal.deploy.dir}"/> + <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar/portal-cms.sar" overwrite="true"> + <fileset dir="${build.lib}/portal-cms-exploded.sar"/> + </copy> + </target> + + <target name="deploy-ha-explode" description="Deploy." depends="output-ha,explode-ha"> + <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> + <copy todir="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar/portal-cms-ha.sar" overwrite="true"> + <fileset dir="${build.lib}/portal-cms-ha-exploded.sar"/> + </copy> + </target> + <!-- - | Undeploy the application - --> + | Undeploy the application + --> <target name="undeploy" description="Undeploy." depends="init"> <require file="${jboss.home}/server/${portal.deploy.dir}"/> <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-cms.sar"/> </target> - + <target name="undeploy-ha" description="Undeploy." depends="init"> - <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> - <delete file="${jboss.home}/server/${portal-ha.deploy.dir}/portal-cms-ha.sar"/> + <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> + <delete file="${jboss.home}/server/${portal-ha.deploy.dir}/portal-cms-ha.sar"/> </target> <target name="tests" depends="init, _buildmagic:configure:deployment"> Modified: branches/JBoss_Portal_Branch_2_7/core-management/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-management/build.xml 2008-06-18 20:53:27 UTC (rev 11085) +++ branches/JBoss_Portal_Branch_2_7/core-management/build.xml 2008-06-18 22:01:58 UTC (rev 11086) @@ -116,7 +116,7 @@ <path refid="qdox.qdox.classpath"/> <pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/> <!-- jbpm integration --> - <path refid="jbpm.jaronly.classpath"/> + <path refid="jbpm.jpdl.classpath"/> </path> <!-- Configure modules --> Modified: branches/JBoss_Portal_Branch_2_7/workflow/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/workflow/build.xml 2008-06-18 20:53:27 UTC (rev 11085) +++ branches/JBoss_Portal_Branch_2_7/workflow/build.xml 2008-06-18 22:01:58 UTC (rev 11086) @@ -23,13 +23,13 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <!DOCTYPE project [ - <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> - <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> - <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"> - <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> - <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> - <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent"> - ]> + <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> + <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> + <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"> + <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> + <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> + <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent"> + ]> <!-- $Id$ --> @@ -89,25 +89,24 @@ &libraries; <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> - <path refid="apache.logging.classpath"/> - <path refid="apache.log4j.classpath"/> - <path refid="apache.collections.classpath"/> - <path refid="beanshell.beanshell.classpath"/> + <path refid="apache.logging.classpath"/> + <path refid="apache.log4j.classpath"/> + <path refid="apache.collections.classpath"/> + <path refid="beanshell.beanshell.classpath"/> <path refid="hibernate.hibernate.classpath"/> - <path refid="ehcache.ehcache.classpath"/> + <path refid="ehcache.ehcache.classpath"/> <path refid="junit.junit.classpath"/> - <path refid="dom4j.dom4j.classpath"/> - <path refid="asm.asm.classpath"/> - <path refid="cglib.cglib.classpath"/> - <path refid="antlr.antlr.classpath"/> - <path refid="jbossas/core.libs.classpath"/> - <path refid="sun.servlet.classpath"/> + <path refid="dom4j.dom4j.classpath"/> + <path refid="asm.asm.classpath"/> + <path refid="cglib.cglib.classpath"/> + <path refid="antlr.antlr.classpath"/> + <path refid="jbossas/core.libs.classpath"/> + <path refid="sun.servlet.classpath"/> <!-- jbpm integration --> - <path refid="jbpm.jaronly.classpath"/> + <path refid="jbpm.jpdl.classpath"/> </path> - - + <path id="javac.classpath"> <pathelement location="${build.classes}"/> </path> @@ -117,8 +116,8 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-jems.classpath"/> - <path refid="jboss.portal/modules/identity.classpath"/> + <path refid="jboss.portal-jems.classpath"/> + <path refid="jboss.portal/modules/identity.classpath"/> </path> @@ -135,29 +134,29 @@ <!--+=======================================+--> <property name="javadoc.private" value="true"/> <property name="javadoc.protected" value="false"/> - - <taskdef name="explode" - classname="org.jboss.portal.common.ant.Explode" - classpathref="explode.task.classpath"/> - <taskdef name="implode" - classname="org.jboss.portal.common.ant.Implode" - classpathref="explode.task.classpath"/> - - </target> - - <target name="configure-explode"> - <path id="explode.task.classpath"> - <pathelement location="${project.tools}/lib/explode.jar"/> - <path refid="apache.ant.classpath"/> - </path> - <taskdef - name="explode" + <taskdef name="explode" classname="org.jboss.portal.common.ant.Explode" classpathref="explode.task.classpath"/> - </target> + <taskdef name="implode" + classname="org.jboss.portal.common.ant.Implode" + classpathref="explode.task.classpath"/> + </target> + + <target name="configure-explode"> + <path id="explode.task.classpath"> + <pathelement location="${project.tools}/lib/explode.jar"/> + <path refid="apache.ant.classpath"/> + </path> + <taskdef + name="explode" + classname="org.jboss.portal.common.ant.Explode" + classpathref="explode.task.classpath"/> + </target> + + <!--+====================================================================+--> <!--| Compile |--> <!--| |--> @@ -185,11 +184,11 @@ <target name="output" description="Generate all target output." depends="compile"> - <mkdir dir="${build.lib}"/> - - <jar jarfile="${build.lib}/portal-workflow-lib.jar" manifest="${build.etc}/portal-workflow-lib-jar.mf"> + <mkdir dir="${build.lib}"/> + + <jar jarfile="${build.lib}/portal-workflow-lib.jar" manifest="${build.etc}/portal-workflow-lib-jar.mf"> <fileset dir="${build.classes}"/> - </jar> + </jar> <!-- <copy todir="${build.resources}/portal-workflow.war"> @@ -203,7 +202,7 @@ <!-- workflow service --> <copy todir="${build.resources}/portal-workflow.sar"> - <fileset dir="${build.resources}/portal-workflow-sar"/> + <fileset dir="${build.resources}/portal-workflow-sar"/> </copy> <!-- @@ -212,8 +211,8 @@ </copy> --> <implode - dir="${build.resources}/portal-workflow.sar" - tofile="${build.lib}/portal-workflow.sar"/> + dir="${build.resources}/portal-workflow.sar" + tofile="${build.lib}/portal-workflow.sar"/> </target> <target name="deploy" @@ -226,18 +225,18 @@ <!-- generates artifacts used for tests, requires output to be previously run --> - <target name="package-tests" depends="init"> - </target> - - <target name="deploy-tests" + <target name="package-tests" depends="init"> + </target> + + <target name="deploy-tests" description="Deploy." - depends="output"> - </target> - - <target name="undeploy-tests" + depends="output"> + </target> + + <target name="undeploy-tests" description="UnDeploy." - depends="output"> - </target> + depends="output"> + </target> <!-- ================================================================== --> <!-- Cleaning --> @@ -272,30 +271,30 @@ <!-- ================================================================== --> <target name="tests" depends="init"> <execute-tests> - <x-test> - <!-- general jbpm unit tests --> + <x-test> + <!-- general jbpm unit tests --> <test todir="${test.reports}" name="org.jboss.portal.workflow.test.HelloWorldDbTest"/> <!-- cms workflow tests --> <test todir="${test.reports}" name="org.jboss.portal.workflow.test.PortalCMSPublish"/> </x-test> <x-classpath> - <path refid="apache.logging.classpath"/> - <path refid="apache.log4j.classpath"/> - <path refid="apache.collections.classpath"/> - <path refid="beanshell.beanshell.classpath"/> - <path refid="hibernate.hibernate.classpath"/> - <path refid="ehcache.ehcache.classpath"/> - <path refid="junit.junit.classpath"/> - <path refid="dom4j.dom4j.classpath"/> - <path refid="asm.asm.classpath"/> - <path refid="cglib.cglib.classpath"/> - <path refid="antlr.antlr.classpath"/> - <path refid="jbossas/core.libs.classpath"/> + <path refid="apache.logging.classpath"/> + <path refid="apache.log4j.classpath"/> + <path refid="apache.collections.classpath"/> + <path refid="beanshell.beanshell.classpath"/> + <path refid="hibernate.hibernate.classpath"/> + <path refid="ehcache.ehcache.classpath"/> + <path refid="junit.junit.classpath"/> + <path refid="dom4j.dom4j.classpath"/> + <path refid="asm.asm.classpath"/> + <path refid="cglib.cglib.classpath"/> + <path refid="antlr.antlr.classpath"/> + <path refid="jbossas/core.libs.classpath"/> <!-- jbpm integration --> - <path refid="jbpm.jaronly.classpath"/> - <pathelement location="${build.lib}/portal-workflow-lib.jar"/> - <pathelement location="${build.resources}/test"/> + <path refid="jbpm.jpdl.classpath"/> + <pathelement location="${build.lib}/portal-workflow-lib.jar"/> + <pathelement location="${build.resources}/test"/> </x-classpath> </execute-tests> </target> Modified: branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadService.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadService.java 2008-06-18 20:53:27 UTC (rev 11085) +++ branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadService.java 2008-06-18 22:01:58 UTC (rev 11086) @@ -23,8 +23,10 @@ package org.jboss.portal.workflow.service; import org.jbpm.JbpmConfiguration; +/* import org.jbpm.msg.command.CommandExecutorThread; import org.jbpm.scheduler.impl.SchedulerThread; +*/ /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> @@ -39,14 +41,17 @@ private WorkflowService workflowService = null; - private CommandExecutorThread commandExecutorThread = null; + /*private CommandExecutorThread commandExecutorThread = null; - private SchedulerThread schedulerThread = null; + private SchedulerThread schedulerThread = null;*/ public void start() { JbpmConfiguration jbpmConfiguration = workflowService.getJbpmConfiguration(); + jbpmConfiguration.getJobExecutor().start(); + +/* commandExecutorThread = new CommandExecutorThread(jbpmConfiguration); commandExecutorThread.setPriority(priority); commandExecutorThread.start(); @@ -54,11 +59,12 @@ schedulerThread = new SchedulerThread(jbpmConfiguration); schedulerThread.setPriority(priority); schedulerThread.setInterval(schedulerInterval); - schedulerThread.start(); + schedulerThread.start();*/ } public void stop() { + workflowService.getJbpmConfiguration().getJobExecutor().stop(); } public int getSchedulerInterval() Modified: branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/test/PortalCMSPublish.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/test/PortalCMSPublish.java 2008-06-18 20:53:27 UTC (rev 11085) +++ branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/test/PortalCMSPublish.java 2008-06-18 22:01:58 UTC (rev 11086) @@ -220,31 +220,30 @@ } //here act as an Admin and approve/reject one of the tasks - Collection allTasks = processInstance.getTaskMgmtInstance().getTaskInstances(); + Collection<TaskInstance> allTasks = processInstance.getTaskMgmtInstance().getTaskInstances(); String[] transitions = {"approval", "rejection"}; java.util.Random random = new java.util.Random(12343); boolean markedForRejection = false; - for (Iterator itr = allTasks.iterator(); itr.hasNext();) + for (TaskInstance task : allTasks) { - TaskInstance cour = (TaskInstance)itr.next(); if (markedForRejection) { - cour.end(transitions[1]); + task.end(transitions[1]); continue; } - if (cour.getActorId().equals(manager)) + if (task.getActorId().equals(manager)) { - System.out.println("Manager=" + cour.getActorId() + "(" + processId + ")"); + System.out.println("Manager=" + task.getActorId() + "(" + processId + ")"); int randomIndex = Math.abs(random.nextInt() % 2); if (randomIndex == 1) { //kill this task markedForRejection = true; - cour.end(transitions[randomIndex]); + task.end(transitions[randomIndex]); } else { - cour.end(transitions[randomIndex]); + task.end(transitions[randomIndex]); break; } } @@ -281,9 +280,11 @@ try { String[] managers = {"Admin", &quot;eric.brown(a)jboss.com&quot;, &quot;sohil.shah(a)jboss.com&quot;}; - for (int i = 0; i < managers.length; i++) + int i = 0; + while (i < managers.length) { executeTask(this.path, this.processId, managers[i], this.reject); + i++; } } catch (Exception e) Modified: branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2008-06-18 20:53:27 UTC (rev 11085) +++ branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2008-06-18 22:01:58 UTC (rev 11086) @@ -22,54 +22,51 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <server> - <!-- Hibernate service --> - <mbean - code="org.jboss.portal.jems.hibernate.SessionFactoryBinder" - name="portal:service=Hibernate,type=Workflow" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <!-- Hibernate service --> + <mbean code="org.jboss.portal.jems.hibernate.SessionFactoryBinder" + name="portal:service=Hibernate,type=Workflow" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends> <attribute name="DoChecking">true</attribute> <attribute name="ConfigLocation">conf/hibernate/workflow/hibernate.cfg.xml</attribute> <attribute name="JNDIName">java:/portal/workflow/WorkFlowSessionFactory</attribute> </mbean> - - <mbean - code="org.jboss.portal.workflow.service.JbpmThreadService" - name="portal:service=Thread,type=WorkflowService"> - <depends optional-attribute-name="WorkflowService" - proxy-type="attribute">portal:service=Workflow,type=WorkflowService</depends> + + <mbean code="org.jboss.portal.workflow.service.JbpmThreadService" + name="portal:service=Thread,type=WorkflowService"> + <depends optional-attribute-name="WorkflowService" proxy-type="attribute"> + portal:service=Workflow,type=WorkflowService + </depends> <attribute name="SchedulerInterval">60000</attribute> </mbean> <!-- Workflow service --> - <mbean - code="org.jboss.portal.workflow.service.WorkflowServiceImpl" - name="portal:service=Workflow,type=WorkflowService" - xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <mbean code="org.jboss.portal.workflow.service.WorkflowServiceImpl" + name="portal:service=Workflow,type=WorkflowService" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends>portal:service=Hibernate,type=Workflow</depends> + <depends>portal:service=Hibernate,type=Workflow</depends> <attribute name="JbpmConfigurationXml"> - <![CDATA[ - <jbpm-configuration> - <jbpm-context> - <service name="persistence" factory="org.jbpm.persistence.db.DbPersistenceServiceFactory" /> - <service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" /> - <service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" /> - </jbpm-context> - <string name="resource.hibernate.cfg.xml" value="conf/hibernate/workflow/hibernate.cfg.xml"/> - <string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties"/> - <string name="resource.default.modules" value="org/jbpm/graph/def/jbpm.default.modules.properties"/> - <string name="resource.converter" value="org/jbpm/db/hibernate/jbpm.converter.properties"/> - <string name="resource.action.types" value="org/jbpm/graph/action/action.types.xml"/> - <string name="resource.node.types" value="org/jbpm/graph/node/node.types.xml"/> - <string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml"/> - </jbpm-configuration> - ]]> - </attribute> + <![CDATA[ + <jbpm-configuration> + <jbpm-context> + <service name="persistence" factory="org.jbpm.persistence.db.DbPersistenceServiceFactory" /> + <service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" /> + <service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" /> + </jbpm-context> + <string name="resource.hibernate.cfg.xml" value="conf/hibernate/workflow/hibernate.cfg.xml"/> + <string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties"/> + <string name="resource.default.modules" value="org/jbpm/graph/def/jbpm.default.modules.properties"/> + <string name="resource.converter" value="org/jbpm/db/hibernate/jbpm.converter.properties"/> + <string name="resource.action.types" value="org/jbpm/graph/action/action.types.xml"/> + <string name="resource.node.types" value="org/jbpm/graph/node/node.types.xml"/> + <string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml"/> + </jbpm-configuration> + ]]> + </attribute> <attribute name="JNDIName">java:/portal/WorkflowService</attribute> </mbean> - </server> Modified: branches/JBoss_Portal_Branch_2_7/wsrp/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/build.xml 2008-06-18 20:53:27 UTC (rev 11085) +++ branches/JBoss_Portal_Branch_2_7/wsrp/build.xml 2008-06-18 22:01:58 UTC (rev 11086) @@ -21,7 +21,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<!DOCTYPE project [<!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"><!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"><!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"><!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"><!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"><!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">]> +<!DOCTYPE project [<!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> + <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> + <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"> + <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> + <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> + <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">]> <!-- $Id$ --> @@ -634,7 +639,7 @@ </target> <target name="tests-local" depends="clean,output"> - <server:start name="default"/> + <!--<server:start name="default"/>--> <antcall target="agent-deploy"/> <antcall target="protocolv1-producer-test"/> <antcall target="protocolv1-consumer-test"/> @@ -643,7 +648,7 @@ <antcall target="consumer-test"/> <antcall target="producer-configuration-test"/> <antcall target="agent-undeploy"/> - <server:stop name="default"/> + <!--<server:stop name="default"/>--> <antcall target="reports"/> </target> Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2008-06-18 20:53:27 UTC (rev 11085) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2008-06-18 22:01:58 UTC (rev 11086) @@ -97,7 +97,7 @@ name="portal:service=PortletInvoker,type=Stateful" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends optional-attribute-name="PortletInvoker" proxy-type="attribute"> + <depends optional-attribute-name="Next" proxy-type="attribute"> portal:service=PortletInvoker,type=Container </depends> <depends optional-attribute-name="PersistenceManager" proxy-type="attribute"> @@ -111,15 +111,24 @@ </depends> </mbean> + <!--<bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher"> + </bean> + <mbean code="org.jboss.portal.portlet.container.ContainerPortletDispatcher" + name="portal:service=Dispatcher,type=Portlet,name=ContainerPortlet" xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + </mbean>--> + + <!-- The portlet container invoker --> <mbean code="org.jboss.portal.portlet.container.ContainerPortletInvoker" name="portal:service=PortletInvoker,type=Container" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <depends optional-attribute-name="StackFactory" proxy-type="attribute"> - portal:service=InterceptorStackFactory,type=Container + <depends optional-attribute-name="Next" proxy-type="attribute"> + portal:service=Interceptor,type=Portlet,name=ContextDispatcher </depends> - <!--<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>--> + <depends>portal:service=InterceptorStackFactory,type=Container</depends> </mbean> <!-- Registration manager -->