gatein SVN: r5260 - epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-11-25 03:11:57 -0500 (Thu, 25 Nov 2010)
New Revision: 5260
Modified:
epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java
Log:
JBEPP-672: Remove screens to select layouts (revert disable page template)
Modified: epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-11-25 06:16:06 UTC (rev 5259)
+++ epp/portal/branches/EPP_5_1_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-11-25 08:11:57 UTC (rev 5260)
@@ -130,12 +130,12 @@
addUIFormInput(uiSettingSet);
setSelectedTab(uiSettingSet.getId());
- WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
- Param param = initParams.getParam("PageTemplate");
- List<SelectItemCategory> itemCategories = (List<SelectItemCategory>)param.getMapGroovyObject(context);
- UIFormInputItemSelector uiTemplate = new UIFormInputItemSelector("Template", "template");
- uiTemplate.setItemCategories(itemCategories);
- addUIFormInput(uiTemplate);
+ //WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
+ //Param param = initParams.getParam("PageTemplate");
+ //List<SelectItemCategory> itemCategories = (List<SelectItemCategory>)param.getMapGroovyObject(context);
+ //UIFormInputItemSelector uiTemplate = new UIFormInputItemSelector("Template", "template");
+ //uiTemplate.setItemCategories(itemCategories);
+ //addUIFormInput(uiTemplate);
uiPermissionSetting = createUIComponent(UIFormInputSet.class, "PermissionSetting", null);
UIListPermissionSelector uiListPermissionSelector = createUIComponent(UIListPermissionSelector.class, null, null);
14 years, 1 month
gatein SVN: r5259 - in epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US: modules and 1 other directory.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-11-25 01:16:06 -0500 (Thu, 25 Nov 2010)
New Revision: 5259
Added:
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/export_done.png
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/export_list.png
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/export_portlet_list.png
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/import_modified_page.png
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/import_original_page.png
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/import_selected_page.png
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/import_start.png
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/import_success.png
Modified:
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/WSRP.xml
Log:
JBEPP-580: WSRP2 content imported from GateIn Reference Guide
Added: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/export_done.png
===================================================================
(Binary files differ)
Property changes on: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/export_done.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/export_list.png
===================================================================
(Binary files differ)
Property changes on: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/export_list.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/export_portlet_list.png
===================================================================
(Binary files differ)
Property changes on: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/export_portlet_list.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/import_modified_page.png
===================================================================
(Binary files differ)
Property changes on: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/import_modified_page.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/import_original_page.png
===================================================================
(Binary files differ)
Property changes on: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/import_original_page.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/import_selected_page.png
===================================================================
(Binary files differ)
Property changes on: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/import_selected_page.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/import_start.png
===================================================================
(Binary files differ)
Property changes on: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/import_start.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/import_success.png
===================================================================
(Binary files differ)
Property changes on: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/images/WSRP/import_success.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/WSRP.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/WSRP.xml 2010-11-25 03:33:55 UTC (rev 5258)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/WSRP.xml 2010-11-25 06:16:06 UTC (rev 5259)
@@ -218,7 +218,7 @@
</para>
</note>
<para>
- &PRODUCT; does <emphasis role="bold">NOT</emphasis>, by default, expose local portlets for consumption by remote WSRP consumers.
+ &PRODUCT; does <emphasis role="bold">not</emphasis>, by default, expose local portlets for consumption by remote WSRP consumers.
</para>
<para>
In order to make a portlet remotely available, it must be made "remotable" by marking it as such in the associated <filename>portlet.xml</filename>.
@@ -277,8 +277,11 @@
&PRODUCT;'s Producer is automatically set up when a portal instance is deployed with the WSRP service.
</para>
<para>
- The WSDL file can be accessed at <filename>http://<replaceable>{hostname}</replaceable>:<replaceable>{port}</replaceable>/wsrp-producer/MarkupService?wsdl</filename>. The default hostname is <literal>localhost</literal> and the default port is <literal>8080</literal>.
+ The WSDL file can be accessed at <filename>http://<replaceable>{hostname}</replaceable>:<replaceable>{port}</replaceable>/wsrp-producer/<replaceable><VERSION></replaceable>/MarkupService?wsdl</filename> (replace <VERSION> with either <emphasis>v1</emphasis> or <emphasis>v2</emphasis>, depending on which version of WSRP you are using).
</para>
+ <para>
+ The default hostname is <literal>localhost</literal> and the default port is <literal>8080</literal>.
+ </para>
</section>
@@ -323,15 +326,11 @@
<para>
&PRODUCT; provides a graphical portlet to assist with configuring access to, and other facets of, remote WSRP Producers.
</para>
- <para>
- The Configuration Portlet is available at: <ulink type="http" url="http://localhost:8080/portal/login?initialURI=%2Fportal%2Fprivate%2Fclass..."></ulink>
- </para>
<!--DOC NOTE: Branching issue -->
-<!--Removed for 5.1 Allianz Beta Release (not required and still formalising branching concerns)
- <important>
+ <important>
<title>Important: Version-specific Information</title>
<para>
- <emphasis role="bold">The implementation of this portlet has changed between the &PRODUCT; 5.0 and &PRODUCT; 5.1 releases:</emphasis>
+ <emphasis role="bold">The implementation of this portlet has changed between the &PRODUCT; 5.0 (WSRP 1.0) and &PRODUCT; 5.1 (WSRP 2.0) releases:</emphasis>
</para>
<formalpara id="form-Reference_Guide-Configuring_a_Remote_Producer-The_Configuration_Portlet-5.1_Accessing">
<title><emphasis role="bold">EPP 5.1: Accessing the Configuration Portlet</emphasis></title>
@@ -363,7 +362,7 @@
</para>
</step>
</procedure>
- </important>-->
+ </important>
@@ -511,7 +510,6 @@
</note>
</section>
-
<section id="sect-Reference_Guide-Configuring_a_Remote_Producer-Configuring_Access_to_a_Remote_Portlet">
<title>Configuring Access to a Remote Portlet</title>
<para>
@@ -609,7 +607,7 @@
The rate at which the information is refreshed is defined by the <literal>expiration-cache</literal> attribute of the <literal><wsrp-producer></literal> element (in seconds).
</para>
<para>
- For example; providing a value of 120 for expiration-cache means that the producer information will not be refreshed for 2 minutes after it has been accessed. If no value is provided, &PRODUCT; will always access the remote producer regardless of whether the remote information has changed or not.
+ For example; providing a value of <literal>120</literal> for expiration-cache means that the producer information will not be refreshed for 2 minutes after it has been accessed. If no value is provided, &PRODUCT; will always access the remote producer regardless of whether the remote information has changed or not.
</para>
<para>
Since, in most instances, the information provided by the producer does not change often, use of this caching facility to minimize bandwidth usage is recommended.
@@ -864,7 +862,7 @@
</varlistentry>
</variablelist>
<formalpara>
- <title><emphasis role="bold">&PRODUCT; 5.1: Additional Functionalities in WSRP 2.0</emphasis></title>
+ <title><emphasis role="bold">EPP 5.1: Additional Functionalities in WSRP 2.0</emphasis></title>
<para>
In addition to those listed above, the WSRP 2.0 implementation in &PRODUCT; 5.1 also includes the following functions:
</para>
@@ -902,15 +900,188 @@
<para>
The import/export implementation in &PRODUCT; allows users to export portlets from a given consumer and then import them back to replace existing portlets assigned to windows on pages by the previously exported portlets.
</para>
- <!--<note>
- <title><emphasis role="bold">DOC TODO</emphasis></title>
- <para>
- Walk-through exporting portlets and then importing them.
- </para>
- </note>-->
+ <procedure>
+ <title></title>
+ <step>
+ <para>
+ Click on the "<guilabel>Export</guilabel>" action for a given consumer to display the list of portlets currently made available by this specific consumer. An example list is shown below:
+ </para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/WSRP/export_portlet_list.png" format="PNG" align="center" scale="95" />
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/WSRP/export_portlet_list.png" format="PNG" align="center" contentwidth="150mm" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
+ Once portlets have been selected, they can be exported by clicking on the "<guilabel>Export</guilabel>" button. This makes them available for later import:
+ </para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/WSRP/export_done.png" format="PNG" align="center" scale="95" />
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/WSRP/export_done.png" format="PNG" align="center" contentwidth="150mm" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ <step>
+ <para>
+ The portlets can be re-imported directly by pressing the "<guilabel>Use for import</guilabel>" button or, on the Consumers list page, using the "<guilabel>Import</guilabel>" action for a given consumer.
+ </para>
+ <para>
+ The example below assumes that the second option has been used and that several sets of previously exported portlets are available to import from. After clicking the action link, a screen similar to the one below shoould appear:
+ </para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/WSRP/export_list.png" format="PNG" align="center" scale="95" />
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/WSRP/export_list.png" format="PNG" align="center" contentwidth="150mm" />
+ </imageobject>
+ </mediaobject>
+ <para>
+ This screen presents the list of available exports with available operations for each.
+ </para>
+ <variablelist>
+ <title>View</title>
+ <varlistentry>
+ <term></term>
+ <listitem>
+ <para>
+ Displays the export details as previously seen when the export was first performed.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Delete</term>
+ <listitem>
+ <para>
+ Deletes the selected export, asking you for confirmation first.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Use for import</term>
+ <listitem>
+ <para>
+ Selects the export to import portlets from.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </step>
+ <step>
+ <para>
+ Once you have selected an export to import from, you will see a screen similar to the one below:
+ </para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/WSRP/import_start.png" format="PNG" align="center" scale="95" />
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/WSRP/import_start.png" format="PNG" align="center" contentwidth="150mm" />
+ </imageobject>
+ </mediaobject>
+ <para>
+ The screen displays the list of available exported portlets for the previously selected export. You can select which portlet you want to import by checking the checkbox next to its name.
+ </para>
+ </step>
+ <step>
+ <para>
+ Select the content of which window the imported portlet will replace. This process is done in three steps:
+ </para>
+ <para>
+ This example assumes that you have the following page called <literal>page1</literal> which contains two windows called <literal>NetUnity WSRP 2 Interop - Cache Markup (remote)</literal> and <literal>/samples-remotecontroller-portlet.RemoteControl (remote)</literal>, as shown below:
+ </para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/WSRP/import_original_page.png" format="PNG" align="center" scale="95" />
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/WSRP/import_original_page.png" format="PNG" align="center" contentwidth="150mm" />
+ </imageobject>
+ </mediaobject>
+ <para>
+ In this example, we want to replace the content of the <literal>/samples-remotecontroller-portlet.RemoteControl (remote)</literal> with the content of the <literal>/ajaxPortlet.JSFAJAXPortlet</literal> portlet that we previously exported.
+ </para>
+ <procedure>
+ <title></title>
+ <step>
+ <para>
+ Check the box next to the <literal>/ajaxPortlet.JSFAJAXPortlet</literal> portlet name to indicate that you want to import its data.
+ </para>
+ </step>
+ <step>
+ <para>
+ Select <literal>page1</literal> in the list of available pages. The screen will then refresh to display the list of available windows on that page, similar to the one seen below:
+ </para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/WSRP/import_selected_page.png" format="PNG" align="center" scale="95" />
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/WSRP/import_selected_page.png" format="PNG" align="center" contentwidth="150mm" />
+ </imageobject>
+ </mediaobject>
+ <note>
+ <title></title>
+ <para>
+ At this point, you still need to select the window which content we want to replace before being able to complete the import operation
+ </para>
+ </note>
+ </step>
+ <step>
+ <para>
+ Select the <literal>/samples-remotecontroller-portlet.RemoteControl (remote)</literal> window, which enables the "<guilabel>Import</guilabel>" button. This indicates that all the necessary data to perform the import is available.
+ </para>
+ </step>
+ <step>
+ <para>
+ Click the "<guilabel>Import</guilabel>" button. A screen similar to the one below will appear:
+ </para>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/WSRP/import_success.png" format="PNG" align="center" scale="95" />
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/WSRP/import_success.png" format="PNG" align="center" contentwidth="150mm" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ </procedure>
+ </step>
+ <step>
+ <para>
+ The <literal>page1</literal> page should now show:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ That the content of <literal>/samples-remotecontroller-portlet.RemoteControl (remote)</literal> window has been replaced by the content of the <literal>/ajaxPortlet.JSFAJAXPortlet</literal> imported portlet.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ The window has been renamed appropriately:
+ </para>
+ </listitem>
+ </itemizedlist>
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/WSRP/import_modified_page.png" format="PNG" align="center" scale="95" />
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/WSRP/import_modified_page.png" format="PNG" align="center" contentwidth="150mm" />
+ </imageobject>
+ </mediaobject>
+ </step>
+ </procedure>
</section>
</section>
-
<section id="sect-Reference_Guide-Consumers_Maintenance-Erasing_Local_Registration_Data">
<title>Erasing Local Registration Data</title>
@@ -999,6 +1170,8 @@
<para>
The full service description includes which <classname>RegistrationPolicy</classname> (and <classname>RegistrationPropertyValidator</classname> if needed) to use, as well as required registration property descriptions for which consumers must provide acceptable values to successfully register.
</para>
+ <para>
+ WSDL URLs to access &PRODUCT_NAME;'s WSRP producer are now displayed in either in WSRP 1 or WSRP 2 mode.</para>
</section>
14 years, 1 month
gatein SVN: r5258 - portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2010-11-24 22:33:55 -0500 (Wed, 24 Nov 2010)
New Revision: 5258
Modified:
portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java
Log:
GTNPORTAL-1106 Remove screens to select layouts (revert disable page template)
Modified: portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-11-25 03:17:15 UTC (rev 5257)
+++ portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageForm.java 2010-11-25 03:33:55 UTC (rev 5258)
@@ -125,12 +125,12 @@
addUIFormInput(uiSettingSet);
setSelectedTab(uiSettingSet.getId());
- WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
- Param param = initParams.getParam("PageTemplate");
- List<SelectItemCategory> itemCategories = (List<SelectItemCategory>)param.getMapGroovyObject(context);
- UIFormInputItemSelector uiTemplate = new UIFormInputItemSelector("Template", "template");
- uiTemplate.setItemCategories(itemCategories);
- addUIFormInput(uiTemplate);
+ //WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
+ //Param param = initParams.getParam("PageTemplate");
+ //List<SelectItemCategory> itemCategories = (List<SelectItemCategory>)param.getMapGroovyObject(context);
+ //UIFormInputItemSelector uiTemplate = new UIFormInputItemSelector("Template", "template");
+ //uiTemplate.setItemCategories(itemCategories);
+ //addUIFormInput(uiTemplate);
uiPermissionSetting = createUIComponent(UIFormInputSet.class, "PermissionSetting", null);
UIListPermissionSelector uiListPermissionSelector = createUIComponent(UIListPermissionSelector.class, null, null);
14 years, 1 month
gatein SVN: r5257 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-11-24 22:17:15 -0500 (Wed, 24 Nov 2010)
New Revision: 5257
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_25_ChangeContainerInPortal.html
Log:
TestVN-356:Clean and Improve existing Selenium for GateIn
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_25_ChangeContainerInPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_25_ChangeContainerInPortal.html 2010-11-25 02:38:04 UTC (rev 5256)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_25_ChangeContainerInPortal.html 2010-11-25 03:17:15 UTC (rev 5257)
@@ -443,17 +443,17 @@
</tr>
<tr>
<td>mouseOver</td>
- <td>//div[4]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td>
+ <td>//div[5]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td>
<td>Test_SNF_PRL_25</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[4]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
+ <td>//div[5]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[4]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
+ <td>//div[5]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
<td></td>
</tr>
<tr>
14 years, 1 month
gatein SVN: r5256 - epp/docs/branches/EPP_5_1_Branch/Site_Publisher.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-11-24 21:38:04 -0500 (Wed, 24 Nov 2010)
New Revision: 5256
Modified:
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/
Log:
Added ignore for local SP User Guide copy
Property changes on: epp/docs/branches/EPP_5_1_Branch/Site_Publisher
___________________________________________________________________
Name: svn:ignore
+ User_Guide
14 years, 1 month
gatein SVN: r5255 - portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-11-24 16:35:33 -0500 (Wed, 24 Nov 2010)
New Revision: 5255
Modified:
portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ProxyServletFilter.java
Log:
oupss
Modified: portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ProxyServletFilter.java
===================================================================
--- portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ProxyServletFilter.java 2010-11-24 21:32:16 UTC (rev 5254)
+++ portal/trunk/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ProxyServletFilter.java 2010-11-24 21:35:33 UTC (rev 5255)
@@ -22,6 +22,9 @@
import org.exoplatform.container.PortalContainer;
import org.exoplatform.web.security.proxy.ProxyFilterService;
+import org.gatein.common.logging.LoggerFactory;
+import org.gatein.common.logging.Logger;
+
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -58,7 +61,7 @@
private ServletContext ctx;
/** . */
- private static final Logger log = LoggerFactory.getLogger(ProxyServletFilter.class);
+ private static final Logger logger = LoggerFactory.getLogger(ProxyServletFilter.class);
public void init(FilterConfig cfg) throws ServletException
{
@@ -109,7 +112,7 @@
catch (java.lang.IllegalArgumentException e)
{
// It happens that some URLs can be wrong, I've seen this with "http://" as URL in one of the Google Gadgets
- logger.debug("Invalid URL: " + url;
+ logger.debug("Invalid URL: " + url);
}
}
}
14 years, 1 month
gatein SVN: r5254 - epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-11-24 16:32:16 -0500 (Wed, 24 Nov 2010)
New Revision: 5254
Modified:
epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ProxyServletFilter.java
Log:
Ouppppss
Modified: epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ProxyServletFilter.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ProxyServletFilter.java 2010-11-24 21:07:03 UTC (rev 5253)
+++ epp/portal/branches/EPP_5_1_Branch/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/ProxyServletFilter.java 2010-11-24 21:32:16 UTC (rev 5254)
@@ -22,6 +22,9 @@
import org.exoplatform.container.PortalContainer;
import org.exoplatform.web.security.proxy.ProxyFilterService;
+import org.gatein.common.logging.LoggerFactory;
+import org.gatein.common.logging.Logger;
+
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -58,7 +61,7 @@
private ServletContext ctx;
/** . */
- private static final Logger log = LoggerFactory.getLogger(ProxyServletFilter.class);
+ private static final Logger logger = LoggerFactory.getLogger(ProxyServletFilter.class);
public void init(FilterConfig cfg) throws ServletException
{
@@ -109,7 +112,7 @@
catch (java.lang.IllegalArgumentException e)
{
// It happens that some URLs can be wrong, I've seen this with "http://" as URL in one of the Google Gadgets
- logger.debug("Invalid URL: " + url;
+ logger.debug("Invalid URL: " + url);
}
}
}
14 years, 1 month
gatein SVN: r5253 - in portal/trunk: web/portal/src/main/webapp/WEB-INF and 1 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-11-24 16:07:03 -0500 (Wed, 24 Nov 2010)
New Revision: 5253
Modified:
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/web.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml
portal/trunk/web/rest/src/main/webapp/WEB-INF/web.xml
Log:
GTNPORTAL-1689 : Remove session timeout configuration from GateIn war file
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/web.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2010-11-24 16:27:38 UTC (rev 5252)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2010-11-24 21:07:03 UTC (rev 5253)
@@ -252,10 +252,6 @@
<url-pattern>/gateinservlet</url-pattern>
</servlet-mapping>
- <session-config>
- <session-timeout>30</session-timeout>
- </session-config>
-
<!-- The Welcome File List for IBM WebSphere -->
<welcome-file-list>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml 2010-11-24 16:27:38 UTC (rev 5252)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml 2010-11-24 21:07:03 UTC (rev 5253)
@@ -292,10 +292,6 @@
<url-pattern>/gateinservlet</url-pattern>
</servlet-mapping>
- <session-config>
- <session-timeout>30</session-timeout>
- </session-config>
-
<!-- The Welcome File List for IBM WebSphere -->
<welcome-file-list>
Modified: portal/trunk/web/rest/src/main/webapp/WEB-INF/web.xml
===================================================================
--- portal/trunk/web/rest/src/main/webapp/WEB-INF/web.xml 2010-11-24 16:27:38 UTC (rev 5252)
+++ portal/trunk/web/rest/src/main/webapp/WEB-INF/web.xml 2010-11-24 21:07:03 UTC (rev 5253)
@@ -84,10 +84,6 @@
<url-pattern>/*</url-pattern>
</servlet-mapping>
- <session-config>
- <session-timeout>30</session-timeout>
- </session-config>
-
<security-constraint>
<web-resource-collection>
<web-resource-name>rest</web-resource-name>
14 years, 1 month
gatein SVN: r5252 - portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-11-24 11:27:38 -0500 (Wed, 24 Nov 2010)
New Revision: 5252
Modified:
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/PatternBuilder.java
Log:
discovered Pattern.quote method
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/PatternBuilder.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/PatternBuilder.java 2010-11-24 15:54:30 UTC (rev 5251)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/PatternBuilder.java 2010-11-24 16:27:38 UTC (rev 5252)
@@ -49,11 +49,22 @@
public PatternBuilder litteral(String s, int from, int to)
{
- for (int i = from;i < to;i++)
+ if (from < 0)
{
- char c = s.charAt(i);
- litteral(c);
+ throw new IllegalArgumentException("No negative from argument");
}
+ if (to > s.length())
+ {
+ throw new IllegalArgumentException("No to argument greater than the string length");
+ }
+ if (from > to)
+ {
+ throw new IllegalArgumentException("The to argument cannot be greater than the from argument");
+ }
+ if (from < to)
+ {
+ buffer.append(Pattern.quote(s.substring(from, to)));
+ }
return this;
}
@@ -69,27 +80,7 @@
public PatternBuilder litteral(char c)
{
- switch (c)
- {
- case '*':
- case '[':
- case '\\':
- case '^':
- case '$':
- case '.':
- case '|':
- case '?':
- case '+':
- case '(':
- case ')':
- buffer.append("\\");
- buffer.append(c);
- break;
- default:
- buffer.append(c);
- break;
- }
- return this;
+ return litteral(Character.toString(c));
}
public Pattern build()
14 years, 1 month
gatein SVN: r5251 - in portal/branches/navcontroller/component/web/controller/src: test/java/org/exoplatform/web/controller/router and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-11-24 10:54:30 -0500 (Wed, 24 Nov 2010)
New Revision: 5251
Added:
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPatternBuilder.java
Modified:
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/PatternBuilder.java
Log:
make char encoding in the pattern more readable
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/PatternBuilder.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/PatternBuilder.java 2010-11-24 15:42:47 UTC (rev 5250)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/PatternBuilder.java 2010-11-24 15:54:30 UTC (rev 5251)
@@ -29,9 +29,6 @@
{
/** . */
- private static final char[] TABLE = "0123456789ABCDEF".toCharArray();
-
- /** . */
private final StringBuilder buffer = new StringBuilder();
public PatternBuilder expr(String s)
@@ -72,11 +69,26 @@
public PatternBuilder litteral(char c)
{
- buffer.append("\\u");
- buffer.append(TABLE[(c & 0xF000) >> 12]);
- buffer.append(TABLE[(c & 0x0F00) >> 8]);
- buffer.append(TABLE[(c & 0x00F0) >> 4]);
- buffer.append(TABLE[c & 0x000F]);
+ switch (c)
+ {
+ case '*':
+ case '[':
+ case '\\':
+ case '^':
+ case '$':
+ case '.':
+ case '|':
+ case '?':
+ case '+':
+ case '(':
+ case ')':
+ buffer.append("\\");
+ buffer.append(c);
+ break;
+ default:
+ buffer.append(c);
+ break;
+ }
return this;
}
@@ -84,5 +96,4 @@
{
return Pattern.compile(buffer.toString());
}
-
}
Added: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPatternBuilder.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPatternBuilder.java (rev 0)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPatternBuilder.java 2010-11-24 15:54:30 UTC (rev 5251)
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2010 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.web.controller.router;
+
+import junit.framework.TestCase;
+
+import java.util.regex.Pattern;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class TestPatternBuilder extends TestCase
+{
+
+ public void testEscapeReservedChar() throws Exception
+ {
+ assertLiteral('^');
+ assertLiteral('*');
+ assertLiteral('$');
+ assertLiteral('[');
+ assertLiteral(']');
+ assertLiteral('.');
+ assertLiteral('|');
+ assertLiteral('+');
+ assertLiteral('(');
+ assertLiteral(')');
+ assertLiteral('?');
+ }
+
+ private void assertLiteral(char c)
+ {
+ PatternBuilder pb = new PatternBuilder();
+ pb.expr("^");
+ pb.litteral(c);
+ pb.expr("$");
+ Pattern pattern = pb.build();
+ assertTrue(pattern.matcher(Character.toString(c)).matches());
+ }
+}
14 years, 1 month