February 2010 - gatein-commits - Jboss List Archives

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-02-25 08:47:01 -0500 (Thu, 25 Feb 2010) New Revision: 1864 Added: portal/branches/tmp_thomas_perf/ Log: Test to enable JBoss Cache on MOPSessionManager Copied: portal/branches/tmp_thomas_perf (from rev 1863, portal/trunk)

14 years, 10 months

1
0
0 / 0

gatein SVN: r1863 - portal/trunk/server/tomcat/patch/src/main/tomcat/bin.

by do-not-reply＠jboss.org

Author: mpodolin Date: 2010-02-25 07:42:28 -0500 (Thu, 25 Feb 2010) New Revision: 1863 Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.bat portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh Log: GTNPORTAL-708: exo.conf.dir property changed from default $TOMCAT_HOME/bin to $TOMCAT_HOME/gatein/conf on tomcat Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat =================================================================== --- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat 2010-02-25 11:02:56 UTC (rev 1862) +++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat 2010-02-25 12:42:28 UTC (rev 1863) @@ -27,7 +27,7 @@ rem Sets some variables set LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog" set SECURITY_OPTS="-Djava.security.auth.login.config=..\conf\jaas.conf" -set EXO_OPTS="-Dexo.product.developing=false" +set EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir=..\gatein\conf" set EXO_CONFIG_OPTS="-Dorg.exoplatform.container.configuration.debug" set JAVA_OPTS=-Xshare:auto -Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS% %EXO_CONFIG_OPTS% set JPDA_TRANSPORT=dt_socket Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh =================================================================== --- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh 2010-02-25 11:02:56 UTC (rev 1862) +++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh 2010-02-25 12:42:28 UTC (rev 1863) @@ -24,7 +24,7 @@ # Sets some variables LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog" SECURITY_OPTS="-Djava.security.auth.login.config=../conf/jaas.conf" -EXO_OPTS="-Dexo.product.developing=true" +EXO_OPTS="-Dexo.product.developing=true -Dexo.conf.dir=../gatein/conf" EXO_CONFIG_OPTS="-Xshare:auto -Xms128m -Xmx512m -Dorg.exoplatform.container.configuration.debug" JPDA_TRANSPORT=dt_socket Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.bat =================================================================== --- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.bat 2010-02-25 11:02:56 UTC (rev 1862) +++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.bat 2010-02-25 12:42:28 UTC (rev 1863) @@ -27,7 +27,7 @@ rem Sets some variables set LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog" set SECURITY_OPTS="-Djava.security.auth.login.config=..\conf\jaas.conf" -set EXO_OPTS="-Dexo.product.developing=false" +set EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir=..\gatein\conf" set JAVA_OPTS=-Xshare:auto -Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS%% rem Launches the server Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh =================================================================== --- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh 2010-02-25 11:02:56 UTC (rev 1862) +++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh 2010-02-25 12:42:28 UTC (rev 1863) @@ -27,7 +27,7 @@ # Sets some variables LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog" SECURITY_OPTS="-Djava.security.auth.login.config=../conf/jaas.conf" -EXO_OPTS="-Dexo.product.developing=false" +EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir=../gatein/conf" JAVA_OPTS="-Xshare:auto -Xms128m -Xmx512m $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS" export JAVA_OPTS

14 years, 10 months

1
0
0 / 0

gatein SVN: r1862 - in portal/trunk/docs/user-guide/en: modules and 3 other directories.

by do-not-reply＠jboss.org

