gatein SVN: r1875 - in portal/trunk/docs/user-guide/en/modules: account and 2 other directories.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-02-26 01:45:18 -0500 (Fri, 26 Feb 2010)
New Revision: 1875
Modified:
portal/trunk/docs/user-guide/en/modules/Introduction.xml
portal/trunk/docs/user-guide/en/modules/account/Register_New_Accounts.xml
portal/trunk/docs/user-guide/en/modules/account/Remember_User_Account.xml
portal/trunk/docs/user-guide/en/modules/account/Sign_in_and_Sign_out.xml
portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml
portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml
portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml
portal/trunk/docs/user-guide/en/modules/terms/Portal_concept.xml
portal/trunk/docs/user-guide/en/modules/terms/Public_mode_and_Private_mode.xml
portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml
Log:
Edits and todos from Luc
Modified: portal/trunk/docs/user-guide/en/modules/Introduction.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/Introduction.xml 2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/Introduction.xml 2010-02-26 06:45:18 UTC (rev 1875)
@@ -27,12 +27,23 @@
GateIn homepage:
<ulink url="http://www.gatein.org">www.gatein.org</ulink>
</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/GateIn.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
</listitem>
<listitem>
<para>
GateIn videos:
<ulink url="http://www.jboss.org/gatein/videos.html">www.jboss.org/gatein/videos.html</ulink>
</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Videos.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+
</listitem>
<listitem>
<para>
@@ -45,6 +56,12 @@
GateIn downloads:
<ulink url="http://www.jboss.org/gatein/downloads.html">www.jboss.org/gatein/downloads.html</ulink>
</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/Downloads.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+
</listitem>
</itemizedlist>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/account/Register_New_Accounts.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/account/Register_New_Accounts.xml 2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/account/Register_New_Accounts.xml 2010-02-26 06:45:18 UTC (rev 1875)
@@ -6,7 +6,7 @@
<section id="sect-User_Guide-Register_New_Accounts">
<title>Register New Accounts</title>
<para>
- Unregistered users who visit the portal are limited in the content they can see.
+ Unregistered users visiting the portal are limited in the content they can see.
</para>
<para>
Users who need access to deeper content or who need to perform actions within the portal should register themselves and then contact the portal administrator to gain appropriate access permissions to their account.
@@ -19,19 +19,14 @@
<para>
Click <emphasis role="bold">Register</emphasis> on the Navigation bar.
</para>
-<note>
-<title>DOC TODO</title>
-<para>
-please update with latest display + mouse pointer on "Register"
-</para>
-</note>
+
<mediaobject>
<imageobject>
- <imagedata fileref="images/Frontpage.png" format="PNG" width="444" />
+ <imagedata fileref="images/Register.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<para>
- The Register page appears:
+ The <emphasis role="bold">Register New Account</emphasis> page appears:
</para>
<mediaobject>
<imageobject>
@@ -40,12 +35,12 @@
</mediaobject>
<para>
- The <emphasis role="bold">Account Setting</emphasis> information includes:
+ The required information includes:
</para>
<variablelist>
<varlistentry>
- <term>User Name</term>
+ <term><emphasis role="bold">User Name</emphasis></term>
<listitem>
<para>
The name used to log in.
@@ -53,7 +48,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>Password</term>
+ <term><emphasis role="bold">Password</emphasis></term>
<listitem>
<para>
The password must be between 6 and 30 characters and can contain spaces.
@@ -61,7 +56,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>Confirm Password</term>
+ <term><emphasis role="bold">Confirm Password</emphasis></term>
<listitem>
<para>
Re-type the password above. The <emphasis>Password</emphasis> and <emphasis>Confirm Password</emphasis> fields must be the same.
@@ -69,7 +64,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>First Name</term>
+ <term><emphasis role="bold">First Name</emphasis></term>
<listitem>
<para>
The user's first name.
@@ -77,7 +72,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>Last Name</term>
+ <term><emphasis role="bold">Last Name</emphasis></term>
<listitem>
<para>
The user's last name.
@@ -85,7 +80,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>Email Address</term>
+ <term><emphasis role="bold">Email Address</emphasis></term>
<listitem>
<para>
The user's email address. This must be in the appropriate format. For example: <replaceable>username(a)abc.com</replaceable>.
@@ -119,7 +114,7 @@
</step> -->
<step>
<para>
- Click <emphasis role="bold">Subscribe</emphasis> to register a new account or <emphasis role="bold">Reset</emphasis> to refresh all entered values. You cannot add a new account if one of these cases occurs:
+ Click <emphasis role="bold">Subscribe</emphasis> to register a new account or <emphasis role="bold">Reset</emphasis> to refresh all entered values. You cannot add a new account if one of the following cases occurs:
</para>
<itemizedlist>
<listitem>
Modified: portal/trunk/docs/user-guide/en/modules/account/Remember_User_Account.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/account/Remember_User_Account.xml 2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/account/Remember_User_Account.xml 2010-02-26 06:45:18 UTC (rev 1875)
@@ -6,11 +6,11 @@
<section id="sect-User_Guide-Remember_User_Account">
<title>Remember User Account</title>
<para>
- Users who return to &PRODUCT; can be automatically authenticated thanks to a cookie set the first time they've logged in. Users do not have to perform an explicit authentication each time they access the portal.
+ Users who return to &PRODUCT; regularly can be automatically authenticated to avoid performing an explicit authentication each time they access the portal.
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/RememberMe2.6.png" format="PNG" width="444" />
+ <imagedata fileref="images/RememberMe.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
<procedure>
@@ -31,7 +31,7 @@
</step>
</procedure>
<para>
- You must remember to close your browser without signing out (as signing out will delete the cookie).
+ Do not sign out when you leave the portal and you will be automatically authenticated next time you visit it.
</para>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/account/Sign_in_and_Sign_out.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/account/Sign_in_and_Sign_out.xml 2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/account/Sign_in_and_Sign_out.xml 2010-02-26 06:45:18 UTC (rev 1875)
@@ -15,7 +15,7 @@
<variablelist>
<varlistentry>
<term>
- User name
+ <emphasis role="bold">User name</emphasis>
</term>
<listitem>
<para>
@@ -25,7 +25,7 @@
</varlistentry>
<varlistentry>
<term>
- Password
+ <emphasis role="bold">Password</emphasis>
</term>
<listitem>
<para>
@@ -35,7 +35,7 @@
</varlistentry>
<varlistentry>
<term>
- Remember My Login
+ <emphasis role="bold">Remember My Login</emphasis>
</term>
<listitem>
<para>
@@ -45,7 +45,7 @@
</varlistentry>
<varlistentry>
<term>
- Forgot your User Name/Password?
+ <emphasis role="bold">Forgot your User Name/Password?</emphasis>
</term>
<listitem>
<para>
@@ -55,7 +55,7 @@
</varlistentry>
<varlistentry>
<term>
- Sign in
+ <emphasis role="bold">Sign in</emphasis>
</term>
<listitem>
<para>
@@ -65,7 +65,7 @@
</varlistentry>
<varlistentry>
<term>
- Discard
+ <emphasis role="bold">Discard</emphasis>
</term>
<listitem>
<para>
@@ -89,7 +89,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/SignIn2.6.png" format="PNG" width="444" />
+ <imagedata fileref="images/Signin.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</step>
@@ -115,34 +115,37 @@
<para>
After signing in, you will be redirected to the homepage and welcomed with your full name in the top right corner of the page.
</para>
-<!--
<mediaobject>
<imageobject>
- <imagedata fileref="images/PortalHome.png" format="PNG" width="444" />
+ <imagedata fileref="images/Toolbar.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
--->
+
</section>
<section id="sect-User_Guide-Sign_Out">
<title>Sign Out</title>
- <procedure>
+ <para>
+ This feature ends the authenticated session and returns the user to the anonymous portal.
+ </para>
+ <procedure>
<step>
<para>
- This feature lets you get back to the anonymous portal. It ends your current portal session.
+ In the upper left corner of the screen, hover your cursor over the &PRODUCT; icon. A drop down menu will appear.
</para>
</step>
<step>
<para>
- In the upper left corner of the screen, click <emphasis role="bold">Sign out</emphasis> :
+ Click <emphasis role="bold">Sign out</emphasis> :
</para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/SignOut.png" format="PNG" />
- </imageobject>
- </mediaobject>
</step>
- </procedure>
+ </procedure>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/StarPortlet.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+
</section>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml 2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml 2010-02-26 06:45:18 UTC (rev 1875)
@@ -13,7 +13,7 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Dashboard1.png" format="PNG" width="444" />
+ <imagedata fileref="images/Dashboard1.png" format="PNG" />
</imageobject>
</mediaobject>
@@ -33,11 +33,11 @@
</procedure>
<para>
- The active Dashboard can be individually named by clicking on the default name ("<emphasis>Click and Type Page Name</emphasis>") where it appears below the current user name and entering a new name.
+ The active Dashboard can be individually named by clicking on the default name ("<emphasis>Click and Type Page Name</emphasis>") and entering a new name.
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Dashname.png" format="PNG" width="444" />
+ <imagedata fileref="images/Dashname.png" format="PNG" />
</imageobject>
</mediaobject>
@@ -46,52 +46,52 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Dash2.png" format="PNG" width="444" />
+ <imagedata fileref="images/Dash2.png" format="PNG" />
</imageobject>
</mediaobject>
<variablelist id="vari-User_Guide-Using_the_Dashboard_Workspace-Default_Gadgets">
<title>Default Gadgets:</title>
<varlistentry>
- <term>Calendar</term>
+ <term><emphasis role="bold">Calendar</emphasis></term>
<listitem>
<para>
The calendar gadget allows users to switch easily between daily, monthly and yearly view and, is customizable to match your portal's theme.
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Calendar.png" format="PNG" />
+ <imagedata fileref="images/Calendar.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
</listitem>
</varlistentry>
<varlistentry>
- <term>ToDo</term>
+ <term><emphasis role="bold">ToDo</emphasis></term>
<listitem>
<para>
This application helps you organize your day and work group. It is designed to keep track of your tasks in a convenient and transparent way. Tasks can be highlighted with different colors.
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Todo.png" format="PNG" />
+ <imagedata fileref="images/Todo.png" format="PNG" />
</imageobject>
</mediaobject>
</listitem>
</varlistentry>
<varlistentry>
- <term>Calculator</term>
+ <term><emphasis role="bold">Calculator</emphasis></term>
<listitem>
<para>
This mini-application lets you perform most basic arithmetic operations and can be themed to match the rest of your portal.
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Calculator.png" format="PNG" />
+ <imagedata fileref="images/Calculator.png" format="PNG" />
</imageobject>
</mediaobject>
</listitem>
</varlistentry>
<varlistentry>
- <term>RSS Reader</term>
+ <term><emphasis role="bold">RSS Reader</emphasis></term>
<listitem>
<para>
An RSS reader, or aggregator, collates content from various, user-specified feed sources and displays them in one location. This content can include, but isn't limited to, news headlines, blog posts or email. The RSS Reader gadget displays this content in a single window on your Portal page.
@@ -104,11 +104,16 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>More Gadgets</term>
+ <term><emphasis role="bold">More Gadgets</emphasis></term>
<listitem>
<para>
Many more gadgets can be found at <ulink type="http" url="http://www.google.com/ig/directory?synd=open">Google Gadget</ulink>. &PRODUCT; is compatible with most of the gadgets available there.
</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/GoogleGadgets.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
</listitem>
</varlistentry>
</variablelist>
@@ -116,13 +121,6 @@
<section id="sect-User_Guide-Dashboard_Portlet-Add_Gadgets">
<title>Add Gadgets</title>
-
-<note>
-<title>DOC TODO</title>
-<para>
-please redo this section wich screenshots to demonstrate the addition of an external gadget provided by Google
-</para>
-</note>
<para>
To add more gadgets from external sources:
</para>
@@ -130,10 +128,18 @@
<step>
<para>
Obtain the URL (.xml or .rss) of the gadget you wish to add from the gadget source.
+ </para>
+ <para>
+ The gadgets available at <ulink type="http" url="http://www.google.com/ig/directory?synd=open">Google Gadget</ulink> provide a link to <emphasis role="bold">View source</emphasis>. Clicking on this link will open a page showing the gadget's XML source. Use the URL of this page in the Dashboard Workspace. The URL should end with <literal>.xml</literal>
</para>
<para>
- For example; the gadgets available at <ulink type="http" url="http://www.google.com/ig/directory?synd=open">Google Gadget</ulink> provide a link to <emphasis role="bold">View source</emphasis>. Clicking on this will open a page showing the gadget's XML source. Use the URL of this page in the Dashboard Workspace. The URL should end with <literal>.xml</literal>
+ For example:
</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/XMLURL.png" format="PNG" width="444" />
+ </imageobject>
+ </mediaobject>
<note>
<title>URL Types</title>
<para>
@@ -145,6 +151,12 @@
<para>
Return to your portal and click the Dashboard link in the toolbar.
</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/DashboardLink.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+
</step>
<step>
<para>
@@ -152,10 +164,9 @@
</para>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Dashboard1.png" format="PNG" width="444" />
+ <imagedata fileref="images/Dashboard1.png" format="PNG" />
</imageobject>
</mediaobject>
-
</step>
<step>
<para>
@@ -171,11 +182,23 @@
<para>
Paste the URL obtained in step 1 into the text box above the gadget list.
</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/CodePaste.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+
</step>
<step>
<para>
Click on the <emphasis role="bold">plus</emphasis> icon to add the new gadget to the page.
</para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/NewGadget.png" format="PNG" />
+ </imageobject>
+ </mediaobject>
+
</step>
</procedure>
Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml 2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml 2010-02-26 06:45:18 UTC (rev 1875)
@@ -45,13 +45,6 @@
<para>
The Application Registry Portlet is used to manage different application categories. You can add, edit, set permissions and delete a category and its applications.
</para>
-
-<note>
-<title>DOC TODO</title>
-<para>
-please redo screenshot, it is not up-to-date
-</para>
-</note>
<mediaobject>
<imageobject>
<imagedata fileref="images/ApplicationRegistry.png" format="PNG" width="444" />
@@ -90,7 +83,7 @@
</varlistentry>
-->
<varlistentry>
- <term>Star Toolbar Portlet</term>
+ <term><emphasis role="bold">Star Toolbar Portlet</emphasis></term>
<listitem>
<para>
The Star Toolbar Portlet is used to change the default language, the skin of the portal or to sign out.
Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml 2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml 2010-02-26 06:45:18 UTC (rev 1875)
@@ -11,68 +11,68 @@
<variablelist>
<varlistentry>
- <term>Banner Portlet</term>
+ <term><emphasis role="bold">Banner Portlet</emphasis></term>
<listitem>
- <para>
- This Portlet contains the organization's slogan, logo, and icons.
- </para>
- <!-- <mediaobject>
+ <mediaobject>
<imageobject>
<imagedata fileref="images/BannerPortlet.png" format="PNG"></imagedata>
</imageobject>
- </mediaobject> -->
+ </mediaobject>
+ <para>
+ This Portlet contains the organization's slogan, logo, and icons.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
- <term>HomePage Portlet</term>
+ <term><emphasis role="bold">HomePage Portlet</emphasis></term>
<listitem>
<para>
This Portlet is the home page for a portal. The home page is the first page displayed when you visit the site.
</para>
- <!-- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/PortletHome2.png" format="PNG"></imagedata>
+ <imagedata fileref="images/PortalHome.png" format="PNG"></imagedata>
</imageobject>
- </mediaobject> -->
+ </mediaobject>
</listitem>
</varlistentry>
<varlistentry>
- <term>Navigation Portlet</term>
+ <term><emphasis role="bold">Navigation Portlet</emphasis></term>
<listitem>
<para>
This Portlet provides a navigation bar. A navigation bar is a menu that helps users to visualize the structure of a site and provide links to quickly move from page to page.
</para>
- <!-- <mediaobject>
+ <mediaobject>
<imageobject>
<imagedata fileref="images/NavigationPortlet.png" format="PNG"></imagedata>
</imageobject>
- </mediaobject> -->
+ </mediaobject>
</listitem>
</varlistentry>
<varlistentry>
- <term>Sitemap Portlet</term>
+ <term><emphasis role="bold">Sitemap Portlet</emphasis></term>
<listitem>
<para>
This Portlet displays a site map page of a web site. It lists pages on a website, typically organized in hierarchical fashion.
</para>
- <!-- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/SiteMap3.png" format="PNG"></imagedata>
+ <imagedata fileref="images/SiteMap.png" format="PNG"></imagedata>
</imageobject>
- </mediaobject> -->
+ </mediaobject>
</listitem>
</varlistentry>
<varlistentry>
- <term>Breadcumbs Portlet</term>
+ <term><emphasis role="bold">Breadcumbs Portlet</emphasis></term>
<listitem>
<para>
This Portlet displays the 'path' the user has taken from the home page to arrive at the currrent page.
</para>
- <!-- <mediaobject>
+ <mediaobject>
<imageobject>
- <imagedata fileref="images/Breadcumbs.png" format="PNG"></imagedata>
+ <imagedata fileref="images/Breadcrumbs.png" format="PNG"></imagedata>
</imageobject>
- </mediaobject> -->
+ </mediaobject>
</listitem>
</varlistentry>
<!-- <varlistentry>
@@ -89,25 +89,23 @@
</listitem>
</varlistentry> -->
<varlistentry>
- <term>Dashboard Portlet</term>
+ <term><emphasis role="bold">Dashboard Portlet</emphasis></term>
<listitem>
<para>
This portlet is used for hosting mini-applications known as gadgets. The dashboard uses a variety of graphical effects for displaying, opening, and using gadgets.
</para>
-<!--
<mediaobject>
<imageobject>
- <imagedata fileref="images/Dashboard1.png" format="PNG" width="444" />
+ <imagedata fileref="images/Dashboard.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
--->
<para>
Refer to <xref linkend="sect-User_Guide-Dashboard_Portlet" /> or <xref linkend="chap-User_Guide-Gadgets_Administration" /> for more information.
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>Iframe Portlet</term>
+ <term><emphasis role="bold">Iframe Portlet</emphasis></term>
<listitem>
<para>
This Portlet is used to create inline frames (IFrame) elements for a site. An Iframe is a HTML element which can embed another document into a parent HTML document. By using IFrames, embedded data is displayed inside a sub-window of browser.
@@ -135,7 +133,7 @@
</varlistentry>
-->
<varlistentry>
- <term>Gadget Wrapper Portlet</term>
+ <term><emphasis role="bold">Gadget Wrapper Portlet</emphasis></term>
<listitem>
<para>
This Portlet allows users to view a gadget in canvas mode.
@@ -163,16 +161,16 @@
</varlistentry>
-->
<varlistentry>
- <term>Footer Portlet</term>
+ <term><emphasis role="bold">Footer Portlet</emphasis></term>
<listitem>
<para>
This Portlet provides the footer for a site. This footer provides information or links about the site's author/institutional sponsor, the date of the last revision made to the site, copyright information, comments form and navigational links.
</para>
- <!-- <mediaobject>
+ <mediaobject>
<imageobject>
<imagedata fileref="images/Footer.png" format="PNG"></imagedata>
</imageobject>
- </mediaobject> -->
+ </mediaobject>
</listitem>
</varlistentry>
</variablelist>
Modified: portal/trunk/docs/user-guide/en/modules/terms/Portal_concept.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Portal_concept.xml 2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/terms/Portal_concept.xml 2010-02-26 06:45:18 UTC (rev 1875)
@@ -6,8 +6,14 @@
<section id="sect-User_Guide-Portal">
<title>Portal</title>
<para>
-An enterprise portal is a Web application that provides means to aggregate and personalize information via application-specific portlets. The users and administrators are able via a web-based user interface to integrate information, people and processes across organizational boundaries. The framework enables aggregation of enterprise content and business applications with flexible management and personalization options.
+An enterprise portal is a Web application that provides means to aggregate and personalize information via application-specific portlets.
</para>
+ <para>
+ Users and administrators are able to integrate information, people and processes across organizational boundaries via a web-based user interface.
+ </para>
+ <para>
+ The framework enables aggregation of enterprise content and business applications with flexible management and personalization options.
+ </para>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/terms/Public_mode_and_Private_mode.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Public_mode_and_Private_mode.xml 2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/terms/Public_mode_and_Private_mode.xml 2010-02-26 06:45:18 UTC (rev 1875)
@@ -10,7 +10,7 @@
</para>
<variablelist>
<varlistentry>
- <term>Public</term>
+ <term><emphasis role="bold">Public</emphasis></term>
<listitem>
<para>
This mode is for guest users who are not registered with the Portal. It does not require a log in and restricts the visitor to the public pages in the portal. Visitors can register an account to gain access to the restricted pages. After being registered, they can use the Private mode but must still contact the Portal administrator to get more rights or a group manager to become a member and gain access a group.
@@ -18,7 +18,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term>Private</term>
+ <term><emphasis role="bold">Private</emphasis></term>
<listitem>
<para>
This mode is for registered users only. Users set a username and password during registration which they can then use to sign in. This mode offers users more site privileges. Registered users can manage private resources (creating, editing or deleting private pages), "borrow" pages from other users by creating hyperlinks and change the language for individual needs.
Modified: portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml 2010-02-26 06:43:46 UTC (rev 1874)
+++ portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml 2010-02-26 06:45:18 UTC (rev 1875)
@@ -6,7 +6,7 @@
<section id="sect-User_Guide-Toolbar-Concept">
<title>Toolbar</title>
<para>
- The Toolbar spans the top of the portal application and provides links to user and administrative actions.
+ The Toolbar spans the top of the portal application and provides links to user and administrative actions.
</para>
<mediaobject>
<imageobject>
14 years, 10 months
- 1
- 0
gatein SVN: r1874 - in portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide: en-US and 1 other directory.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-02-26 01:43:46 -0500 (Fri, 26 Feb 2010)
New Revision: 1874
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Author_Group.xml
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.ent
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/pom.xml
Log:
Edits and todo's from Luc
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Author_Group.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Author_Group.xml 2010-02-26 04:43:52 UTC (rev 1873)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/Author_Group.xml 2010-02-26 06:43:46 UTC (rev 1874)
@@ -8,26 +8,31 @@
<firstname>Scott</firstname>
<surname>Mumford</surname>
<affiliation>
- <orgname>Red Hat</orgname>
+ <shortaffil>Red Hat</shortaffil>
<orgdiv>Engineering Content Services</orgdiv>
</affiliation>
- <contrib>Document editing</contrib>
<email>smumford(a)redhat.com</email>
</editor>
<editor>
<firstname>Thomas</firstname>
<surname>Heute</surname>
<affiliation>
- <orgname>Red Hat</orgname>
+ <shortaffil>Red Hat</shortaffil>
<orgdiv>JBoss Services R&D</orgdiv>
</affiliation>
- <contrib>Document review and editing</contrib>
<email>theute(a)redhat.com</email>
</editor>
+ <editor>
+ <firstname>Luc</firstname>
+ <surname>Texier</surname>
+ <affiliation>
+ <shortaffil>Red Hat</shortaffil>
+ </affiliation>
+ <email>ltexier(a)redhat.com</email>
+ </editor>
<othercredit>
<affiliation>
- <orgname><ulink type="http" url="http://www.jboss.org/gatein/">GateIn</ulink> and <ulink type="http" url="http://www.exoplatform.com/portal/public/website/">Exo Platform</ulink></orgname>
- <orgdiv>Documentation Teams</orgdiv>
+ <orgname><emphasis role="bold"><ulink type="http" url="http://www.jboss.org/gatein/">Jboss Portal</ulink></emphasis> and <emphasis role="bold"><ulink type="http" url="http://www.exoplatform.com/portal/public/website/">Exo Platform</ulink> Communities</emphasis></orgname>
</affiliation>
<contrib>Original product documentation by:</contrib>
</othercredit>
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.ent
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.ent 2010-02-26 04:43:52 UTC (rev 1873)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/en-US/User_Guide.ent 2010-02-26 06:43:46 UTC (rev 1874)
@@ -1,4 +1,4 @@
-<!ENTITY PRODUCT "Enterprise Portal Platform">
+<!ENTITY PRODUCT "GateIn Portal">
<!ENTITY BOOKID "User Guide">
<!ENTITY YEAR "2010">
<!ENTITY HOLDER "Red Hat, Inc">
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/pom.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/pom.xml 2010-02-26 04:43:52 UTC (rev 1873)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_User_Guide/pom.xml 2010-02-26 06:43:46 UTC (rev 1874)
@@ -52,7 +52,7 @@
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
+ <version>2.2.1</version>
<extensions>true</extensions>
<configuration>
<formats>
@@ -89,7 +89,7 @@
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
+ <version>2.2.1</version>
<extensions>true</extensions>
<configuration>
<formats>
@@ -116,7 +116,7 @@
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
- <version>2.2.0</version>
+ <version>2.2.1</version>
<extensions>true</extensions>
<configuration>
<formats>
14 years, 10 months
- 1
- 0
gatein SVN: r1873 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2010-02-25 23:43:52 -0500 (Thu, 25 Feb 2010)
New Revision: 1873
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
Log:
GTNPORTAL-768 unknown error when click edit layout of Dashboard
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-02-26 04:41:53 UTC (rev 1872)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-02-26 04:43:52 UTC (rev 1873)
@@ -134,13 +134,15 @@
UIPortalApplication uiApp = Util.getUIPortalApplication();
UIPortal uiPortal = uiApp.getShowedUIPortal();
-
+
UserPortalConfigService service = uiApp.getApplicationComponent(UserPortalConfigService.class);
UserPortalConfig userConfig =
service.getUserPortalConfig(uiPortal.getName(), event.getRequestContext().getRemoteUser());
-
- PortalConfig portalConfig = userConfig.getPortalConfig();
+ if (userConfig == null)
+ userConfig = uiApp.getUserPortalConfig();
+ PortalConfig portalConfig = userConfig.getPortalConfig();
+
UserACL userACL = uiPortal.getApplicationComponent(UserACL.class);
if (!userACL.hasEditPermission(portalConfig))
{
14 years, 10 months
- 1
- 0
gatein SVN: r1872 - portal/trunk/web/portal/src/main/webapp/groovy/webui/form.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2010-02-25 23:41:53 -0500 (Thu, 25 Feb 2010)
New Revision: 1872
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl
Log:
GTNPORTAL-608 Display fail in Access permission form of category in Application registry
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl 2010-02-26 00:57:47 UTC (rev 1871)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/form/UIForm.gtmpl 2010-02-26 04:41:53 UTC (rev 1872)
@@ -8,20 +8,8 @@
for(field in uiform.getChildren()) {
if(field.isRendered()) {
%>
- <tr>
- <%fieldName = uicomponent.getLabel(field.getName());%>
- <%
- if(fieldName != null && fieldName.length() > 0 && !fieldName.equals(uicomponent.getId()) && !fieldName.equals(field.getName())) {
- %>
- <td class="FieldLabel">
- <%/*if(fieldName != null && fieldName.length() > 0) {*/%>
- <%=uicomponent.getLabel(field.getName()) %>
- <%/*}*/%>
- </td>
+ <tr>
<td class="FieldComponent"><% uiform.renderField(field) %></td>
- <%} else {%>
- <td class="FieldComponent" colspan="2"><% uiform.renderField(field) %></td>
- <%}%>
</tr>
<%
}
14 years, 10 months
- 1
- 0
gatein SVN: r1871 - in portal/trunk: component/portal/src/main/java/org/exoplatform/portal/config/model and 10 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-25 19:57:47 -0500 (Thu, 25 Feb 2010)
New Revision: 1871
Removed:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/LegacyPortalStateManager.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/replication/ReplicatingStateManager.java
Modified:
portal/trunk/component/portal/src/main/java/gatein_objects_1_0.xsd
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNode.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationNodeData.java
portal/trunk/component/portal/src/main/resources/binding.xml
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java
portal/trunk/component/portal/src/test/resources/portal/portal/test/navigation.xml
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStateManager.java
Log:
GTNPORTAL-767: Improve node navigation visibility
Modified: portal/trunk/component/portal/src/main/java/gatein_objects_1_0.xsd
===================================================================
--- portal/trunk/component/portal/src/main/java/gatein_objects_1_0.xsd 2010-02-25 23:10:54 UTC (rev 1870)
+++ portal/trunk/component/portal/src/main/java/gatein_objects_1_0.xsd 2010-02-26 00:57:47 UTC (rev 1871)
@@ -66,13 +66,21 @@
<xs:element name="icon" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="start-publication-date" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="end-publication-date" type="xs:string" minOccurs="0" maxOccurs="1"/>
- <xs:element name="show-publication-date" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
- <xs:element name="visible" type="xs:boolean" default="true" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="visibility" type="visibility" default="VISIBLE" minOccurs="0" maxOccurs="1"/>
<xs:element name="page-reference" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="node" type="nodeType" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
+ <xs:simpleType name="visibility">
+ <xs:restriction base='xs:string'>
+ <xs:enumeration value="DISPLAYED"/>
+ <xs:enumeration value="HIDDEN"/>
+ <xs:enumeration value="TEMPORAL"/>
+ <xs:enumeration value="SYSTEM"/>
+ </xs:restriction>
+ </xs:simpleType>
+
<xs:complexType name="pageSetType">
<xs:sequence>
<xs:element name="page" type="pageType" minOccurs="0" maxOccurs="unbounded"/>
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNode.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNode.java 2010-02-25 23:10:54 UTC (rev 1870)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PageNode.java 2010-02-26 00:57:47 UTC (rev 1871)
@@ -20,6 +20,7 @@
package org.exoplatform.portal.config.model;
import org.exoplatform.commons.utils.ExpressionUtil;
+import org.exoplatform.portal.mop.Visibility;
import org.exoplatform.portal.pom.data.NavigationNodeData;
import java.util.ArrayList;
@@ -46,10 +47,8 @@
private Date endPublicationDate;
- private boolean showPublicationDate = false;
+ private Visibility visibility = Visibility.DISPLAYED;
- private boolean visible = true;
-
private String pageReference;
private transient boolean modifiable;
@@ -74,8 +73,7 @@
this.name = nav.getName();
this.startPublicationDate = nav.getStartPublicationDate();
this.endPublicationDate = nav.getEndPublicationDate();
- this.showPublicationDate = nav.getShowPublicationDate();
- this.visible = nav.isVisible();
+ this.visibility = nav.getVisibility();
this.pageReference = nav.getPageReference();
this.children = children;
}
@@ -203,26 +201,56 @@
public boolean isDisplay()
{
- if (visible && showPublicationDate)
+ switch (visibility)
{
- return isInPublicationDate();
+ case DISPLAYED:
+ return true;
+ case HIDDEN:
+ return false;
+ case TEMPORAL:
+ return isInPublicationDate();
+ case SYSTEM:
+ return false;
+ default:
+ throw new AssertionError();
}
- return visible;
}
public boolean isVisible()
{
- return visible;
+ switch (visibility)
+ {
+ case DISPLAYED:
+ case TEMPORAL:
+ return true;
+ case SYSTEM:
+ case HIDDEN:
+ return false;
+ default:
+ throw new AssertionError();
+ }
}
- public boolean getVisible()
+ public void setVisible(Boolean b)
{
- return visible;
+ if (b != null)
+ {
+ switch (visibility)
+ {
+ case SYSTEM:
+ break;
+ case HIDDEN:
+ case DISPLAYED:
+ case TEMPORAL:
+ visibility = b ? Visibility.DISPLAYED : Visibility.HIDDEN;
+ break;
+ }
+ }
}
- public void setVisible(Boolean b)
+ public void setVisibility(Visibility visibility)
{
- visible = b.booleanValue();
+ this.visibility = visibility;
}
private boolean isInPublicationDate()
@@ -230,22 +258,33 @@
if (startPublicationDate != null && endPublicationDate != null)
{
Date currentDate = new Date();
- if (currentDate.compareTo(startPublicationDate) >= 0 && currentDate.compareTo(endPublicationDate) <= 0)
- return true;
+
+ //
+ return currentDate.compareTo(startPublicationDate) >= 0 && currentDate.compareTo(endPublicationDate) <= 0;
}
- else if (startPublicationDate == null && endPublicationDate == null)
- return true;
- return false;
+ else return startPublicationDate == null && endPublicationDate == null;
}
public void setShowPublicationDate(Boolean show)
{
- showPublicationDate = show.booleanValue();
+ if (show != null)
+ {
+ switch (visibility)
+ {
+ case SYSTEM:
+ case HIDDEN:
+ break;
+ case TEMPORAL:
+ case DISPLAYED:
+ visibility = show ? Visibility.TEMPORAL : Visibility.DISPLAYED;
+ break;
+ }
+ }
}
public boolean isShowPublicationDate()
{
- return showPublicationDate;
+ return visibility == Visibility.TEMPORAL;
}
public PageNode getChild(String name)
@@ -275,10 +314,9 @@
newNode.setResolvedLabel(resolvedLabel);
newNode.setPageReference(pageReference);
newNode.setModifiable(modifiable);
- newNode.setShowPublicationDate(showPublicationDate);
newNode.setStartPublicationDate(startPublicationDate);
newNode.setEndPublicationDate(endPublicationDate);
- newNode.setVisible(visible);
+ newNode.setVisibility(visibility);
if (children == null || children.size() < 1)
return newNode;
for (PageNode ele : children)
@@ -300,8 +338,7 @@
name,
startPublicationDate,
endPublicationDate,
- showPublicationDate,
- visible,
+ visibility,
pageReference,
children
);
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java 2010-02-25 23:10:54 UTC (rev 1870)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java 2010-02-26 00:57:47 UTC (rev 1871)
@@ -68,13 +68,10 @@
public static final Key<Date> END_PUBLICATION_DATE = Key.create("end-publication-date", ValueType.DATE);
/** . */
- public static final Key<Boolean> VISIBLE = Key.create("visible", ValueType.BOOLEAN);
-
- /** . */
public static final Key<String> TEMPLATE = Key.create("template", ValueType.STRING);
/** . */
- public static final Key<Boolean> SHOW_PUBLICATION_DATE = Key.create("show-publication-date", ValueType.BOOLEAN);
+ public static final Key<String> VISIBILITY = Key.create("visibility", ValueType.STRING);
/** . */
public static final Key<Boolean> SHOW_INFO_BAR = Key.create("show-info-bar", ValueType.BOOLEAN);
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-25 23:10:54 UTC (rev 1870)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-02-26 00:57:47 UTC (rev 1871)
@@ -29,6 +29,7 @@
import org.exoplatform.portal.config.model.PersistentApplicationState;
import org.exoplatform.portal.config.model.PortalConfig;
import org.exoplatform.portal.config.model.TransientApplicationState;
+import org.exoplatform.portal.mop.Visibility;
import org.exoplatform.portal.pom.config.POMSession;
import org.exoplatform.portal.pom.config.Utils;
import org.exoplatform.portal.pom.spi.portlet.Portlet;
@@ -162,8 +163,7 @@
src.getName(),
attrs.getValue(MappedAttributes.START_PUBLICATION_DATE),
attrs.getValue(MappedAttributes.END_PUBLICATION_DATE),
- attrs.getValue(MappedAttributes.SHOW_PUBLICATION_DATE, false),
- attrs.getValue(MappedAttributes.VISIBLE, true),
+ Visibility.valueOf(attrs.getValue(MappedAttributes.VISIBILITY, Visibility.DISPLAYED.toString())),
pageReference,
children
);
@@ -211,8 +211,7 @@
attrs.setValue(MappedAttributes.ICON, node.getIcon());
attrs.setValue(MappedAttributes.START_PUBLICATION_DATE, node.getStartPublicationDate());
attrs.setValue(MappedAttributes.END_PUBLICATION_DATE, node.getEndPublicationDate());
- attrs.setValue(MappedAttributes.SHOW_PUBLICATION_DATE, node.getShowPublicationDate());
- attrs.setValue(MappedAttributes.VISIBLE, node.isVisible());
+ attrs.setValue(MappedAttributes.VISIBILITY, node.getVisibility().name());
}
else if (src instanceof NavigationData)
{
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationNodeData.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationNodeData.java 2010-02-25 23:10:54 UTC (rev 1870)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationNodeData.java 2010-02-26 00:57:47 UTC (rev 1871)
@@ -18,6 +18,8 @@
*/
package org.exoplatform.portal.pom.data;
+import org.exoplatform.portal.mop.Visibility;
+
import java.util.Date;
import java.util.List;
@@ -47,12 +49,9 @@
private final Date endPublicationDate;
/** . */
- private final boolean showPublicationDate;
+ private final Visibility visibility;
/** . */
- private final boolean visible;
-
- /** . */
private final String pageReference;
public NavigationNodeData(
@@ -62,12 +61,11 @@
String name,
Date startPublicationDate,
Date endPublicationDate,
- Boolean showPublicationDate,
- Boolean visible,
+ Visibility visibility,
String pageReference,
List<NavigationNodeData> children)
{
- this(null, uri, label, icon, name, startPublicationDate, endPublicationDate, showPublicationDate, visible, pageReference, children);
+ this(null, uri, label, icon, name, startPublicationDate, endPublicationDate, visibility, pageReference, children);
}
public NavigationNodeData(
@@ -78,8 +76,7 @@
String name,
Date startPublicationDate,
Date endPublicationDate,
- Boolean showPublicationDate,
- Boolean visible,
+ Visibility visibility,
String pageReference,
List<NavigationNodeData> children)
{
@@ -92,8 +89,7 @@
this.name = name;
this.startPublicationDate = startPublicationDate;
this.endPublicationDate = endPublicationDate;
- this.showPublicationDate = showPublicationDate != null ? showPublicationDate : false;
- this.visible = visible != null ? visible : true;
+ this.visibility = visibility;
this.pageReference = pageReference;
}
public String getURI()
@@ -126,16 +122,11 @@
return endPublicationDate;
}
- public boolean getShowPublicationDate()
+ public Visibility getVisibility()
{
- return showPublicationDate;
+ return visibility;
}
- public boolean isVisible()
- {
- return visible;
- }
-
public String getPageReference()
{
return pageReference;
Modified: portal/trunk/component/portal/src/main/resources/binding.xml
===================================================================
--- portal/trunk/component/portal/src/main/resources/binding.xml 2010-02-25 23:10:54 UTC (rev 1870)
+++ portal/trunk/component/portal/src/main/resources/binding.xml 2010-02-26 00:57:47 UTC (rev 1871)
@@ -96,8 +96,7 @@
<value name="icon" field="icon" usage="optional"/>
<value name="start-publication-date" field="startPublicationDate" usage="optional"/>
<value name="end-publication-date" field="endPublicationDate" usage="optional"/>
- <value name="show-publication-date" field="showPublicationDate" usage="optional"/>
- <value name="visible" field="visible" usage="optional" default="true"/>
+ <value name="visibility" field="visibility" usage="optional" default="DISPLAYED"/>
<value name="page-reference" field="pageReference" usage="optional"/>
<collection field="children" usage="optional" item-type="org.exoplatform.portal.config.model.PageNode"/>
</mapping>
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-02-25 23:10:54 UTC (rev 1870)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-02-26 00:57:47 UTC (rev 1871)
@@ -119,8 +119,7 @@
GregorianCalendar end = new GregorianCalendar(2009, 2, 21, 1, 33, 0);
end.setTimeZone(TimeZone.getTimeZone("UTC"));
assertEquals(end.getTime(), nodeAttrs.getDate("end-publication-date"));
- assertEquals(true, (boolean)nodeAttrs.getBoolean("show-publication-date"));
- assertEquals(true, (boolean)nodeAttrs.getBoolean("visible"));
+ assertEquals("TEMPORAL", nodeAttrs.getString("visibility"));
//
Link link = nodeNavigation.getLink();
Modified: portal/trunk/component/portal/src/test/resources/portal/portal/test/navigation.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/portal/test/navigation.xml 2010-02-25 23:10:54 UTC (rev 1870)
+++ portal/trunk/component/portal/src/test/resources/portal/portal/test/navigation.xml 2010-02-26 00:57:47 UTC (rev 1871)
@@ -33,8 +33,7 @@
<icon>node_icon</icon>
<start-publication-date>2000-03-21T01:33:00</start-publication-date>
<end-publication-date>2009-03-21T01:33:00</end-publication-date>
- <show-publication-date>true</show-publication-date>
- <visible>true</visible>
+ <visibility>TEMPORAL</visibility>
<page-reference>portal::test::test</page-reference>
</node>
<node>
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml 2010-02-25 23:10:54 UTC (rev 1870)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/portal/portal/classic/navigation.xml 2010-02-26 00:57:47 UTC (rev 1871)
@@ -37,8 +37,8 @@
<uri>groupnavigation</uri>
<name>groupnavigation</name>
<label>#{portal.classic.groupnavigation}</label>
- <!-- Change visible attribute to "true" -->
- <visible>true</visible>
+ <!-- Change visibility attribute to displayed -->
+ <visibility>DISPLAYED</visibility>
<page-reference>portal::classic::groupnavigation</page-reference>
</node>
</page-nodes>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml 2010-02-25 23:10:54 UTC (rev 1870)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/portal/portal/classic/navigation.xml 2010-02-26 00:57:47 UTC (rev 1871)
@@ -37,8 +37,8 @@
<uri>groupnavigation</uri>
<name>groupnavigation</name>
<label>#{portal.classic.groupnavigation}</label>
- <!-- Change visible attribute to "true" -->
- <visible>true</visible>
+ <!-- Change visibility attribute to displayed -->
+ <visibility>DISPLAYED</visibility>
<page-reference>portal::classic::groupnavigation</page-reference>
</node>
</page-nodes>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml 2010-02-25 23:10:54 UTC (rev 1870)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/navigation.xml 2010-02-26 00:57:47 UTC (rev 1871)
@@ -36,28 +36,28 @@
<uri>sitemap</uri>
<name>sitemap</name>
<label>#{portal.classic.sitemap}</label>
- <visible>true</visible>
+ <visibility>DISPLAYED</visibility>
<page-reference>portal::classic::sitemap</page-reference>
</node>
<node>
<uri>groupnavigation</uri>
<name>groupnavigation</name>
<label>#{portal.classic.groupnavigation}</label>
- <visible>false</visible>
- <page-reference>portal::classic::groupnavigation</page-reference>
+ <visibility>SYSTEM</visibility>
+ <page-reference>portal::classic::groupnavigation</page-reference>
</node>
<node>
<uri>portalnavigation</uri>
<name>portalnavigation</name>
<label>#{portal.classic.portalnavigation}</label>
- <visible>false</visible>
- <page-reference>portal::classic::portalnavigation</page-reference>
+ <visibility>SYSTEM</visibility>
+ <page-reference>portal::classic::portalnavigation</page-reference>
</node>
<node>
<uri>register</uri>
<name>register</name>
<label>#{portal.classic.register}</label>
- <visible>false</visible>
+ <visibility>SYSTEM</visibility>
<page-reference>portal::classic::register</page-reference>
</node>
</page-nodes>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml 2010-02-25 23:10:54 UTC (rev 1870)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/navigation.xml 2010-02-26 00:57:47 UTC (rev 1871)
@@ -37,21 +37,21 @@
<uri>groupnavigation</uri>
<name>groupnavigation</name>
<label>Group Navigation</label>
- <visible>false</visible>
+ <visibility>SYSTEM</visibility>
<page-reference>portal::@owner@::groupnavigation</page-reference>
</node>
<node>
<uri>portalnavigation</uri>
<name>portalnavigation</name>
<label>Portal Navigation</label>
- <visible>false</visible>
+ <visibility>SYSTEM</visibility>
<page-reference>portal::@owner@::portalnavigation</page-reference>
</node>
<node>
<uri>register</uri>
<name>register</name>
<label>Register</label>
- <visible>false</visible>
+ <visibility>SYSTEM</visibility>
<page-reference>portal::@owner@::register</page-reference>
</node>
</page-nodes>
Deleted: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/LegacyPortalStateManager.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/LegacyPortalStateManager.java 2010-02-25 23:10:54 UTC (rev 1870)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/LegacyPortalStateManager.java 2010-02-26 00:57:47 UTC (rev 1871)
@@ -1,213 +0,0 @@
-/*
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * 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.exoplatform.portal.application;
-
-import org.exoplatform.commons.utils.Safe;
-import org.exoplatform.container.ExoContainer;
-import org.exoplatform.container.SessionManagerContainer;
-import org.exoplatform.portal.config.UserPortalConfig;
-import org.exoplatform.portal.config.UserPortalConfigService;
-import org.exoplatform.portal.webui.workspace.UIPortalApplication;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-import org.exoplatform.webui.application.ConfigurationManager;
-import org.exoplatform.webui.application.StateManager;
-import org.exoplatform.webui.application.WebuiApplication;
-import org.exoplatform.webui.application.WebuiRequestContext;
-import org.exoplatform.webui.application.portlet.PortletRequestContext;
-import org.exoplatform.webui.core.UIApplication;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-public class LegacyPortalStateManager extends StateManager
-{
-
- protected static Log log = ExoLogger.getLogger("portal:PortalStateManager");
-
- /** ConcurrentMap<SessionId, HashMap<PortalName, PortalApplicationState>> * */
- private ConcurrentMap<String, HashMap<String, PortalApplicationState>> uiApplications =
- new ConcurrentHashMap<String, HashMap<String, PortalApplicationState>>();
-
- /**
- * This method is used to restore the UI component tree either the current request targets a portlet or the portal.
- * <p/>
- * In both cases, if the tree is not stored already it is created and then stored in a local Map
- */
- @SuppressWarnings("unchecked")
- public UIApplication restoreUIRootComponent(WebuiRequestContext context) throws Exception
- {
- context.setStateManager(this);
- WebuiApplication app = (WebuiApplication)context.getApplication();
-
- /*
- * If the request context is of type PortletRequestContext, we extract the parent context which will
- * allow to get access to the PortalApplicationState object thanks to the session id used as the key for the
- * synchronize Map uiApplications
- */
- if (context instanceof PortletRequestContext)
- {
- WebuiRequestContext preqContext = (WebuiRequestContext)context.getParentAppRequestContext();
- PortletRequestContext pcontext = (PortletRequestContext)context;
- String key = pcontext.getApplication().getApplicationId() + "/" + pcontext.getWindowId();
- PortalApplicationState state = getApplicationState(preqContext);
- UIApplication uiApplication = state.get(key);
- if (uiApplication != null)
- {
- return uiApplication;
- }
- ConfigurationManager cmanager = app.getConfigurationManager();
- String uirootClass = cmanager.getApplication().getUIRootComponent();
- Class type = Thread.currentThread().getContextClassLoader().loadClass(uirootClass);
- uiApplication = (UIApplication)app.createUIComponent(type, null, null, context);
- state.put(key, uiApplication);
- return uiApplication;
- }
-
- PortalRequestContext pcontext = (PortalRequestContext)context;
- PortalApplicationState state = getApplicationState(pcontext);
- if (state != null)
- {
- if (!Safe.equals(pcontext.getRemoteUser(), state.getUserName()))
- {
- clearSession(pcontext.getRequest().getSession());
- state = null;
- }
- }
- if (state == null)
- {
- ConfigurationManager cmanager = app.getConfigurationManager();
- String uirootClass = cmanager.getApplication().getUIRootComponent();
- Class type = Thread.currentThread().getContextClassLoader().loadClass(uirootClass);
- UserPortalConfig config = getUserPortalConfig(pcontext);
- if (config == null)
- {
- HttpServletResponse response = pcontext.getResponse();
- // if(pcontext.getRemoteUser() == null) {
- // String portalName = pcontext.getPortalOwner() ;
- // portalName = URLEncoder.encode(portalName, "UTF-8") ;
- // String redirect = pcontext.getRequest().getContextPath() + "/private/" + portalName + "/";
- // response.sendRedirect(redirect);
- // }
- // else response.sendRedirect(pcontext.getRequest().getContextPath() + "/portal-unavailable.jsp");
- response.sendRedirect(pcontext.getRequest().getContextPath() + "/portal-unavailable.jsp");
- pcontext.setResponseComplete(true);
- return null;
- }
- pcontext.setAttribute(UserPortalConfig.class, config);
- UIPortalApplication uiApplication = (UIPortalApplication)app.createUIComponent(type, null, null, context);
- state = new PortalApplicationState(uiApplication, pcontext.getRemoteUser());
- cacheApplicationState(pcontext.getSessionId(), pcontext.getPortalOwner(), state);
- SessionManagerContainer pcontainer = (SessionManagerContainer)app.getApplicationServiceContainer();
- pcontainer.createSessionContainer(context.getSessionId(), uiApplication.getOwner());
- }
- return state.getUIPortalApplication();
- }
-
- @SuppressWarnings("unused")
- public void storeUIRootComponent(WebuiRequestContext context)
- {
- }
-
- public void expire(String sessionId, WebuiApplication app)
- {
- uiApplications.remove(sessionId);
- SessionManagerContainer pcontainer = (SessionManagerContainer)app.getApplicationServiceContainer();
- pcontainer.removeSessionContainer(sessionId);
- }
-
- private PortalApplicationState getApplicationState(WebuiRequestContext context)
- {
- PortalRequestContext portalContext = null;
- if (context instanceof PortalRequestContext)
- {
- portalContext = (PortalRequestContext)context;
- }
- else
- {
- portalContext = (PortalRequestContext)context.getParentAppRequestContext();
- }
- String portalName = portalContext.getPortalOwner();
- String sessionId = portalContext.getSessionId();
-
- HashMap<String, PortalApplicationState> appStates = uiApplications.get(sessionId);
- return (appStates == null) ? null : appStates.get(portalName);
- }
-
- private void cacheApplicationState(String sessionId, String portalName, PortalApplicationState state)
- {
- HashMap<String, PortalApplicationState> appStates = uiApplications.get(sessionId);
- if (appStates == null)
- {
- appStates = new HashMap<String, PortalApplicationState>();
- uiApplications.put(sessionId, appStates);
- }
- appStates.put(portalName, state);
- }
-
- private UserPortalConfig getUserPortalConfig(PortalRequestContext context) throws Exception
- {
- ExoContainer appContainer = context.getApplication().getApplicationServiceContainer();
- UserPortalConfigService service_ =
- (UserPortalConfigService)appContainer.getComponentInstanceOfType(UserPortalConfigService.class);
- String remoteUser = context.getRemoteUser();
- String ownerUser = context.getPortalOwner();
- return service_.getUserPortalConfig(ownerUser, remoteUser);
- }
-
- private void clearSession(HttpSession session)
- {
- Enumeration<?> e = session.getAttributeNames();
- while (e.hasMoreElements())
- {
- String name = (String)e.nextElement();
- session.removeAttribute(name);
- }
- }
-
- @SuppressWarnings("serial")
- static public class PortalApplicationState extends HashMap<String, UIApplication>
- {
-
- private final UIPortalApplication uiPortalApplication_;
-
- private final String userName_;
-
- public PortalApplicationState(UIPortalApplication uiPortalApplication, String userName)
- {
- uiPortalApplication_ = uiPortalApplication;
- userName_ = userName;
- }
-
- public String getUserName()
- {
- return userName_;
- }
-
- public UIPortalApplication getUIPortalApplication()
- {
- return uiPortalApplication_;
- }
- }
-}
\ No newline at end of file
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStateManager.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStateManager.java 2010-02-25 23:10:54 UTC (rev 1870)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStateManager.java 2010-02-26 00:57:47 UTC (rev 1871)
@@ -19,49 +19,164 @@
package org.exoplatform.portal.application;
+import org.exoplatform.commons.utils.Safe;
import org.exoplatform.container.ExoContainer;
-import org.exoplatform.portal.application.replication.ReplicatingStateManager;
+import org.exoplatform.portal.application.replication.ApplicationState;
+import org.exoplatform.portal.config.UserPortalConfig;
+import org.exoplatform.portal.config.UserPortalConfigService;
+import org.exoplatform.webui.application.ConfigurationManager;
import org.exoplatform.webui.application.StateManager;
import org.exoplatform.webui.application.WebuiApplication;
import org.exoplatform.webui.application.WebuiRequestContext;
+import org.exoplatform.webui.application.portlet.PortletRequestContext;
import org.exoplatform.webui.core.UIApplication;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
public class PortalStateManager extends StateManager
{
/** . */
- private final StateManager impl;
+ private static final String APPLICATION_ATTRIBUTE_PREFIX = "rsm.";
- public PortalStateManager()
+ /** . */
+ private static final Logger log = LoggerFactory.getLogger(PortalStateManager.class);
+
+ @Override
+ public UIApplication restoreUIRootComponent(WebuiRequestContext context) throws Exception
{
- boolean clustered = ExoContainer.getProfiles().contains("cluster");
+ context.setStateManager(this);
//
- if (clustered)
+ WebuiApplication app = (WebuiApplication)context.getApplication();
+
+ //
+ ApplicationState appState = null;
+ HttpSession session = getSession(context);
+ String key = getKey(context);
+ if (session != null)
{
- impl = new ReplicatingStateManager();
+ appState = (ApplicationState)session.getAttribute(APPLICATION_ATTRIBUTE_PREFIX + key);
}
+
+ //
+
+ //
+ UIApplication uiapp = null;
+ if (appState != null)
+ {
+ if (Safe.equals(context.getRemoteUser(), appState.getUserName()))
+ {
+ uiapp = appState.getApplication();
+ }
+ }
+
+ //
+ if (appState != null)
+ {
+ log.debug("Found application " + key + " :" + appState.getApplication());
+ }
else
{
- impl = new LegacyPortalStateManager();
+ log.debug("Application " + key + " not found");
}
+
+ // Looks like some necessary hacking
+ if (context instanceof PortalRequestContext)
+ {
+ PortalRequestContext portalRC = (PortalRequestContext)context;
+ UserPortalConfig config = getUserPortalConfig(portalRC);
+ if (config == null)
+ {
+ HttpServletResponse response = portalRC.getResponse();
+ response.sendRedirect(portalRC.getRequest().getContextPath() + "/portal-unavailable.jsp");
+ portalRC.setResponseComplete(true);
+ return null;
+ }
+ portalRC.setAttribute(UserPortalConfig.class, config);
+ }
+
+ //
+ if (uiapp == null)
+ {
+ ConfigurationManager cmanager = app.getConfigurationManager();
+ String uirootClass = cmanager.getApplication().getUIRootComponent();
+ Class<? extends UIApplication> type = (Class<UIApplication>) Thread.currentThread().getContextClassLoader().loadClass(uirootClass);
+ uiapp = app.createUIComponent(type, null, null, context);
+ }
+
+ //
+ return uiapp;
}
@Override
- public UIApplication restoreUIRootComponent(WebuiRequestContext context) throws Exception
+ public void storeUIRootComponent(final WebuiRequestContext context) throws Exception
{
- return impl.restoreUIRootComponent(context);
+ UIApplication uiapp = context.getUIApplication();
+
+ //
+ HttpSession session = getSession(context);
+
+ // At this point if it returns null it means that it was not possible to create a session
+ // because the session might be invalidated and the response is already commited to the client.
+ // That situation happens during a logout that invalidates the HttpSession
+ if (session != null)
+ {
+ String key = getKey(context);
+ log.debug("Storing application " + key);
+ session.setAttribute(APPLICATION_ATTRIBUTE_PREFIX + key, new ApplicationState(uiapp, context.getRemoteUser()));
+ }
}
@Override
- public void storeUIRootComponent(WebuiRequestContext context) throws Exception
+ public void expire(String sessionId, WebuiApplication app) throws Exception
{
- impl.storeUIRootComponent(context);
+ // For now do nothing....
}
- @Override
- public void expire(String sessionId, WebuiApplication app) throws Exception
+ private UserPortalConfig getUserPortalConfig(PortalRequestContext context) throws Exception
{
- impl.expire(sessionId, app);
+ ExoContainer appContainer = context.getApplication().getApplicationServiceContainer();
+ UserPortalConfigService service_ = (UserPortalConfigService)appContainer.getComponentInstanceOfType(UserPortalConfigService.class);
+ String remoteUser = context.getRemoteUser();
+ String ownerUser = context.getPortalOwner();
+ return service_.getUserPortalConfig(ownerUser, remoteUser);
}
+
+ private String getKey(WebuiRequestContext webuiRC)
+ {
+ if (webuiRC instanceof PortletRequestContext)
+ {
+ PortletRequestContext portletRC = (PortletRequestContext)webuiRC;
+
+ // We are temporarily not using the window id as it changes when the back end is not the same
+ return portletRC.getApplication().getApplicationId()/* + "/" + portletRC.getWindowId()*/;
+ }
+ else
+ {
+ PortalRequestContext portalRC = (PortalRequestContext)webuiRC;
+ String portalOwner = portalRC.getPortalOwner();
+ return "portal_" + portalOwner;
+ }
+ }
+
+ private HttpSession getSession(WebuiRequestContext webuiRC)
+ {
+ PortalRequestContext portalRC;
+ if (webuiRC instanceof PortletRequestContext)
+ {
+ PortletRequestContext portletRC = (PortletRequestContext)webuiRC;
+ portalRC = (PortalRequestContext) portletRC.getParentAppRequestContext();
+ }
+ else
+ {
+ portalRC = (PortalRequestContext)webuiRC;
+ }
+ HttpServletRequest req = portalRC.getRequest();
+ return req.getSession(false);
+ }
}
\ No newline at end of file
Deleted: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/replication/ReplicatingStateManager.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/replication/ReplicatingStateManager.java 2010-02-25 23:10:54 UTC (rev 1870)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/replication/ReplicatingStateManager.java 2010-02-26 00:57:47 UTC (rev 1871)
@@ -1,186 +0,0 @@
-/*
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * 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.exoplatform.portal.application.replication;
-
-import org.exoplatform.commons.utils.Safe;
-import org.exoplatform.container.ExoContainer;
-import org.exoplatform.portal.application.LegacyPortalStateManager;
-import org.exoplatform.portal.application.PortalRequestContext;
-import org.exoplatform.portal.config.UserPortalConfig;
-import org.exoplatform.portal.config.UserPortalConfigService;
-import org.exoplatform.webui.application.ConfigurationManager;
-import org.exoplatform.webui.application.StateManager;
-import org.exoplatform.webui.application.WebuiApplication;
-import org.exoplatform.webui.application.WebuiRequestContext;
-import org.exoplatform.webui.application.portlet.PortletRequestContext;
-import org.exoplatform.webui.core.UIApplication;
-import org.gatein.common.logging.Logger;
-import org.gatein.common.logging.LoggerFactory;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-/**
- * The basis is either {@link org.exoplatform.webui.core.UIPortletApplication} or
- * {@link org.exoplatform.portal.webui.workspace.UIPortalApplication}.
- *
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-public class ReplicatingStateManager extends StateManager
-{
-
- /** . */
- private static final String APPLICATION_ATTRIBUTE_PREFIX = "rsm.";
-
- /** . */
- private static final Logger log = LoggerFactory.getLogger(ReplicatingStateManager.class);
-
- @Override
- public UIApplication restoreUIRootComponent(WebuiRequestContext context) throws Exception
- {
- context.setStateManager(this);
-
- //
- WebuiApplication app = (WebuiApplication)context.getApplication();
-
- //
- HttpSession session = getSession(context);
- String key = getKey(context);
-
- //
- ApplicationState appState = (ApplicationState)session.getAttribute(APPLICATION_ATTRIBUTE_PREFIX + key);
-
- //
- UIApplication uiapp = null;
- if (appState != null)
- {
- if (Safe.equals(context.getRemoteUser(), appState.getUserName()))
- {
- uiapp = appState.getApplication();
- }
- }
-
- //
- if (appState != null)
- {
- log.debug("Found application " + key + " :" + appState.getApplication());
- }
- else
- {
- log.debug("Application " + key + " not found");
- }
-
- // Looks like some necessary hacking
- if (context instanceof PortalRequestContext)
- {
- PortalRequestContext portalRC = (PortalRequestContext)context;
- UserPortalConfig config = getUserPortalConfig(portalRC);
- if (config == null)
- {
- HttpServletResponse response = portalRC.getResponse();
- response.sendRedirect(portalRC.getRequest().getContextPath() + "/portal-unavailable.jsp");
- portalRC.setResponseComplete(true);
- return null;
- }
- portalRC.setAttribute(UserPortalConfig.class, config);
-// SessionManagerContainer pcontainer = (SessionManagerContainer)app.getApplicationServiceContainer();
-// pcontainer.createSessionContainer(context.getSessionId(), uiapp.getOwner());
- }
-
- //
- if (uiapp == null)
- {
- ConfigurationManager cmanager = app.getConfigurationManager();
- String uirootClass = cmanager.getApplication().getUIRootComponent();
- Class<? extends UIApplication> type = (Class<UIApplication>) Thread.currentThread().getContextClassLoader().loadClass(uirootClass);
- uiapp = app.createUIComponent(type, null, null, context);
- }
-
- //
- return uiapp;
- }
-
- @Override
- public void storeUIRootComponent(final WebuiRequestContext context) throws Exception
- {
- UIApplication uiapp = context.getUIApplication();
-
- //
- HttpSession session = getSession(context);
-
- //
- String key = getKey(context);
-
- //
- log.debug("Storing application " + key);
- session.setAttribute(APPLICATION_ATTRIBUTE_PREFIX + key, new ApplicationState(uiapp, context.getRemoteUser()));
- }
-
- @Override
- public void expire(String sessionId, WebuiApplication app) throws Exception
- {
- // For now do nothing....
- }
-
- private UserPortalConfig getUserPortalConfig(PortalRequestContext context) throws Exception
- {
- ExoContainer appContainer = context.getApplication().getApplicationServiceContainer();
- UserPortalConfigService service_ = (UserPortalConfigService)appContainer.getComponentInstanceOfType(UserPortalConfigService.class);
- String remoteUser = context.getRemoteUser();
- String ownerUser = context.getPortalOwner();
- return service_.getUserPortalConfig(ownerUser, remoteUser);
- }
-
- private String getKey(WebuiRequestContext webuiRC)
- {
- if (webuiRC instanceof PortletRequestContext)
- {
- PortletRequestContext portletRC = (PortletRequestContext)webuiRC;
-
- // We are temporarily not using the window id as it changes when the back end is not the same
- return portletRC.getApplication().getApplicationId()/* + "/" + portletRC.getWindowId()*/;
- }
- else
- {
- PortalRequestContext portalRC = (PortalRequestContext)webuiRC;
- String portalOwner = portalRC.getPortalOwner();
- return "portal_" + portalOwner;
- }
- }
-
- private HttpSession getSession(WebuiRequestContext webuiRC)
- {
- if (webuiRC instanceof PortletRequestContext)
- {
- PortletRequestContext portletRC = (PortletRequestContext)webuiRC;
- PortalRequestContext portalRC = (PortalRequestContext) portletRC.getParentAppRequestContext();
- HttpServletRequest req = portalRC.getRequest();
- return req.getSession();
- }
- else
- {
- PortalRequestContext portalRC = (PortalRequestContext)webuiRC;
- HttpServletRequest req = portalRC.getRequest();
- return req.getSession();
- }
- }
-}
14 years, 10 months
- 1
- 0
gatein SVN: r1870 - in components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet: state/producer and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-02-25 18:10:54 -0500 (Thu, 25 Feb 2010)
New Revision: 1870
Added:
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/AbstractPortletStatePersistenceManager.java
Modified:
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/state/producer/PortletStatePersistenceManagerService.java
Log:
- Extracted non-persistence-specific code from PortletStatePersistenceManagerService into AbstractPortletStatePersistenceManager as a
base for reuse in other implementations.
Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/state/producer/PortletStatePersistenceManagerService.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/state/producer/PortletStatePersistenceManagerService.java 2010-02-25 23:04:21 UTC (rev 1869)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/state/producer/PortletStatePersistenceManagerService.java 2010-02-25 23:10:54 UTC (rev 1870)
@@ -1,34 +1,32 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, 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. *
- ******************************************************************************/
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2010, 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.gatein.pc.portlet.impl.state.producer;
-import org.gatein.pc.portlet.state.InvalidStateIdException;
-import org.gatein.pc.portlet.state.NoSuchStateException;
import org.gatein.pc.api.state.PropertyMap;
+import org.gatein.pc.portlet.state.InvalidStateIdException;
import org.gatein.pc.portlet.state.SimplePropertyMap;
-import org.gatein.pc.portlet.state.producer.PortletStatePersistenceManager;
+import org.gatein.pc.portlet.state.producer.AbstractPortletStatePersistenceManager;
import org.gatein.pc.portlet.state.producer.PortletStateContext;
-import org.gatein.pc.portlet.state.producer.PortletState;
import java.util.HashMap;
import java.util.Map;
@@ -39,7 +37,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 7215 $
*/
-public class PortletStatePersistenceManagerService implements PortletStatePersistenceManager
+public class PortletStatePersistenceManagerService extends AbstractPortletStatePersistenceManager
{
/** . */
@@ -48,83 +46,33 @@
/** . */
private int counter = 0;
- public synchronized PortletStateContext loadState(String stateId) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException
+ @Override
+ protected synchronized PortletStateContext getStateContext(String stateId) throws InvalidStateIdException
{
- if (stateId == null)
- {
- throw new IllegalArgumentException("No null state id accepted");
- }
- try
- {
- Integer.parseInt(stateId);
- }
- catch (NumberFormatException e)
- {
- throw new InvalidStateIdException(e, stateId);
- }
- PortletStateContext context = store.get(stateId);
- if (context == null)
- {
- throw new NoSuchStateException(stateId);
- }
- return context;
- }
+ checkId(stateId);
- private synchronized PortletState getState(String stateId) throws NoSuchStateException, InvalidStateIdException
- {
- PortletStateContext context = loadState(stateId);
- return context.getState();
+ return store.get(stateId);
}
- public synchronized String createState(String portletId, PropertyMap propertyMap)
+ @Override
+ protected synchronized String createStateContext(String portletId, PropertyMap propertyMap)
{
- if (portletId == null)
- {
- throw new IllegalArgumentException("No null portlet id accepted");
- }
- if (propertyMap == null)
- {
- throw new IllegalArgumentException("No null value map accepted");
- }
String id = Integer.toString(counter++);
PortletStateContext state = new PortletStateContextImpl(id, portletId, new SimplePropertyMap(propertyMap));
store.put(id, state);
return id;
}
- public synchronized String cloneState(String stateId, PropertyMap propertyMap) throws NoSuchStateException, InvalidStateIdException
+ @Override
+ protected synchronized PortletStateContext destroyStateContext(String stateId) throws InvalidStateIdException
{
- if (propertyMap == null)
- {
- throw new IllegalArgumentException();
- }
- PortletState stateContext = getState(stateId);
- return createState(stateContext.getPortletId(), propertyMap);
- }
+ checkId(stateId);
- public String cloneState(String stateId) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException
- {
- PortletState state = getState(stateId);
- return createState(state.getPortletId(), new SimplePropertyMap(state.getProperties()));
+ return store.remove(stateId);
}
- public synchronized void updateState(String stateId, PropertyMap propertyMap) throws NoSuchStateException, InvalidStateIdException
+ private void checkId(String stateId) throws InvalidStateIdException
{
- if (propertyMap == null)
- {
- throw new IllegalArgumentException("No null value map");
- }
- PortletState ctx = getState(stateId);
- ctx.getProperties().clear();
- ctx.getProperties().putAll(propertyMap);
- }
-
- public synchronized void destroyState(String stateId) throws InvalidStateIdException, NoSuchStateException
- {
- if (stateId == null)
- {
- throw new IllegalArgumentException();
- }
try
{
Integer.parseInt(stateId);
@@ -133,12 +81,14 @@
{
throw new InvalidStateIdException(e, stateId);
}
- if (store.remove(stateId) == null)
- {
- throw new NoSuchStateException(stateId);
- }
}
+ @Override
+ protected void updateStateContext(PortletStateContext stateContext)
+ {
+ // nothing to do here
+ }
+
public synchronized int getSize()
{
return store.size();
Added: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/AbstractPortletStatePersistenceManager.java
===================================================================
--- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/AbstractPortletStatePersistenceManager.java (rev 0)
+++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/AbstractPortletStatePersistenceManager.java 2010-02-25 23:10:54 UTC (rev 1870)
@@ -0,0 +1,107 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2010, 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.gatein.pc.portlet.state.producer;
+
+import org.gatein.common.util.ParameterValidation;
+import org.gatein.pc.api.state.PropertyMap;
+import org.gatein.pc.portlet.state.InvalidStateIdException;
+import org.gatein.pc.portlet.state.NoSuchStateException;
+import org.gatein.pc.portlet.state.SimplePropertyMap;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public abstract class AbstractPortletStatePersistenceManager implements PortletStatePersistenceManager
+{
+ public PortletStateContext loadState(String stateId) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException
+ {
+ ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(stateId, "state id", null);
+
+ PortletStateContext context = getStateContext(stateId);
+ if (context == null)
+ {
+ throw new NoSuchStateException(stateId);
+ }
+ return context;
+ }
+
+ protected PortletState getState(String stateId) throws NoSuchStateException, InvalidStateIdException
+ {
+ PortletStateContext context = loadState(stateId);
+ return context.getState();
+ }
+
+ public String createState(String portletId, PropertyMap propertyMap)
+ {
+ ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(portletId, "portlet id", null);
+ ParameterValidation.throwIllegalArgExceptionIfNull(propertyMap, "property map");
+
+ return createStateContext(portletId, propertyMap);
+ }
+
+ public String cloneState(String stateId, PropertyMap propertyMap) throws NoSuchStateException, InvalidStateIdException
+ {
+ ParameterValidation.throwIllegalArgExceptionIfNull(propertyMap, "property map");
+
+ PortletState stateContext = getState(stateId);
+ return createState(stateContext.getPortletId(), propertyMap);
+ }
+
+ public String cloneState(String stateId) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException
+ {
+ PortletState state = getState(stateId);
+ return createState(state.getPortletId(), new SimplePropertyMap(state.getProperties()));
+ }
+
+ public void updateState(String stateId, PropertyMap propertyMap) throws NoSuchStateException, InvalidStateIdException
+ {
+ ParameterValidation.throwIllegalArgExceptionIfNull(propertyMap, "property map");
+
+ PortletStateContext ctx = loadState(stateId);
+ PortletState state = ctx.getState();
+ PropertyMap props = state.getProperties();
+ props.clear();
+ props.putAll(propertyMap);
+ updateStateContext(ctx);
+ }
+
+ public void destroyState(String stateId) throws InvalidStateIdException, NoSuchStateException
+ {
+ ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(stateId, "state id", null);
+
+ if (destroyStateContext(stateId) == null)
+ {
+ throw new NoSuchStateException(stateId);
+ }
+ }
+
+ protected abstract PortletStateContext getStateContext(String stateId) throws InvalidStateIdException;
+
+ protected abstract String createStateContext(String portletId, PropertyMap propertyMap);
+
+ protected abstract PortletStateContext destroyStateContext(String stateId) throws InvalidStateIdException;
+
+ protected abstract void updateStateContext(PortletStateContext stateContext);
+}
14 years, 10 months
- 1
- 0
gatein SVN: r1869 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/conf/wsrp and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-02-25 18:04:21 -0500 (Thu, 25 Feb 2010)
New Revision: 1869
Modified:
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/EndpointInfoMapping.java
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml
Log:
- GTNPORTAL-766: Forgot to add property for WS timeout.
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/EndpointInfoMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/EndpointInfoMapping.java 2010-02-25 21:35:01 UTC (rev 1868)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/EndpointInfoMapping.java 2010-02-25 23:04:21 UTC (rev 1869)
@@ -41,14 +41,21 @@
public abstract void setWSDLURL(String wsdlURL);
+ @Property(name = "timeout")
+ public abstract Integer getWSTimeoutMilliseconds();
+
+ public abstract void setWSTimeoutMilliseconds(Integer expiration);
+
public void initFrom(EndpointConfigurationInfo info)
{
setWSDLURL(info.getWsdlDefinitionURL());
+ setWSTimeoutMilliseconds(info.getWSOperationTimeOut());
}
EndpointConfigurationInfo toEndpointConfigurationInfo(EndpointConfigurationInfo initial)
{
initial.setWsdlDefinitionURL(getWSDLURL());
+ initial.setWSOperationTimeOut(getWSTimeoutMilliseconds());
return initial;
}
}
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml 2010-02-25 21:35:01 UTC (rev 1868)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml 2010-02-25 23:04:21 UTC (rev 1869)
@@ -88,6 +88,10 @@
onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
+ <propertyDefinition name="timeout" requiredType="Integer" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
</propertyDefinitions>
</nodeType>
14 years, 10 months
- 1
- 0
gatein SVN: r1867 - portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-25 10:47:55 -0500 (Thu, 25 Feb 2010)
New Revision: 1867
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties
Log:
GTNPORTAL-595: Show invalid message when create group name already exists
Typo (vi probably)
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties 2010-02-25 15:29:38 UTC (rev 1866)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/OrganizationPortlet_en.properties 2010-02-25 15:47:55 UTC (rev 1867)
@@ -197,7 +197,7 @@
EditGroup.action.Save=#{word.save}
EditGroup.action.Back=#{word.cancel}
-UIGroupForm.msg.group-exist=This group name ialready exists, please enter another one
+UIGroupForm.msg.group-exist=This group name already exists, please enter another one
UIGroupForm.msg.group-not-exist=Group "{0}" doesn't exist or has been deleted.
############################################################################
# org.exoplatform.portal.component.customization.UIShareNavigationForm #
14 years, 10 months
- 1
- 0
gatein SVN: r1866 - portal/trunk/server/jboss/patch-ear/src/main/jboss/bin.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-25 10:29:38 -0500 (Thu, 25 Feb 2010)
New Revision: 1866
Modified:
portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf
portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf.bat
Log:
Seems to only hide the memory issue (Portal might still stale)
Modified: portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf
===================================================================
--- portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf 2010-02-25 14:08:50 UTC (rev 1865)
+++ portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf 2010-02-25 15:29:38 UTC (rev 1866)
@@ -42,7 +42,7 @@
# Specify options to pass to the Java VM.
#
if [ "x$JAVA_OPTS" = "x" ]; then
- JAVA_OPTS="-Xms512m -Xmx768m -XX:MaxPermSize=256m -XX:-UseGCOverheadLimit -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000"
+ JAVA_OPTS="-Xms512m -Xmx768m -XX:MaxPermSize=256m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000"
fi
# Sample JPDA settings for remote socket debugging
Modified: portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf.bat
===================================================================
--- portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf.bat 2010-02-25 14:08:50 UTC (rev 1865)
+++ portal/trunk/server/jboss/patch-ear/src/main/jboss/bin/run.conf.bat 2010-02-25 15:29:38 UTC (rev 1866)
@@ -40,7 +40,7 @@
rem #
rem # JVM memory allocation pool parameters - modify as appropriate.
-set "JAVA_OPTS=-Xms512M -Xmx768M -XX:MaxPermSize=256M -XX:-UseGCOverheadLimit"
+set "JAVA_OPTS=-Xms512M -Xmx768M -XX:MaxPermSize=256M"
rem # Reduce the RMI GCs to once per hour for Sun JVMs.
set "JAVA_OPTS=%JAVA_OPTS% -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000"
14 years, 10 months
- 1
- 0
gatein SVN: r1865 - in portal/branches/tmp_thomas_perf: component/portal/src/main/java/org/exoplatform/portal/pom/config/cache and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-25 09:08:50 -0500 (Thu, 25 Feb 2010)
New Revision: 1865
Modified:
portal/branches/tmp_thomas_perf/component/common/src/main/java/conf/configuration-jboss.properties
portal/branches/tmp_thomas_perf/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java
portal/branches/tmp_thomas_perf/packaging/module/src/main/javascript/portal.packaging.module.js
portal/branches/tmp_thomas_perf/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
Log:
test
Modified: portal/branches/tmp_thomas_perf/component/common/src/main/java/conf/configuration-jboss.properties
===================================================================
--- portal/branches/tmp_thomas_perf/component/common/src/main/java/conf/configuration-jboss.properties 2010-02-25 13:47:01 UTC (rev 1864)
+++ portal/branches/tmp_thomas_perf/component/common/src/main/java/conf/configuration-jboss.properties 2010-02-25 14:08:50 UTC (rev 1865)
@@ -24,7 +24,7 @@
gatein.db.data.dir=${gatein.data.dir}/db
# JCR
-gatein.jcr.config.type=local
+gatein.jcr.config.type=cluster
gatein.jcr.datasource.name=java:jdbcjcr
gatein.jcr.datasource.dialect=auto
Modified: portal/branches/tmp_thomas_perf/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java
===================================================================
--- portal/branches/tmp_thomas_perf/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java 2010-02-25 13:47:01 UTC (rev 1864)
+++ portal/branches/tmp_thomas_perf/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java 2010-02-25 14:08:50 UTC (rev 1865)
@@ -47,7 +47,7 @@
public <V> V execute(POMSession session, POMTask<V> task) throws Exception
{
- if (task instanceof CacheableDataTask && !cluster)
+ if (task instanceof CacheableDataTask)
{
CacheableDataTask<?, V> loadTask = (CacheableDataTask<?, V>)task;
switch (loadTask.getAccessMode())
Modified: portal/branches/tmp_thomas_perf/packaging/module/src/main/javascript/portal.packaging.module.js
===================================================================
--- portal/branches/tmp_thomas_perf/packaging/module/src/main/javascript/portal.packaging.module.js 2010-02-25 13:47:01 UTC (rev 1864)
+++ portal/branches/tmp_thomas_perf/packaging/module/src/main/javascript/portal.packaging.module.js 2010-02-25 14:08:50 UTC (rev 1865)
@@ -163,6 +163,7 @@
addDependency(kernel.component.remote).
addDependency(kernel.component.cache).
addDependency(kernel.component.command).
+ addDependency(new Project("org.exoplatform.kernel", "exo.kernel.component.ext.cache.impl.jboss.v3", "jar", kernel.version)).
addDependency(core.component.database).
addDependency(core.component.organization).
Modified: portal/branches/tmp_thomas_perf/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
===================================================================
--- portal/branches/tmp_thomas_perf/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-02-25 13:47:01 UTC (rev 1864)
+++ portal/branches/tmp_thomas_perf/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-02-25 14:08:50 UTC (rev 1865)
@@ -194,6 +194,17 @@
</component-plugins>
</component>
+ <component>
+ <key>org.exoplatform.services.cache.ExoCacheFactory</key>
+ <type>org.exoplatform.services.cache.impl.jboss.ExoCacheFactoryImpl</type>
+ <init-params>
+ <value-param>
+ <name>cache.config.template</name>
+ <value>classpath:/conf/jcr/jbosscache/cluster/config.xml</value>
+ </value-param>
+ </init-params>
+ </component>
+
<external-component-plugins>
<target-component>org.exoplatform.services.organization.OrganizationService</target-component>
<component-plugin>
@@ -263,4 +274,42 @@
</component-plugin>
</external-component-plugins>
+ <external-component-plugins>
+ <target-component>org.exoplatform.services.cache.ExoCacheFactory</target-component>
+ <component-plugin>
+ <name>addCreator</name>
+ <set-method>addCreator</set-method>
+ <type>org.exoplatform.services.cache.impl.jboss.ExoCacheCreatorPlugin</type>
+ <description>add Exo Cache Creator</description>
+ <init-params>
+ <object-param>
+ <name>LRU</name>
+ <description>The LRU cache creator</description>
+ <object type="org.exoplatform.services.cache.impl.jboss.lru.LRUExoCacheCreator"></object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+
+ <external-component-plugins>
+ <target-component>org.exoplatform.services.cache.CacheService</target-component>
+ <component-plugin>
+ <name>addExoCacheConfig</name>
+ <set-method>addExoCacheConfig</set-method>
+ <type>org.exoplatform.services.cache.ExoCacheConfigPlugin</type>
+ <description>add Exo Cache Config</description>
+ <init-params>
+ <object-param>
+ <name>cache.config.PomSessionManager</name>
+ <description>The JBoss Cache LRU configuration</description>
+ <object type="org.exoplatform.services.cache.impl.jboss.lru.LRUExoCacheConfig">
+ <field name="name"><string>PomSessionManager</string></field>
+ <field name="maxNodes"><int>-1</int></field>
+ <field name="minTimeToLive"><long>0</long></field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+
</configuration>
14 years, 10 months
- 1
- 0