JBoss Portal SVN: r10965 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-06-09 21:29:50 -0400 (Mon, 09 Jun 2008)
New Revision: 10965
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml
Log:
forget what I changed here...
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml 2008-06-10 01:26:58 UTC (rev 10964)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/ajax.xml 2008-06-10 01:29:50 UTC (rev 10965)
@@ -209,7 +209,7 @@
<listitem>
<para>Form GET are not handled, however it should not be an issue as this situation is discouraged
by the Portlet specification. It however taken in account, just in case of. Here is an example
- of a Java Server Page that would do one:</para>
+ of a JavaServer Page that would do one:</para>
<programlisting><![CDATA[
<form action="<%= renderResponse.createActionURL() %>" method="get">
...
17 years, 11 months
JBoss Portal SVN: r10964 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-06-09 21:26:58 -0400 (Mon, 09 Jun 2008)
New Revision: 10964
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
fixing tramemarks (in progress)
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml 2008-06-10 00:53:11 UTC (rev 10963)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml 2008-06-10 01:26:58 UTC (rev 10964)
@@ -40,7 +40,7 @@
<warning>
<title>Root User Privileges</title>
<para>
- Linux systems require root user privileges to run a service on a port less than 1024. Starting JBoss EAP or JBoss AS on port 80 as a non-privileged user will not work. Running JBoss EAP or JBoss AS as the root user could lead to security breaches.
+ <trademark class="registered">Linux</trademark> systems require root user privileges to run a service on a port less than 1024. Starting JBoss EAP or JBoss AS on port 80 as a non-privileged user will not work. Running JBoss EAP or JBoss AS as the root user could lead to security breaches.
</para>
</warning>
</para>
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-06-10 00:53:11 UTC (rev 10963)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-06-10 01:26:58 UTC (rev 10964)
@@ -89,7 +89,7 @@
<sect3>
<title>Database Setup</title>
<para>
- A database is required for JBoss Portal to run. JBoss EAP and JBoss AS include an embedded Hypersonic SQL database that JBoss Portal can use; however, this is only recommended for developer use. The following databases are recommended for production use, and have had test suites run against them: MySQL 4, MySQL 5, <trademark class="registered">Microsoft SQL Server</trademark>, PostgreSQL 8, <trademark class="registered">Oracle</trademark> Database 9, and <trademark class="registered">Oracle</trademark> Database 10. JBoss Portal can use any database that is supported by Hibernate.
+ A database is required for JBoss Portal to run. JBoss EAP and JBoss AS include an embedded Hypersonic SQL database that JBoss Portal can use; however, this is only recommended for developer use. The following databases are recommended for production use, and have had test suites run against them: MySQL 4, MySQL 5, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, PostgreSQL 8, <trademark class="registered">Oracle</trademark> Database 9, and <trademark class="registered">Oracle</trademark> Database 10. JBoss Portal can use any database that is supported by Hibernate.
</para>
<para>
To configure a database to use with JBoss Portal:
@@ -117,7 +117,7 @@
<sect3>
<title>Datasource Descriptors</title>
<para>
- The JBoss Portal binary download that was extracted in <xref linkend="install_binarydownload"/>, contains pre-configured Datasource descriptors for the more popular databases. Datasource descriptors are provided for the MySQL 4, MySQL 5, PostgreSQL, <trademark class="registered">Microsoft SQL Server</trademark>, and <trademark class="registered">Oracle</trademark> databases, and can be found in the <filename>setup</filename> subdirectory where the JBoss Portal binary was extracted to:
+ The JBoss Portal binary download that was extracted in <xref linkend="install_binarydownload"/>, contains pre-configured Datasource descriptors for the more popular databases. Datasource descriptors are provided for the MySQL 4, MySQL 5, PostgreSQL, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, and <trademark class="registered">Oracle</trademark> databases, and can be found in the <filename>setup</filename> subdirectory where the JBoss Portal binary was extracted to:
</para>
<mediaobject>
<imageobject>
@@ -384,7 +384,7 @@
<sect2>
<title>Database Setup</title>
<para>
- A database is required for JBoss Portal to run. JBoss EAP and JBoss AS include an embedded Hypersonic SQL database that JBoss Portal can use; however, this is only recommended for developer use. The following databases are recommended for production use, and have had test suites run against them: MySQL 4, MySQL 5, <trademark class="registered">Microsoft SQL Server</trademark>, PostgreSQL 8, <trademark class="registered">Oracle</trademark> Database 9, and <trademark class="registered">Oracle</trademark> Database 10. JBoss Portal can use any database that is supported by Hibernate.
+ A database is required for JBoss Portal to run. JBoss EAP and JBoss AS include an embedded Hypersonic SQL database that JBoss Portal can use; however, this is only recommended for developer use. The following databases are recommended for production use, and have had test suites run against them: MySQL 4, MySQL 5, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, PostgreSQL 8, <trademark class="registered">Oracle</trademark> Database 9, and <trademark class="registered">Oracle</trademark> Database 10. JBoss Portal can use any database that is supported by Hibernate.
</para>
<para>
To configure a database to use with JBoss Portal:
@@ -412,7 +412,7 @@
<sect2>
<title>Datasource Configuration</title>
<para>
- The JBoss Portal binary download that was extracted in <xref linkend="install_binarydownload"/>, contains pre-configured Datasource descriptors for the more popular databases. Datasource descriptors are provided for the MySQL 4, MySQL 5, PostgreSQL, <trademark class="registered">Microsoft SQL Server</trademark>, and <trademark class="registered">Oracle</trademark> databases, and can be found in the <filename>setup</filename> subdirectory where the JBoss Portal binary was extracted to:
+ The JBoss Portal binary download that was extracted in <xref linkend="install_binarydownload"/>, contains pre-configured Datasource descriptors for the more popular databases. Datasource descriptors are provided for the MySQL 4, MySQL 5, PostgreSQL, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, and <trademark class="registered">Oracle</trademark> databases, and can be found in the <filename>setup</filename> subdirectory where the JBoss Portal binary was extracted to:
</para>
<mediaobject>
<imageobject>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2008-06-10 00:53:11 UTC (rev 10963)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2008-06-10 01:26:58 UTC (rev 10964)
@@ -54,7 +54,7 @@
<listitem>Hypersonic SQL</listitem>
<listitem>Derby</listitem>
<listitem><trademark class="registered">Oracle</trademark> Database 9 and 10g (use the <ulink url="http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/index.html">latest driver from the Oracle 10 branch</ulink> even if you are running Oracle 9)</listitem>
- <listitem><trademark class="registered">Microsoft SQL Server</trademark></listitem>
+ <listitem><trademark class="registered">Microsoft</trademark><trademark class="registered"> SQL Server</trademark></listitem>
<listitem>MaxDB</listitem>
</itemizedlist>
<note>
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-06-10 00:53:11 UTC (rev 10963)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-06-10 01:26:58 UTC (rev 10964)
@@ -1556,7 +1556,7 @@
</mediaobject>
</para>
<para>
- The <filename>jboss-portal-<replaceable>version</replaceable>/setup/</filename> directory contains sample Datasource descriptors for the MySQL, <trademark class="registered">Microsoft SQL Server</trademark>, PostgreSQL, and <trademark class="registered">Oracle</trademark> databases, which can be customized for your own database:
+ The <filename>jboss-portal-<replaceable>version</replaceable>/setup/</filename> directory contains sample Datasource descriptors for the MySQL, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, PostgreSQL, and <trademark class="registered">Oracle</trademark> databases, which can be customized for your own database:
</para>
<para>
<mediaobject>
17 years, 11 months
JBoss Portal SVN: r10963 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-06-09 20:53:11 -0400 (Mon, 09 Jun 2008)
New Revision: 10963
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml
Log:
fixing trademarks for Linux and Windows
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml 2008-06-10 00:17:34 UTC (rev 10962)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/configuration.xml 2008-06-10 00:53:11 UTC (rev 10963)
@@ -274,7 +274,7 @@
</screen>
</para>
<para>
- On Windows-based systems, run the following command:
+ On <trademark class="registered">Windows</trademark>, run the following command:
</para>
<para>
<screen>
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-06-10 00:17:34 UTC (rev 10962)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-06-10 00:53:11 UTC (rev 10963)
@@ -20,12 +20,12 @@
</listitem>
<listitem>
<para>
- <emphasis role="bold">Extract the bundle:</emphasis> extract the ZIP archive. It does not matter which directory is used. On Windows-based systems, the recommended directory is <filename>C:\jboss-<replaceable>version-number</replaceable></filename>.
+ <emphasis role="bold">Extract the bundle:</emphasis> extract the ZIP archive. It does not matter which directory is used. On <trademark class="registered">Windows</trademark>, the recommended directory is <filename>C:\jboss-<replaceable>version-number</replaceable></filename>.
</para>
</listitem>
<listitem>
<para>
- <emphasis role="bold">Start the server:</emphasis> change into the <filename>JBOSS_PORTAL_INSTALLATION_DIRECTORY/bin/</filename> directory. On Windows-based systems, execute <command>run.bat</command>. On Linux, run the <command>sh run.sh</command> command. To specify a configuration to use, for example, the default configuration, append the <command> -c default</command> option to the <command>run.bat</command> or <command>sh run.sh</command> commands.
+ <emphasis role="bold">Start the server:</emphasis> change into the <filename>JBOSS_PORTAL_INSTALLATION_DIRECTORY/bin/</filename> directory. On <trademark class="registered">Windows</trademark>, execute <command>run.bat</command>. On <trademark class="registered">Linux</trademark>, run the <command>sh run.sh</command> command. To specify a configuration to use, for example, the default configuration, append the <command> -c default</command> option to the <command>run.bat</command> or <command>sh run.sh</command> commands.
</para>
</listitem>
<listitem>
@@ -161,7 +161,7 @@
</listitem>
<listitem>
<para>
- <emphasis role="bold">Start the server:</emphasis> change into the <filename>$JBOSS_HOME/bin/</filename> directory. On Windows-based systems, execute <command>run.bat</command>. On Linux, run the <command>sh run.sh</command> command. To specify a configuration to use, for example, the default configuration, append the <command> -c default</command> option to the <command>run.bat</command> or <command>sh run.sh</command> commands.
+ <emphasis role="bold">Start the server:</emphasis> change into the <filename>$JBOSS_HOME/bin/</filename> directory. On <trademark class="registered">Windows</trademark>, execute <command>run.bat</command>. On <trademark class="registered">Linux</trademark>, run the <command>sh run.sh</command> command. To specify a configuration to use, for example, the default configuration, append the <command> -c default</command> option to the <command>run.bat</command> or <command>sh run.sh</command> commands.
</para>
</listitem>
<listitem>
@@ -265,7 +265,7 @@
<title>Operating System Environment Settings</title>
<para>For build targets to work, you must configure a <filename>JBOSS_HOME</filename> environment variable. This environment variable must point to the root directory of the JBoss EAP or JBoss AS installation directory, which is the directory where the JBoss EAP or JBoss AS files were extracted to.
</para>
- <para>On Windows-based systems, this is accomplished by going to
+ <para>On <trademark class="registered">Windows</trademark>, this is accomplished by going to
<emphasis>Start > Settings > Control Panel > System > Advanced > Environment Variables</emphasis>. Under the
<emphasis>System Variables</emphasis>
section, click
@@ -278,7 +278,7 @@
</mediaobject>
</para>
<para>
- To configure the <filename>JBOSS_HOME</filename> environment variable on Linux:
+ To configure the <filename>JBOSS_HOME</filename> environment variable on <trademark class="registered">Linux</trademark>:
</para>
<para>
<orderedlist>
@@ -327,7 +327,7 @@
<para>
Replace <replaceable>proxy-hostname</replaceable> with the proxy server's hostname, and <replaceable>proxy-port</replaceable> with the correct proxy server port number.
</para>
- <para>To build and deploy JBoss Portal from the sources, change into the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory, where <filename>JBOSS_PORTAL_SOURCE_DIRECTORY</filename> is the directory where the JBoss Portal source code was downloaded to. Then, <trademark class="registered">Windows</trademark> users need to run the <command>build.bat deploy</command> command, and Linux users need to run the <command>sh build.sh deploy</command> command.
+ <para>To build and deploy JBoss Portal from the sources, change into the <filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory, where <filename>JBOSS_PORTAL_SOURCE_DIRECTORY</filename> is the directory where the JBoss Portal source code was downloaded to. Then, <trademark class="registered">Windows</trademark>, users need to run the <command>build.bat deploy</command> command, and <trademark class="registered">Linux</trademark> users need to run the <command>sh build.sh deploy</command> command.
</para>
<para>
At the end of the build process, the <filename>jboss-portal.sar</filename> file is copied into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory:
@@ -343,12 +343,12 @@
<note>
<title>Portal Modules</title>
<para>
- The previous steps install a bare version of JBoss Portal. In previous versions, several additional modules were deployed as well, but this has since been modularized to provide greater flexibility. To deploy additional modules, refer to the <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=PortalModules">Portal's module list</ulink> for more information. To deploy all modules at once, change into the <filename>build</filename> directory. If you are running Linux, run the <command>sh build.sh deploy-all</command> command. On Windows-based systems, run the <command>build.bat deploy-all</command> command.
+ The previous steps install a bare version of JBoss Portal. In previous versions, several additional modules were deployed as well, but this has since been modularized to provide greater flexibility. To deploy additional modules, refer to the <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=PortalModules">Portal's module list</ulink> for more information. To deploy all modules at once, change into the <filename>build</filename> directory. If you are running <trademark class="registered">Linux</trademark>, run the <command>sh build.sh deploy-all</command> command. On <trademark class="registered">Windows</trademark>, run the <command>build.bat deploy-all</command> command.
</para>
</note>
</para>
<para>
- To build the clustered version on Linux Operating Systems:
+ To build the clustered version on <trademark class="registered">Linux</trademark> operating systems:
</para>
<para>
<orderedlist>
@@ -378,7 +378,7 @@
</orderedlist>
</para>
<para>
- To build the clustered version on Windows-based systems, repeat the previous steps, replacing <command>sh build.sh</command> with <command>build.bat</command>.
+ To build the clustered version on <trademark class="registered">Windows</trademark>, repeat the previous steps, replacing <command>sh build.sh</command> with <command>build.bat</command>.
</para>
</sect2>
<sect2>
@@ -456,7 +456,7 @@
</listitem>
<listitem>
<para>
- <emphasis role="bold">Start the server:</emphasis> change into the <filename>$JBOSS_HOME/bin/</filename> directory. On Windows-based systems, execute <command>run.bat</command>. On Linux, run the <command>sh run.sh</command> command. To specify a configuration to use, for example, the default configuration, append the <command> -c default</command> option to the <command>run.bat</command> or <command>sh run.sh</command> commands.
+ <emphasis role="bold">Start the server:</emphasis> change into the <filename>$JBOSS_HOME/bin/</filename> directory. On <trademark class="registered">Windows</trademark>, execute <command>run.bat</command>. On <trademark class="registered">Linux</trademark>, run the <command>sh run.sh</command> command. To specify a configuration to use, for example, the default configuration, append the <command> -c default</command> option to the <command>run.bat</command> or <command>sh run.sh</command> commands.
</para>
</listitem>
<listitem>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2008-06-10 00:17:34 UTC (rev 10962)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2008-06-10 00:53:11 UTC (rev 10963)
@@ -32,7 +32,7 @@
<sect1>
<title>Supported Operating Systems</title>
<para>JBoss Portal is 100% pure Java, and therefore it is interoperable with most operating systems
- capable of running a Java Virtual Machine (JVM), including Linux, <trademark class="registered">Windows</trademark>, <trademark class="registered">UNIX</trademark> operating systems, and Mac OS X.
+ capable of running a Java Virtual Machine (JVM), including <trademark class="registered">Linux</trademark>, <trademark class="registered">Windows</trademark>, <trademark class="registered">UNIX</trademark> operating systems, and Mac OS X.
</para>
</sect1>
<sect1>
@@ -63,6 +63,6 @@
</sect1>
<sect1>
<title>Source building</title>
- <para>The source building mechanism works on Linux, <trademark class="registered">Windows</trademark>, Mac OS X, and <trademark class="registered">UNIX</trademark> operating systems.</para>
+ <para>The source building mechanism works on <trademark class="registered">Linux</trademark>, <trademark class="registered">Windows</trademark>, Mac OS X, and <trademark class="registered">UNIX</trademark> operating systems.</para>
</sect1>
</chapter>
17 years, 11 months
JBoss Portal SVN: r10962 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-06-09 20:17:34 -0400 (Mon, 09 Jun 2008)
New Revision: 10962
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml
Log:
updating trademark section (to be front page), with
trademark credits for Sun, JBoss, Oracle, Microsoft,
and "Other". Need to work out Linux, UNIX, Apache,
and Red Hat. Will mail Legal
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml 2008-06-09 12:40:39 UTC (rev 10961)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/trademarks.xml 2008-06-10 00:17:34 UTC (rev 10962)
@@ -3,7 +3,18 @@
<para>
JavaServer, JSP, Java, Java runtime environment, JRE, J2EE, JVM, Javadoc, JavaScript, and J2SE are trademarks or registered trademarks of Sun Microsystems, Inc. in the United States and other countries. Red Hat, Inc. is independent of Sun Microsystems, Inc.
</para>
-
+ <para>
+ JBoss is a registered trademark of Red Hat, Inc. in the U.S. and other countries.
+ </para>
+ <para>
+ Oracle is a registered trademark of Oracle Corporation and/or its affiliates. Other names may be trademarks of their respective owners.
+ </para>
+ <para>
+ Microsoft, Windows, and SQL Server are either registered trademarks or trademarks of Microsoft Corporation in the United States and/or other countries.
+ </para>
+ <para>
+ Other product and company names mentioned herein may be the trademarks of their respective owners.
+ </para>
</preface>
@@ -16,8 +27,8 @@
All the sun stuff
-Oracle covered...(but check)
+
Microsoft?
17 years, 11 months
JBoss Portal SVN: r10961 - branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-09 08:40:39 -0400 (Mon, 09 Jun 2008)
New Revision: 10961
Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml
Log:
- removed too many windows, putting back the Google Weather Portlet
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml 2008-06-09 12:27:25 UTC (rev 10960)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml 2008-06-09 12:40:39 UTC (rev 10961)
@@ -64,6 +64,13 @@
</window>
<window>
+ <window-name>GoogleWeatherPortletWindow1</window-name>
+ <instance-ref>GoogleWeatherPortletInstance</instance-ref>
+ <region>center</region>
+ <height>2</height>
+ </window>
+
+ <window>
<window-name>ShoppingCatalogPortletWindow</window-name>
<instance-ref>ShoppingCatalogPortletInstance</instance-ref>
<region>center</region>
17 years, 11 months
JBoss Portal SVN: r10960 - in branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core: impl/model/content/generic and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-09 08:27:25 -0400 (Mon, 09 Jun 2008)
New Revision: 10960
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java
Log:
- Fixed "uri" public parameter scoped to a unique window
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2008-06-09 10:33:35 UTC (rev 10959)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPageNavigationalState.java 2008-06-09 12:27:25 UTC (rev 10960)
@@ -22,14 +22,16 @@
******************************************************************************/
package org.jboss.portal.core.controller.portlet;
-import org.jboss.portal.common.util.ParameterMap;
-import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.navstate.NavigationalStateContext;
+import org.jboss.portal.portlet.ParametersStateString;
import org.jboss.portal.portlet.controller.state.PageNavigationalState;
import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
import org.jboss.portal.portlet.info.NavigationInfo;
import org.jboss.portal.portlet.info.ParameterInfo;
import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.common.util.ParameterMap;
+import org.jboss.portal.core.CoreConstants;
+import org.jboss.portal.core.navstate.NavigationalStateContext;
+import org.jboss.portal.core.model.portal.Window;
import javax.xml.namespace.QName;
import java.util.Collections;
@@ -39,6 +41,7 @@
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
* @version $Revision: 630 $
*/
public class ControllerPageNavigationalState implements PageNavigationalState
@@ -57,11 +60,14 @@
private final boolean mutable;
/** . */
- private Map<String, WindowNavigationalState> updates;
+ private Map<String, org.jboss.portal.core.model.portal.navstate.WindowNavigationalState> updates;
/** . */
private Map<QName, String[]> pageUpdates;
+ /** . */
+ private Map<String, HashMap<QName, String[]>> windowPublicNavigationalStateUpdate;
+
public ControllerPageNavigationalState(
NavigationalStateContext navigationalStateContext,
ControllerPortletControllerContext controllerContext,
@@ -72,6 +78,7 @@
this.mutable = mutable;
this.updates = null;
this.pageUpdates = null;
+ this.windowPublicNavigationalStateUpdate = null;
}
public ControllerPageNavigationalState(
@@ -81,8 +88,9 @@
this.navigationalStateContext = that.navigationalStateContext;
this.controllerContext = that.controllerContext;
this.mutable = mutable;
- this.updates = that.updates != null ? new HashMap<String, WindowNavigationalState>(that.updates) : null;
+ this.updates = that.updates != null ? new HashMap<String, org.jboss.portal.core.model.portal.navstate.WindowNavigationalState>(that.updates) : null;
this.pageUpdates = that.pageUpdates != null ? new HashMap<QName, String[]>(that.pageUpdates) : null;
+ this.windowPublicNavigationalStateUpdate = that.windowPublicNavigationalStateUpdate != null ? new HashMap<String, HashMap<QName, String[]>>(that.windowPublicNavigationalStateUpdate) : null;
}
/**
@@ -90,15 +98,42 @@
*/
public void flushUpdates()
{
+
+ if (windowPublicNavigationalStateUpdate != null)
+ {
+ for (Map.Entry<String, HashMap<QName, String[]>> entry : windowPublicNavigationalStateUpdate.entrySet())
+ {
+ org.jboss.portal.core.model.portal.navstate.WindowNavigationalState wns = updates.get(entry.getKey());
+ if (wns == null)
+ {
+ Window window = controllerContext.getWindow(entry.getKey());
+ String windowId = window.getId().toString();
+ wns = navigationalStateContext.getWindowNavigationalState(windowId);
+ }
+
+ Map<String, String[]> parameters = new HashMap<String, String[]>();
+
+ for (Map.Entry<QName, String[]> value : entry.getValue().entrySet())
+ {
+ parameters.put(value.getKey().toString(), value.getValue());
+ }
+
+ ParametersStateString pss = ParametersStateString.create(parameters);
+
+ updates.put(entry.getKey(), new org.jboss.portal.core.model.portal.navstate.WindowNavigationalState(wns.getWindowState(), wns.getMode(), wns.getContentState(), pss));
+ }
+
+ //
+ windowPublicNavigationalStateUpdate.clear();
+
+ }
+
if (updates != null)
{
- for (Map.Entry<String, WindowNavigationalState> entry : updates.entrySet())
+ for (Map.Entry<String, org.jboss.portal.core.model.portal.navstate.WindowNavigationalState> entry : updates.entrySet())
{
Window window = controllerContext.getWindow(entry.getKey());
- org.jboss.portal.core.model.portal.navstate.WindowNavigationalState wns = new org.jboss.portal.core.model.portal.navstate.WindowNavigationalState(
- entry.getValue().getWindowState(),
- entry.getValue().getMode(),
- entry.getValue().getPortletNavigationalState());
+ org.jboss.portal.core.model.portal.navstate.WindowNavigationalState wns = entry.getValue();
navigationalStateContext.setWindowNavigationalState(window.getId().toString(), wns);
}
@@ -146,14 +181,20 @@
}
}
+ /**
+ *
+ */
public Set<String> getWindowIds()
{
return controllerContext.getWindowNames();
}
+ /**
+ *
+ */
public WindowNavigationalState getWindowNavigationalState(String windowName) throws IllegalArgumentException
{
- WindowNavigationalState update = null;
+ org.jboss.portal.core.model.portal.navstate.WindowNavigationalState update = null;
//
if (updates != null)
@@ -164,7 +205,7 @@
//
if (update != null)
{
- return update;
+ return new WindowNavigationalState(update.getContentState(), update.getMode(), update.getWindowState());
}
//
@@ -191,6 +232,9 @@
return null;
}
+ /**
+ *
+ */
public void setWindowNavigationalState(String windowName, WindowNavigationalState windowNavigationalState) throws IllegalArgumentException, IllegalStateException
{
if (!mutable)
@@ -204,14 +248,71 @@
{
if (updates == null)
{
- updates = new HashMap<String, WindowNavigationalState>();
+ updates = new HashMap<String, org.jboss.portal.core.model.portal.navstate.WindowNavigationalState>();
}
//
- updates.put(windowName, windowNavigationalState);
+ updates.put(windowName, new org.jboss.portal.core.model.portal.navstate.WindowNavigationalState(windowNavigationalState.getWindowState(), windowNavigationalState.getMode(), windowNavigationalState.getPortletNavigationalState(), null));
}
}
+ public void setWindowPublicNavigationalState(String windowName, QName name, String[] value) throws IllegalArgumentException, IllegalStateException
+ {
+ if (!mutable)
+ {
+ throw new IllegalStateException();
+ }
+
+ //
+ if (windowPublicNavigationalStateUpdate == null)
+ {
+ windowPublicNavigationalStateUpdate = new HashMap<String, HashMap<QName, String[]>>();
+ }
+
+ if (windowPublicNavigationalStateUpdate.get(windowName) == null)
+ {
+ windowPublicNavigationalStateUpdate.put(windowName, new HashMap<QName, String[]>());
+ }
+
+ windowPublicNavigationalStateUpdate.get(windowName).put(name, value);
+ }
+
+ public String[] getWindowPublicNavigationalState(String windowName, QName name) throws IllegalArgumentException, IllegalStateException
+ {
+ String[] value = null;
+
+ //
+ if (windowPublicNavigationalStateUpdate != null)
+ {
+ if (windowPublicNavigationalStateUpdate.get(windowName) != null)
+ {
+ value = windowPublicNavigationalStateUpdate.get(windowName).get(name);
+ }
+
+ }
+
+ //
+ if (value == null)
+ {
+
+ Window window = controllerContext.getWindow(windowName);
+ org.jboss.portal.core.model.portal.navstate.WindowNavigationalState wns = navigationalStateContext.getWindowNavigationalState(window.getId().toString());
+
+ //
+ if (wns != null)
+ {
+ ParametersStateString pss = (ParametersStateString)wns.getPublicContentState();
+ if (pss != null)
+ {
+ value = pss.getValues(name.toString());
+ }
+ }
+ }
+
+ //
+ return value != null && value.length > 0 ? value : null;
+ }
+
/**
* For now we do not implement any kind of mapping between qnames, it's the basic straightforward 1-1 mapping.
*/
@@ -225,15 +326,34 @@
ParameterMap publicNavigationalState = new ParameterMap();
for (ParameterInfo parameterInfo : info.getNavigation().getPublicParameters())
{
- String[] parameterValue = getPublicNavigationalState(parameterInfo.getName());
+ // Don't store the URI as a page scoped public render parameter but window scoped
+ if (CoreConstants.JBOSS_PORTAL_CONTENT_URI.equals(parameterInfo.getName()))
+ {
+ String[] parameterValue = getWindowPublicNavigationalState(windowName, parameterInfo.getName());
- //
- if (parameterValue != null)
+ //
+ if (parameterValue != null)
+ {
+ String parameterId = parameterInfo.getId();
+
+ // We clone the value here so we keep the internal state not potentially changed
+ publicNavigationalState.put(parameterId, parameterValue.clone());
+
+ }
+ }
+ else
{
- String parameterId = parameterInfo.getId();
+ String[] parameterValue = getPublicNavigationalState(parameterInfo.getName());
- // We clone the value here so we keep the internal state not potentially changed
- publicNavigationalState.put(parameterId, parameterValue.clone());
+ //
+ if (parameterValue != null)
+ {
+ String parameterId = parameterInfo.getId();
+
+ // We clone the value here so we keep the internal state not potentially changed
+ publicNavigationalState.put(parameterId, parameterValue.clone());
+
+ }
}
}
@@ -244,7 +364,9 @@
//
return null;
}
+
+
public String getPublicNavigationalParameterId(String windowName, QName name)
{
PortletInfo info = controllerContext.getPortletInfo(windowName);
@@ -265,6 +387,9 @@
return null;
}
+ /**
+ *
+ */
public void setPublicNavigationalState(String windowName, Map<String, String[]> update)
{
if (!mutable)
@@ -291,19 +416,39 @@
{
QName name = parameterInfo.getName();
String[] value = entry.getValue();
- if (value.length > 0)
+
+ // Don't store the URI as a page scoped public render parameter but window scoped
+ if (CoreConstants.JBOSS_PORTAL_CONTENT_URI.equals(name))
{
- setPublicNavigationalState(name, value);
+ if (value.length > 0)
+ {
+ setWindowPublicNavigationalState(windowName, name, value);
+ }
+ else
+ {
+ setWindowPublicNavigationalState(windowName, name, REMOVAL);
+ }
+
}
else
{
- removePublicNavigationalState(name);
+ if (value.length > 0)
+ {
+ setPublicNavigationalState(name, value);
+ }
+ else
+ {
+ removePublicNavigationalState(name);
+ }
}
}
}
}
}
+ /**
+ *
+ */
public Set<QName> getPublicNames()
{
if (pageUpdates == null)
@@ -315,6 +460,9 @@
return pageUpdates.keySet();
}
+ /**
+ *
+ */
public String[] getPublicNavigationalState(QName name) throws IllegalArgumentException
{
String[] value = null;
@@ -341,6 +489,9 @@
return value != null && value.length > 0 ? value : null;
}
+ /**
+ *
+ */
public void setPublicNavigationalState(QName name, String[] value) throws IllegalArgumentException, IllegalStateException
{
if (!mutable)
@@ -358,6 +509,9 @@
pageUpdates.put(name, value);
}
+ /**
+ *
+ */
public void removePublicNavigationalState(QName name) throws IllegalArgumentException, IllegalStateException
{
if (!mutable)
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2008-06-09 10:33:35 UTC (rev 10959)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2008-06-09 12:27:25 UTC (rev 10960)
@@ -194,7 +194,7 @@
RenderInvocation invocation = rendererContext.createRenderInvocation(navigationalState);
//
- if (invocation.getPublicNavigationalState() == null)
+ if (invocation.getPublicNavigationalState() == null || invocation.getPublicNavigationalState().size() == 0)
{
String id = null;
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2008-06-09 10:33:35 UTC (rev 10959)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2008-06-09 12:27:25 UTC (rev 10960)
@@ -253,7 +253,7 @@
if (!key.equals(maximizedKey) && wns.getWindowState().equals(WindowState.MAXIMIZED))
{
WindowNavigationalState wns2 = new WindowNavigationalState(WindowState.NORMAL, wns.getMode(), wns
- .getContentState());
+ .getContentState(), wns.getPublicContentState());
store.setAttribute(key, wns2);
}
}
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java 2008-06-09 10:33:35 UTC (rev 10959)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/WindowNavigationalState.java 2008-06-09 12:27:25 UTC (rev 10960)
@@ -50,12 +50,15 @@
/** . */
private final StateString contentState;
+ /** . */
+ private final StateString publicContentState;
+
public static WindowNavigationalState create()
{
return DEFAULT;
}
- public WindowNavigationalState(WindowState windowState, Mode mode, StateString contentState)
+ public WindowNavigationalState(WindowState windowState, Mode mode, StateString contentState, StateString publicContentState)
{
if (windowState == null)
{
@@ -68,11 +71,12 @@
this.windowState = windowState;
this.mode = mode;
this.contentState = contentState;
+ this.publicContentState = publicContentState;
}
private WindowNavigationalState()
{
- this(WindowState.NORMAL, Mode.VIEW, null);
+ this(WindowState.NORMAL, Mode.VIEW, null, null);
}
public WindowState getWindowState()
@@ -90,6 +94,11 @@
return contentState;
}
+ public StateString getPublicContentState()
+ {
+ return publicContentState;
+ }
+
public static WindowState getWindowState(AttributeResolver resolver, Object id)
{
NavigationalStateKey key = new NavigationalStateKey(WindowNavigationalState.class, id);
@@ -127,11 +136,11 @@
//
if (wns == null)
{
- wns = new WindowNavigationalState(windowState, Mode.VIEW, null);
+ wns = new WindowNavigationalState(windowState, Mode.VIEW, null, null);
}
else
{
- wns = new WindowNavigationalState(windowState, wns.getMode(), wns.getContentState());
+ wns = new WindowNavigationalState(windowState, wns.getMode(), wns.getContentState(), wns.getPublicContentState());
}
//
@@ -175,11 +184,11 @@
//
if (wns == null)
{
- wns = new WindowNavigationalState(WindowState.NORMAL, mode, null);
+ wns = new WindowNavigationalState(WindowState.NORMAL, mode, null, null);
}
else
{
- wns = new WindowNavigationalState(wns.getWindowState(), mode, wns.getContentState());
+ wns = new WindowNavigationalState(wns.getWindowState(), mode, wns.getContentState(), wns.getPublicContentState());
}
//
@@ -202,6 +211,22 @@
setState(resolver, new NavigationalStateKey(WindowNavigationalState.class, id), state);
}
+ public static StateString getPublicState(AttributeResolver resolver, Object id)
+ {
+ NavigationalStateKey key = new NavigationalStateKey(WindowNavigationalState.class, id);
+
+ //
+ WindowNavigationalState wns = (WindowNavigationalState)resolver.getAttribute(key);
+
+ //
+ return wns != null ? wns.getPublicContentState() : null;
+ }
+
+ public static void setPublicState(AttributeResolver resolver, Object id, StateString state)
+ {
+ setPublicState(resolver, new NavigationalStateKey(WindowNavigationalState.class, id), state);
+ }
+
public static void setState(AttributeResolver resolver, NavigationalStateKey key, StateString state)
{
if (resolver == null)
@@ -223,17 +248,49 @@
//
if (wns == null)
{
- wns = new WindowNavigationalState(WindowState.NORMAL, Mode.VIEW, state);
+ wns = new WindowNavigationalState(WindowState.NORMAL, Mode.VIEW, state, null);
}
else
{
- wns = new WindowNavigationalState(wns.getWindowState(), wns.getMode(), state);
+ wns = new WindowNavigationalState(wns.getWindowState(), wns.getMode(), state, wns.getPublicContentState());
}
//
resolver.setAttribute(key, wns);
}
+ public static void setPublicState(AttributeResolver resolver, NavigationalStateKey key, StateString publicState)
+ {
+ if (resolver == null)
+ {
+ throw new IllegalArgumentException("No null resolver");
+ }
+ if (key == null)
+ {
+ throw new IllegalArgumentException("No null key");
+ }
+ if (publicState == null)
+ {
+ throw new IllegalArgumentException("No null public state");
+ }
+
+ //
+ WindowNavigationalState wns = (WindowNavigationalState)resolver.getAttribute(key);
+
+ //
+ if (wns == null)
+ {
+ wns = new WindowNavigationalState(WindowState.NORMAL, Mode.VIEW, null, publicState);
+ }
+ else
+ {
+ wns = new WindowNavigationalState(wns.getWindowState(), wns.getMode(), wns.getContentState(), publicState);
+ }
+
+ //
+ resolver.setAttribute(key, wns);
+ }
+
public static void setState(AttributeResolver resolver, NavigationalStateKey key, StateString state, Window window)
{
if (resolver == null)
@@ -259,11 +316,11 @@
//
if (wns == null)
{
- wns = new WindowNavigationalState(window.getInitialWindowState(), window.getInitialMode(), state);
+ wns = new WindowNavigationalState(window.getInitialWindowState(), window.getInitialMode(), state, null);
}
else
{
- wns = new WindowNavigationalState(wns.getWindowState(), wns.getMode(), state);
+ wns = new WindowNavigationalState(wns.getWindowState(), wns.getMode(), state, wns.getPublicContentState());
}
//
@@ -295,6 +352,7 @@
}
// Create new NS
- return new WindowNavigationalState(newWindowState, newMode, newState);
+ return new WindowNavigationalState(newWindowState, newMode, newState, oldNS.getPublicContentState());
}
+
}
17 years, 11 months
JBoss Portal SVN: r10959 - modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-09 06:33:35 -0400 (Mon, 09 Jun 2008)
New Revision: 10959
Added:
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/DesktopLayout.java
Modified:
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Constants.java
Log:
add placeholder for desktop layout
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Constants.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Constants.java 2008-06-09 10:29:43 UTC (rev 10958)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Constants.java 2008-06-09 10:33:35 UTC (rev 10959)
@@ -33,6 +33,15 @@
public static final String LAYOUT_ID = "org.jboss.portal.presentation.layout_id";
/** . */
+ public static final String SIMPLE_LAYOUT = "simple";
+
+ /** . */
+ public static final String REGION_LAYOUT = "region";
+
+ /** . */
+ public static final String DESKTOP_LAYOUT = "desktop";
+
+ /** . */
public static final String SIMPLE_LAYOUT_ORIENTATION = "org.jboss.portal.presentation.layout.simple.orientation";
/** . */
@@ -45,17 +54,18 @@
public static final String HORIZONTAL_ORIENTATION = "horizontal";
/** . */
- public static final String SIMPLE_LAYOUT = "simple_layout";
+ public static final String REGION_LAYOUT_TEMPLATE = "org.jboss.portal.presentation.layout.region.template";
/** . */
- public static final String REGION_LAYOUT = "region_layout";
+ public static final String REGION_LAYOUT_NAME = "org.jboss.portal.presentation.layout.region.name";
/** . */
- public static final String REGION_LAYOUT_TEMPLATE = "org.jboss.portal.presentation.layout.region.template";
+ public static final String REGION_LAYOUT_INDEX = "org.jboss.portal.presentation.layout.region.index";
/** . */
- public static final String REGION_LAYOUT_NAME = "org.jboss.portal.presentation.layout.region.name";
+ public static final String DESKTOP_LAYOUT_X = "org.jboss.portal.presentation.layout.desktop.x";
/** . */
- public static final String REGION_LAYOUT_INDEX = "org.jboss.portal.presentation.layout.region.index";
+ public static final String DESKTOP_LAYOUT_Y = "org.jboss.portal.presentation.layout.desktop.y";
+
}
Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/DesktopLayout.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/DesktopLayout.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/DesktopLayout.java 2008-06-09 10:33:35 UTC (rev 10959)
@@ -0,0 +1,33 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model.layout;
+
+/**
+ * Desktop layout.
+ *
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class DesktopLayout implements Layout
+{
+}
17 years, 11 months
JBoss Portal SVN: r10958 - in modules/presentation/trunk/portal/src/main: java/org/jboss/portal/presentation/portal/servlet and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-09 06:29:43 -0400 (Mon, 09 Jun 2008)
New Revision: 10958
Added:
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/ModelImportTrigger.java
Removed:
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/ModelImporter.java
Modified:
modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/jboss-beans.xml
Log:
still renaming to avoid conflicts
Modified: modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/jboss-beans.xml
===================================================================
--- modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/jboss-beans.xml 2008-06-09 10:27:59 UTC (rev 10957)
+++ modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/jboss-beans.xml 2008-06-09 10:29:43 UTC (rev 10958)
@@ -148,7 +148,7 @@
</constructor>
</bean>
- <bean name="StructuralStateContextImporter" class="org.jboss.portal.presentation.portal.servlet.ModelImporter">
+ <bean name="StructuralStateContextImporter" class="org.jboss.portal.presentation.portal.servlet.ModelImportTrigger">
<property name="servletContext"><inject bean="ServletContext"/></property>
<property name="portalNodeManager"><inject bean="PortalNodeManager"/></property>
<property name="layoutStore"><inject bean="LayoutStore"/></property>
Copied: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/ModelImportTrigger.java (from rev 10942, modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/StructuralStateContextImporter.java)
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/ModelImportTrigger.java (rev 0)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/ModelImportTrigger.java 2008-06-09 10:29:43 UTC (rev 10958)
@@ -0,0 +1,95 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.portal.servlet;
+
+import org.jboss.portal.presentation.portal.model.object.PortalNodeManager;
+import org.jboss.portal.presentation.portal.model.ModelImporter;
+import org.jboss.portal.presentation.portal.model.object.ContextNode;
+import org.jboss.portal.presentation.portal.model.layout.LayoutStore;
+import org.jboss.portal.common.io.IOTools;
+
+import javax.servlet.ServletContext;
+import java.io.InputStream;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class ModelImportTrigger
+{
+
+ /** . */
+ private ServletContext servletContext;
+
+ /** . */
+ private PortalNodeManager portalNodeManager;
+
+ /** . */
+ private LayoutStore layoutStore;
+
+ public ServletContext getServletContext()
+ {
+ return servletContext;
+ }
+
+ public void setServletContext(ServletContext servletContext)
+ {
+ this.servletContext = servletContext;
+ }
+
+ public PortalNodeManager getPortalNodeManager()
+ {
+ return portalNodeManager;
+ }
+
+ public void setPortalNodeManager(PortalNodeManager portalNodeManager)
+ {
+ this.portalNodeManager = portalNodeManager;
+ }
+
+ public LayoutStore getLayoutStore()
+ {
+ return layoutStore;
+ }
+
+ public void setLayoutStore(LayoutStore layoutStore)
+ {
+ this.layoutStore = layoutStore;
+ }
+
+ public void start() throws Exception
+ {
+ InputStream in = servletContext.getResourceAsStream("/WEB-INF/page-structure.xml");
+
+ //
+ try
+ {
+ ContextNode root = portalNodeManager.getRoot();
+ new ModelImporter(root, layoutStore).importDocument(in);
+ }
+ finally
+ {
+ IOTools.safeClose(in);
+ }
+ }
+}
Deleted: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/ModelImporter.java
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/ModelImporter.java 2008-06-09 10:27:59 UTC (rev 10957)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/ModelImporter.java 2008-06-09 10:29:43 UTC (rev 10958)
@@ -1,95 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.presentation.portal.servlet;
-
-import org.jboss.portal.presentation.portal.model.object.PortalNodeManager;
-import org.jboss.portal.presentation.portal.model.ModelImporter;
-import org.jboss.portal.presentation.portal.model.object.ContextNode;
-import org.jboss.portal.presentation.portal.model.layout.LayoutStore;
-import org.jboss.portal.common.io.IOTools;
-
-import javax.servlet.ServletContext;
-import java.io.InputStream;
-
-/**
- * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class ModelImporter
-{
-
- /** . */
- private ServletContext servletContext;
-
- /** . */
- private PortalNodeManager portalNodeManager;
-
- /** . */
- private LayoutStore layoutStore;
-
- public ServletContext getServletContext()
- {
- return servletContext;
- }
-
- public void setServletContext(ServletContext servletContext)
- {
- this.servletContext = servletContext;
- }
-
- public PortalNodeManager getPortalNodeManager()
- {
- return portalNodeManager;
- }
-
- public void setPortalNodeManager(PortalNodeManager portalNodeManager)
- {
- this.portalNodeManager = portalNodeManager;
- }
-
- public LayoutStore getLayoutStore()
- {
- return layoutStore;
- }
-
- public void setLayoutStore(LayoutStore layoutStore)
- {
- this.layoutStore = layoutStore;
- }
-
- public void start() throws Exception
- {
- InputStream in = servletContext.getResourceAsStream("/WEB-INF/page-structure.xml");
-
- //
- try
- {
- ContextNode root = portalNodeManager.getRoot();
- new org.jboss.portal.presentation.portal.model.ModelImporter(root, layoutStore).importDocument(in);
- }
- finally
- {
- IOTools.safeClose(in);
- }
- }
-}
17 years, 11 months
JBoss Portal SVN: r10957 - in modules/presentation/trunk/portal/src/main: java/org/jboss/portal/presentation/portal/servlet and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-09 06:27:59 -0400 (Mon, 09 Jun 2008)
New Revision: 10957
Added:
modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/ModelImporter.java
Modified:
modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/jboss-beans.xml
Log:
rename StructuralContextImporter to ModelImporter
Modified: modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/jboss-beans.xml
===================================================================
--- modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/jboss-beans.xml 2008-06-09 10:25:23 UTC (rev 10956)
+++ modules/presentation/trunk/portal/src/main/artifacts/presentation-portal-war/WEB-INF/jboss-beans.xml 2008-06-09 10:27:59 UTC (rev 10957)
@@ -148,7 +148,7 @@
</constructor>
</bean>
- <bean name="StructuralStateContextImporter" class="org.jboss.portal.presentation.portal.servlet.StructuralStateContextImporter">
+ <bean name="StructuralStateContextImporter" class="org.jboss.portal.presentation.portal.servlet.ModelImporter">
<property name="servletContext"><inject bean="ServletContext"/></property>
<property name="portalNodeManager"><inject bean="PortalNodeManager"/></property>
<property name="layoutStore"><inject bean="LayoutStore"/></property>
Copied: modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/ModelImporter.java (from rev 10942, modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/StructuralStateContextImporter.java)
===================================================================
--- modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/ModelImporter.java (rev 0)
+++ modules/presentation/trunk/portal/src/main/java/org/jboss/portal/presentation/portal/servlet/ModelImporter.java 2008-06-09 10:27:59 UTC (rev 10957)
@@ -0,0 +1,95 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.portal.servlet;
+
+import org.jboss.portal.presentation.portal.model.object.PortalNodeManager;
+import org.jboss.portal.presentation.portal.model.ModelImporter;
+import org.jboss.portal.presentation.portal.model.object.ContextNode;
+import org.jboss.portal.presentation.portal.model.layout.LayoutStore;
+import org.jboss.portal.common.io.IOTools;
+
+import javax.servlet.ServletContext;
+import java.io.InputStream;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class ModelImporter
+{
+
+ /** . */
+ private ServletContext servletContext;
+
+ /** . */
+ private PortalNodeManager portalNodeManager;
+
+ /** . */
+ private LayoutStore layoutStore;
+
+ public ServletContext getServletContext()
+ {
+ return servletContext;
+ }
+
+ public void setServletContext(ServletContext servletContext)
+ {
+ this.servletContext = servletContext;
+ }
+
+ public PortalNodeManager getPortalNodeManager()
+ {
+ return portalNodeManager;
+ }
+
+ public void setPortalNodeManager(PortalNodeManager portalNodeManager)
+ {
+ this.portalNodeManager = portalNodeManager;
+ }
+
+ public LayoutStore getLayoutStore()
+ {
+ return layoutStore;
+ }
+
+ public void setLayoutStore(LayoutStore layoutStore)
+ {
+ this.layoutStore = layoutStore;
+ }
+
+ public void start() throws Exception
+ {
+ InputStream in = servletContext.getResourceAsStream("/WEB-INF/page-structure.xml");
+
+ //
+ try
+ {
+ ContextNode root = portalNodeManager.getRoot();
+ new org.jboss.portal.presentation.portal.model.ModelImporter(root, layoutStore).importDocument(in);
+ }
+ finally
+ {
+ IOTools.safeClose(in);
+ }
+ }
+}
17 years, 11 months
JBoss Portal SVN: r10956 - modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-06-09 06:25:23 -0400 (Mon, 09 Jun 2008)
New Revision: 10956
Modified:
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Constants.java
Log:
added a constant for the layout template for region based layouts
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Constants.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Constants.java 2008-06-09 10:23:13 UTC (rev 10955)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Constants.java 2008-06-09 10:25:23 UTC (rev 10956)
@@ -51,6 +51,9 @@
public static final String REGION_LAYOUT = "region_layout";
/** . */
+ public static final String REGION_LAYOUT_TEMPLATE = "org.jboss.portal.presentation.layout.region.template";
+
+ /** . */
public static final String REGION_LAYOUT_NAME = "org.jboss.portal.presentation.layout.region.name";
/** . */
17 years, 11 months