Author: luc.texier(a)jboss.com Date: 2010-02-25 06:02:56 -0500 (Thu, 25 Feb 2010) New Revision: 1862 Removed: portal/trunk/docs/user-guide/en/Introduction.xml Modified: portal/trunk/docs/user-guide/en/modules/Introduction.xml portal/trunk/docs/user-guide/en/modules/Terms.xml portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml portal/trunk/docs/user-guide/en/modules/account/Change_Account_Settings.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/Gadget_concept.xml portal/trunk/docs/user-guide/en/modules/terms/Permission_levels.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: GTNPORTAL-719: Luc's review is finished, hand over to ScottM Deleted: portal/trunk/docs/user-guide/en/Introduction.xml =================================================================== --- portal/trunk/docs/user-guide/en/Introduction.xml 2010-02-25 09:44:27 UTC (rev 1861) +++ portal/trunk/docs/user-guide/en/Introduction.xml 2010-02-25 11:02:56 UTC (rev 1862) @@ -1,65 +0,0 @@ - - -<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.4//EN" "http://www.oasis-open.org/docbook/sgml/4.4/docbookx.dtd"> -<chapter> - <title>Introduction</title> - <mediaobject> - <imageobject> - <imagedata fileref="images/Frontpage.png" scalefit="1" /> - </imageobject> - </mediaobject> - - <para>GateIn portal is a merge of two mature projects that have - been around for a while, JBoss Portal and eXo Portal. It takes the - best of both into a single new project. The aim is to provide both an - intuitive portal to use as-is and a portal framework to build upon - depending on your needs.</para> - <section> - <title>Links</title> - <itemizedlist> - <listitem> - <para> - GateIn homepage: - <ulink url="http://www.gatein.org">www.gatein.org</ulink> - </para> - </listitem> - <listitem> - <para> - GateIn videos: - <ulink url="http://www.jboss.org/gatein/videos.html">www.jboss.org/gatein/videos.html</ulink> - </para> - </listitem> - <listitem> - <para> - GateIn documentation: - <ulink url="http://www.jboss.org/gatein/documentation.html">www.jboss.org/gatein/documentation.html</ulink> - </para> - </listitem> - <listitem> - <para> - GateIn downloads: - <ulink url="http://www.jboss.org/gatein/downloads.html">www.jboss.org/gatein/downloads.html</ulink> - </para> - </listitem> - </itemizedlist> - </section> -</chapter> Modified: portal/trunk/docs/user-guide/en/modules/Introduction.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/Introduction.xml 2010-02-25 09:44:27 UTC (rev 1861) +++ portal/trunk/docs/user-guide/en/modules/Introduction.xml 2010-02-25 11:02:56 UTC (rev 1862) @@ -6,7 +6,7 @@ <chapter id="chap-User_Guide-Introduction"> <title>Introduction</title> <para> - &PRODUCT; is a merge of two mature projects; JBoss Portal and eXo Portal. It takes the best of both offerings and incorporates them into a single new project. The aim is to provide an intuitive portal for as-is use and a framework to build upon depending on your needs. + &PRODUCT; is the merge of two mature Java projects; JBoss Portal and eXo Portal. This new community project takes the best of both offerings and incorporates them into a single j2ee deployment archive. The aim is to provide an intuitive user-friendly portal and a framework to address the needs of today's Web 2.0 applications. </para> <mediaobject> <imageobject> @@ -14,29 +14,38 @@ </imageobject> </mediaobject> <para> - This book explains various apsects of &PRODUCT;, such as managing users and access permissions, using portlets and changing simple interface features such as skins, langauage and page orientation. + This book introduces and provides detailed information about most features and capabilities of &PRODUCT; such as user/group management and access permissions, using portlets and changing basic interface objects such as skins, language and page orientation. </para> <para> - Refer to the <ulink type="http" url="http://redhat.com/docs">&PRODUCT; Installation Guide</ulink> for information on downloading and installing the product or the <ulink type="http" url="http://redhat.com/docs">&PRODUCT; Reference Guide</ulink> for information on more advanced topics. + Refer to <ulink type="http" url="http://www.jboss.org/gatein/documentation.html">&PRODUCT; Installation Guide</ulink> for information on downloading and installing the project or <ulink type="http" url="http://www.jboss.org/gatein/documentation.html">&PRODUCT; Reference Guide</ulink> for detailed information on all aspects of the project. </para> <section id="sect-Install_Guide-Introduction-Related_Links"> <title>Related Links</title> <itemizedlist> <listitem> <para> - GateIn 3.0 is the community project that &PRODUCT; is based on. GateIn project homepage. <ulink url="http://www.gatein.org" /> + GateIn homepage: + <ulink url="http://www.gatein.org">www.gatein.org</ulink> </para> </listitem> <listitem> <para> - GateIn downloads: <ulink url="http://www.jboss.org/gatein/downloads.html">www.jboss.org/gatein/downloads.html</ulink> + GateIn videos: + <ulink url="http://www.jboss.org/gatein/videos.html">www.jboss.org/gatein/videos.html</ulink> </para> </listitem> <listitem> <para> - Further documentation about the Red Hat &PRODUCT; and other Red Hat products can be found at <ulink type="http" url="www.redhat.com/docs" /> + GateIn documentation: + <ulink url="http://www.jboss.org/gatein/documentation.html">www.jboss.org/gatein/documentation.html</ulink> </para> </listitem> + <listitem> + <para> + GateIn downloads: + <ulink url="http://www.jboss.org/gatein/downloads.html">www.jboss.org/gatein/downloads.html</ulink> + </para> + </listitem> </itemizedlist> </section> Modified: portal/trunk/docs/user-guide/en/modules/Terms.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/Terms.xml 2010-02-25 09:44:27 UTC (rev 1861) +++ portal/trunk/docs/user-guide/en/modules/Terms.xml 2010-02-25 11:02:56 UTC (rev 1862) @@ -4,7 +4,7 @@ %BOOK_ENTITIES; ]> <chapter id="chap-User_Guide-Terms"> - <title>Terms &PRODUCT;</title> + <title>Glossary</title> <xi:include href="terms/Portal_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="terms/Portlet_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="terms/Toolbar_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> Modified: portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml 2010-02-25 09:44:27 UTC (rev 1861) +++ portal/trunk/docs/user-guide/en/modules/account/Account_and_Password_Retrieval.xml 2010-02-25 11:02:56 UTC (rev 1862) @@ -4,43 +4,32 @@ %BOOK_ENTITIES; ]> <section id="sect-User_Guide-Account_and_Password_Retrieval"> - <title>Account and Password Retrieval</title> + <title>Account and Password Retrieval</title> <para> You can recover your username or password should you forget them by following these steps: </para> <procedure> <step> <para> - Click the link '<emphasis role="bold">Forgot your User Name/Password?</emphasis>' (beneath the <emphasis role="bold">Password</emphasis> field of the <emphasis role="bold">Sign in</emphasis> form). This presents the form that guides you through recovering your username and/or password. + Click the link '<emphasis role="bold">Forgot your User Name/Password?</emphasis>' </para> +<note> +<title>DOC TODO</title> +<para> +please redo the screenshot without "Click here when..." and instead display a mouse pointer on the box being checked +</para> +</note> + <mediaobject> <imageobject> <imagedata fileref="images/SignIn1.png" format="PNG" width="444" /> </imageobject> </mediaobject> </step> + <step> <para> - This form offers two options to select: + This form offers two options: </para> <itemizedlist> <listitem> @@ -54,6 +43,13 @@ </para> </listitem> </itemizedlist> +<note> +<title>DOC TODO</title> +<para> +please redo the screenshot, it is too big +</para> +</note> + <mediaobject> <imageobject> <imagedata fileref="images/Forgot1.png" format="PNG" width="444" /> @@ -72,6 +68,13 @@ <para> If you selected the <emphasis role="bold">Forgot my password</emphasis> option you will be prompted for your username: </para> +<note> +<title>DOC TODO</title> +<para> +please redo the screenshot without "Click Send to send...", the circle around the field and "Enter your username" +</para> +</note> + <mediaobject> <imageobject> <imagedata fileref="images/ForgotUserName1.png" format="PNG" width="444" /> @@ -82,6 +85,12 @@ <para> If you selected <emphasis role="bold">Forgot my username</emphasis> you will be prompted for your email address. </para> +<note> +<title>DOC TODO</title> +<para> +please redo the screenshot without "Click Send to send...", the circle around the field and "Enter your email" +</para> +</note> <mediaobject> <imageobject> <imagedata fileref="images/ForgotEmail1.png" format="PNG" width="444" /> @@ -90,22 +99,12 @@ </listitem> </itemizedlist> </step> - <step> - <para> - Enter the approprate value into the open field. - </para> - </step> - <step> - <para> - Click the <emphasis role="bold">Send</emphasis> button to send the entered values. - </para> - </step> </procedure> <para> After you submit the form an email will be send to your email address with the requested information, either your username or password. </para> <para> - If you forgot your password you will be sent a new (temporary) password. Your original password will not be valid after this email is sent. You will be directed to update your password the next time you sign in. + If you forgot your password you will be sent a new (temporary) password. Your original password will not be valid after this email is sent. You will be directed to a page to update your password the next time you sign in. </para> </section> Modified: portal/trunk/docs/user-guide/en/modules/account/Change_Account_Settings.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/account/Change_Account_Settings.xml 2010-02-25 09:44:27 UTC (rev 1861) +++ portal/trunk/docs/user-guide/en/modules/account/Change_Account_Settings.xml 2010-02-25 11:02:56 UTC (rev 1862) @@ -4,27 +4,8 @@ %BOOK_ENTITIES; ]> <section id="sect-User_Guide-Change_Account_Settings"> - <title>Change Account Settings</title> - <para> To change your account information, click on the account name in the top navigation bar: </para> @@ -36,18 +17,26 @@ <para> The <emphasis role="bold">Account Profiles</emphasis> form will appear: </para> + + +<note> +<title>DOC TODO</title> +<para> +please redo the screenshot without "Click Save to..." and using a smaller window, it is too big right now +</para> +</note> <mediaobject> <imageobject> <imagedata fileref="images/AccountProfiles3.png" format="PNG" width="444" /> </imageobject> </mediaobject> <para> - If you want to change your Account Profile information: + To change your Account Profile information: </para> <procedure> <step> <para> - Select the <emphasis role="bold">Account Profiles</emphasis> tab. This will display your current basic information. + Select the <emphasis role="bold">Account Profiles</emphasis> tab. </para> </step> <step> @@ -69,6 +58,12 @@ <para> Select the <emphasis role="bold">Change Password</emphasis> tab, it will display the following form: </para> +<note> +<title>DOC TODO</title> +<para> +please redo the screenshot without "Click Save to..." and using a smaller window, it is too big right now +</para> +</note> <mediaobject> <imageobject> <imagedata fileref="images/ChangePassword.png" format="PNG" width="444" /> 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-25 09:44:27 UTC (rev 1861) +++ portal/trunk/docs/user-guide/en/modules/account/Register_New_Accounts.xml 2010-02-25 11:02:56 UTC (rev 1862) @@ -4,47 +4,34 @@ %BOOK_ENTITIES; ]> <section id="sect-User_Guide-Register_New_Accounts"> - <title>Register New Accounts</title> + <title>Register New Accounts</title> <para> Unregistered users who visit the portal are limited in the content they can see. </para> <para> - Users who need access to deeper content or who need to undertake actions within the portal should register themselves and then contact the portal administrator to have appropriate permissions added to their account. + 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. </para> <para> - Users can quickly and easily register a new account for themselves. Complete the steps below: + Users can quickly and easily register a new account for themselves. </para> <procedure> <step> <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" /> </imageobject> </mediaobject> <para> - The Register page will appear: + The Register page appears: </para> <mediaobject> <imageobject> @@ -114,7 +101,7 @@ </step> <step> <para> - Click the 'find' icon beside the user name field to check if the chosen username is available. + Click the 'find' icon beside the user name field to check whether the chosen username is available. </para> </step> <title>Remember User Account</title> + <title>Remember User Account</title> <para> - Users can return to the &PRODUCT; and be automatically authenticated with a cookie provided by their browser. This means users do not have to perform an explicit authentication each time they access the portal. + 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. </para> <mediaobject> <imageobject> @@ -50,7 +31,7 @@ </step> </procedure> <para> - You must remember to close your browser without signing out (as signing out will delete the cookie). This will allow you to re-enter the portal without having to sign in again. + You must remember to close your browser without signing out (as signing out will delete the cookie). </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-25 09:44:27 UTC (rev 1861) +++ portal/trunk/docs/user-guide/en/modules/account/Sign_in_and_Sign_out.xml 2010-02-25 11:02:56 UTC (rev 1862) @@ -4,29 +4,10 @@ %BOOK_ENTITIES; ]> <section id="sect-User_Guide-Sign_In_and_Sign_Out"> - <title>Sign In and Sign Out</title> - <para> - After registering your account, you can sign in to &PRODUCT; to go into private mode. + In order to enter the portal in private mode, you should use the account previously registered. </para> <para> To sign in to a portal, users must complete the <emphasis role="bold">Sign in</emphasis> form. This form contains the following elements: @@ -58,7 +39,7 @@ </term> <listitem> <para> - This option allows users to return to &PRODUCT; and be automatically authenticated based on the value of a cookie provided by the <literal>bvarlistentryser</literal>. Thus users do not have to perform an explicit authentication again. + Check this box to avoid log in every time </para> </listitem> </varlistentry> @@ -93,8 +74,10 @@ </listitem> </varlistentry> </variablelist> + + <section id="sect-User_Guide-Sign_In"> + <title>Sign In</title> <procedure> - <title>Sign In</title> <step> <para> Go to your portal by entering the URL into the address bar of your browser (For example http://localhost:8080/portal). @@ -132,16 +115,21 @@ <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> + + </section> + + <section id="sect-User_Guide-Sign_Out"> + <title>Sign Out</title> <procedure> - <title>Sign Out</title> <step> <para> - This function lets you get back to the anonymous portal. It ends your current portal session. + This feature lets you get back to the anonymous portal. It ends your current portal session. </para> </step> <step> @@ -155,6 +143,7 @@ </mediaobject> </step> </procedure> + </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-25 09:44:27 UTC (rev 1861) +++ portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml 2010-02-25 11:02:56 UTC (rev 1862) @@ -17,7 +17,6 @@ </imageobject> </mediaobject> - <section id="sect-User_Guide-Dashboard_Portlet-Using_the_Dashboard_Workspace"> <title>Using the Dashboard Workspace</title> <procedure> @@ -34,7 +33,7 @@ </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 (see image below) 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>") where it appears below the current user name and entering a new name. </para> <mediaobject> <imageobject> @@ -43,7 +42,7 @@ </mediaobject> <para> - The Dashboard Workspace lists all available gadgets. There are four gadgets built into &PRODUCT; by default, however you can add many more. + The Dashboard Workspace lists all available gadgets. Four gadgets are provided by default with &PRODUCT;, however you can add many more. </para> <mediaobject> <imageobject> @@ -56,7 +55,7 @@ <term>Calendar</term> <listitem> <para> - The calendar gadget allows users to switch easily between daily, monthly and yearly view and, again, is customizable to match your portal's theme. + 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> @@ -108,7 +107,7 @@ <term>More Gadgets</term> <listitem> <para> - Further gadgets can be obtained from the <ulink type="http" url="http://www.google.com/ig/directory?synd=open">Google Gadget</ulink> site. &PRODUCT; is compatible with most of the gadgets available here. + 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> </listitem> </varlistentry> @@ -117,6 +116,13 @@ <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> @@ -126,12 +132,12 @@ Obtain the URL (.xml or .rss) of the gadget you wish to add from the gadget source. </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 in <literal>.xml</literal> + 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> </para> <note> <title>URL Types</title> <para> - Remote gadgets can be only created using an .xml link or RSS URL. However, if you use a link that generates an RSS feed (for example: <ulink type="http" url="http://feeds.feedburner.com/gatein">http://feeds.feedburner.com/gatein</ulink>), a new RSS reader gadget will be created automatically even if the URL does not end in <literal>.rss</literal>. + Remote gadgets can be only created using an .xml link or RSS URL. However, if you use a link that generates an RSS feed (for example: <ulink type="http" url="http://feeds.feedburner.com/gatein">http://feeds.feedburner.com/gatein</ulink>), a new RSS reader gadget will be created automatically even if the URL does not end with <literal>.rss</literal>. </para> </note> </step> 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-25 09:44:27 UTC (rev 1861) +++ portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml 2010-02-25 11:02:56 UTC (rev 1862) @@ -9,15 +9,15 @@ Portlets are pluggable user interface components that are managed and displayed within a portal. Functional Portlets support all functions of a Portal. They are built into the portal and are accessed via toolbar links as required when actioning portal tasks. </para> <para> - &PRODUCT; provides the following portlets by default. + &PRODUCT; provides the following portlets by default: </para> <variablelist> <varlistentry> - <term>Account Portlet</term> + <term><emphasis role="bold">Account Portlet</emphasis></term> <listitem> <para> - This Portlet allows users to register a new account and choose a preferred language for displaying the Portal interface. + The Account Portlet allows users to register a new account and choose a preferred language for displaying the Portal interface. </para> <mediaobject> <imageobject> @@ -27,10 +27,10 @@ </listitem> </varlistentry> <varlistentry> - <term>Organization Portlet</term> + <term><emphasis role="bold">Organization Portlet</emphasis></term> <listitem> <para> - This Portlet is used to manage user information, groups of users and groups memberships. + The Organization Portlet is used to manage user information, groups of users and groups memberships. </para> <mediaobject> <imageobject> @@ -40,11 +40,18 @@ </listitem> </varlistentry> <varlistentry> - <term>Application Registry Portlet</term> + <term><emphasis role="bold">Application Registry Portlet</emphasis></term> <listitem> <para> - This Portlet is used to manage different application categories. You can add, edit, set permissions and delete a category and its applications. + 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" /> @@ -52,8 +59,9 @@ </mediaobject> </listitem> </varlistentry> +  + </mediaobject> </listitem> </varlistentry>  <para> Refer to <xref linkend="sect-User_Guide-Dashboard_Portlet" /> or <xref linkend="chap-User_Guide-Gadgets_Administration" /> for more information. </para> Modified: portal/trunk/docs/user-guide/en/modules/terms/Gadget_concept.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/terms/Gadget_concept.xml 2010-02-25 09:44:27 UTC (rev 1861) +++ portal/trunk/docs/user-guide/en/modules/terms/Gadget_concept.xml 2010-02-25 11:02:56 UTC (rev 1862) @@ -6,10 +6,10 @@ <section id="sect-User_Guide-Gadgets"> <title>Gadgets</title> <para> - A gadget is a mini web application that a portal user can add to their web page. Some useful gadgets that are packaged by default with &PRODUCT;: + A gadget is a customizable mini web application that portal users may add to their web pages. </para> <para> - See the <emphasis role="bold">Default Gadgets</emphasis> section of <xref linkend="sect-User_Guide-Dashboard_Portlet-Using_the_Dashboard_Workspace" /> for more information about these gadgets. + For more information about the gadgets shipped by default with &PRODUCT;, please check out <xref linkend="sect-User_Guide-Dashboard_Portlet-Using_the_Dashboard_Workspace" /> </para> </section> Modified: portal/trunk/docs/user-guide/en/modules/terms/Permission_levels.xml =================================================================== --- portal/trunk/docs/user-guide/en/modules/terms/Permission_levels.xml 2010-02-25 09:44:27 UTC (rev 1861) +++ portal/trunk/docs/user-guide/en/modules/terms/Permission_levels.xml 2010-02-25 11:02:56 UTC (rev 1862) @@ -9,12 +9,12 @@ Permission settings control what users can and cannot do within the portal and are set by portal administrators. </para> <para> - Permission <emphasis role="bold">types</emphasis> dictate what a user can do within the portal. There are two permission types used in &PRODUCT;: + Permission <emphasis role="bold">types</emphasis> dictate what a user can do within the portal. Two permission types are available as follows: </para> <variablelist> <varlistentry> - <term>Access</term> + <term><emphasis role="bold">Access</emphasis></term> <listitem> <para> This permission type allows users to utilize portal content, that is; sign in, rearrange portlets, etc. This permission can be set for multiple member groups. @@ -22,7 +22,7 @@ </listitem> </varlistentry> <varlistentry> - <term>Edit</term> + <term><emphasis role="bold">Edit</emphasis></term> <listitem> <para> This permission type allows users to change portal content. This includes actions such as changing page information, deleting pages etc. The <emphasis>edit</emphasis> permission is set for only one group at a time. @@ -37,7 +37,7 @@ <variablelist> <varlistentry> - <term>Portal</term> + <term><emphasis role="bold">Portal</emphasis></term> <listitem> <para> The portal permission level includes all pages within the portal. Therefore, a user with the <emphasis role="bold">access</emphasis> permission type can view (but not edit) all the pages within the portal. A user with <emphasis role="bold">edit</emphasis> permission at the portal level, can change any page in the portal. @@ -45,7 +45,7 @@ </listitem> </varlistentry> <varlistentry> - <term>Page</term> + <term><emphasis role="bold">Page</emphasis></term> <listitem> <para> The page permission level restricts the user to particular pages. Users are only able to see and/or edit (depending on their permission <emphasis role="bold">type</emphasis>) pages they have been given access to. @@ -53,10 +53,10 @@ </listitem> </varlistentry> <varlistentry> - <term>Portlet</term> + <term><emphasis role="bold">Portlet</emphasis></term> <listitem> <para> - The portlet permission level allows users create a page by dragging and dropping portlets into a page. Some portlets are only used for administrators while some are used for individuals thus administrators have to set the appropriate access permissions. + The portlet permission level allows users to create a page by dragging and dropping portlets into a page. Some portlets are only used for administrators while some are used for individuals thus administrators have to set the appropriate access permissions. </para> </listitem> </varlistentry> 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-25 09:44:27 UTC (rev 1861) +++ portal/trunk/docs/user-guide/en/modules/terms/Portal_concept.xml 2010-02-25 11:02:56 UTC (rev 1862) @@ -6,35 +6,8 @@ <section id="sect-User_Guide-Portal"> <title>Portal</title> <para> - &PRODUCT; is a web-based application that provides users with a personalized User Interface (UI). This interface allows users to easily search applications and information or communicate with other users. +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. </para> - <para> - The Portal provides a graphical 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-25 09:44:27 UTC (rev 1861) +++ portal/trunk/docs/user-guide/en/modules/terms/Public_mode_and_Private_mode.xml 2010-02-25 11:02:56 UTC (rev 1862) @@ -6,7 +6,7 @@ <section id="sect-User_Guide-Modes"> <title>Modes</title> <para> - &PRODUCT; has two <emphasis role="bold">modes</emphasis>: + By default &PRODUCT; offers two access <emphasis role="bold">modes</emphasis>: </para> <variablelist> <varlistentry> @@ -21,7 +21,7 @@ <term>Private</term> <listitem> <para> - This mode is for registered users. Users set a username and password during registration which they can use to sign in. This mode allows 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. + 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. </para> </listitem> </varlistentry> 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-25 09:44:27 UTC (rev 1861) +++ portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml 2010-02-25 11:02:56 UTC (rev 1862) @@ -6,18 +6,15 @@ <section id="sect-User_Guide-Toolbar-Concept"> <title>Toolbar</title> <para> - The Toolbar spans the top of the portal application and contains links to user and administrative actions. It helps users and the administrator access and perform actions easily, quickly and effectively. - </para> - <para> - You can see the toolbar below as it appears in the Portal: - </para> + The Toolbar spans the top of the portal application and provides links to user and administrative actions. + </para> <mediaobject> <imageobject> <imagedata fileref="images/Toolbar.png" format="PNG" width="444" /> </imageobject> </mediaobject> <para> - In this image you can see the three Navigations referred to in <xref linkend="sect-User_Guide-Navigation" /> as well as the main Menu button (on the far left of the toolbar) and the name of the current user (on the far right). + This screenshot displays three Navigations referred to in <xref linkend="sect-User_Guide-Navigation" /> as well as the main Menu button (on the far left of the toolbar) and the name of the current user (on the far right). </para> <para> In this example the current user is the site administrator, hence the extra "Site Editor" menu.

14 years, 10 months

1
0
0 / 0

gatein SVN: r1861 - 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 04:44:27 -0500 (Thu, 25 Feb 2010) New Revision: 1861 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java Log: GTNPORTAL-592 Language of portal wrong when check in Edit layout 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-25 09:25:19 UTC (rev 1860) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-02-25 09:44:27 UTC (rev 1861) @@ -22,6 +22,7 @@ import org.exoplatform.portal.application.PortalRequestContext; import org.exoplatform.portal.config.UserACL; import org.exoplatform.portal.config.UserPortalConfig; +import org.exoplatform.portal.config.UserPortalConfigService; import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.PortalConfig; import org.exoplatform.portal.webui.page.UIPage; @@ -90,10 +91,10 @@ UIPage newUIPage = uiWorkingWS.createUIComponent(UIPage.class, null, null); PortalDataMapper.toUIPage(newUIPage, page); uiToolPanel.setWorkingComponent(newUIPage); - + // Remove current UIPage from UIPageBody pageBody.setUIComponent(null); - + event.getRequestContext().addUIComponentToUpdateByAjax(uiWorkingWS); Util.getPortalRequestContext().setFullRender(true); } @@ -131,8 +132,15 @@ public void execute(Event<UIWorkingWorkspace> event) throws Exception { UIPortalApplication uiApp = Util.getUIPortalApplication(); + UIPortal uiPortal = uiApp.getShowedUIPortal(); - PortalConfig portalConfig = uiApp.getUserPortalConfig().getPortalConfig(); + + UserPortalConfigService service = uiApp.getApplicationComponent(UserPortalConfigService.class); + UserPortalConfig userConfig = + service.getUserPortalConfig(uiPortal.getName(), event.getRequestContext().getRemoteUser()); + + PortalConfig portalConfig = userConfig.getPortalConfig(); + UserACL userACL = uiPortal.getApplicationComponent(UserACL.class); if (!userACL.hasEditPermission(portalConfig)) { @@ -146,7 +154,7 @@ uiApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE); UIPortal newPortal = uiWorkingWS.createUIComponent(UIPortal.class, null, null); - PortalDataMapper.toUIPortal(newPortal, uiApp.getUserPortalConfig()); + PortalDataMapper.toUIPortal(newPortal, userConfig); newPortal.setSelectedNode(uiPortal.getSelectedNode()); newPortal.setSelectedNavigation(uiPortal.getSelectedNavigation()); newPortal.setSelectedPath(uiPortal.getSelectedPath()); @@ -155,7 +163,7 @@ uiEditWS.setUIComponent(newPortal); UISiteBody siteBody = uiWorkingWS.findFirstComponentOfType(UISiteBody.class); siteBody.setUIComponent(null); - + UIPortalComposer uiComposer = uiEditWS.getComposer().setRendered(true); uiComposer.setComponentConfig(UIPortalComposer.class, null); uiComposer.setShowControl(true);

14 years, 10 months

1
0
0 / 0

gatein SVN: r1860 - in portal/trunk: component/application-registry/src/main/java/org/exoplatform/application/gadget and 1 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-02-25 04:25:19 -0500 (Thu, 25 Feb 2010) New Revision: 1860 Added: portal/trunk/component/application-registry/src/main/java/gadgets_1_0.xsd Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/GadgetDeployer.java portal/trunk/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml Log: let's be crazy and use a schema for gadget deployment Added: portal/trunk/component/application-registry/src/main/java/gadgets_1_0.xsd =================================================================== --- portal/trunk/component/application-registry/src/main/java/gadgets_1_0.xsd (rev 0) +++ portal/trunk/component/application-registry/src/main/java/gadgets_1_0.xsd 2010-02-25 09:25:19 UTC (rev 1860) @@ -0,0 +1,46 @@ +<?xml version="1.0"?> + + +<xs:schema + targetNamespace="http://www.gatein.org/xml/ns/gadgets_1_0" + xmlns="http://www.gatein.org/xml/ns/gadgets_1_0" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified" + attributeFormDefault="unqualified" + version="1.0"> + + <xs:element name="gadgets" type="gadgets"/> + + <xs:complexType name="gadgets"> + <xs:sequence minOccurs="0" maxOccurs="unbounded"> + <xs:element name="gadget" type="gadget"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="gadget"> + <xs:sequence> + <xs:choice> + <xs:element name="path" type="xs:string" minOccurs="1" maxOccurs="1"/> + <xs:element name="url" type="xs:string" minOccurs="1" maxOccurs="1"/> + </xs:choice> + </xs:sequence> + <xs:attribute name="name" type="xs:string"/> + </xs:complexType> +</xs:schema> \ No newline at end of file Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/GadgetDeployer.java =================================================================== --- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/GadgetDeployer.java 2010-02-25 08:45:38 UTC (rev 1859) +++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/GadgetDeployer.java 2010-02-25 09:25:19 UTC (rev 1860) @@ -21,6 +21,8 @@ import org.exoplatform.application.gadget.impl.GadgetRegistryServiceImpl; import org.exoplatform.commons.chromattic.ChromatticLifeCycle; import org.exoplatform.commons.chromattic.SessionContext; +import org.exoplatform.commons.xml.DocumentSource; +import org.exoplatform.commons.xml.XMLValidator; import org.exoplatform.container.ExoContainerContext; import org.exoplatform.container.PortalContainer; import org.exoplatform.container.RootContainer; @@ -52,6 +54,9 @@ { /** . */ + private static final XMLValidator validator = new XMLValidator(GadgetDeployer.class, "http://www.gatein.org/xml/ns/gadgets_1_0", "gadgets_1_0.xsd"); + + /** . */ private final Logger log = LoggerFactory.getLogger(GadgetDeployer.class); /** . */ @@ -112,12 +117,9 @@ { ChromatticLifeCycle lifeCycle = gadgetRegistryService.getChromatticLifeCycle(); lifeCycle.openContext(); - InputStream in; try { - in = gadgetsURL.openStream(); - DocumentBuilder db = DocumentBuilderFactory.newInstance().newDocumentBuilder(); - Document docXML = db.parse(in); + Document docXML = validator.validate(DocumentSource.create(gadgetsURL)); NodeList nodeList = docXML.getElementsByTagName("gadget"); for (int i = 0; i < nodeList.getLength(); i++) { Modified: portal/trunk/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml =================================================================== --- portal/trunk/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml 2010-02-25 08:45:38 UTC (rev 1859) +++ portal/trunk/gadgets/eXoGadgets/src/main/webapp/WEB-INF/gadget.xml 2010-02-25 09:25:19 UTC (rev 1860) @@ -20,7 +20,11 @@ --> -<gadgets> +<gadgets + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gadgets_1_0" + xmlns="http://www.gatein.org/xml/ns/gadgets_1_0"> + <gadget name="Todo"> <path>/gadgets/Todo/Todo.xml</path> </gadget>

14 years, 10 months

1
0
0 / 0

gatein SVN: r1859 - in portal/trunk: component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component and 9 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-02-25 03:45:38 -0500 (Thu, 25 Feb 2010) New Revision: 1859 Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/serialization/serial/ObjectWriter.java portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardContainer.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageNavigationTask.java portal/trunk/component/web/src/main/java/org/exoplatform/upload/UploadService.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java portal/trunk/webui/core/src/main/java/org/exoplatform/webui/config/Param.java portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputIconSelector.java portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputWithActions.java portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormSelectBoxWithGroups.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/replication/ReplicatingStateManager.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerList.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageTemplateOptions.java Log: - GTNPORTAL-502 : Remove println messages from java files - make a bit more type safe Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/serialization/serial/ObjectWriter.java =================================================================== --- portal/trunk/component/common/src/main/java/org/exoplatform/commons/serialization/serial/ObjectWriter.java 2010-02-25 07:39:51 UTC (rev 1858) +++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/serialization/serial/ObjectWriter.java 2010-02-25 08:45:38 UTC (rev 1859) @@ -22,6 +22,8 @@ import org.exoplatform.commons.serialization.SerializationContext; import org.exoplatform.commons.serialization.api.TypeConverter; import org.exoplatform.commons.serialization.model.*; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import java.io.*; import java.util.IdentityHashMap; @@ -34,6 +36,9 @@ { /** . */ + private static final Logger log = LoggerFactory.getLogger(ObjectWriter.class); + + /** . */ private final SerializationContext context; /** . */ @@ -188,7 +193,7 @@ case FULL: break; case PARTIAL: - System.out.println("Partial serialization of object " + obj); + log.debug("Partial serialization of object " + obj); break; case NONE: throw new NotSerializableException("Type " + typeModel + " is not serializable"); Modified: portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardContainer.java =================================================================== --- portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardContainer.java 2010-02-25 07:39:51 UTC (rev 1858) +++ portal/trunk/component/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardContainer.java 2010-02-25 08:45:38 UTC (rev 1859) @@ -105,7 +105,7 @@ windowId = ((PortletRequestContext)context).getRequest().getWindowID(); Param param = initParams.getParam("ContainerConfigs"); - containerOptions = param.getMapGroovyObject(context); + containerOptions = (List<SelectItemOption<String>>)param.getMapGroovyObject(context); if (containerOptions == null) { return; Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2010-02-25 07:39:51 UTC (rev 1858) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2010-02-25 08:45:38 UTC (rev 1859) @@ -27,6 +27,8 @@ import org.exoplatform.portal.application.PortletPreferences; import org.exoplatform.portal.config.NoSuchDataException; import org.exoplatform.portal.pom.data.Mapper; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.gatein.mop.api.Model; import org.gatein.mop.api.content.Customization; import org.gatein.mop.api.workspace.ObjectType; @@ -57,6 +59,9 @@ { /** . */ + private static final Logger log = LoggerFactory.getLogger(POMSession.class); + + /** . */ private static final Map<ObjectType<?>, Class> mapping = new HashMap<ObjectType<?>, Class>(); static @@ -396,7 +401,7 @@ } else { - System.out.println("Will not save session that is marked for rollback"); + log.debug("Will not save session that is marked for rollback"); } } } Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageNavigationTask.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageNavigationTask.java 2010-02-25 07:39:51 UTC (rev 1858) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/tasks/PageNavigationTask.java 2010-02-25 08:45:38 UTC (rev 1859) @@ -26,6 +26,8 @@ import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.data.NavigationData; import org.exoplatform.portal.pom.data.NavigationKey; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import org.gatein.mop.api.workspace.Navigation; import org.gatein.mop.api.workspace.ObjectType; import org.gatein.mop.api.workspace.Site; @@ -39,6 +41,9 @@ { /** . */ + private static final Logger log = LoggerFactory.getLogger(PageNavigationTask.class); + + /** . */ protected final ObjectType<? extends Site> siteType; /** . */ @@ -88,7 +93,7 @@ } else { - System.out.println("Cannot load page navigation as the corresponding portal " + key.getId() + log.debug("Cannot load page navigation as the corresponding portal " + key.getId() + " with type " + siteType + " does not exist"); } Modified: portal/trunk/component/web/src/main/java/org/exoplatform/upload/UploadService.java =================================================================== --- portal/trunk/component/web/src/main/java/org/exoplatform/upload/UploadService.java 2010-02-25 07:39:51 UTC (rev 1858) +++ portal/trunk/component/web/src/main/java/org/exoplatform/upload/UploadService.java 2010-02-25 08:45:38 UTC (rev 1859) @@ -21,6 +21,8 @@ import org.exoplatform.container.xml.InitParams; import org.exoplatform.container.xml.PortalContainerInfo; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import java.io.File; import java.io.FileOutputStream; @@ -40,6 +42,9 @@ public class UploadService { + /** . */ + private static final Logger log = LoggerFactory.getLogger(UploadService.class); + private Map<String, UploadResource> uploadResources = new LinkedHashMap<String, UploadResource>(); private String uploadLocation_; @@ -78,7 +83,7 @@ upResource.setStatus(UploadResource.FAILED_STATUS); //upResource.setLimitMB(limitMB); uploadResources.put(uploadId, upResource); - System.out.println("Upload cancelled because file bigger than size limit : " + estimatedSizeMB + " MB > " + log.debug("Upload cancelled because file bigger than size limit : " + estimatedSizeMB + " MB > " + limitMB + " MB"); // WebuiRequestContext ctx = WebuiRequestContext.getCurrentInstance(); // UIApplication uiApp = ctx.getUIApplication(); @@ -129,7 +134,7 @@ { // a limit set to 0 means unlimited upResource.setStatus(UploadResource.FAILED_STATUS); uploadResources.put(uploadId, upResource); - System.out.println("Upload cancelled because file bigger than size limit : " + estimatedSizeMB + " MB > " + log.debug("Upload cancelled because file bigger than size limit : " + estimatedSizeMB + " MB > " + limitMB + " MB"); return; } Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2010-02-25 07:39:51 UTC (rev 1858) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2010-02-25 08:45:38 UTC (rev 1859) @@ -72,7 +72,7 @@ { Param param = initParams.getParam("SampleGadget"); WebuiRequestContext context = WebuiRequestContext.getCurrentInstance(); - String sample = param.getMapGroovyObject(context); + String sample = (String)param.getMapGroovyObject(context); addUIFormInput(new UIFormTextAreaInput(FIELD_SOURCE, null, sample).addValidator(MandatoryValidator.class) .addValidator(GadgetSpecValidator.class)); } Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/config/Param.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/config/Param.java 2010-02-25 07:39:51 UTC (rev 1858) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/config/Param.java 2010-02-25 08:45:38 UTC (rev 1859) @@ -25,12 +25,17 @@ import org.exoplatform.resolver.ResourceResolver; import org.exoplatform.webui.application.WebuiRequestContext; import org.exoplatform.xml.object.XMLObject; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import java.io.InputStream; public class Param { + /** . */ + private static final Logger log = LoggerFactory.getLogger(Param.class); + private String name; private String value; @@ -69,12 +74,12 @@ } @SuppressWarnings("unchecked") - public <T> T getMapGroovyObject(WebuiRequestContext context) throws Exception + public Object getMapGroovyObject(WebuiRequestContext context) throws Exception { try { if (object != null) - return (T)object; + return object; ResourceResolver resolver = context.getResourceResolver(value); InputStream is = resolver.getInputStream(value); //TODO if is == null throw an exception saying the it's impossible to find the file @@ -82,17 +87,16 @@ GroovyShell shell = new GroovyShell(Thread.currentThread().getContextClassLoader(), binding); object = shell.evaluate(is); is.close(); - return (T)object; + return object; } - catch (Exception ex) + catch (Exception e) { - System.out.println("A problem in the groovy script : " + value); - ex.printStackTrace(); - throw ex; + log.error("A problem in the groovy script : " + value, e); + throw e; } } - public <T> T getFreshObject(WebuiRequestContext context) throws Exception + public Object getFreshObject(WebuiRequestContext context) throws Exception { try { @@ -102,13 +106,12 @@ GroovyShell shell = new GroovyShell(Thread.currentThread().getContextClassLoader(), binding); object = shell.evaluate(is); is.close(); - return (T)object; + return object; } - catch (Exception ex) + catch (Exception e) { - System.out.println("A problem in the groovy script : " + value); - ex.printStackTrace(); - throw ex; + log.error("A problem in the groovy script : " + value, e); + throw e; } } } \ No newline at end of file Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputIconSelector.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputIconSelector.java 2010-02-25 07:39:51 UTC (rev 1858) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputIconSelector.java 2010-02-25 08:45:38 UTC (rev 1859) @@ -111,7 +111,7 @@ { if (param.getName().equals(paramName)) { - CategoryIcon categoryIconSet = param.getMapGroovyObject(context); + CategoryIcon categoryIconSet = (CategoryIcon)param.getMapGroovyObject(context); if (selectedIconCategory == null) selectedIconCategory = categoryIconSet; for (IconSet iconset : categoryIconSet.getCategory()) Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputWithActions.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputWithActions.java 2010-02-25 07:39:51 UTC (rev 1858) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormInputWithActions.java 2010-02-25 08:45:38 UTC (rev 1859) @@ -109,18 +109,18 @@ catch (MissingResourceException ex) { actionLabel = action.getActionName(); - System.out.println("\n Key: '" + uiForm.getId() + ".label.action." + action.getActionName() + log.debug("Key: '" + uiForm.getId() + ".label.action." + action.getActionName() + "' not found"); } String actionLink; if (action.getActionParameter() != null) { actionLink = - ((UIComponent)getParent()).event(action.getActionListener(), action.getActionParameter()); + getParent().event(action.getActionListener(), action.getActionParameter()); } else { - actionLink = ((UIComponent)getParent()).event(action.getActionListener()); + actionLink = getParent().event(action.getActionListener()); } if (action.getActionType() == ActionData.TYPE_ICON) Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormSelectBoxWithGroups.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormSelectBoxWithGroups.java 2010-02-25 07:39:51 UTC (rev 1858) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/UIFormSelectBoxWithGroups.java 2010-02-25 08:45:38 UTC (rev 1859) @@ -24,6 +24,8 @@ import org.exoplatform.webui.core.model.SelectItem; import org.exoplatform.webui.core.model.SelectOption; import org.exoplatform.webui.core.model.SelectOptionGroup; +import org.gatein.common.logging.Logger; +import org.gatein.common.logging.LoggerFactory; import java.io.Writer; import java.util.ArrayList; @@ -38,6 +40,9 @@ public class UIFormSelectBoxWithGroups extends UIFormStringInput { + /** . */ + private static final Logger log = LoggerFactory.getLogger(UIFormSelectBoxWithGroups.class); + /** * It make SelectBox's ability to select multiple values */ @@ -339,7 +344,7 @@ } catch (MissingResourceException ex) { - System.out.println("Could not find: " + getFrom().getId() + ".optionGroup.label." + label); + log.debug("Could not find: " + getFrom().getId() + ".optionGroup.label." + label); } w.write("<optgroup label=\""); w.write(label); Modified: 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 07:39:51 UTC (rev 1858) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/replication/ReplicatingStateManager.java 2010-02-25 08:45:38 UTC (rev 1859) @@ -31,6 +31,8 @@ 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; @@ -46,6 +48,12 @@ 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 { @@ -59,7 +67,7 @@ String key = getKey(context); // - ApplicationState appState = (ApplicationState)session.getAttribute("bilto_" + key); + ApplicationState appState = (ApplicationState)session.getAttribute(APPLICATION_ATTRIBUTE_PREFIX + key); // UIApplication uiapp = null; @@ -74,11 +82,11 @@ // if (appState != null) { - System.out.println("Found application " + key + " :" + appState.getApplication()); + log.debug("Found application " + key + " :" + appState.getApplication()); } else { - System.out.println("Application " + key + " not found"); + log.debug("Application " + key + " not found"); } // Looks like some necessary hacking @@ -123,8 +131,8 @@ String key = getKey(context); // - System.out.println("Storing application " + key); - session.setAttribute("bilto_" + key, new ApplicationState(uiapp, context.getRemoteUser())); + log.debug("Storing application " + key); + session.setAttribute(APPLICATION_ATTRIBUTE_PREFIX + key, new ApplicationState(uiapp, context.getRemoteUser())); } @Override Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerList.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerList.java 2010-02-25 07:39:51 UTC (rev 1858) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerList.java 2010-02-25 08:45:38 UTC (rev 1859) @@ -59,7 +59,7 @@ return; WebuiRequestContext context = WebuiRequestContext.getCurrentInstance(); Param param = initParams.getParam("ContainerConfigOption"); - categories_ = param.getMapGroovyObject(context); + categories_ = (List<SelectItemCategory>)param.getMapGroovyObject(context); if (categories_ == null) return; setSelectedCategory(categories_.get(0)); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-02-25 07:39:51 UTC (rev 1858) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-02-25 08:45:38 UTC (rev 1859) @@ -131,7 +131,7 @@ WebuiRequestContext context = WebuiRequestContext.getCurrentInstance(); Param param = initParams.getParam("PageTemplate"); - List<SelectItemCategory> itemCategories = param.getMapGroovyObject(context); + List<SelectItemCategory> itemCategories = (List<SelectItemCategory>)param.getMapGroovyObject(context); UIFormInputItemSelector uiTemplate = new UIFormInputItemSelector("Template", "template"); uiTemplate.setItemCategories(itemCategories); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageTemplateOptions.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageTemplateOptions.java 2010-02-25 07:39:51 UTC (rev 1858) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageTemplateOptions.java 2010-02-25 08:45:38 UTC (rev 1859) @@ -54,7 +54,7 @@ return; WebuiRequestContext context = WebuiRequestContext.getCurrentInstance(); Param param = initParams.getParam("PageLayout"); - categories_ = param.getFreshObject(context); + categories_ = (List<SelectItemCategory>)param.getFreshObject(context); selectedItemOption_ = getDefaultItemOption(); List<SelectItemOption<String>> itemOptions = new ArrayList<SelectItemOption<String>>();

14 years, 10 months

1
0
0 / 0

gatein SVN: r1858 - in portal/trunk: webui/eXo/src/main/java/org/exoplatform/webui/organization and 1 other directory.

by do-not-reply＠jboss.org

Author: liem_nguyen Date: 2010-02-25 02:39:51 -0500 (Thu, 25 Feb 2010) New Revision: 1858 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java Log: GTNPORTAL-703 When passwords aren't equals when we change it, Gatein return an "Info" Box Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java 2010-02-25 07:38:37 UTC (rev 1857) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java 2010-02-25 07:39:51 UTC (rev 1858) @@ -114,7 +114,7 @@ String oldEmail = user.getEmail(); if (user == null) { - uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg.user-is-deleted", null)); + uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg.user-is-deleted", null, ApplicationMessage.WARNING)); UIUserInfo userInfo = getParent(); if (userInfo != null) { @@ -137,7 +137,7 @@ String pass2x = getUIStringInput(PASSWORD2X).getValue(); if (!pass1x.equals(pass2x)) { - uiApp.addMessage(new ApplicationMessage("UIAccountForm.msg.password-is-not-match", null)); + uiApp.addMessage(new ApplicationMessage("UIAccountForm.msg.password-is-not-match", null, ApplicationMessage.WARNING)); return false; } user.setPassword(pass1x); @@ -153,7 +153,7 @@ user.setEmail(oldEmail); query.setEmail(oldEmail); Object[] args = {username}; - uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg.email-exist", args)); + uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg.email-exist", args, ApplicationMessage.WARNING)); return false; } service.getUserHandler().saveUser(user, true); Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java =================================================================== --- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java 2010-02-25 07:38:37 UTC (rev 1857) +++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java 2010-02-25 07:39:51 UTC (rev 1858) @@ -19,13 +19,13 @@ package org.exoplatform.webui.organization; +import org.exoplatform.commons.serialization.api.annotations.Serialized; import org.exoplatform.portal.pom.config.Utils; import org.exoplatform.services.organization.OrganizationService; import org.exoplatform.services.organization.Query; import org.exoplatform.services.organization.User; import org.exoplatform.web.application.ApplicationMessage; import org.exoplatform.webui.application.WebuiRequestContext; -import org.exoplatform.commons.serialization.api.annotations.Serialized; import org.exoplatform.webui.core.UIApplication; import org.exoplatform.webui.form.UIFormInputWithActions; import org.exoplatform.webui.form.UIFormStringInput; @@ -103,7 +103,7 @@ String pass2x = getUIStringInput(PASSWORD2X).getValue(); if (!pass1x.equals(pass2x)) { - uiApp.addMessage(new ApplicationMessage("UIAccountForm.msg.password-is-not-match", null)); + uiApp.addMessage(new ApplicationMessage("UIAccountForm.msg.password-is-not-match", null, ApplicationMessage.ERROR)); return false; } String username = getUIStringInput(USERNAME).getValue(); @@ -115,7 +115,7 @@ if (service.getUserHandler().findUserByName(user.getUserName()) != null) { Object[] args = {user.getUserName()}; - uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg.user-exist", args)); + uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg.user-exist", args, ApplicationMessage.ERROR)); return false; } @@ -124,7 +124,7 @@ if (service.getUserHandler().findUsers(query).getAll().size() > 0) { Object[] args = {user.getUserName()}; - uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg.email-exist", args)); + uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg.email-exist", args, ApplicationMessage.ERROR)); return false; }

14 years, 10 months

1
0
0 / 0

gatein SVN: r1857 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component.

by do-not-reply＠jboss.org

Author: liem_nguyen Date: 2010-02-25 02:38:37 -0500 (Thu, 25 Feb 2010) New Revision: 1857 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java Log: GTNPORTAL-700 saving a profile will not return you to the main user management page Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java 2010-02-25 04:46:32 UTC (rev 1856) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java 2010-02-25 07:38:37 UTC (rev 1857) @@ -141,6 +141,16 @@ uiApp.findFirstComponentOfType(UIWorkingWorkspace.class)); Util.getPortalRequestContext().setFullRender(true); } + + UIUserManagement userManagement = uiUserInfo.getParent(); + UIListUsers listUser = userManagement.getChild(UIListUsers.class); + UIAccountEditInputSet accountInput = uiUserInfo.getChild(UIAccountEditInputSet.class); + UIUserProfileInputSet userProfile = uiUserInfo.getChild(UIUserProfileInputSet.class); + uiUserInfo.setRenderSibling(UIListUsers.class); + listUser.search(new Query()); + accountInput.reset(); + userProfile.reset(); + event.getRequestContext().setProcessRender(true); } }

