JBoss Portal SVN: r10399 - in modules/common/tags/JBP_COMMON_1_1_0: common and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-03-28 10:36:48 -0400 (Fri, 28 Mar 2008)
New Revision: 10399
Modified:
modules/common/tags/JBP_COMMON_1_1_0/common/pom.xml
modules/common/tags/JBP_COMMON_1_1_0/mc/pom.xml
modules/common/tags/JBP_COMMON_1_1_0/pom.xml
modules/common/tags/JBP_COMMON_1_1_0/portal/pom.xml
Log:
Use shorter names convention
Modified: modules/common/tags/JBP_COMMON_1_1_0/common/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_1_0/common/pom.xml 2008-03-28 13:06:47 UTC (rev 10398)
+++ modules/common/tags/JBP_COMMON_1_1_0/common/pom.xml 2008-03-28 14:36:48 UTC (rev 10399)
@@ -2,11 +2,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.jboss.portal.common</groupId>
- <artifactId>jboss-portal-modules-common-root</artifactId>
+ <artifactId>module-parent</artifactId>
<version>1.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-portal-modules-common</artifactId>
+ <artifactId>common-common</artifactId>
<packaging>jar</packaging>
<name>JBoss Portal Modules Common</name>
Modified: modules/common/tags/JBP_COMMON_1_1_0/mc/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_1_0/mc/pom.xml 2008-03-28 13:06:47 UTC (rev 10398)
+++ modules/common/tags/JBP_COMMON_1_1_0/mc/pom.xml 2008-03-28 14:36:48 UTC (rev 10399)
@@ -2,11 +2,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.jboss.portal.common</groupId>
- <artifactId>jboss-portal-modules-common-root</artifactId>
+ <artifactId>module-parent</artifactId>
<version>1.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-portal-modules-common-mc</artifactId>
+ <artifactId>common-mc</artifactId>
<packaging>jar</packaging>
<name>JBoss Portal Modules Common MC</name>
Modified: modules/common/tags/JBP_COMMON_1_1_0/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_1_0/pom.xml 2008-03-28 13:06:47 UTC (rev 10398)
+++ modules/common/tags/JBP_COMMON_1_1_0/pom.xml 2008-03-28 14:36:48 UTC (rev 10399)
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.common</groupId>
- <artifactId>jboss-portal-modules-common-root</artifactId>
+ <artifactId>module-parent</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Modules Common</name>
<version>1.1.0</version>
@@ -120,12 +120,12 @@
</build>
<distributionManagement>
- <!--<repository>-->
+ <repository>
<!--Copy the distribution jar file to a local checkout of the maven repository
- This variable can be set in $MAVEN_HOME/conf/settings.xml-->
- <!--<id>repository.jboss.org</id>-->
- <!--<url>file://${jboss.repository.root}</url>-->
- <!--</repository>-->
+ <id>repository.jboss.org</id>
+ <url>file://${jboss.repository.root}</url>
+ </repository>
<snapshotRepository>
<id>snapshots.jboss.org</id>
<name>JBoss Snapshot Repository</name>
Modified: modules/common/tags/JBP_COMMON_1_1_0/portal/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_1_0/portal/pom.xml 2008-03-28 13:06:47 UTC (rev 10398)
+++ modules/common/tags/JBP_COMMON_1_1_0/portal/pom.xml 2008-03-28 14:36:48 UTC (rev 10399)
@@ -2,11 +2,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.jboss.portal.common</groupId>
- <artifactId>jboss-portal-modules-common-root</artifactId>
+ <artifactId>module-parent</artifactId>
<version>1.1.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-portal-modules-common-portal</artifactId>
+ <artifactId>common-portal</artifactId>
<packaging>jar</packaging>
<name>JBoss Portal Modules Common Portal</name>
18 years, 1 month
JBoss Portal SVN: r10398 - modules/test/tags/JBP_TEST_1_0_1/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-03-28 09:06:47 -0400 (Fri, 28 Mar 2008)
New Revision: 10398
Modified:
modules/test/tags/JBP_TEST_1_0_1/build/build-thirdparty.xml
Log:
Must used fixed versions
Modified: modules/test/tags/JBP_TEST_1_0_1/build/build-thirdparty.xml
===================================================================
--- modules/test/tags/JBP_TEST_1_0_1/build/build-thirdparty.xml 2008-03-28 06:59:49 UTC (rev 10397)
+++ modules/test/tags/JBP_TEST_1_0_1/build/build-thirdparty.xml 2008-03-28 13:06:47 UTC (rev 10398)
@@ -47,7 +47,7 @@
are pushed to the http://repository.jboss.com site.
-->
- <componentref name="jboss-portal/modules/common" version="trunk-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/common" version="1.1.0"/>
<componentref name="codehaus/cargo" version="0.9"/>
18 years, 1 month
JBoss Portal SVN: r10397 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-03-28 02:59:49 -0400 (Fri, 28 Mar 2008)
New Revision: 10397
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.2.1. *-object.xml Descriptors
minor revisions
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-28 06:38:03 UTC (rev 10396)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-28 06:59:49 UTC (rev 10397)
@@ -568,7 +568,7 @@
</screen>
</para>
<para>
- The <computeroutput><parent-ref></computeroutput> element contains a reference to the parent object. The naming convention for naming objects is to concatenate the names of the path to the object, and separate the names by a period. If the path is empty, then the empty string must be used. The <computeroutput><parent-ref></computeroutput> element tells the portal where the portlet will appear. The syntax for the <computeroutput><parent-ref></computeroutput> element is <computeroutput><replaceable>portal-instance</replaceable>.<replaceable>portal-page</replaceable></computeroutput>.
+ The <computeroutput><parent-ref></computeroutput> element contains a reference to the parent object. The naming convention for naming objects is to concatenate the names of the path to the object, and separate the names using a period. If the path is empty, the empty string must be used. The <computeroutput><parent-ref></computeroutput> element tells the portal where the portlet will appear. The syntax for the <computeroutput><parent-ref></computeroutput> element is <computeroutput><replaceable>portal-instance</replaceable>.<replaceable>portal-page</replaceable></computeroutput>.
</para>
<para>
The following is an example of the root having an empty path:
@@ -1027,10 +1027,10 @@
<programlisting><![CDATA[<parent-ref>...</parent-ref>]]></programlisting>
</para>
<para>
- The <computeroutput><parent-ref></computeroutput> element contains a reference to the parent object. The naming convention for naming objects is to concatenate the names of the path to the object, and separate the names by a period. If the path is empty, then the empty string must be used. The <computeroutput><parent-ref></computeroutput> element tells the portal where the portlet will appear. The syntax for the <computeroutput><parent-ref></computeroutput> element is <computeroutput><replaceable>portal-instance</replaceable>.<replaceable>portal-page</replaceable></computeroutput>.
+ The <computeroutput><parent-ref></computeroutput> element contains a reference to the parent object. The naming convention for naming objects is to concatenate the names of the path to the object, and separate the names using a period. If the path is empty, the empty string must be used. The <computeroutput><parent-ref></computeroutput> element tells the portal where the portlet will appear. The syntax for the <computeroutput><parent-ref></computeroutput> element is <computeroutput><replaceable>portal-instance</replaceable>.<replaceable>portal-page</replaceable></computeroutput>.
</para>
<para>
- In the example above, a window is defined, and assigned to <computeroutput>default.default</computeroutput>. This means the window will appear in the <computeroutput>default</computeroutput> page, in the <computeroutput>default</computeroutput> portal.
+ In the example above, a window is defined, and assigned to <computeroutput>default.default</computeroutput>. This means the window will appear on the <computeroutput>default</computeroutput> page, in the <computeroutput>default</computeroutput> portal.
</para>
</listitem>
<listitem>
@@ -1038,7 +1038,7 @@
<programlisting><![CDATA[<window>...</window>]]></programlisting>
</para>
<para>
- The <computeroutput><window></computeroutput> element defines a portlet window. The <computeroutput><window></computeroutput> element requires an <computeroutput><instance-ref></computeroutput> element, which is used to assign the window a portal instance. As well, use the <computeroutput><region></computeroutput> and <computeroutput><height></computeroutput> elements to define where the window will appear within the portlet.
+ The <computeroutput><window></computeroutput> element defines a portlet window. The <computeroutput><window></computeroutput> element requires an <computeroutput><instance-ref></computeroutput> element, which is used to assign a portal instance to a window. As well, use the <computeroutput><region></computeroutput> and <computeroutput><height></computeroutput> elements to define where the window will appear within the portlet.
</para>
</listitem>
<listitem>
18 years, 1 month
JBoss Portal SVN: r10396 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-03-28 02:38:03 -0400 (Fri, 28 Mar 2008)
New Revision: 10396
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
trying to remove passive voice (should), replacing
with will, advised to etc
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-03-28 06:27:15 UTC (rev 10395)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-03-28 06:38:03 UTC (rev 10396)
@@ -77,7 +77,7 @@
</sect3>
<sect3>
<title>JBoss EAP and JBoss AS Setup</title>
- <para>Before deploying JBoss Portal, make sure you have JBoss EAP or JBoss AS installed. Customers who have access to the <ulink url="https://support.redhat.com/portal/login.html">JBoss Customer Support Portal (CSP)</ulink> should download and install JBoss EAP 4.2. Customers who do not have access to the JBoss CSP are advised to use <ulink url="http://labs.jboss.com/jbossas/downloads/">JBoss AS</ulink>. For JBoss AS installation instructions, please refer to the <ulink url="http://labs.jboss.com/jbossas/docs/index.html">JBoss AS Installation Guide</ulink>.
+ <para>Before deploying JBoss Portal, make sure you have JBoss EAP or JBoss AS installed. Customers who have access to the <ulink url="https://support.redhat.com/portal/login.html">JBoss Customer Support Portal (CSP)</ulink> are advised to download and install JBoss EAP 4.2. Customers who do not have access to the JBoss CSP are advised to use <ulink url="http://labs.jboss.com/jbossas/downloads/">JBoss AS</ulink>. For JBoss AS installation instructions, please refer to the <ulink url="http://labs.jboss.com/jbossas/docs/index.html">JBoss AS Installation Guide</ulink>.
</para>
<warning>
<title>Use the JBoss EAP and JBoss AS zip file</title>
@@ -266,7 +266,7 @@
<title>JBoss EAP and JBoss AS Setup</title>
<sect3>
<title>JBoss Application Server Setup</title>
- <para>Before deploying JBoss Portal, make sure you have JBoss EAP or JBoss AS installed. Customers who have access to the <ulink url="https://support.redhat.com/portal/login.html">JBoss Customer Support Portal (CSP)</ulink> should download and install JBoss EAP 4.2. Customers who do not have access to the JBoss CSP are advised to use <ulink url="http://labs.jboss.com/jbossas/downloads/">JBoss AS</ulink>. For JBoss AS installation instructions, please refer to the <ulink url="http://labs.jboss.com/jbossas/docs/index.html">JBoss AS Installation Guide</ulink>.
+ <para>Before deploying JBoss Portal, make sure you have JBoss EAP or JBoss AS installed. Customers who have access to the <ulink url="https://support.redhat.com/portal/login.html">JBoss Customer Support Portal (CSP)</ulink> are advised to download and install JBoss EAP 4.2. Customers who do not have access to the JBoss CSP are advised to use <ulink url="http://labs.jboss.com/jbossas/downloads/">JBoss AS</ulink>. For JBoss AS installation instructions, please refer to the <ulink url="http://labs.jboss.com/jbossas/docs/index.html">JBoss AS Installation Guide</ulink>.
</para>
<warning>
<title>Use the JBoss EAP and JBoss AS zip file</title>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml 2008-03-28 06:27:15 UTC (rev 10395)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/migration.xml 2008-03-28 06:38:03 UTC (rev 10396)
@@ -110,7 +110,7 @@
</orderedlist>
</para>
<para>
- The <emphasis>NavigationPortlet</emphasis> from JBoss Portal 2.4 has been removed, and its functionality is now replaced by <emphasis>PageCustomizerInterceptor</emphasis>. All references to the <emphasis>NavigationPortlet</emphasis> should be removed from all portal pages. Remove <emphasis>NavigationPortletInstance</emphasis> using the AdminPortlet, or edit the database as follows:
+ The <emphasis>NavigationPortlet</emphasis> from JBoss Portal 2.4 has been removed, and its functionality is now replaced by <emphasis>PageCustomizerInterceptor</emphasis>. Remove all references to the <emphasis>NavigationPortlet</emphasis> from all portal pages. Remove <emphasis>NavigationPortletInstance</emphasis> using the AdminPortlet, or edit the database as follows:
</para>
<para>
<orderedlist>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-03-28 06:27:15 UTC (rev 10395)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-03-28 06:38:03 UTC (rev 10396)
@@ -66,7 +66,7 @@
<sect2>
<title>Window States</title>
<para>
- Window states are an indicator of how much page real-estate a portlet should consume on any given page.
+ Window states are an indicator of how much page real-estate a portlet will consume on any given page.
The three states defined by the JSR-168 specification are:
</para>
<para>
@@ -418,7 +418,7 @@
</screen></term>
<listitem>
<para>
- Tells the portal where this portlet should appear. In this case, <computeroutput>default.default</computeroutput> specifies that the portlet will appear in the portal instance named <computeroutput>default</computeroutput>, and on the page named <computeroutput>default</computeroutput>.
+ Tells the portal where this portlet will appear. In this case, <computeroutput>default.default</computeroutput> specifies that the portlet will appear in the portal instance named <computeroutput>default</computeroutput>, and on the page named <computeroutput>default</computeroutput>.
</para>
</listitem>
</varlistentry>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-28 06:27:15 UTC (rev 10395)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-28 06:38:03 UTC (rev 10396)
@@ -568,7 +568,7 @@
</screen>
</para>
<para>
- The <computeroutput><parent-ref></computeroutput> element contains a reference to the parent object. The naming convention for naming objects is to concatenate the names of the path to the object, and separate the names by a period. If the path is empty, then the empty string must be used. The <computeroutput><parent-ref></computeroutput> element tells the portal where the portlet should appear. The syntax for the <computeroutput><parent-ref></computeroutput> element is <computeroutput><replaceable>portal-instance</replaceable>.<replaceable>portal-page</replaceable></computeroutput>.
+ The <computeroutput><parent-ref></computeroutput> element contains a reference to the parent object. The naming convention for naming objects is to concatenate the names of the path to the object, and separate the names by a period. If the path is empty, then the empty string must be used. The <computeroutput><parent-ref></computeroutput> element tells the portal where the portlet will appear. The syntax for the <computeroutput><parent-ref></computeroutput> element is <computeroutput><replaceable>portal-instance</replaceable>.<replaceable>portal-page</replaceable></computeroutput>.
</para>
<para>
The following is an example of the root having an empty path:
@@ -1027,7 +1027,7 @@
<programlisting><![CDATA[<parent-ref>...</parent-ref>]]></programlisting>
</para>
<para>
- The <computeroutput><parent-ref></computeroutput> element contains a reference to the parent object. The naming convention for naming objects is to concatenate the names of the path to the object, and separate the names by a period. If the path is empty, then the empty string must be used. The <computeroutput><parent-ref></computeroutput> element tells the portal where the portlet should appear. The syntax for the <computeroutput><parent-ref></computeroutput> element is <computeroutput><replaceable>portal-instance</replaceable>.<replaceable>portal-page</replaceable></computeroutput>.
+ The <computeroutput><parent-ref></computeroutput> element contains a reference to the parent object. The naming convention for naming objects is to concatenate the names of the path to the object, and separate the names by a period. If the path is empty, then the empty string must be used. The <computeroutput><parent-ref></computeroutput> element tells the portal where the portlet will appear. The syntax for the <computeroutput><parent-ref></computeroutput> element is <computeroutput><replaceable>portal-instance</replaceable>.<replaceable>portal-page</replaceable></computeroutput>.
</para>
<para>
In the example above, a window is defined, and assigned to <computeroutput>default.default</computeroutput>. This means the window will appear in the <computeroutput>default</computeroutput> page, in the <computeroutput>default</computeroutput> portal.
@@ -1038,7 +1038,7 @@
<programlisting><![CDATA[<window>...</window>]]></programlisting>
</para>
<para>
- Used to define a portlet window. The <computeroutput><window></computeroutput> element requires an <computeroutput><instance-ref></computeroutput> element, which is used to assign the window a portal instance. As well, use the <computeroutput><region></computeroutput> and <computeroutput><height></computeroutput> elements to define where the window will appear within the portlet.
+ The <computeroutput><window></computeroutput> element defines a portlet window. The <computeroutput><window></computeroutput> element requires an <computeroutput><instance-ref></computeroutput> element, which is used to assign the window a portal instance. As well, use the <computeroutput><region></computeroutput> and <computeroutput><height></computeroutput> elements to define where the window will appear within the portlet.
</para>
</listitem>
<listitem>
18 years, 1 month
JBoss Portal SVN: r10395 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-03-28 02:27:15 -0400 (Fri, 28 Mar 2008)
New Revision: 10395
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.2.1. *-object.xml Descriptors
periodic backup, minor revisions...
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-28 06:03:03 UTC (rev 10394)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-28 06:27:15 UTC (rev 10395)
@@ -1003,7 +1003,7 @@
<listitem>
<para>
<programlisting><![CDATA[<deployments>...</deployments>]]></programlisting>
- The <computeroutput><deployments></computeroutput> element encapsulates the entire document. Multiple deployments can be specified within the <computeroutput><deployments></computeroutput> tag.
+ The <computeroutput><deployments></computeroutput> element encapsulates the entire document, and is a container for the <computeroutput><deployment></computeroutput> element. Multiple deployments can be specified within the <computeroutput><deployments></computeroutput> tag.
</para>
</listitem>
<listitem>
@@ -1038,7 +1038,7 @@
<programlisting><![CDATA[<window>...</window>]]></programlisting>
</para>
<para>
- Used to define a portlet window. The <computeroutput><window></computeroutput> element requires an <computeroutput><instance-ref></computeroutput> element, which is used to assign the window a portal instance. As well, use the <computeroutput><region></computeroutput> and <computeroutput><height></computeroutput> elements to define where the window will appear in the portlet.
+ Used to define a portlet window. The <computeroutput><window></computeroutput> element requires an <computeroutput><instance-ref></computeroutput> element, which is used to assign the window a portal instance. As well, use the <computeroutput><region></computeroutput> and <computeroutput><height></computeroutput> elements to define where the window will appear within the portlet.
</para>
</listitem>
<listitem>
@@ -1064,7 +1064,7 @@
<height>...</height>]]></programlisting>
</para>
<para>
- Specifies where the window will appear within the page layout. The <computeroutput><region></computeroutput> element specifies where the window will appear on the page. The <computeroutput><region></computeroutput> element often depends on other regions defined in your layout. The <computeroutput><height></computeroutput> element can be assigned a value between one and <replaceable>X</replaceable>.
+ Specifies where the window will appear within the page layout. The <computeroutput><region></computeroutput> element specifies where the window will appear on the page. The <computeroutput><region></computeroutput> element often depends on other regions defined in the portal layout. The <computeroutput><height></computeroutput> element can be assigned a value between one and <replaceable>X</replaceable>.
</para>
</listitem>
</itemizedlist>
18 years, 1 month
JBoss Portal SVN: r10394 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-03-28 02:03:03 -0400 (Fri, 28 Mar 2008)
New Revision: 10394
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.2.1. *-object.xml Descriptors
- revising
- trying to make text consistent across chapters
(5.2.1.4. Application Descriptors)
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-03-27 17:36:08 UTC (rev 10393)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-03-28 06:03:03 UTC (rev 10394)
@@ -436,7 +436,7 @@
</screen></term>
<listitem>
<para>
- This can be named anything.
+ A <emphasis role="bold">unique name</emphasis> given to the portlet window. This can be named anything.
</para>
</listitem>
</varlistentry>
@@ -456,7 +456,7 @@
</screen></term>
<listitem>
<para>
- Specifies the layout region, and the order this window will be found on the portal page.
+ Specifies where the window will appear within the page layout.
</para>
</listitem>
</varlistentry>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-27 17:36:08 UTC (rev 10393)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-28 06:03:03 UTC (rev 10394)
@@ -738,7 +738,7 @@
</screen>
</para>
<para>
- Define the content of the window as a reference to a portlet instance. This value is the ID of the instance, and must much the value of one of the <computeroutput><instance-id></computeroutput> elements in the <filename>WEB-INF/portlet-instances.xml</filename> file. The following is an example of the <computeroutput><instance-ref></computeroutput> element:
+ Define the content of the window as a reference to a portlet instance. This value is the ID of a portlet instance, and must much the value of one of the <computeroutput><instance-id></computeroutput> elements in the <filename>WEB-INF/portlet-instances.xml</filename> file. The following is an example of the <computeroutput><instance-ref></computeroutput> element:
</para>
<para>
<screen>
@@ -1036,35 +1036,35 @@
<listitem>
<para>
<programlisting><![CDATA[<window>...</window>]]></programlisting>
- Used to define a portlet window. You will then need to assign to this window, a portlet instance
- and assign it to a layout region.
+ </para>
+ <para>
+ Used to define a portlet window. The <computeroutput><window></computeroutput> element requires an <computeroutput><instance-ref></computeroutput> element, which is used to assign the window a portal instance. As well, use the <computeroutput><region></computeroutput> and <computeroutput><height></computeroutput> elements to define where the window will appear in the portlet.
</para>
</listitem>
<listitem>
<para>
<programlisting><![CDATA[<window-name>...</window-name>]]></programlisting>
- A
- <emphasis role="bold">unique name</emphasis>
- given to this portlet window.
+ </para>
+ <para>
+ A <emphasis role="bold">unique name</emphasis> given to the portlet window. This can be named anything.
</para>
</listitem>
<listitem>
<para>
<programlisting><![CDATA[<instance-ref>...</instance-ref>]]></programlisting>
- The portlet instance that this window will represent. It must correspond to the value of
- <emphasis>instance-id</emphasis>
- , assigned in your
- <emphasis>portlet-instances.xml</emphasis>
- </para>
+ </para>
+ <para>
+ The portlet instance that the window will represent. This value is the ID of a portlet instance, and must match the value of one of the <computeroutput><instance-id></computeroutput> elements in the <filename>WEB-INF/portlet-instances.xml</filename> file.
+ </para>
</listitem>
<listitem>
<para>
- <programlisting><![CDATA[<region>...</region><height>...</height>]]></programlisting>
- The values are used to specify where this window will appear within the page layout.
- <emphasis>Region</emphasis>
- often depends on regions defined in your layout.
- <emphasis>Height</emphasis>
- can be any number between 0-X.
+<programlisting><![CDATA[
+<region>...</region>
+<height>...</height>]]></programlisting>
+ </para>
+ <para>
+ Specifies where the window will appear within the page layout. The <computeroutput><region></computeroutput> element specifies where the window will appear on the page. The <computeroutput><region></computeroutput> element often depends on other regions defined in your layout. The <computeroutput><height></computeroutput> element can be assigned a value between one and <replaceable>X</replaceable>.
</para>
</listitem>
</itemizedlist>
18 years, 1 month
JBoss Portal SVN: r10393 - branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/handler.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-03-27 13:36:08 -0400 (Thu, 27 Mar 2008)
New Revision: 10393
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/handler/RequestHeaderClientHandler.java
Log:
Not sure why the import was not there to start with...
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/handler/RequestHeaderClientHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/handler/RequestHeaderClientHandler.java 2008-03-27 14:33:09 UTC (rev 10392)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/handler/RequestHeaderClientHandler.java 2008-03-27 17:36:08 UTC (rev 10393)
@@ -26,6 +26,7 @@
import org.apache.commons.httpclient.cookie.MalformedCookieException;
import org.apache.commons.httpclient.cookie.RFC2109Spec;
import org.jboss.portal.wsrp.consumer.ProducerSessionInformation;
+import org.jboss.logging.Logger;
import javax.xml.namespace.QName;
import javax.xml.rpc.Stub;
18 years, 1 month
JBoss Portal SVN: r10392 - in branches/JBoss_Portal_Branch_2_6: wsrp/src/main/org/jboss/portal/test/wsrp/consumer and 6 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-03-27 10:33:09 -0400 (Thu, 27 Mar 2008)
New Revision: 10392
Modified:
branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/RegistrationUtils.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ProducerSessionInformationTestCase.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/handler/RequestHeaderClientHandlerTestCase.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/WSRPConstants.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerSessionInformation.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/handler/RequestHeaderClientHandler.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml
Log:
- Multiple cookies were not properly escaped (used ';' instead of ',').
- WSRPConstants.DEFAULT_LOCALES now uses the default locale instead of hardcoding en-US.
- JBPORTAL-1963: Added support for multiple Set-Cookie headers. Needs more testing.
- JBPORTAL-1964: Added strict mode on producer configuration. Need to work on GUI and consumer configuration.
Modified: branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/RegistrationUtils.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/RegistrationUtils.java 2008-03-27 10:49:24 UTC (rev 10391)
+++ branches/JBoss_Portal_Branch_2_6/registration/src/main/org/jboss/portal/registration/RegistrationUtils.java 2008-03-27 14:33:09 UTC (rev 10392)
@@ -23,6 +23,7 @@
package org.jboss.portal.registration;
+import org.jboss.logging.Logger;
import org.jboss.portal.common.util.ParameterValidation;
/**
@@ -32,6 +33,15 @@
*/
public class RegistrationUtils
{
+ private static boolean strict = true;
+ private static Logger log = Logger.getLogger(RegistrationUtils.class);
+
+ public static void setStrict(boolean strict)
+ {
+ RegistrationUtils.strict = strict;
+ log.debug("Using " + (strict ? "strict" : "lenient") + " Consumer Agent validation mode.");
+ }
+
/**
* @param consumerAgent
* @throws IllegalArgumentException
@@ -52,6 +62,15 @@
return;
}
}
- throw new IllegalArgumentException("'" + consumerAgent + "' is not a valid Consumer Agent.");
+
+ String msg = "'" + consumerAgent + "' is not a valid Consumer Agent. Please notify your Consumer provider that it is not WSRP-compliant.";
+ if (strict)
+ {
+ throw new IllegalArgumentException(msg);
+ }
+ else
+ {
+ log.debug(msg);
+ }
}
}
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ProducerSessionInformationTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ProducerSessionInformationTestCase.java 2008-03-27 10:49:24 UTC (rev 10391)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/consumer/ProducerSessionInformationTestCase.java 2008-03-27 14:33:09 UTC (rev 10392)
@@ -59,7 +59,7 @@
cookies = new Cookie[]{createCookie("name1", "value1", 1), createCookie("name2", "value2", 3)};
info.setUserCookie(cookies);
- assertEquals("name1=value1;name2=value2", info.getUserCookie());
+ assertEquals("name1=value1,name2=value2", info.getUserCookie());
Thread.sleep(1000);
assertEquals("name2=value2", info.getUserCookie());
@@ -93,7 +93,7 @@
info.setGroupCookieFor(groupId, new Cookie[]{createCookie("name1", "value1", 1),
createCookie("name2", "value2", WSRPConstants.SESSION_NEVER_EXPIRES)});
- assertEquals("name1=value1;name2=value2", info.getGroupCookieFor(groupId));
+ assertEquals("name1=value1,name2=value2", info.getGroupCookieFor(groupId));
Thread.sleep(1000);
assertEquals("name2=value2", info.getGroupCookieFor(groupId));
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/handler/RequestHeaderClientHandlerTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/handler/RequestHeaderClientHandlerTestCase.java 2008-03-27 10:49:24 UTC (rev 10391)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/handler/RequestHeaderClientHandlerTestCase.java 2008-03-27 14:33:09 UTC (rev 10392)
@@ -116,7 +116,7 @@
MimeHeaders headers = message.getMimeHeaders();
String[] cookie = headers.getHeader("Cookie");
assertEquals(1, cookie.length);
- assertEquals("name=value;usercookie=uservalue", cookie[0]);
+ assertEquals("name=value,usercookie=uservalue", cookie[0]);
}
public void testCookieWithoutInitHandleResponse()
@@ -134,6 +134,21 @@
assertFalse(info.isPerGroupCookies());
}
+ public void testMultipleCookiesInResponse()
+ {
+ MockSOAPMessage message = new MockSOAPMessage();
+ SOAPMessageContext msgContext = MockSOAPMessageContext.createMessageContext(message, getClass().getClassLoader());
+ MimeHeaders headers = new MimeHeaders();
+ headers.addHeader("Set-Cookie", "name1=value1");
+ headers.addHeader("Set-Cookie", "name2=value2");
+ headers.addHeader("Set-Cookie", "name3=value3");
+ message.setMimeHeaders(headers);
+
+ handler.handleResponse(msgContext);
+ ProducerSessionInformation info = RequestHeaderClientHandler.getCurrentProducerSessionInformation();
+ assertEquals("name1=value1,name2=value2,name3=value3", info.getUserCookie());
+ }
+
public void testCurrentInfo()
{
assertNull(RequestHeaderClientHandler.getCurrentProducerSessionInformation());
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/WSRPConstants.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/WSRPConstants.java 2008-03-27 10:49:24 UTC (rev 10391)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/WSRPConstants.java 2008-03-27 14:33:09 UTC (rev 10392)
@@ -28,6 +28,7 @@
import javax.xml.namespace.QName;
import java.net.InetAddress;
import java.net.UnknownHostException;
+import java.util.Locale;
import java.util.Random;
/**
@@ -116,8 +117,16 @@
/** Default character set used to generate markup. */
public static final String DEFAULT_CHARACTER_SET = "UTF-8";
+
/** Default locales. */
- public static final String[] DEFAULT_LOCALES = new String[]{"en-US", "en"};
+ public static final String[] DEFAULT_LOCALES;
+
+ static
+ {
+ String defaultLocale = WSRPUtils.toString(Locale.getDefault());
+ DEFAULT_LOCALES = new String[]{defaultLocale, "en"};
+ }
+
/** Default MIME types. */
public static final String[] DEFAULT_MIME_TYPES = new String[]{"text/html"};
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerSessionInformation.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerSessionInformation.java 2008-03-27 10:49:24 UTC (rev 10391)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerSessionInformation.java 2008-03-27 14:33:09 UTC (rev 10392)
@@ -340,13 +340,14 @@
{
if (cookies != null && cookies.length != 0)
{
- StringBuffer sb = new StringBuffer(64);
- for (int i = 0; i < cookies.length; i++)
+ int cookieNumber = cookies.length;
+ StringBuffer sb = new StringBuffer(128 * cookieNumber);
+ for (int i = 0; i < cookieNumber; i++)
{
sb.append(cookies[i].toExternalForm());
- if (i != cookies.length - 1)
+ if (i != cookieNumber - 1)
{
- sb.append(";");
+ sb.append(","); // multiple cookies are separated by commas: http://www.ietf.org/rfc/rfc2109.txt, 4.2.2
}
}
return sb.toString();
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/handler/RequestHeaderClientHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/handler/RequestHeaderClientHandler.java 2008-03-27 10:49:24 UTC (rev 10391)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/handler/RequestHeaderClientHandler.java 2008-03-27 14:33:09 UTC (rev 10392)
@@ -48,6 +48,7 @@
{
private static final ThreadLocal local = new ThreadLocal();
private static final RFC2109Spec cookieParser = new RFC2109Spec();
+ private static final Logger log = Logger.getLogger(RequestHeaderClientHandler.class);
public QName[] getHeaders()
{
@@ -91,7 +92,7 @@
{
if (cookie.length() != 0)
{
- cookie.append(";");
+ cookie.append(','); // multiple cookies are separated by commas: http://www.ietf.org/rfc/rfc2109.txt, 4.2.2
}
cookie.append(userCookie);
}
@@ -113,20 +114,10 @@
if (cookieValues != null)
{
- if (cookieValues.length > 1)
- {
- StringBuffer sb = new StringBuffer(128);
- sb.append("Cookie headers:\n");
- for (int i = 0; i < cookieValues.length; i++)
- {
- sb.append("\t").append(i).append(":\t").append(cookieValues[i]).append("\n");
+ String cookieValue = coalesceCookies(cookieValues);
- }
- throw new IllegalArgumentException("Too many cookie headers!\n" + sb.toString());
- }
+ Cookie[] cookies = extractCookies((String)msgContext.getProperty(Stub.ENDPOINT_ADDRESS_PROPERTY), cookieValue);
- Cookie[] cookies = extractCookies((String)msgContext.getProperty(Stub.ENDPOINT_ADDRESS_PROPERTY), cookieValues);
-
CurrentInfo info = getCurrentInfo(true);
ProducerSessionInformation sessionInfo = info.sessionInfo;
@@ -148,8 +139,53 @@
return super.handleResponse(msgContext);
}
- private Cookie[] extractCookies(String endpointAddress, String[] cookieValues)
+ /**
+ * Coalesce several Set-Cookie headers into one and returning the resulting concatenated String.
+ *
+ * @param cookieValues the array containing the values of the different Set-Cookie headers to be coalesced
+ * @return the concatenated value that could be used as one Set-Cookie header
+ */
+ private String coalesceCookies(String[] cookieValues)
{
+ assert cookieValues != null;
+
+ StringBuffer logBuffer = null;
+ if (log.isDebugEnabled())
+ {
+ logBuffer = new StringBuffer(128);
+ logBuffer.append("Cookie headers:\n");
+ }
+
+ int cookieNumber = cookieValues.length;
+ StringBuffer cookieBuffer = new StringBuffer(cookieNumber * 128);
+ String cookieValue;
+ for (int i = 0; i < cookieNumber; i++)
+ {
+ cookieValue = cookieValues[i];
+ cookieBuffer.append(cookieValue);
+
+ // multiple cookies are separated by commas: http://www.ietf.org/rfc/rfc2109.txt, 4.2.2
+ if (i < cookieNumber - 1)
+ {
+ cookieBuffer.append(',');
+ }
+
+ if (log.isDebugEnabled())
+ {
+ logBuffer.append("\t").append(i).append(":\t").append(cookieValue).append("\n");
+ }
+ }
+
+ if (log.isDebugEnabled())
+ {
+ log.debug(logBuffer.toString());
+ }
+
+ return cookieBuffer.toString();
+ }
+
+ private Cookie[] extractCookies(String endpointAddress, String cookieValue)
+ {
if (endpointAddress == null)
{
throw new NullPointerException("Was expecting an endpoint address but none was provided in the MessageContext");
@@ -166,7 +202,6 @@
throw new IllegalArgumentException(endpointAddress + " is not a valid URL for the endpoint address.");
}
- String cookie = cookieValues[0];
Cookie[] cookies;
try
{
@@ -179,16 +214,16 @@
String path = hostURL.getPath();
boolean secure = hostURL.getProtocol().endsWith("s"); // todo: is that correct?
- cookies = cookieParser.parse(host, port, path, secure, cookie);
+ cookies = cookieParser.parse(host, port, path, secure, cookieValue);
- for (int i = 0; i < cookies.length; i++)
+ for (Cookie cookie : cookies)
{
- cookieParser.validate(host, port, path, secure, cookies[i]);
+ cookieParser.validate(host, port, path, secure, cookie);
}
}
catch (MalformedCookieException e)
{
- throw new IllegalArgumentException("Malformed cookie: " + cookie);
+ throw new IllegalArgumentException("Malformed cookie: " + cookieValue);
}
return cookies;
}
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2008-03-27 10:49:24 UTC (rev 10391)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2008-03-27 14:33:09 UTC (rev 10392)
@@ -33,6 +33,7 @@
import org.jboss.portal.registration.Registration;
import org.jboss.portal.registration.RegistrationLocal;
import org.jboss.portal.registration.RegistrationManager;
+import org.jboss.portal.registration.RegistrationUtils;
import org.jboss.portal.wsrp.ResponseDebugFactory;
import org.jboss.portal.wsrp.WSRPExceptionFactory;
import org.jboss.portal.wsrp.WSRPProducer;
@@ -92,7 +93,7 @@
public class WSRPProducerImpl extends AbstractJBossService implements WSRPProducer
{
/** logger used for logging ;) */
- private final Logger log = Logger.getLogger(getClass());
+ private static final Logger log = Logger.getLogger(WSRPProducerImpl.class);
/** The invoker used to retrieve portlet information and invoke methods. */
private PortletInvoker invoker;
@@ -267,6 +268,11 @@
return configurationService;
}
+ public void setUseStrictMode(boolean strict)
+ {
+ RegistrationUtils.setStrict(strict);
+ }
+
protected void startService() throws Exception
{
super.startService();
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2008-03-27 10:49:24 UTC (rev 10391)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2008-03-27 14:33:09 UTC (rev 10392)
@@ -38,6 +38,8 @@
<depends optional-attribute-name="ProducerConfigurationService" proxy-type="attribute">
portal.wsrp:service=ProducerConfiguration
</depends>
+ <attribute name="UseStrictMode">true</attribute>
+ <!-- Set to false to switch to lenient mode -->
</mbean>
<!-- Registration manager -->
@@ -76,10 +78,12 @@
<attribute name="DTDMapping">
<properties>
<entry
- key="-//JBoss Portal//DTD WSRP Remote Producer Configuration 2.6//EN">dtd/jboss-wsrp-consumer_2_6.dtd
+ key="-//JBoss Portal//DTD WSRP Remote Producer Configuration 2.6//EN">
+ dtd/jboss-wsrp-consumer_2_6.dtd
</entry>
<entry
- key="-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN">dtd/jboss-wsrp-producer_2_6.dtd
+ key="-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN">
+ dtd/jboss-wsrp-producer_2_6.dtd
</entry>
<entry key="urn:jboss:portal:wsrp:consumer:v2_6">/xsd/jboss-wsrp-consumer_2_6.xsd</entry>
<entry key="urn:jboss:portal:wsrp:producer:v2_6">/xsd/jboss-wsrp-consumer_2_6.xsd</entry>
@@ -107,8 +111,8 @@
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
<!-- Uncomment in clustered mode : hibernate depends on its tree cache service @portal.single.xml.close@
- <depends>portal:service=TreeCacheProvider,type=hibernate</depends>
- @portal.single.xml.open@ -->
+ <depends>portal:service=TreeCacheProvider,type=hibernate</depends>
+ @portal.single.xml.open@ -->
<attribute name="DoChecking">true</attribute>
<attribute name="ConfigLocation">conf/hibernate/consumer/hibernate.cfg.xml</attribute>
<attribute name="JNDIName">java:/portal/WSRPConsumerSessionFactory</attribute>
18 years, 1 month
JBoss Portal SVN: r10391 - branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-27 06:49:24 -0400 (Thu, 27 Mar 2008)
New Revision: 10391
Modified:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/Refresh.java
Log:
more compact code
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/Refresh.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/Refresh.java 2008-03-27 10:45:01 UTC (rev 10390)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/Refresh.java 2008-03-27 10:49:24 UTC (rev 10391)
@@ -366,42 +366,37 @@
{
return false;
}
-
- //
- context.addObject(object);
-
- //
- if (tmp == ObjectTraversalType.RECURSIVE)
+ else
{
- Collection<StructuralObject> structuralChildren = structuralStateContext.loadChildren(object.structuralObject);
+ context.addObject(object);
//
- Map<String, UIObjectImpl.ChildRef> childrenRefs = new HashMap<String, UIObjectImpl.ChildRef>(structuralChildren.size());
-
- //
- context.createChildren(structuralObject.getId());
-
- //
- for (StructuralObject structuralChild : structuralChildren)
+ if (tmp == ObjectTraversalType.RECURSIVE)
{
- boolean loaded = load(structuralChild);
+ Collection<StructuralObject> structuralChildren = structuralStateContext.loadChildren(object.structuralObject);
+ Map<String, UIObjectImpl.ChildRef> childrenRefs = new HashMap<String, UIObjectImpl.ChildRef>(structuralChildren.size());
+ context.createChildren(structuralObject.getId());
//
- childrenRefs.put(structuralChild.getId(), new UIObjectImpl.ChildRef(structuralChild.getId(), loaded));
-
- //
- if (loaded)
+ for (StructuralObject structuralChild : structuralChildren)
{
- context.addChild(structuralObject.getId(), structuralChild.getId());
+ boolean loaded = load(structuralChild);
+ childrenRefs.put(structuralChild.getId(), new UIObjectImpl.ChildRef(structuralChild.getId(), loaded));
+
+ //
+ if (loaded)
+ {
+ context.addChild(structuralObject.getId(), structuralChild.getId());
+ }
}
+
+ // Update
+ object.childrenRefs = childrenRefs;
}
- // Update
- object.childrenRefs = childrenRefs;
+ //
+ return true;
}
-
- //
- return true;
}
finally
{
18 years, 1 month
JBoss Portal SVN: r10390 - in branches/presentation/presentation/src/main/org/jboss/portal/presentation: model2 and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-27 06:45:01 -0400 (Thu, 27 Mar 2008)
New Revision: 10390
Modified:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/Refresh.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortContext.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/UIObjectTree.java
Log:
rename initChildren method name to createChildren
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/Refresh.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/Refresh.java 2008-03-27 07:08:25 UTC (rev 10389)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/Refresh.java 2008-03-27 10:45:01 UTC (rev 10390)
@@ -164,7 +164,7 @@
if (!hadChildren)
{
object.childrenRefs = new HashMap<String, UIObjectImpl.ChildRef>();
- context.initChildren(objectId);
+ context.createChildren(objectId);
}
//
@@ -379,7 +379,7 @@
Map<String, UIObjectImpl.ChildRef> childrenRefs = new HashMap<String, UIObjectImpl.ChildRef>(structuralChildren.size());
//
- context.initChildren(structuralObject.getId());
+ context.createChildren(structuralObject.getId());
//
for (StructuralObject structuralChild : structuralChildren)
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortContext.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortContext.java 2008-03-27 07:08:25 UTC (rev 10389)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortContext.java 2008-03-27 10:45:01 UTC (rev 10390)
@@ -35,7 +35,7 @@
void addObject(UIObject object);
- void initChildren(String parentId);
+ void createChildren(String parentId);
void destroyChildren(String parentId);
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/UIObjectTree.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/UIObjectTree.java 2008-03-27 07:08:25 UTC (rev 10389)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model2/UIObjectTree.java 2008-03-27 10:45:01 UTC (rev 10390)
@@ -137,7 +137,7 @@
parent.removeChild(child);
}
- public void initChildren(String parentId)
+ public void createChildren(String parentId)
{
UIObjectNode parent = nodes.get(parentId);
if (parent == null)
18 years, 1 month