Author: thomas.heute(a)jboss.com Date: 2007-09-06 12:00:01 -0400 (Thu, 06 Sep 2007) New Revision: 8192 Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/web.xml branches/JBoss_Portal_Branch_2_6/workflow/build.xml Log: Move some more from workflow to CMS Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/web.xml 2007-09-06 15:41:56 UTC (rev 8191) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/web.xml 2007-09-06 16:00:01 UTC (rev 8192) @@ -43,4 +43,17 @@ <servlet-name>CMSExportServlet</servlet-name> <url-pattern>/cmsexport/*</url-pattern> </servlet-mapping> + + <servlet> + <servlet-name>ApprovePublishServlet</servlet-name> + <servlet-class>org.jboss.portal.cms.workflow.ApprovePublishServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>ApprovePublishServlet</servlet-name> + <url-pattern>/approve/*</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>ApprovePublishServlet</servlet-name> + <url-pattern>/reject/*</url-pattern> + </servlet-mapping> </web-app> Modified: branches/JBoss_Portal_Branch_2_6/workflow/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/workflow/build.xml 2007-09-06 15:41:56 UTC (rev 8191) +++ branches/JBoss_Portal_Branch_2_6/workflow/build.xml 2007-09-06 16:00:01 UTC (rev 8192) @@ -191,6 +191,7 @@ <fileset dir="${build.classes}"/> </jar> + <!-- <copy todir="${build.resources}/portal-workflow.war"> <fileset dir="${build.resources}/portal-workflow-war"/> </copy> @@ -198,17 +199,18 @@ <jar jarfile="${build.lib}/portal-workflow.war"> <fileset dir="${build.resources}/portal-workflow.war"/> </jar> - + --> + <!-- workflow service --> <copy todir="${build.resources}/portal-workflow.sar"> <fileset dir="${build.resources}/portal-workflow-sar"/> </copy> - <!-- workflow service --> + <!-- <copy todir="${build.resources}/portal-workflow.sar/portal-worflow.war"> <fileset dir="${build.resources}/portal-workflow.war"/> </copy> - + --> <implode dir="${build.resources}/portal-workflow.sar" tofile="${build.lib}/portal-workflow.sar"/>