14 years, 10 months

1
0
0 / 0

gatein SVN: r1856 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2010-02-24 23:46:32 -0500 (Wed, 24 Feb 2010) New Revision: 1856 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java Log: Fix error of missing Edit Page item in admin toolbar after aborting edit page Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-02-25 04:31:14 UTC (rev 1855) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-02-25 04:46:32 UTC (rev 1856) @@ -589,11 +589,13 @@ UIPortalApplication uiPortalApp = Util.getUIPortalApplication(); uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE); - UIPortal uiPortal = Util.getUIPortal(); + UIPortal uiPortal = uiPortalApp.getShowedUIPortal(); uiPortal.setRenderSibling(UIPortal.class); UIPortalComposer composer = uiWorkingWS.findFirstComponentOfType(UIPortalComposer.class).setRendered(false); composer.setEditted(false); + uiPortal.refreshUIPage(); + PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, (uiPortal.getSelectedNode() != null ? uiPortal.getSelectedNode().getUri() : null));

14 years, 10 months

1
0
0 / 0

gatein SVN: r1855 - portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization.

by do-not-reply＠jboss.org

Author: liem_nguyen Date: 2010-02-24 23:31:14 -0500 (Wed, 24 Feb 2010) New Revision: 1855 Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroupMembershipSelector.java Log: GTNPORTAL-593 Don't update new membership in Select Permission form after create new membership Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroupMembershipSelector.java =================================================================== --- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroupMembershipSelector.java 2010-02-25 04:10:17 UTC (rev 1854) +++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIGroupMembershipSelector.java 2010-02-25 04:31:14 UTC (rev 1855) @@ -19,25 +19,25 @@ package org.exoplatform.webui.organization; +import org.exoplatform.commons.serialization.api.annotations.Serialized; import org.exoplatform.services.organization.Group; import org.exoplatform.services.organization.MembershipType; import org.exoplatform.services.organization.OrganizationService; import org.exoplatform.web.application.ApplicationMessage; import org.exoplatform.webui.application.WebuiRequestContext; -import org.exoplatform.commons.serialization.api.annotations.Serialized; import org.exoplatform.webui.config.annotation.ComponentConfig; import org.exoplatform.webui.config.annotation.ComponentConfigs; import org.exoplatform.webui.config.annotation.EventConfig; import org.exoplatform.webui.core.UIApplication; import org.exoplatform.webui.core.UIBreadcumbs; -import org.exoplatform.webui.core.UIBreadcumbs.LocalPath; import org.exoplatform.webui.core.UIComponent; import org.exoplatform.webui.core.UIContainer; import org.exoplatform.webui.core.UIPopupWindow; import org.exoplatform.webui.core.UITree; +import org.exoplatform.webui.core.UIBreadcumbs.LocalPath; import org.exoplatform.webui.event.Event; +import org.exoplatform.webui.event.EventListener; import org.exoplatform.webui.event.Event.Phase; -import org.exoplatform.webui.event.EventListener; import org.exoplatform.webui.form.UIForm; import java.util.ArrayList; @@ -103,6 +103,28 @@ } }*/ + /** + * @see org.exoplatform.webui.core.UIComponent#processRender(org.exoplatform.webui.application.WebuiRequestContext) + */ + @Override + public void processRender(WebuiRequestContext context) throws Exception + { + OrganizationService service = getApplicationComponent(OrganizationService.class); + Collection<?> sibblingsGroup = service.getGroupHandler().findGroups(null); + UITree tree = getChild(UITree.class); + if (tree != null) + tree.setSibbling((List)sibblingsGroup); + + Collection<?> collection = service.getMembershipTypeHandler().findMembershipTypes(); + listMemberhip = new ArrayList<String>(5); + for (Object obj : collection) + { + listMemberhip.add(((MembershipType)obj).getName()); + } + listMemberhip.add("*"); + super.processRender(context); + } + public Group getCurrentGroup() { return selectGroup_; @@ -192,7 +214,7 @@ UIComponent uiComp = event.getSource(); UIGroupMembershipSelector uiSelector = uiComp.getParent(); uiSelector.changeGroup(groupId); - UIComponent uiPermission = uiSelector.<UIComponent>getParent().getParent(); + UIComponent uiPermission = uiSelector.<UIComponent> getParent().getParent(); uiPermission.setRenderSibling(uiPermission.getClass()); uiPermission.broadcast(event, Event.Phase.PROCESS); UIPopupWindow uiPopup = uiSelector.getParent(); @@ -214,7 +236,7 @@ public void execute(Event<UIGroupMembershipSelector> event) throws Exception { UIGroupMembershipSelector uiSelector = event.getSource(); - UIComponent uiPermission = uiSelector.<UIComponent>getParent().getParent(); + UIComponent uiPermission = uiSelector.<UIComponent> getParent().getParent(); uiPermission.setRenderSibling(uiPermission.getClass()); WebuiRequestContext pcontext = event.getRequestContext(); @@ -235,7 +257,7 @@ { UIApplication uiApp = pcontext.getUIApplication(); uiApp.addMessage(new ApplicationMessage("UIGroupMembershipSelector.msg.selectGroup", null)); -// pcontext.addUIComponentToUpdateByAjax(uiApp.getUIPopupMessages()); + // pcontext.addUIComponentToUpdateByAjax(uiApp.getUIPopupMessages()); uiPopup.setShow(true); return; }

14 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits February 2010