[portal-commits] JBoss Portal SVN: r9992 - in demo/trunk: conf/core-cms and 2 other directories.

Author: thomas.heute(a)jboss.com Date: 2008-02-15 15:16:12 -0500 (Fri, 15 Feb 2008) New Revision: 9992 Added: demo/trunk/portlets/seamBooking/ demo/trunk/portlets/seamBooking/seamEAR.ear Modified: demo/trunk/build.properties demo/trunk/build.xml demo/trunk/conf/core-cms/jboss-service.xml Log: Modified: demo/trunk/build.properties =================================================================== --- demo/trunk/build.properties 2008-02-15 19:27:11 UTC (rev 9991) +++ demo/trunk/build.properties 2008-02-15 20:16:12 UTC (rev 9992) @@ -1,7 +1,7 @@ # Location of the JBoss Portal + 4.0.5 AS bundle -portal.bundle.url=/home/theute/Portal/workspace_2.6/demo/jboss-portal-2.6.3-bundled.zip +portal.bundle.url=/home/theute/Downloads/jboss-portal-2.6.4-bundled.zip # Name used as top directory in the bundle -portal.name.dir=jboss-portal-2.6.3 +portal.name.dir=jboss-portal-2.6.4 # Where to create the demo website and associated tgz file destination.dir=/home/theute/Portal/demoWebsite # Where to put temporary files during the construction of the portal demo Modified: demo/trunk/build.xml =================================================================== --- demo/trunk/build.xml 2008-02-15 19:27:11 UTC (rev 9991) +++ demo/trunk/build.xml 2008-02-15 20:16:12 UTC (rev 9992) @@ -113,6 +113,11 @@ <delete file="${destination.dir}/${portal.name.dir}/server/default/deploy/wiki.ear/wiki.war/WEB-INF/wiki-object.xml"/> </target> + <target name="install-seamBooking"> + <copy file="portlets/seamBooking/seamEAR.ear" todir="${destination.dir}/${portal.name.dir}/server/default/deploy"/> + </target> + + <target name="default-cms-content"> <delete dir="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar/portal-cms.sar/portal/cms/conf/default-content/"/> <mkdir dir="${destination.dir}/${portal.name.dir}/server/default/deploy/jboss-portal.sar/portal-cms.sar/portal/cms/conf/default-content"/> @@ -137,8 +142,8 @@ <target name="main" depends="unzip-bundle, delete-docs, configure-jboss, configure-identity, delete-objectsdescriptors, delete-wsrpdescriptors, - update-context,install-objectsdescriptor, install-wsrpdescriptor, install-jbossforums, install-jbosswiki, activate-workflow, default-cms-content"> + update-context,install-objectsdescriptor, install-wsrpdescriptor, install-jbossforums, install-seamBooking, install-jbosswiki, activate-workflow, default-cms-content"> <tar destfile="${destination.dir}/${portal.name.dir}.tgz" basedir="${destination.dir}" includes="${portal.name.dir}/**" longfile="gnu" compression="gzip"/> </target> -</project> \ No newline at end of file +</project> Modified: demo/trunk/conf/core-cms/jboss-service.xml =================================================================== --- demo/trunk/conf/core-cms/jboss-service.xml 2008-02-15 19:27:11 UTC (rev 9991) +++ demo/trunk/conf/core-cms/jboss-service.xml 2008-02-15 20:16:12 UTC (rev 9992) @@ -24,9 +24,11 @@ <server> <!-- Management MBean --> + <!-- Unused, the bean doesn't bring any interesting value --> + <!-- <mbean code="org.jboss.portal.cms.management.CMSImpl" - name="portal:service=Management,type=CMS,name=Default" + name="portal.management:service=Management,type=CMS,name=Default" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <depends @@ -34,8 +36,9 @@ proxy-type="attribute">portal:service=CMS</depends> <xmbean/> </mbean> - - <mbean + --> + + <mbean code="org.jboss.portal.jems.hibernate.SessionFactoryBinder" name="portal:service=Hibernate,type=CMS" xmbean-dd="" @@ -57,18 +60,18 @@ <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends> <depends>portal:service=JAASLoginModule</depends> <depends>portal:service=Hibernate,type=CMS</depends> - <depends optional-attribute-name="IdentityServiceController" proxy-type="attribute">portal:service=Module,type=IdentityServiceController</depends> - + <depends>cms.pm.cache:service=TreeCache</depends> + <depends optional-attribute-name="AuthorizationManager" proxy-type="attribute">portal:service=AuthorizationManager,type=cms</depends> + <!-- Add this to activate publish/approval workflow integration --> <depends optional-attribute-name="ApprovePublishWorkflow" proxy-type="attribute">portal:service=ApprovePublish,type=Workflow</depends> - + <depends optional-attribute-name="StackFactory" proxy-type="attribute">portal:service=InterceptorStackFactory,type=Cms</depends> <attribute name="DoChecking">true</attribute> <attribute name="DefaultContentLocation">portal/cms/conf/default-content/default/</attribute> <attribute name="DefaultLocale">en</attribute> <attribute name="RepositoryName">PortalRepository</attribute> <attribute name="HomeDir">${jboss.server.data.dir}${/}portal${/}cms${/}conf</attribute> - <attribute name="IdentitySessionFactory">java:/portal/IdentitySessionFactory</attribute> <attribute name="Config"> <Repository> <!-- @@ -126,7 +129,7 @@ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex"> <param name="path" value="${wsp.home}/index"/> - <param name="textFilterClasses" value="org.apache.jackrabbit.core.query.HTMLTextFilter" /> + <param name="textFilterClasses" value="org.apache.jackrabbit.core.query.HTMLTextFilter"/> <param name="useCompoundFile" value="true"/> <param name="minMergeDocs" value="100"/> <param name="volatileIdleTime" value="3"/> @@ -261,13 +264,10 @@ <!-- TreeCache configuration used to cache CMS data --> <mbean code="org.jboss.cache.TreeCache" - name="cms.pm.cache:service=TreeCache"> - + name="cms.pm.cache:service=TreeCache"> <depends>jboss:service=Naming</depends> <depends>jboss:service=TransactionManager</depends> <depends>portal:service=Hibernate,type=CMS</depends> - <depends>portal:service=CMS</depends> - <!-- Configure the TransactionManager --> @@ -431,7 +431,7 @@ <attribute name="CacheLoaderFetchPersistentState">false</attribute> <attribute name="CacheLoaderAsynchronous">false</attribute--> </mbean> - + <!-- interceptor factory where all cms interceptors are registered --> <mbean code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" @@ -443,8 +443,8 @@ <depends-list-element>portal:service=Interceptor,type=Cms,name=ACL</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Cms,name=ApprovalWorkflow</depends-list-element> </depends-list> - </mbean> - + </mbean> + <!-- CMS Authorization Security Service --> <mbean code="org.jboss.portal.cms.security.AuthorizationManagerImpl" @@ -463,9 +463,15 @@ xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> + <!-- + NOTE: cmsRootUserName denotes a single Portal user that has access to everything in the CMS. Denote this user + carefully and should be synonymous to the 'root' user in a Unix system. By default: this value is the built-in + 'admin' user account. This can be changed to any other user account registered in your Portal + --> + <attribute name="CmsRootUserName">admin</attribute> <depends optional-attribute-name="IdentityServiceController" proxy-type="attribute">portal:service=Module,type=IdentityServiceController</depends> </mbean> - + <!-- ACL Security Interceptor --> <mbean code="org.jboss.portal.cms.impl.interceptors.ACLInterceptor" @@ -518,7 +524,7 @@ <depends>portal:service=Hibernate,type=CMS</depends> <depends>portal:service=Module,type=IdentityServiceController</depends> </mbean> - + <!-- Approval Workflow Interceptor --> <mbean code="org.jboss.portal.cms.impl.interceptors.ApprovalWorkflowInterceptor" @@ -566,5 +572,100 @@ <depends optional-attribute-name="CommandFactory" proxy-type="attribute">portal:commandFactory=CMSObject</depends> + <depends + optional-attribute-name="PortalAuthorizationManagerFactory" + proxy-type="attribute">portal:service=PortalAuthorizationManagerFactory</depends> + <depends + optional-attribute-name="InstanceContainer" + proxy-type="attribute">portal:container=Instance</depends> </mbean> + + <!-- ApprovePublish workflow service --> + <mbean + code="org.jboss.portal.cms.workflow.ApprovePublishImpl" + name="portal:service=ApprovePublish,type=Workflow" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + <depends optional-attribute-name="WorkflowService" proxy-type="attribute"> + portal:service=Workflow,type=WorkflowService + </depends> + <depends optional-attribute-name="IdentityServiceController" proxy-type="attribute"> + portal:service=Module,type=IdentityServiceController + </depends> + <!-- JBPM process definition --> + <attribute name="Process"> + <![CDATA[ + <!-- cms approval workflow --> + <process-definition name="approval_workflow"> + <start-state> + <transition to="request_approval"/> + </start-state> + <task-node name="request_approval" signal="first"> + <task name="approve_publish"> + <assignment class="org.jboss.portal.cms.workflow.PublishAssignmentHandler"/> + <event type="task-start"> + <action class="org.jboss.portal.cms.workflow.FinalizePublish"/> + </event> + <exception-handler> + <action class="org.jboss.portal.cms.workflow.TaskExceptionHandler"/> + </exception-handler> + </task> + <transition name="approval" to="end"/> + <transition name="rejection" to="end"/> + </task-node> + <end-state name="end"/> + </process-definition> + ]]> + </attribute> + <!-- + overwrite = false creates the process first time if does not exist, for + subsequent server restarts, this process definition remains in tact + + overwrite = true creates the process first time if does not exist, + for subsequent server restarts, it creates a new version of the process definition + which will be used for processes created from then onwards. Old processes created + for an older version of the definition remain in tact and use their corresponding + process definition. + + Typically use overwrite=false and overwrite=true only when a new process definition + related to this workflow needs to be deployed + --> + <attribute name="Overwrite">false</attribute> + <!-- + a comma separated list of portal roles that are designated + to act as workflow managers. They are allowed to + approve/reject content publish requests + --> + <attribute name="ManagerRoles">Admin</attribute> + <attribute name="JNDIName">java:portal/ApprovePublishWorkflow</attribute> + + <!-- Now that a manager GUI is integrated..no need for email based manager screen --> + <!-- + <attribute name=&quot;From&quot;&gt;do-not-reply(a)jboss.com&lt;/attribute&gt; + <attribute name="Subject">Content Approval Requested</attribute> + <attribute name="Body"> + <![CDATA[ + Approval is needed to publish the following Content: + + Content Location : {0} + + Content Type : {1} + + Content Size : {2} + + Creation Date : {3} + + User : {4} + + + <a href="http://localhost/workflow/approve?pId={5}&manager={6}">Approve</a> + + + <a href="http://localhost/workflow/reject?pId={7}&manager={8}">Reject</a> + ]]> + </attribute> + --> + </mbean> + </server> Added: demo/trunk/portlets/seamBooking/seamEAR.ear =================================================================== (Binary files differ) Property changes on: demo/trunk/portlets/seamBooking/seamEAR.ear ___________________________________________________________________ Name: svn:mime-type + application/octet-stream