JBoss Portal SVN: r7582 - trunk/core-samples.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-06-27 12:06:03 -0400 (Wed, 27 Jun 2007)
New Revision: 7582
Modified:
trunk/core-samples/build.xml
Log:
- Fixed undeploy task.
Modified: trunk/core-samples/build.xml
===================================================================
--- trunk/core-samples/build.xml 2007-06-27 15:55:56 UTC (rev 7581)
+++ trunk/core-samples/build.xml 2007-06-27 16:06:03 UTC (rev 7582)
@@ -314,10 +314,10 @@
description="Undeploy."
depends="init">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <delete file="${build.lib}/portal-basic-samples.sar"/>
- <delete file="${build.lib}/portal-jsp-samples.war"/>
- <delete file="${build.lib}/portal-news-samples.war"/>
- <delete file="${build.lib}/portal-weather-samples.war"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-basic-samples.sar"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-jsp-samples.war"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-news-samples.war"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-weather-samples.war"/>
</target>
<target name="tests" depends="init, _buildmagic:configure:deployment">
18 years, 10 months
JBoss Portal SVN: r7581 - tags/JBoss_Portal_2_6_0/core-samples.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-06-27 11:55:56 -0400 (Wed, 27 Jun 2007)
New Revision: 7581
Modified:
tags/JBoss_Portal_2_6_0/core-samples/build.xml
Log:
- Fixed undeploy task.
Modified: tags/JBoss_Portal_2_6_0/core-samples/build.xml
===================================================================
--- tags/JBoss_Portal_2_6_0/core-samples/build.xml 2007-06-27 15:44:04 UTC (rev 7580)
+++ tags/JBoss_Portal_2_6_0/core-samples/build.xml 2007-06-27 15:55:56 UTC (rev 7581)
@@ -310,10 +310,10 @@
description="Undeploy."
depends="init">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <delete file="${build.lib}/portal-basic-samples.sar"/>
- <delete file="${build.lib}/portal-jsp-samples.war"/>
- <delete file="${build.lib}/portal-news-samples.war"/>
- <delete file="${build.lib}/portal-weather-samples.war"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-basic-samples.sar"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-jsp-samples.war"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-news-samples.war"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-weather-samples.war"/>
</target>
<target name="tests" depends="init, _buildmagic:configure:deployment">
18 years, 10 months
JBoss Portal SVN: r7580 - tags/JBoss_Portal_2_6_0/core-cms/src/bin/portal-cms-war/images/cms/admin.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-06-27 11:44:04 -0400 (Wed, 27 Jun 2007)
New Revision: 7580
Modified:
tags/JBoss_Portal_2_6_0/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css
Log:
Fic CMS admin action selector that was displayig bullets
Modified: tags/JBoss_Portal_2_6_0/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css
===================================================================
--- tags/JBoss_Portal_2_6_0/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css 2007-06-27 14:19:59 UTC (rev 7579)
+++ tags/JBoss_Portal_2_6_0/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css 2007-06-27 15:44:04 UTC (rev 7580)
@@ -22,6 +22,7 @@
float: left;
width: 150px;
position: relative;
+ list-style: none;
}
/* style the links for the top level */
18 years, 10 months
JBoss Portal SVN: r7579 - in docs/tags/JBoss_Portal_2_6_0/referenceGuide/en: modules and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-06-27 10:19:59 -0400 (Wed, 27 Jun 2007)
New Revision: 7579
Removed:
docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/content-container.gif
docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/header.gif
docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-container.gif
Modified:
docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portal-header.gif
docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-body.gif
docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-content-center.gif
docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-content-left.gif
docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-content-right.gif
docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-footer-center.gif
docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-footer-left.gif
docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-footer-right.gif
docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-titlebar-center.gif
docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-titlebar-left.gif
docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-titlebar-right.gif
docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/region-selectors.gif
docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/regions.gif
docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/selector-outline.gif
docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/modules/themeandlayouts.xml
docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/modules/workflow.xml
Log:
Update workflow and layout chapters
Deleted: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/content-container.gif
===================================================================
(Binary files differ)
Deleted: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/header.gif
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portal-header.gif
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-body.gif
===================================================================
(Binary files differ)
Deleted: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-container.gif
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-content-center.gif
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-content-left.gif
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-content-right.gif
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-footer-center.gif
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-footer-left.gif
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-footer-right.gif
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-titlebar-center.gif
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-titlebar-left.gif
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/portlet-titlebar-right.gif
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/region-selectors.gif
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/regions.gif
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/images/themeguide/selector-outline.gif
===================================================================
(Binary files differ)
Modified: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/modules/themeandlayouts.xml
===================================================================
--- docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/modules/themeandlayouts.xml 2007-06-27 12:56:55 UTC (rev 7578)
+++ docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/modules/themeandlayouts.xml 2007-06-27 14:19:59 UTC (rev 7579)
@@ -1194,8 +1194,8 @@
bottom: 5px;*/
}
</programlisting>
- Usage: Wrapper selector used to control the position of the header on the page
- (see yellow border in screen shot). This selector is applied as an ID on the
+ Usage: Wrapper selector used to control the position of the header on the page.
+ This selector is applied as an ID on the
table used to structure the header. You can adjust the attributes to reposition
the header location on the page and/or create margin space on the top, right,
bottom and left sides of the header.
@@ -1295,13 +1295,6 @@
header (see orange border in screen shot). Its attributes can be adjusted to
create margin space on page, as well as control positioning of the area of the
page below the header.
- <para>Screenshot:</para>
- <para>
- <imageobject>
- <imagedata fileref="images/themeguide/content-container.gif" format="gif"
- />
- </imageobject>
- </para>
<programlisting>
#regionA {
/* test to swap columns with regionB...
@@ -1537,13 +1530,6 @@
Usage: Wrapper that surrounds the portlet windows (see green border in screen
shot). Currently, this selector is used to create space (padding) between the
portlets displayed in each particular region.
- <para>Screenshot:</para>
- <para>
- <imageobject>
- <imagedata fileref="images/themeguide/portlet-container.gif" format="gif"
- />
- </imageobject>
- </para>
<programlisting>
.portlet-titlebar-title {
font-family: Verdana, Arial, Helvetica, sans-serif;
Modified: docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/modules/workflow.xml
===================================================================
--- docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/modules/workflow.xml 2007-06-27 12:56:55 UTC (rev 7578)
+++ docs/tags/JBoss_Portal_2_6_0/referenceGuide/en/modules/workflow.xml 2007-06-27 14:19:59 UTC (rev 7579)
@@ -17,44 +17,47 @@
<para>
The JBPM Workflow service is packaged as an mbean and takes care of all the low-level JBPM related functions. The configuration is found in
jboss-portal.sar/portal-cms.sar/portal-workflow.sar/META-INF/jboss-service.xml. The mbean service configuration is as follows:
- <programlisting>
- <![CDATA[
- <!-- 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>
-
- <!-- 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">
- <xmbean/>
- <depends>portal:service=Hibernate,type=Workflow</depends>
- <attribute name="JbpmConfigurationXml">
- <jbpm-configuration>
- <jbpm-context>
- <service name="persistence" factory="org.jbpm.persistence.db.DbPersistenceServiceFactory"/>
- </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>
- </mbean>
+ <programlisting><![CDATA[<!-- 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>
+
+<!-- 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">
+ <xmbean/>
+ <depends>portal:service=Hibernate,type=Workflow</depends>
+ <attribute name="JbpmConfigurationXml">
+ <jbpm-configuration>
+ <jbpm-context>
+ <service name="persistence"
+ factory="org.jbpm.persistence.db.DbPersistenceServiceFactory"/>
+ </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>
+</mbean>
]]>
</programlisting>
</para>
@@ -71,33 +74,33 @@
In the following file, jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml, activate this feature on the org.jboss.portal.cms.impl.jcr.JCRCMS MBean
<programlisting>
<![CDATA[
- <mbean
- code="org.jboss.portal.cms.impl.jcr.JCRCMS"
- name="portal:service=CMS"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <!-- The datasource hibernate depends on, it can be commented when the file store is used -->
- <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
- <depends>portal:service=JAASLoginModule</depends>
- <depends>portal:service=Hibernate,type=CMS</depends>
- <depends>portal:service=Module,type=IdentityServiceController</depends>
- <!--depends optional-attribute-name="UserModule" proxy-type="attribute">portal:service=Module,type=User</depends-->
+<mbean
+ code="org.jboss.portal.cms.impl.jcr.JCRCMS"
+ name="portal:service=CMS"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <!-- The datasource hibernate depends on,
+ it can be commented when the file store is used -->
+ <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
+ <depends>portal:service=JAASLoginModule</depends>
+ <depends>portal:service=Hibernate,type=CMS</depends>
+ <depends>portal:service=Module,type=IdentityServiceController</depends>
+ <!-- Uncomment this to activate publish/approval workflow integration -->
+ <depends optional-attribute-name="ApprovePublishWorkflow"
+ proxy-type="attribute">portal:service=ApprovePublish,type=Workflow</depends>
-
- <!-- Uncomment 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="Config">
+ <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="Config">
]]>
</programlisting>
</para>
@@ -108,67 +111,67 @@
The configuration for this workflow service is found in the jboss-portal.sar/portal-cms.sar/portal-workflow.sar/META-INF/jboss-service.xml
file
<programlisting>
- <![CDATA[
- <!-- ApprovePublish workflow service -->
- <mbean
- code="org.jboss.portal.workflow.cms.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">
- <!-- 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.workflow.cms.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>
- </mbean>
- ]]>
- </programlisting>
+ <![CDATA[
+<!-- ApprovePublish workflow service -->
+<mbean
+ code="org.jboss.portal.workflow.cms.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">
+ <!-- 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.workflow.cms.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
+ elated 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>
+</mbean>
+ ]]>
+ </programlisting>
</para>
</sect1>
</section>
18 years, 10 months
JBoss Portal SVN: r7578 - in docs/trunk/referenceGuide/en: modules and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-06-27 08:56:55 -0400 (Wed, 27 Jun 2007)
New Revision: 7578
Removed:
docs/trunk/referenceGuide/en/images/themeguide/content-container.gif
docs/trunk/referenceGuide/en/images/themeguide/header.gif
docs/trunk/referenceGuide/en/images/themeguide/portlet-container.gif
Modified:
docs/trunk/referenceGuide/en/images/themeguide/portal-header.gif
docs/trunk/referenceGuide/en/images/themeguide/portlet-body.gif
docs/trunk/referenceGuide/en/images/themeguide/portlet-content-center.gif
docs/trunk/referenceGuide/en/images/themeguide/portlet-content-left.gif
docs/trunk/referenceGuide/en/images/themeguide/portlet-content-right.gif
docs/trunk/referenceGuide/en/images/themeguide/portlet-footer-center.gif
docs/trunk/referenceGuide/en/images/themeguide/portlet-footer-left.gif
docs/trunk/referenceGuide/en/images/themeguide/portlet-footer-right.gif
docs/trunk/referenceGuide/en/images/themeguide/portlet-titlebar-center.gif
docs/trunk/referenceGuide/en/images/themeguide/portlet-titlebar-left.gif
docs/trunk/referenceGuide/en/images/themeguide/portlet-titlebar-right.gif
docs/trunk/referenceGuide/en/images/themeguide/region-selectors.gif
docs/trunk/referenceGuide/en/images/themeguide/regions.gif
docs/trunk/referenceGuide/en/images/themeguide/selector-outline.gif
docs/trunk/referenceGuide/en/modules/themeandlayouts.xml
Log:
Updated reference guide layout chapter screenshots
Deleted: docs/trunk/referenceGuide/en/images/themeguide/content-container.gif
===================================================================
(Binary files differ)
Deleted: docs/trunk/referenceGuide/en/images/themeguide/header.gif
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/themeguide/portal-header.gif
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/themeguide/portlet-body.gif
===================================================================
(Binary files differ)
Deleted: docs/trunk/referenceGuide/en/images/themeguide/portlet-container.gif
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/themeguide/portlet-content-center.gif
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/themeguide/portlet-content-left.gif
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/themeguide/portlet-content-right.gif
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/themeguide/portlet-footer-center.gif
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/themeguide/portlet-footer-left.gif
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/themeguide/portlet-footer-right.gif
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/themeguide/portlet-titlebar-center.gif
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/themeguide/portlet-titlebar-left.gif
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/themeguide/portlet-titlebar-right.gif
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/themeguide/region-selectors.gif
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/themeguide/regions.gif
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/themeguide/selector-outline.gif
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/modules/themeandlayouts.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/themeandlayouts.xml 2007-06-27 11:11:01 UTC (rev 7577)
+++ docs/trunk/referenceGuide/en/modules/themeandlayouts.xml 2007-06-27 12:56:55 UTC (rev 7578)
@@ -1194,8 +1194,8 @@
bottom: 5px;*/
}
</programlisting>
- Usage: Wrapper selector used to control the position of the header on the page
- (see yellow border in screen shot). This selector is applied as an ID on the
+ Usage: Wrapper selector used to control the position of the header on the page.
+ This selector is applied as an ID on the
table used to structure the header. You can adjust the attributes to reposition
the header location on the page and/or create margin space on the top, right,
bottom and left sides of the header.
@@ -1295,13 +1295,6 @@
header (see orange border in screen shot). Its attributes can be adjusted to
create margin space on page, as well as control positioning of the area of the
page below the header.
- <para>Screenshot:</para>
- <para>
- <imageobject>
- <imagedata fileref="images/themeguide/content-container.gif" format="gif"
- />
- </imageobject>
- </para>
<programlisting>
#regionA {
/* test to swap columns with regionB...
@@ -1537,13 +1530,6 @@
Usage: Wrapper that surrounds the portlet windows (see green border in screen
shot). Currently, this selector is used to create space (padding) between the
portlets displayed in each particular region.
- <para>Screenshot:</para>
- <para>
- <imageobject>
- <imagedata fileref="images/themeguide/portlet-container.gif" format="gif"
- />
- </imageobject>
- </para>
<programlisting>
.portlet-titlebar-title {
font-family: Verdana, Arial, Helvetica, sans-serif;
18 years, 10 months
JBoss Portal SVN: r7577 - docs/trunk/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-06-27 07:11:01 -0400 (Wed, 27 Jun 2007)
New Revision: 7577
Modified:
docs/trunk/referenceGuide/en/modules/workflow.xml
Log:
Make the code fit on a page
Modified: docs/trunk/referenceGuide/en/modules/workflow.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/workflow.xml 2007-06-27 10:10:44 UTC (rev 7576)
+++ docs/trunk/referenceGuide/en/modules/workflow.xml 2007-06-27 11:11:01 UTC (rev 7577)
@@ -17,44 +17,47 @@
<para>
The JBPM Workflow service is packaged as an mbean and takes care of all the low-level JBPM related functions. The configuration is found in
jboss-portal.sar/portal-cms.sar/portal-workflow.sar/META-INF/jboss-service.xml. The mbean service configuration is as follows:
- <programlisting>
- <![CDATA[
- <!-- 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>
-
- <!-- 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">
- <xmbean/>
- <depends>portal:service=Hibernate,type=Workflow</depends>
- <attribute name="JbpmConfigurationXml">
- <jbpm-configuration>
- <jbpm-context>
- <service name="persistence" factory="org.jbpm.persistence.db.DbPersistenceServiceFactory"/>
- </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>
- </mbean>
+ <programlisting><![CDATA[<!-- 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>
+
+<!-- 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">
+ <xmbean/>
+ <depends>portal:service=Hibernate,type=Workflow</depends>
+ <attribute name="JbpmConfigurationXml">
+ <jbpm-configuration>
+ <jbpm-context>
+ <service name="persistence"
+ factory="org.jbpm.persistence.db.DbPersistenceServiceFactory"/>
+ </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>
+</mbean>
]]>
</programlisting>
</para>
@@ -71,33 +74,33 @@
In the following file, jboss-portal.sar/portal-cms.sar/META-INF/jboss-service.xml, activate this feature on the org.jboss.portal.cms.impl.jcr.JCRCMS MBean
<programlisting>
<![CDATA[
- <mbean
- code="org.jboss.portal.cms.impl.jcr.JCRCMS"
- name="portal:service=CMS"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <!-- The datasource hibernate depends on, it can be commented when the file store is used -->
- <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
- <depends>portal:service=JAASLoginModule</depends>
- <depends>portal:service=Hibernate,type=CMS</depends>
- <depends>portal:service=Module,type=IdentityServiceController</depends>
- <!--depends optional-attribute-name="UserModule" proxy-type="attribute">portal:service=Module,type=User</depends-->
+<mbean
+ code="org.jboss.portal.cms.impl.jcr.JCRCMS"
+ name="portal:service=CMS"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <!-- The datasource hibernate depends on,
+ it can be commented when the file store is used -->
+ <depends>jboss.jca:service=DataSourceBinding,name=PortalDS</depends>
+ <depends>portal:service=JAASLoginModule</depends>
+ <depends>portal:service=Hibernate,type=CMS</depends>
+ <depends>portal:service=Module,type=IdentityServiceController</depends>
+ <!-- Uncomment this to activate publish/approval workflow integration -->
+ <depends optional-attribute-name="ApprovePublishWorkflow"
+ proxy-type="attribute">portal:service=ApprovePublish,type=Workflow</depends>
-
- <!-- Uncomment 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="Config">
+ <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="Config">
]]>
</programlisting>
</para>
@@ -108,67 +111,67 @@
The configuration for this workflow service is found in the jboss-portal.sar/portal-cms.sar/portal-workflow.sar/META-INF/jboss-service.xml
file
<programlisting>
- <![CDATA[
- <!-- ApprovePublish workflow service -->
- <mbean
- code="org.jboss.portal.workflow.cms.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">
- <!-- 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.workflow.cms.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>
- </mbean>
- ]]>
- </programlisting>
+ <![CDATA[
+<!-- ApprovePublish workflow service -->
+<mbean
+ code="org.jboss.portal.workflow.cms.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">
+ <!-- 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.workflow.cms.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
+ elated 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>
+</mbean>
+ ]]>
+ </programlisting>
</para>
</sect1>
</section>
18 years, 10 months
JBoss Portal SVN: r7576 - trunk/build.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-06-27 06:10:44 -0400 (Wed, 27 Jun 2007)
New Revision: 7576
Modified:
trunk/build/build.xml
Log:
fix deploy all on trunk
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-06-27 09:58:43 UTC (rev 7575)
+++ trunk/build/build.xml 2007-06-27 10:10:44 UTC (rev 7576)
@@ -293,7 +293,10 @@
<copy file="../core-admin/output/lib//portal-admin.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<copy file="../core-cms/output/lib/portal-cms.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<copy file="../core-management/output/lib/portal-management.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
- <copy file="../core-samples/output/lib/portal-samples.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
+ <copy file="../core-samples/output/lib/portal-basic-samples.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
+ <copy file="../core-samples/output/lib/portal-news-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
+ <copy file="../core-samples/output/lib/portal-jsp-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
+ <copy file="../core-samples/output/lib/portal-weather-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<!--<copy file="../core-search/output/lib/portal-search.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>-->
<copy file="../widget/output/lib/widget.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<copy file="../wsrp/output/lib/portal-wsrp.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
18 years, 10 months
JBoss Portal SVN: r7575 - tags/JBoss_Portal_2_6_0/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-06-27 05:58:43 -0400 (Wed, 27 Jun 2007)
New Revision: 7575
Modified:
tags/JBoss_Portal_2_6_0/build/build.xml
Log:
Fix deploy-all target
Modified: tags/JBoss_Portal_2_6_0/build/build.xml
===================================================================
--- tags/JBoss_Portal_2_6_0/build/build.xml 2007-06-27 01:39:01 UTC (rev 7574)
+++ tags/JBoss_Portal_2_6_0/build/build.xml 2007-06-27 09:58:43 UTC (rev 7575)
@@ -293,7 +293,10 @@
<copy file="../core-admin/output/lib//portal-admin.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<copy file="../core-cms/output/lib/portal-cms.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<copy file="../core-management/output/lib/portal-management.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
- <copy file="../core-samples/output/lib/portal-samples.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
+ <copy file="../core-samples/output/lib/portal-basic-samples.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
+ <copy file="../core-samples/output/lib/portal-news-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
+ <copy file="../core-samples/output/lib/portal-jsp-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
+ <copy file="../core-samples/output/lib/portal-weather-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<!--<copy file="../core-search/output/lib/portal-search.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>-->
<copy file="../widget/output/lib/widget.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<copy file="../wsrp/output/lib/portal-wsrp.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
18 years, 10 months
JBoss Portal SVN: r7574 - tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/impl/model/portal.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-06-26 21:39:01 -0400 (Tue, 26 Jun 2007)
New Revision: 7574
Modified:
tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
Log:
port children access optimization to GA as it matters to have efficency
Modified: tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
===================================================================
--- tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-06-27 01:31:54 UTC (rev 7573)
+++ tags/JBoss_Portal_2_6_0/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-06-27 01:39:01 UTC (rev 7574)
@@ -36,6 +36,8 @@
import java.util.Iterator;
import java.util.Map;
import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.HashSet;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -69,7 +71,7 @@
private Map childrenMap;
private Map properties;
private Map unmodifiableProperties;
- private boolean childrenAccessed;
+ private Set accessedChildren;
public PortalObjectImpl()
{
@@ -85,7 +87,7 @@
this.childrenMap = null;
this.properties = null;
this.unmodifiableProperties = null;
- this.childrenAccessed = false;
+ this.accessedChildren = null;
}
public Long getKey()
@@ -231,10 +233,20 @@
public Object[] toArray(Object a[])
{
ArrayList tmp = new ArrayList(objectNode.getChildren().size());
+
+ //
+ Set accessedChildren = getAccessedChildren();
+
+ //
for (Iterator i = iterator(); i.hasNext();)
{
- PortalObject child = (PortalObject)i.next();
- tmp.add(child);
+ PortalObject childObject = (PortalObject)i.next();
+
+ //
+ accessedChildren.add(childObject);
+
+ //
+ tmp.add(childObject);
}
return tmp.toArray(a);
}
@@ -246,9 +258,8 @@
private final Iterator iterator;
/** . */
- private PortalObject next = null;
+ private PortalObject nextChild = null;
-
public ChildrenIterator()
{
Map childrenMap = objectNode.getChildren();
@@ -263,34 +274,41 @@
public boolean hasNext()
{
- if (next == null)
+ if (nextChild == null)
{
- while (next == null && iterator.hasNext())
+ while (nextChild == null && iterator.hasNext())
{
- ObjectNode node = (ObjectNode)iterator.next();
- PortalObjectImpl object = node.getObject();
- if (mask == ALL_TYPES_MASK || (object.getMask() & mask) != 0)
+ ObjectNode childNode = (ObjectNode)iterator.next();
+ PortalObjectImpl childObject = childNode.getObject();
+ if (mask == ALL_TYPES_MASK || (childObject.getMask() & mask) != 0)
{
- next = object;
+ nextChild = childObject;
}
}
}
- return next != null;
+ return nextChild != null;
}
public Object next()
{
- if (next == null)
+ if (this.nextChild == null)
{
hasNext();
}
- if (next == null)
+ if (this.nextChild == null)
{
throw new NoSuchElementException();
}
- PortalObject next = this.next;
- this.next = null;
- return next;
+
+ //
+ getAccessedChildren().add(nextChild);
+
+ //
+ PortalObject nextChild = this.nextChild;
+ this.nextChild = null;
+
+ //
+ return nextChild;
}
}
}
@@ -308,7 +326,6 @@
if (childrenMap == null)
{
childrenMap = new HashMap();
- childrenAccessed = true;
}
else
{
@@ -355,8 +372,13 @@
ObjectNode childNode = (ObjectNode)objectNode.getChildren().get(name);
if (childNode != null)
{
- childrenAccessed = true;
- return childNode.getObject();
+ PortalObjectImpl childObject = childNode.getObject();
+
+ // Track it
+ getAccessedChildren().add(childObject);
+
+ //
+ return childObject;
}
else
{
@@ -364,6 +386,15 @@
}
}
+ private Set getAccessedChildren()
+ {
+ if (accessedChildren == null)
+ {
+ accessedChildren = new HashSet();
+ }
+ return accessedChildren;
+ }
+
/**
* Get the aggregated properties in a lazy manner.
*/
@@ -465,12 +496,12 @@
}
//
- if (childrenAccessed)
+ if (accessedChildren != null)
{
- for (Iterator i = this.getChildren().iterator();i.hasNext();)
+ for (Iterator i = accessedChildren.iterator(); i.hasNext();)
{
- PortalObjectImpl child = (PortalObjectImpl)i.next();
- child.propagatePropertyUpdate(name, value, false);
+ PortalObjectImpl child = (PortalObjectImpl)i.next();
+ child.propagatePropertyUpdate(name, value, false);
}
}
}
@@ -592,7 +623,9 @@
protected final void addChild(String name, PortalObjectImpl childObject) throws DuplicatePortalObjectException, IllegalArgumentException
{
objectNode.addChild(name, childObject);
- childrenAccessed = true;
+
+ //
+ getAccessedChildren().add(childObject);
}
private PortalObjectImpl copy(PortalObjectImpl parent, String name, boolean deep) throws DuplicatePortalObjectException
18 years, 10 months
JBoss Portal SVN: r7573 - trunk/core/src/main/org/jboss/portal/core/impl/model/portal.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-06-26 21:31:54 -0400 (Tue, 26 Jun 2007)
New Revision: 7573
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
Log:
for declared property updates really do it only on children which have been accessed as it is way more efficient for large collections
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-06-27 01:10:07 UTC (rev 7572)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-06-27 01:31:54 UTC (rev 7573)
@@ -36,6 +36,8 @@
import java.util.Iterator;
import java.util.Map;
import java.util.NoSuchElementException;
+import java.util.Set;
+import java.util.HashSet;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -69,7 +71,7 @@
private Map childrenMap;
private Map properties;
private Map unmodifiableProperties;
- private boolean childrenAccessed;
+ private Set accessedChildren;
public PortalObjectImpl()
{
@@ -85,7 +87,7 @@
this.childrenMap = null;
this.properties = null;
this.unmodifiableProperties = null;
- this.childrenAccessed = false;
+ this.accessedChildren = null;
}
public Long getKey()
@@ -231,10 +233,20 @@
public Object[] toArray(Object a[])
{
ArrayList tmp = new ArrayList(objectNode.getChildren().size());
+
+ //
+ Set accessedChildren = getAccessedChildren();
+
+ //
for (Iterator i = iterator(); i.hasNext();)
{
- PortalObject child = (PortalObject)i.next();
- tmp.add(child);
+ PortalObject childObject = (PortalObject)i.next();
+
+ //
+ accessedChildren.add(childObject);
+
+ //
+ tmp.add(childObject);
}
return tmp.toArray(a);
}
@@ -246,9 +258,8 @@
private final Iterator iterator;
/** . */
- private PortalObject next = null;
+ private PortalObject nextChild = null;
-
public ChildrenIterator()
{
Map childrenMap = objectNode.getChildren();
@@ -263,34 +274,41 @@
public boolean hasNext()
{
- if (next == null)
+ if (nextChild == null)
{
- while (next == null && iterator.hasNext())
+ while (nextChild == null && iterator.hasNext())
{
- ObjectNode node = (ObjectNode)iterator.next();
- PortalObjectImpl object = node.getObject();
- if (mask == ALL_TYPES_MASK || (object.getMask() & mask) != 0)
+ ObjectNode childNode = (ObjectNode)iterator.next();
+ PortalObjectImpl childObject = childNode.getObject();
+ if (mask == ALL_TYPES_MASK || (childObject.getMask() & mask) != 0)
{
- next = object;
+ nextChild = childObject;
}
}
}
- return next != null;
+ return nextChild != null;
}
public Object next()
{
- if (next == null)
+ if (this.nextChild == null)
{
hasNext();
}
- if (next == null)
+ if (this.nextChild == null)
{
throw new NoSuchElementException();
}
- PortalObject next = this.next;
- this.next = null;
- return next;
+
+ //
+ getAccessedChildren().add(nextChild);
+
+ //
+ PortalObject nextChild = this.nextChild;
+ this.nextChild = null;
+
+ //
+ return nextChild;
}
}
}
@@ -308,7 +326,6 @@
if (childrenMap == null)
{
childrenMap = new HashMap();
- childrenAccessed = true;
}
else
{
@@ -355,8 +372,13 @@
ObjectNode childNode = (ObjectNode)objectNode.getChildren().get(name);
if (childNode != null)
{
- childrenAccessed = true;
- return childNode.getObject();
+ PortalObjectImpl childObject = childNode.getObject();
+
+ // Track it
+ getAccessedChildren().add(childObject);
+
+ //
+ return childObject;
}
else
{
@@ -364,6 +386,15 @@
}
}
+ private Set getAccessedChildren()
+ {
+ if (accessedChildren == null)
+ {
+ accessedChildren = new HashSet();
+ }
+ return accessedChildren;
+ }
+
/**
* Get the aggregated properties in a lazy manner.
*/
@@ -465,9 +496,9 @@
}
//
- if (childrenAccessed)
+ if (accessedChildren != null)
{
- for (Iterator i = this.getChildren().iterator(); i.hasNext();)
+ for (Iterator i = accessedChildren.iterator(); i.hasNext();)
{
PortalObjectImpl child = (PortalObjectImpl)i.next();
child.propagatePropertyUpdate(name, value, false);
@@ -592,7 +623,9 @@
protected final void addChild(String name, PortalObjectImpl childObject) throws DuplicatePortalObjectException, IllegalArgumentException
{
objectNode.addChild(name, childObject);
- childrenAccessed = true;
+
+ //
+ getAccessedChildren().add(childObject);
}
private PortalObjectImpl copy(PortalObjectImpl parent, String name, boolean deep) throws DuplicatePortalObjectException
18 years, 10 months