February 2010 - gatein-commits - Jboss List Archives

gatein SVN: r1885 - components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-02-26 09:54:09 -0500 (Fri, 26 Feb 2010) New Revision: 1885 Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/PortletState.java Log: - More specific error reporting. Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/PortletState.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/PortletState.java 2010-02-26 14:32:31 UTC (rev 1884) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/state/producer/PortletState.java 2010-02-26 14:54:09 UTC (rev 1885) @@ -1,27 +1,28 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ +/* + * JBoss, a division of Red Hat + * Copyright 2010, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.gatein.pc.portlet.state.producer; +import org.gatein.common.util.ParameterValidation; import org.gatein.pc.api.state.PropertyMap; import org.gatein.pc.portlet.state.SimplePropertyMap; @@ -52,14 +53,8 @@ public PortletState(String portletId, PropertyMap properties) { - if (portletId == null) - { - throw new IllegalArgumentException(); - } - if (properties == null) - { - throw new IllegalArgumentException(); - } + ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(portletId, "portlet id", "PortletState"); + ParameterValidation.throwIllegalArgExceptionIfNull(properties, "PropertyMap"); this.portletId = portletId; this.properties = properties; this.terminationTime = null;

14 years, 2 months

1
0
0 / 0

gatein SVN: r1884 - portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-02-26 09:32:31 -0500 (Fri, 26 Feb 2010) New Revision: 1884 Modified: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardPortlet.java Log: fix security NPE when editing dashboard in edit page Modified: portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardPortlet.java =================================================================== --- portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardPortlet.java 2010-02-26 12:08:54 UTC (rev 1883) +++ portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardPortlet.java 2010-02-26 14:32:31 UTC (rev 1884) @@ -20,7 +20,10 @@ package org.exoplatform.dashboard.webui.component; import org.exoplatform.portal.application.PortalRequestContext; +import org.exoplatform.portal.config.DataStorage; import org.exoplatform.portal.config.UserACL; +import org.exoplatform.portal.config.model.Page; +import org.exoplatform.portal.config.model.PageNode; import org.exoplatform.portal.webui.container.UIContainer; import org.exoplatform.portal.webui.page.UIPage; import org.exoplatform.portal.webui.page.UIPageBody; @@ -68,10 +71,31 @@ PortalRequestContext prc = (PortalRequestContext)context.getParentAppRequestContext(); UIPortalApplication portalApp = (UIPortalApplication)prc.getUIApplication(); UIPortal portal = portalApp.getShowedUIPortal(); - UIPageBody body = portal.findFirstComponentOfType(UIPageBody.class); - UIPage page = body.findFirstComponentOfType(UIPage.class); - UserACL userACL = portal.getApplicationComponent(UserACL.class); - return userACL.hasPermission(page.getEditPermission()); + + // + try + { + PageNode node = portal.getSelectedNode(); + if (node != null) + { + String pageRef = node.getPageReference(); + DataStorage storage = portal.getApplicationComponent(DataStorage.class); + Page page = storage.getPage(pageRef); + if (page != null) + { + UserACL userACL = portal.getApplicationComponent(UserACL.class); + return userACL.hasPermission(page.getEditPermission()); + } + } + } + catch (Exception e) + { + log.error("Could not check dashboard edition" ,e); + } + + + // + return false; } /**

14 years, 2 months

1
0
0 / 0

gatein SVN: r1883 - in portal/trunk/testsuite/selenium-snifftests/src: suite/org/exoplatform/portal/selenium and 4 other directories.

by do-not-reply＠jboss.org

Author: arthurpeltier Date: 2010-02-26 07:08:54 -0500 (Fri, 26 Feb 2010) New Revision: 1883 Modified: portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_02.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_SNF_PRL_22.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_SNF_PRL_28.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_24.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_21.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_25.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_26.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_27.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/unstable/Test_SNF_PRL_20.html Log: GTNPORTAL-741 : * Add "Refresh" action to SeleniumTestCaseGenerator.java * Update Tests with xpath= prefix * Modify Test_SNF_PRL_09 verifications and goals * Improve stability Modified: portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-02-26 12:08:54 UTC (rev 1883) @@ -379,6 +379,8 @@ sb.append("\"))\n break;\n }\n catch (Exception e) {}\n"); sb.append("Thread.sleep(1000);\n"); sb.append("}\n"); + } else if (param1.equals("refresh")) { + sb.append("selenium.refresh();\n"); } else if (param1.equals("storeXpathCount")) { sb.append("String ").append(param3).append(" = selenium.getXpathCount(\"").append(param2).append( "\").toString();\n"); Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_02.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_02.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_02.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -22,6 +22,11 @@ <td></td> </tr> <tr> + <td>setSpeed</td> + <td>150</td> + <td></td> +</tr> +<tr> <td>echo</td> <td>--Register new account</td> <td></td> @@ -103,7 +108,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIPortalLoginFormAction']//a</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']//a</td> <td></td> </tr> <tr> @@ -148,7 +153,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIPortalLoginFormAction']//a</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']//a</td> <td></td> </tr> <tr> @@ -163,12 +168,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@class='UIListUsers']//tbody/tr[5]//img[@class='DeleteUserIcon']</td> + <td>xpath=//div[@class='UIListUsers']//tbody/tr[5]//img[@class='DeleteUserIcon']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@class='UIListUsers']//tbody/tr[5]//img[@class='DeleteUserIcon']</td> + <td>xpath=//div[@class='UIListUsers']//tbody/tr[5]//img[@class='DeleteUserIcon']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_03.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -23,7 +23,7 @@ </tr> <tr> <td>clickAt</td> - <td>//a[@class='Language']</td> + <td>xpath=//a[@class='Language']</td> <td>1,1</td> </tr> <tr> @@ -48,22 +48,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//a[@class='Language']</td> + <td>xpath=//a[@class='Language']</td> <td>1,1</td> </tr> <tr> <td>clickAt</td> - <td>//a[@class='Language']</td> + <td>xpath=//a[@class='Language']</td> <td>1,1</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UITabContent']//div[2]/a</td> + <td>xpath=//div[@id='UITabContent']//div[2]/a</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@id='UITabContent']//div[2]/a</td> + <td>xpath=//div[@id='UITabContent']//div[2]/a</td> <td>1,1</td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_04.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -42,8 +42,8 @@ <td>gtn</td> </tr> <tr> - <td>click</td> - <td>//div[@id='UIPortalLoginFormAction']//a</td> + <td>clickAt</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']//a</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_07.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -43,7 +43,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td> <td></td> </tr> <tr> @@ -73,12 +73,12 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='GroupButton']</td> + <td>xpath=//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='GroupButton']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div/a</td> + <td>xpath=//div[@id='UIOrganizationPortlet']/div[2]/div[2]/div[1]/div[2]/div[1]/div[2]/div/div/div/div[3]/div/a</td> <td></td> </tr> <tr> @@ -88,7 +88,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIOrganizationPortlet']//div[3]//div[@class='ExpandIcon']/a</td> + <td>xpath=//div[@id='UIOrganizationPortlet']//div[3]//div[@class='ExpandIcon']/a</td> <td></td> </tr> <tr> @@ -103,7 +103,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIOrganizationPortlet']//div[3]//div[@class='ExpandIcon']/a</td> + <td>xpath=//div[@id='UIOrganizationPortlet']//div[3]//div[@class='ExpandIcon']/a</td> <td></td> </tr> <tr> @@ -113,12 +113,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@class="GroupNavigation"]//a[@class="TreeActionIcon AddGroupIcon"]</td> + <td>xpath=//div[@id='UIOrganizationPortlet']//div[@class='TitleBar']/a[@class='TreeActionIcon AddGroupIcon']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@class="GroupNavigation"]//a[@class="TreeActionIcon AddGroupIcon"]</td> + <td>xpath=//div[2]/div[1]/div[1]/a[3]</td> <td></td> </tr> <tr> @@ -148,7 +148,7 @@ </tr> <tr> <td>clickAt</td> - <td>//form[@id='UIGroupForm']//div[@class='ActionButton LightBlueStyle']</td> + <td>xpath=//form[@id='UIGroupForm']//div[@class='ActionButton LightBlueStyle']</td> <td></td> </tr> <tr> @@ -168,17 +168,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIGroupMembershipForm']//div[@class='HorizontalLayout']//table[@class='UIFormGrid']//td[@class='FieldComponent']/a</td> + <td>xpath=//form[@id='UIGroupMembershipForm']//div[@class='HorizontalLayout']//table[@class='UIFormGrid']//td[@class='FieldComponent']/a</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//td[2]/a</td> + <td>xpath=//td[2]/a</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIUserSelector']/div[2]/div[2]/table/tbody/tr/td/a[1]/div/div/div</td> + <td>xpath=//form[@id='UIUserSelector']/div[2]/div[2]/table/tbody/tr/td/a[1]/div/div/div</td> <td></td> </tr> <tr> @@ -203,17 +203,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//form[@id='UIUserSelector']//div[@class='UIAction']//a[@class='ActionButton LightBlueStyle']</td> + <td>xpath=//form[@id='UIUserSelector']//div[@class='UIAction']//a[@class='ActionButton LightBlueStyle']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//form[@id='UIUserSelector']//div[@class='UIAction']//a[@class='ActionButton LightBlueStyle']</td> + <td>xpath=//form[@id='UIUserSelector']//div[@class='UIAction']//a[@class='ActionButton LightBlueStyle']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//input[@value='john,mary,root']</td> + <td>xpath=//input[@value='john,mary,root']</td> <td></td> </tr> <tr> @@ -223,7 +223,7 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@class='UIUserInGroup']//div[@title='john']</td> + <td>xpath=//div[@class='UIUserInGroup']//div[@title='john']</td> <td></td> </tr> <tr> @@ -253,7 +253,7 @@ </tr> <tr> <td>clickAt</td> - <td>//a[@class='TreeActionIcon RemoveGroupIcon']</td> + <td>xpath=//a[@class='TreeActionIcon RemoveGroupIcon']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_08.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -27,11 +27,6 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>username</td> - <td>root</td> -</tr> -<tr> <td>type</td> <td>username</td> <td>root</td> @@ -43,7 +38,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td> <td></td> </tr> <tr> @@ -57,7 +52,7 @@ <td></td> </tr> <tr> - <td>clickAndWait</td> + <td>click</td> <td>link=Group</td> <td></td> </tr> @@ -78,7 +73,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='MembershipButton']</td> + <td>xpath=//div[@id='UIOrganizationPortlet']//div[@class='ManagementIconContainer']/a[@class='MembershipButton']</td> <td></td> </tr> <tr> @@ -123,12 +118,12 @@ </tr> <tr> <td>clickAt</td> - <td>//table[@class='UIGrid']//tbody/tr[2]/td[5]//img[@class='EditMembershipIcon']</td> + <td>xpath=//table[@class='UIGrid']//tbody/tr[2]/td[5]//img[@class='EditMembershipIcon']</td> <td>1,1</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//textarea['test_description_08']</td> + <td>xpath=//textarea['test_description_08']</td> <td></td> </tr> <tr> @@ -142,18 +137,23 @@ <td>1,1</td> </tr> <tr> - <td>clickAt</td> - <td>//table[@class='UIGrid']//tbody/tr[1]/td[5]//img[@class='EditMembershipIcon']</td> - <td>1,1</td> + <td>waitForTextPresent</td> + <td>test_description_edit_08</td> + <td></td> </tr> <tr> + <td>verifyTextPresent</td> + <td>test_description_edit_08</td> + <td></td> +</tr> +<tr> <td>echo</td> <td>--Delete membership</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//table[@class='UIGrid']//tbody/tr[2]/td[5]//img[@class='DeleteMembershipIcon']</td> + <td>xpath=//table[@class='UIGrid']//tbody/tr[2]/td[5]//img[@class='DeleteMembershipIcon']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_09.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -43,7 +43,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td> <td></td> </tr> <tr> @@ -52,7 +52,7 @@ <td></td> </tr> <tr> - <td>clickAndWait</td> + <td>clickAt</td> <td>link=Application Registry</td> <td>1,1</td> </tr> @@ -68,7 +68,27 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']//div[@class='IconControl ImportIcon']</td> + <td>xpath=//a[contains(@onclick,'op=RemoveApplication&objectId=GroupNavigationPortlet&ajaxRequest=true')]</td> + <td></td> +</tr> +<tr> + <td>waitForConfirmation</td> + <td>Are you sure to delete this application?</td> + <td></td> +</tr> +<tr> + <td>waitForTextNotPresent</td> + <td>Group Navigation Portlet</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> + <td>Group Navigation Portlet</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>xpath=//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']//div[@class='IconControl ImportIcon']</td> <td>1,1</td> </tr> <tr> @@ -78,22 +98,22 @@ </tr> <tr> <td>waitForTextPresent</td> - <td>Register Portlet</td> + <td>Group Navigation Portlet</td> <td></td> </tr> <tr> <td>verifyTextPresent</td> - <td>Register Portlet</td> + <td>Group Navigation Portlet</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//a[contains(@onclick,'op=RemoveApplication&objectId=RegisterPortlet&ajaxRequest=true')]</td> + <td>xpath=//a[contains(@onclick,'op=RemoveApplication&objectId=GroupNavigationPortlet&ajaxRequest=true')]</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//a[contains(@onclick,'op=RemoveApplication&objectId=RegisterPortlet&ajaxRequest=true')]</td> + <td>xpath=//a[contains(@onclick,'op=RemoveApplication&objectId=GroupNavigationPortlet&ajaxRequest=true')]</td> <td></td> </tr> <tr> @@ -102,11 +122,26 @@ <td></td> </tr> <tr> + <td>waitForTextNotPresent</td> + <td>Group Navigation Portlet</td> + <td></td> +</tr> +<tr> <td>verifyTextNotPresent</td> - <td>Register Portlet</td> + <td>Group Navigation Portlet</td> <td></td> </tr> <tr> + <td>clickAt</td> + <td>xpath=//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']//div[@class='IconControl ImportIcon']</td> + <td>1,1</td> +</tr> +<tr> + <td>storeConfirmation</td> + <td>clean</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Sign out</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_10.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -27,11 +27,6 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>username</td> - <td>root</td> -</tr> -<tr> <td>type</td> <td>username</td> <td>root</td> @@ -43,7 +38,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td> <td></td> </tr> <tr> @@ -63,12 +58,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']/div[1]</td> + <td>xpath=//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']/div[1]</td> <td>1,1</td> </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']/div[1]</td> + <td>xpath=//div[@id='UIApplicationOrganizer']//div[@class='UIControlbar']/div[1]</td> <td>1,1</td> </tr> <tr> @@ -98,7 +93,7 @@ </tr> <tr> <td>click</td> - <td>//div[@class='WorkingArea']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> + <td>xpath=//div[@class='WorkingArea']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> <td></td> </tr> <tr> @@ -123,6 +118,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>link=manager</td> <td></td> </tr> @@ -132,13 +137,18 @@ <td></td> </tr> <tr> + <td>waitForText</td> + <td>//div[@id='PermissionGrid']/table/tbody/tr/td[2]/div</td> + <td>manager</td> +</tr> +<tr> <td>clickAt</td> <td>link=Save</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIApplicationOrganizer']//a[@class='ControlIcon EditIcon']</td> + <td>xpath=//div[@id='UIApplicationOrganizer']//a[@class='ControlIcon EditIcon']</td> <td></td> </tr> <tr> @@ -158,7 +168,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIApplicationOrganizer']//a[@class='ControlIcon EditIcon']</td> + <td>xpath=//div[@id='UIApplicationOrganizer']//a[@class='ControlIcon EditIcon']</td> <td>1,1</td> </tr> <tr> @@ -193,7 +203,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@class='SelectedTab']//a[@class='ControlIcon DeleteIcon']</td> + <td>xpath=//div[@class='SelectedTab']//a[@class='ControlIcon DeleteIcon']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -43,7 +43,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td> <td></td> </tr> <tr> @@ -58,22 +58,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[1]//a</td> + <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[1]//a</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[1]//a</td> + <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[1]//a</td> <td></td> </tr> <tr> <td>waitForTextPresent</td> - <td>Application Registry</td> + <td>ApplicationRegistryPortlet</td> <td></td> </tr> <tr> <td>verifyTextPresent</td> - <td>Application Registry</td> + <td>ApplicationRegistryPortlet</td> <td></td> </tr> <tr> @@ -83,17 +83,17 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[2]//a</td> + <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[2]//a</td> <td></td> </tr> <tr> <td>waitForTextPresent</td> - <td>Organization Management</td> + <td>OrganizationPortlet</td> <td></td> </tr> <tr> <td>verifyTextPresent</td> - <td>Organization Management</td> + <td>OrganizationPortlet</td> <td></td> </tr> <tr> @@ -103,17 +103,17 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[3]//a</td> + <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[3]//a</td> <td></td> </tr> <tr> <td>waitForTextPresent</td> - <td>New Account</td> + <td>AccountPortlet</td> <td></td> </tr> <tr> <td>verifyTextPresent</td> - <td>New Account</td> + <td>AccountPortlet</td> <td></td> </tr> <tr> @@ -123,15 +123,50 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@class='UIVerticalSlideTabs']/div[2]//a</td> + <td>xpath=//div[@class='UIVerticalSlideTabs']/div[2]//a</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[1]//a</td> + <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[1]//a</td> <td></td> </tr> <tr> + <td>waitForTextPresent</td> + <td>DashboardPortlet</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>DashboardPortlet</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Verify details of Dashboard>>Gadget Wrapper Portlet</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[2]//a</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>GadgetPortlet</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>GadgetPortlet</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--It is possible to verify all portlets.......</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Sign out</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_14.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -38,7 +38,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td> <td></td> </tr> <tr> @@ -48,12 +48,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@class='IconControl ImportIcon']</td> + <td>xpath=//div[@class='IconControl ImportIcon']</td> <td></td> </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@class='IconControl ImportIcon']</td> + <td>xpath=//div[@class='IconControl ImportIcon']</td> <td></td> </tr> <tr> @@ -68,27 +68,27 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//a[@class='EditPortletPropertiesIcon']</td> + <td>xpath=//a[@class='EditPortletPropertiesIcon']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//a[@class='EditPortletPropertiesIcon']</td> + <td>xpath=//a[@class='EditPortletPropertiesIcon']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//input[@class='checkbox']</td> + <td>xpath=//input[@class='checkbox']</td> <td></td> </tr> <tr> <td>verifyChecked</td> - <td>//input[@class='checkbox']</td> + <td>xpath=//input[@class='checkbox']</td> <td></td> </tr> <tr> <td>uncheck</td> - <td>//input[@class='checkbox']</td> + <td>xpath=//input[@class='checkbox']</td> <td></td> </tr> <tr> @@ -103,7 +103,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>xpath=//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> <td></td> </tr> <tr> @@ -123,7 +123,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@class='IconControl ImportIcon']</td> + <td>xpath=//div[@class='IconControl ImportIcon']</td> <td></td> </tr> <tr> @@ -138,27 +138,27 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//a[@class='EditPortletPropertiesIcon']</td> + <td>xpath=//a[@class='EditPortletPropertiesIcon']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//a[@class='EditPortletPropertiesIcon']</td> + <td>xpath=//a[@class='EditPortletPropertiesIcon']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//input[@class='checkbox']</td> + <td>xpath=//input[@class='checkbox']</td> <td></td> </tr> <tr> <td>verifyNotChecked</td> - <td>//input[@class='checkbox']</td> + <td>xpath=//input[@class='checkbox']</td> <td></td> </tr> <tr> <td>check</td> - <td>//input[@class='checkbox']</td> + <td>xpath=//input[@class='checkbox']</td> <td></td> </tr> <tr> @@ -173,7 +173,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td>xpath=//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> <td></td> </tr> <tr> @@ -193,7 +193,7 @@ </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@class='IconControl ImportIcon']</td> + <td>xpath=//div[@class='IconControl ImportIcon']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_15.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -38,7 +38,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_16.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -38,7 +38,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td> <td></td> </tr> <tr> @@ -53,7 +53,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UISiteMap']//div[@class='ClearFix']/div[2]</td> + <td>xpath=//div[@id='UISiteMap']//div[@class='ClearFix']/div[2]</td> <td>1,1</td> </tr> <tr> @@ -73,7 +73,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@class='ExpandIcon FloatLeft']</td> + <td>xpath=//div[@class='ExpandIcon FloatLeft']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_17.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -27,11 +27,6 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>username</td> - <td></td> -</tr> -<tr> <td>type</td> <td>username</td> <td>root</td> @@ -43,7 +38,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td> <td></td> </tr> <tr> @@ -58,7 +53,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UISiteMap']//div[@class='ClearFix']/div[2]</td> + <td>xpath=//div[@id='UISiteMap']//div[@class='ClearFix']/div[2]</td> <td>1,1</td> </tr> <tr> @@ -83,7 +78,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UISiteMap']//div[@class='ClearFix']/div[1]</td> + <td>xpath=//div[@id='UISiteMap']//div[@class='ClearFix']/div[1]</td> <td>1,1</td> </tr> <tr> @@ -93,7 +88,7 @@ </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@class='CollapseIcon FloatLeft']</td> + <td>xpath=//div[@class='CollapseIcon FloatLeft']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -43,7 +43,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td> <td></td> </tr> <tr> @@ -58,7 +58,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UISiteManagement']//div[@class='UIAction']//div[@class='ActionButton BlueButton']</td> + <td>xpath=//div[@id='UISiteManagement']//div[@class='UIAction']//div[@class='ActionButton BlueButton']</td> <td></td> </tr> <tr> @@ -68,12 +68,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> + <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> + <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> <td></td> </tr> <tr> @@ -88,7 +88,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[4]//div[@class='MiddleTab']</td> + <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']/div[4]//div[@class='MiddleTab']</td> <td></td> </tr> <tr> @@ -113,22 +113,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='PermissionSelector']//a[@title='Administrators']</td> + <td>xpath=//div[@id='PermissionSelector']//a[@title='Administrators']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@id='PermissionSelector']//a[@title='Administrators']</td> + <td>xpath=//div[@id='PermissionSelector']//a[@title='Administrators']</td> <td>1,1</td> </tr> <tr> <td>clickAt</td> - <td>//div[@id='PermissionSelector']//a[@title='manager']</td> + <td>xpath=//div[@id='PermissionSelector']//a[@title='manager']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@id='PermissionSelector']//a[@title='manager']</td> + <td>xpath=//div[@id='PermissionSelector']//a[@title='manager']</td> <td></td> </tr> <tr> @@ -138,7 +138,7 @@ </tr> <tr> <td>clickAt</td> - <td>//form[@id='UIPortalForm']//div[@class='UIAction']//div[@class='ActionButton LightBlueStyle']//div[@class='ButtonMiddle']/a</td> + <td>xpath=//form[@id='UIPortalForm']//div[@class='UIAction']//div[@class='ActionButton LightBlueStyle']//div[@class='ButtonMiddle']/a</td> <td>1,1</td> </tr> <tr> @@ -172,13 +172,13 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']/table[2]//a[@class='DeleteIcon']</td> + <td>clickAt</td> + <td>xpath=//div[@id='UISiteManagement']/table[2]//a[@class='DeleteIcon']</td> <td></td> </tr> <tr> - <td>clickAndWait</td> - <td>//div[@id='UISiteManagement']/table[2]//a[@class='DeleteIcon']</td> + <td>waitForElementPresent</td> + <td>xpath=//div[@id='UISiteManagement']/table/tbody/tr/td[2]/div</td> <td></td> </tr> <tr> @@ -187,21 +187,31 @@ <td></td> </tr> <tr> - <td>open</td> - <td>/portal/public/classic/</td> + <td>clickAt</td> + <td>link=Site</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Site</td> + <td>waitForTextPresent</td> + <td>Portal Navigation</td> <td></td> </tr> <tr> + <td>refresh</td> + <td></td> + <td></td> +</tr> +<tr> <td>waitForTextPresent</td> <td>Portal Navigation</td> <td></td> </tr> <tr> + <td>waitForTextNotPresent</td> + <td>test_portal_18</td> + <td></td> +</tr> +<tr> <td>verifyTextNotPresent</td> <td>test_portal_18</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_31.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -38,7 +38,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_32.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -43,7 +43,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> <td></td> </tr> <tr> @@ -58,17 +58,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']//div[@class='SelectedItem Item']</td> + <td>xpath=//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']//div[@class='SelectedItem Item']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']//div[@class='SelectedItem Item']</td> + <td>xpath=//div[@id='UITabContent']//div[@class='ItemListContainer']//div[@class='ItemList']//div[@class='SelectedItem Item']</td> <td>1,1</td> </tr> <tr> <td>clickAtAndWait</td> - <td>//div[@id='UIMaskWorkspace']//div[@class='ActionButton LightBlueStyle']</td> + <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='ActionButton LightBlueStyle']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_33.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -103,7 +103,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIPortalLoginFormAction']//a</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']//a</td> <td></td> </tr> <tr> @@ -188,7 +188,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIPortalLoginFormAction']//a</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']//a</td> <td></td> </tr> <tr> @@ -233,7 +233,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIPortalLoginFormAction']//a</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']//a</td> <td></td> </tr> <tr> @@ -248,12 +248,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@class='UIListUsers']//tbody/tr[5]//img[@class='DeleteUserIcon']</td> + <td>xpath=//div[@class='UIListUsers']//tbody/tr[5]//img[@class='DeleteUserIcon']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@class='UIListUsers']//tbody/tr[5]//img[@class='DeleteUserIcon']</td> + <td>xpath=//div[@class='UIListUsers']//tbody/tr[5]//img[@class='DeleteUserIcon']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_34.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -43,7 +43,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> <td></td> </tr> <tr> @@ -63,12 +63,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//a[@class='EditPortletPropertiesIcon']</td> + <td>xpath=//a[@class='EditPortletPropertiesIcon']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//a[@class='EditPortletPropertiesIcon']</td> + <td>xpath=//a[@class='EditPortletPropertiesIcon']</td> <td></td> </tr> <tr> @@ -93,22 +93,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>xpath=//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> + <td>xpath=//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UILogoPortlet']/a/img[@src='http://ocs.inrialpes.fr/userfiles/image/logo/Picture%203.png']</td> + <td>xpath=//div[@id='UILogoPortlet']/a/img[@src='http://ocs.inrialpes.fr/userfiles/image/logo/Picture%203.png']</td> <td></td> </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@id='UILogoPortlet']/a/img[@src='http://ocs.inrialpes.fr/userfiles/image/logo/Picture%203.png']</td> + <td>xpath=//div[@id='UILogoPortlet']/a/img[@src='http://ocs.inrialpes.fr/userfiles/image/logo/Picture%203.png']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_35.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -38,7 +38,7 @@ </tr> <tr> <td>clickAtAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td> <td></td> </tr> <tr> @@ -88,7 +88,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@class='UIRowContainer']//div[@class='UIFormTabPane']//div[@class='TabsContainer']/div[2]/div/div/div/div</td> + <td>xpath=//div[@class='UIRowContainer']//div[@class='UIFormTabPane']//div[@class='TabsContainer']/div[2]/div/div/div/div</td> <td></td> </tr> <tr> @@ -103,7 +103,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@class='UIRowContainer']//div[@class='UIFormTabPane']//div[@class='TabsContainer']/div/div/div/div/div</td> + <td>xpath=//div[@class='UIRowContainer']//div[@class='UIFormTabPane']//div[@class='TabsContainer']/div/div/div/div/div</td> <td></td> </tr> <tr> @@ -143,12 +143,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@class='UIListUsers']//tbody/tr[5]//img[@class='DeleteUserIcon']</td> + <td>xpath=//div[@class='UIListUsers']//tbody/tr[5]//img[@class='DeleteUserIcon']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@class='UIListUsers']//tbody/tr[5]//img[@class='DeleteUserIcon']</td> + <td>xpath=//div[@class='UIListUsers']//tbody/tr[5]//img[@class='DeleteUserIcon']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_SNF_PRL_22.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_SNF_PRL_22.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_SNF_PRL_22.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -4,12 +4,12 @@ <head profile="http://selenium-ide.openqa.org/profiles/test-case"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="selenium.base" href="http://localhost:8080/portal" /> -<title>SNF_PRL_22 Not working select</title> +<title>SNF_PRL_22</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_22 Not working select</td></tr> +<tr><td rowspan="1" colspan="3">SNF_PRL_22</td></tr> </thead><tbody> <tr> <td>open</td> @@ -43,7 +43,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td> <td></td> </tr> <tr> @@ -78,7 +78,7 @@ </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']//div[3]//div[@class='MiddleTab']</td> + <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']//div[3]//div[@class='MiddleTab']</td> <td></td> </tr> <tr> @@ -133,7 +133,7 @@ </tr> <tr> <td>waitForText</td> - <td>//div[@id='UIPermissionSelector']/div/div[2]/div[1]/div[3]/div[2]</td> + <td>xpath=//div[@id='UIPermissionSelector']/div/div[2]/div[1]/div[3]/div[2]</td> <td>exact:*</td> </tr> <tr> @@ -143,7 +143,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td> + <td>xpath=//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td> <td>1,1</td> </tr> <tr> @@ -198,7 +198,7 @@ </tr> <tr> <td>click</td> - <td>//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']//div[3]//div[@class='MiddleTab']</td> + <td>xpath=//div[@id='UIMaskWorkspace']//div[@class='TabsContainer']//div[3]//div[@class='MiddleTab']</td> <td></td> </tr> <tr> @@ -208,7 +208,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td> + <td>xpath=//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td> <td>1,1</td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_SNF_PRL_28.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_SNF_PRL_28.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_SNF_PRL_28.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -4,12 +4,12 @@ <head profile="http://selenium-ide.openqa.org/profiles/test-case"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="selenium.base" href="" /> -<title>SNF_PRL_28 Not working</title> +<title>SNF_PRL_28</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_28 Not working</td></tr> +<tr><td rowspan="1" colspan="3">SNF_PRL_28</td></tr> </thead><tbody> <tr> <td>open</td> @@ -43,7 +43,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> <td></td> </tr> <tr> @@ -73,42 +73,42 @@ </tr> <tr> <td>type</td> - <td>//input[@id='url']</td> + <td>xpath=//input[@id='url']</td> <td>http://www.google.com/ig/modules/datetime.xml</td> </tr> <tr> <td>clickAt</td> - <td>//img[@class='AddNewNodeIcon']</td> + <td>xpath=//img[@class='AddNewNodeIcon']</td> <td>1,1</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@class='UIPopupWindow UIDragObject']//div[@class='CloseButton']</td> + <td>xpath=//div[@class='UIPopupWindow UIDragObject']//div[@class='CloseButton']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@class='UIPopupWindow UIDragObject']//div[@class='CloseButton']</td> + <td>xpath=//div[@class='UIPopupWindow UIDragObject']//div[@class='CloseButton']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@class='GadgetTitle']</td> + <td>xpath=//div[@class='GadgetTitle']</td> <td></td> </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@class='GadgetTitle']</td> + <td>xpath=//div[@class='GadgetTitle']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@title='Delete Gadget']</td> + <td>xpath=//div[@title='Delete Gadget']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@onclick='eXo.gadget.UIGadget.deleteGadget(this)']</td> + <td>xpath=//div[@onclick='eXo.gadget.UIGadget.deleteGadget(this)']</td> <td></td> </tr> <tr> @@ -133,52 +133,47 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@class='GadgetTitle' and @title='Calculator']</td> + <td>xpath=//div[@class='GadgetTitle' and @title='Calculator']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@class='GadgetTitle' and @title='Calculator']</td> + <td>xpath=//div[@class='GadgetTitle' and @title='Calculator']</td> <td></td> </tr> <tr> <td>dragAndDropToObject</td> - <td>//div[@class='GadgetTitle' and @title='Calculator']</td> - <td>//div[@class='UIDashboardContainer']</td> + <td>xpath=//div[@class='GadgetTitle' and @title='Calculator']</td> + <td>xpath=//div[@class='UIDashboardContainer']</td> </tr> <tr> - <td>echo</td> - <td>--------To fast</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> - <td>//div[@class='GadgetTitle' and @style='display: block;']</td> + <td>xpath=//div[@class='GadgetTitle' and @style='display: block;']</td> <td></td> </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@class='GadgetTitle' and @style='display: block;']</td> + <td>xpath=//div[@class='GadgetTitle' and @style='display: block;']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@class='CloseGadget IconControl']</td> + <td>xpath=//div[@class='CloseGadget IconControl']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@class='UIPopupWindow UIDragObject']//div[@class='CloseButton']</td> + <td>xpath=//div[@class='UIPopupWindow UIDragObject']//div[@class='CloseButton']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@class='UIPopupWindow UIDragObject']//div[@class='CloseButton']</td> + <td>xpath=//div[@class='UIPopupWindow UIDragObject']//div[@class='CloseButton']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@onclick='eXo.gadget.UIGadget.deleteGadget(this)']</td> + <td>xpath=//div[@onclick='eXo.gadget.UIGadget.deleteGadget(this)']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_24.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_24.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/issues/Test_SNF_PRL_24.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -4,12 +4,12 @@ <head profile="http://selenium-ide.openqa.org/profiles/test-case"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="selenium.base" href="" /> -<title>SNF_PRL_24 Users not always same place</title> +<title>SNF_PRL_24</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_24 Users not always same place</td></tr> +<tr><td rowspan="1" colspan="3">SNF_PRL_24</td></tr> </thead><tbody> <tr> <td>open</td> @@ -43,7 +43,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> <td></td> </tr> <tr> @@ -113,7 +113,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@class='CenterHorizontalTabs']//div[@class='NormalTab']//div[@class='MiddleTab']</td> + <td>xpath=//div[@class='CenterHorizontalTabs']//div[@class='NormalTab']//div[@class='MiddleTab']</td> <td></td> </tr> <tr> @@ -128,7 +128,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIRepeater']//img[@class='SelectPageIcon']</td> + <td>xpath=//div[@id='UIRepeater']//img[@class='SelectPageIcon']</td> <td></td> </tr> <tr> @@ -158,7 +158,7 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='PortalNavigationTopContainer']/div[2]/div/div/div/div/div/div/a</td> + <td>xpath=//div[@id='PortalNavigationTopContainer']/div[2]/div/div/div/div/div/div/a</td> <td></td> </tr> <tr> @@ -168,20 +168,25 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIGroupNavigationGrid']/table[4]//td[@class='ActionBlock']//a[@class='EditProIcon']</td> + <td>xpath=//div[@id='UIGroupNavigationGrid']/table[4]//td[@class='ActionBlock']//a[@class='EditProIcon']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIGroupNavigationGrid']/table[4]//td[@class='ActionBlock']//a[@class='EditProIcon']</td> + <td>xpath=//div[@id='UIGroupNavigationGrid']/table[4]//td[@class='ActionBlock']//a[@class='EditProIcon']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>priority</td> + <td>description</td> <td></td> </tr> <tr> + <td>type</td> + <td>description</td> + <td>test_description_edit_24</td> +</tr> +<tr> <td>select</td> <td>priority</td> <td>10</td> @@ -192,23 +197,28 @@ <td></td> </tr> <tr> + <td>verifyTextPresent</td> + <td>Description: test_description_edit_24</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> - <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> + <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> + <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//a[@title='test_grp_label_24']</td> + <td>xpath=//a[@title='test_grp_label_24']</td> <td></td> </tr> <tr> <td>verifyElementPresent</td> - <td>//a[@title='test_grp_label_24']</td> + <td>xpath=//a[@title='test_grp_label_24']</td> <td></td> </tr> <tr> @@ -218,12 +228,12 @@ </tr> <tr> <td>componentExoContextMenu</td> - <td>//a[@title='test_grp_label_24']</td> + <td>xpath=//a[@title='test_grp_label_24']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> + <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_21.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_21.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_21.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -4,12 +4,12 @@ <head profile="http://selenium-ide.openqa.org/profiles/test-case"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="selenium.base" href="" /> -<title>SNF_PRL_21</title> +<title>SNF_PRL_21 verifyTextNotPresent failing in Java</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_21</td></tr> +<tr><td rowspan="1" colspan="3">SNF_PRL_21 verifyTextNotPresent failing in Java</td></tr> </thead><tbody> <tr> <td>open</td> @@ -197,6 +197,26 @@ <td></td> </tr> <tr> + <td>clickAt</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Portal Navigation</td> + <td></td> +</tr> +<tr> + <td>refresh</td> + <td></td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Portal Navigation</td> + <td></td> +</tr> +<tr> <td>waitForTextNotPresent</td> <td>test_portal_name_21</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_25.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_25.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_25.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -4,12 +4,12 @@ <head profile="http://selenium-ide.openqa.org/profiles/test-case"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="selenium.base" href="http://localhost:8080/" /> -<title>SNF_PRL_25</title> +<title>Test_SNF_PRL_25</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_25</td></tr> +<tr><td rowspan="1" colspan="3">Test_SNF_PRL_25</td></tr> </thead><tbody> <tr> <td>open</td> @@ -48,7 +48,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> <td></td> </tr> <tr> @@ -113,7 +113,7 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//img[@title='Select Page']</td> + <td>xpath=//img[@title='Select Page']</td> <td></td> </tr> <tr> @@ -153,22 +153,27 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> + <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[1]//a[@class='EditNavIcon']</td> <td></td> </tr> <tr> + <td>setSpeed</td> + <td>300</td> + <td></td> +</tr> +<tr> <td>clickAt</td> - <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> + <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[1]//a[@class='EditNavIcon']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@class='UIPopupWindow UIDragObject' and contains(@style,'width: 400px; display: block; visibility: visible')]//a[@title='test_grp_label_25']</td> + <td>xpath=//div[@class='UIPopupWindow UIDragObject' and contains(@style,'width: 400px; display: block; visibility: visible')]//a[@title='test_grp_label_25']</td> <td></td> </tr> <tr> <td>componentExoContextMenu</td> - <td>//a[@title='test_grp_label_25']</td> + <td>xpath=//a[@title='test_grp_label_25']</td> <td></td> </tr> <tr> @@ -178,12 +183,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon EditPageNode16x16Icon']</td> + <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon EditPageNode16x16Icon']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon EditPageNode16x16Icon']</td> + <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon EditPageNode16x16Icon']</td> <td></td> </tr> <tr> @@ -198,12 +203,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//input[@class='checkbox']</td> + <td>xpath=//input[@class='checkbox']</td> <td></td> </tr> <tr> <td>check</td> - <td>//input[@class='checkbox']</td> + <td>xpath=//input[@class='checkbox']</td> <td></td> </tr> <tr> @@ -213,12 +218,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//a[@class='EdittedSaveButton']</td> + <td>xpath=//a[@class='EdittedSaveButton']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//a[@class='EdittedSaveButton']</td> + <td>xpath=//a[@class='EdittedSaveButton']</td> <td></td> </tr> <tr> @@ -243,22 +248,32 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> + <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[1]//a[@class='EditNavIcon']</td> <td></td> </tr> <tr> + <td>setSpeed</td> + <td>300</td> + <td></td> +</tr> +<tr> <td>clickAt</td> - <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> + <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[1]//a[@class='EditNavIcon']</td> <td></td> </tr> <tr> + <td>setSpeed</td> + <td>0</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> - <td>//div[@class='UIPopupWindow UIDragObject' and contains(@style,'width: 400px; display: block; visibility: visible')]//a[@title='test_grp_label_25']</td> + <td>xpath=//div[@class='UIPopupWindow UIDragObject' and contains(@style,'width: 400px; display: block; visibility: visible')]//a[@title='test_grp_label_25']</td> <td></td> </tr> <tr> <td>componentExoContextMenu</td> - <td>//a[@title='test_grp_label_25']</td> + <td>xpath=//a[@title='test_grp_label_25']</td> <td></td> </tr> <tr> @@ -268,7 +283,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon EditPageNode16x16Icon']</td> + <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon EditPageNode16x16Icon']</td> <td></td> </tr> <tr> @@ -283,12 +298,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//input[@class='checkbox']</td> + <td>xpath=//input[@class='checkbox']</td> <td></td> </tr> <tr> <td>uncheck</td> - <td>//input[@class='checkbox']</td> + <td>xpath=//input[@class='checkbox']</td> <td></td> </tr> <tr> @@ -298,12 +313,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//a[@class='EdittedSaveButton']</td> + <td>xpath=//a[@class='EdittedSaveButton']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//a[@class='EdittedSaveButton']</td> + <td>xpath=//a[@class='EdittedSaveButton']</td> <td></td> </tr> <tr> @@ -323,22 +338,22 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> + <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[1]//a[@class='EditNavIcon']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> + <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[1]//a[@class='EditNavIcon']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@class='UIPopupWindow UIDragObject' and contains(@style,'width: 400px; display: block; visibility: visible')]//a[@title='test_grp_label_25']</td> + <td>xpath=//div[@class='UIPopupWindow UIDragObject' and contains(@style,'width: 400px; display: block; visibility: visible')]//a[@title='test_grp_label_25']</td> <td></td> </tr> <tr> <td>componentExoContextMenu</td> - <td>//a[@title='test_grp_label_25']</td> + <td>xpath=//a[@title='test_grp_label_25']</td> <td></td> </tr> <tr> @@ -347,8 +362,13 @@ <td></td> </tr> <tr> + <td>setSpeed</td> + <td>300</td> + <td></td> +</tr> +<tr> <td>clickAt</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> + <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> <td></td> </tr> <tr> @@ -367,6 +387,11 @@ <td></td> </tr> <tr> + <td>setSpeed</td> + <td>0</td> + <td></td> +</tr> +<tr> <td>waitForElementNotPresent</td> <td>link=test_grp_label_25</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_26.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_26.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_26.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -4,12 +4,12 @@ <head profile="http://selenium-ide.openqa.org/profiles/test-case"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="selenium.base" href="" /> -<title>SNF_PRL_26</title> +<title>Test_SNF_PRL_26</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_26</td></tr> +<tr><td rowspan="1" colspan="3">Test_SNF_PRL_26</td></tr> </thead><tbody> <tr> <td>open</td> @@ -103,12 +103,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//img[@title='Select Page']</td> + <td>xpath=//img[@title='Select Page']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//img[@title='Select Page']</td> + <td>xpath=//img[@title='Select Page']</td> <td></td> </tr> <tr> @@ -127,13 +127,18 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=test_grp_label_26</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=test_grp_label_26</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='PortalNavigationTopContainer']/div[2]/div/div/div/div/div/div/a</td> + <td>xpath=//div[@id='PortalNavigationTopContainer']/div[2]/div/div/div/div/div/div/a</td> <td></td> </tr> <tr> @@ -153,17 +158,17 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> + <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[1]//a[@class='EditNavIcon']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> + <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[1]//a[@class='EditNavIcon']</td> <td></td> </tr> <tr> <td>verifyElementPresent</td> - <td>//a[@title='test_grp_label_26']</td> + <td>xpath=//a[@title='test_grp_label_26']</td> <td></td> </tr> <tr> @@ -177,23 +182,33 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=test_grp_label_26</td> + <td></td> +</tr> +<tr> <td>componentExoContextMenu</td> - <td>//a[@title='test_grp_label_26']</td> + <td>xpath=//a[@title='test_grp_label_26']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveUp16x16Icon']</td> + <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveUp16x16Icon']</td> <td></td> </tr> <tr> + <td>setSpeed</td> + <td>300</td> + <td></td> +</tr> +<tr> <td>clickAt</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveUp16x16Icon']</td> + <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveUp16x16Icon']</td> <td></td> </tr> <tr> <td>verifyElementNotPresent</td> - <td>//div[@class='TreeContainer JSContainer']/div/div[${nodeLvl}]/div/a[@title='test_grp_label_26']</td> + <td>xpath=//div[@class='TreeContainer JSContainer']/div/div[${nodeLvl}]/div/a[@title='test_grp_label_26']</td> <td></td> </tr> <tr> @@ -208,22 +223,22 @@ </tr> <tr> <td>componentExoContextMenu</td> - <td>//a[@title='test_grp_label_26']</td> + <td>xpath=//a[@title='test_grp_label_26']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveDown16x16Icon']</td> + <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveDown16x16Icon']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveDown16x16Icon']</td> + <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon MoveDown16x16Icon']</td> <td></td> </tr> <tr> <td>verifyElementPresent</td> - <td>//div[@class='TreeContainer JSContainer']/div/div[${nodeLvl}]/div/a[@title='test_grp_label_26']</td> + <td>xpath=//div[@class='TreeContainer JSContainer']/div/div[${nodeLvl}]/div/a[@title='test_grp_label_26']</td> <td></td> </tr> <tr> @@ -243,32 +258,32 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> + <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[1]//a[@class='EditNavIcon']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@ID='UIGroupNavigationGrid']//table[4]//a[@class='EditNavIcon']</td> + <td>xpath=//div[@ID='UIGroupNavigationGrid']//table[1]//a[@class='EditNavIcon']</td> <td></td> </tr> <tr> <td>verifyElementPresent</td> - <td>//a[@title='test_grp_label_26']</td> + <td>xpath=//a[@title='test_grp_label_26']</td> <td></td> </tr> <tr> <td>componentExoContextMenu</td> - <td>//a[@title='test_grp_label_26']</td> + <td>xpath=//a[@title='test_grp_label_26']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> + <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> + <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> <td></td> </tr> <tr> @@ -297,6 +312,11 @@ <td></td> </tr> <tr> + <td>setSpeed</td> + <td>0</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=Sign out</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_27.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_27.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/ko/Test_SNF_PRL_27.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -4,12 +4,12 @@ <head profile="http://selenium-ide.openqa.org/profiles/test-case"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="selenium.base" href="" /> -<title>SNF_PRL_27</title> +<title>Test_SNF_PRL_27</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_27</td></tr> +<tr><td rowspan="1" colspan="3">Test_SNF_PRL_27</td></tr> </thead><tbody> <tr> <td>open</td> @@ -172,16 +172,31 @@ <td></td> </tr> <tr> + <td>setSpeed</td> + <td>300</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=Edit Page</td> <td></td> </tr> <tr> + <td>setSpeed</td> + <td>0</td> + <td></td> +</tr> +<tr> <td>echo</td> <td>--Show form to edit page by wizard</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=View Page properties</td> + <td>1,1</td> +</tr> +<tr> <td>clickAt</td> <td>link=View Page properties</td> <td>1,1</td> @@ -207,16 +222,31 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Platform</td> + <td>1,1</td> +</tr> +<tr> <td>clickAt</td> <td>link=Platform</td> <td>1,1</td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=Administrators</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPageFormPopupGroupMembershipSelector']//div[@class='MembershipSelector']//a</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>//div[@id='UIPageFormPopupGroupMembershipSelector']//div[@class='MembershipSelector']//a</td> <td></td> @@ -227,6 +257,11 @@ <td>1,1</td> </tr> <tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>//div[@id='UIPageEditor']/div[1]/div/div/div/a[2]</td> <td></td> @@ -262,9 +297,14 @@ <td>1,1</td> </tr> <tr> + <td>waitForElementPresent</td> + <td>locale</td> + <td></td> +</tr> +<tr> <td>select</td> <td>locale</td> - <td>label=French (France)</td> + <td>label=French</td> </tr> <tr> <td>clickAt</td> @@ -297,8 +337,13 @@ <td>1,1</td> </tr> <tr> + <td>waitForElementPresent</td> + <td>locale</td> + <td></td> +</tr> +<tr> <td>verifyTextPresent</td> - <td>French (France)</td> + <td>French</td> <td></td> </tr> <tr> @@ -317,73 +362,78 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=Group</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@class='UIComponentBlock']//a[@class='EditNavIcon']</td> + <td>xpath=//div[@class='UIComponentBlock']//a[@class='EditNavIcon']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@class='UIComponentBlock']//a[@class='EditNavIcon']</td> + <td>xpath=//div[@class='UIComponentBlock']//a[@class='EditNavIcon']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIGroupNavigationGrid']/table[4]/tbody/tr/td[3]/a[1]</td> + <td>xpath=//div[@id='UIGroupNavigationGrid']/table[2]/tbody/tr/td[3]/a[1]</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@id='UIGroupNavigationGrid']/table[4]/tbody/tr/td[3]/a[1]</td> + <td>xpath=//div[@id='UIGroupNavigationGrid']/table[2]/tbody/tr/td[3]/a[1]</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@class='TreeContainer JSContainer']/div/div[2]//a</td> + <td>xpath=//div[@class='TreeContainer JSContainer']/div/div[2]//a</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@class='TreeContainer JSContainer']/div/div[2]//a</td> + <td>xpath=//div[@class='TreeContainer JSContainer']/div/div[2]//a</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@class='TreeContainer JSContainer']/div/div[2]//a[@title='Page Management']</td> + <td>xpath=//div[@class='TreeContainer JSContainer']/div/div[2]//a[@title='Page Management']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@class='TreeContainer JSContainer']/div/div[2]//a[@title='Page Management']</td> + <td>xpath=//div[@class='TreeContainer JSContainer']/div/div[2]//a[@title='Page Management']</td> <td></td> </tr> <tr> - <td>verifyElementPresent</td> - <td>//a[@title='test_page_name_27']</td> + <td>waitForElementPresent</td> + <td>xpath=//a[@title='test_page_name_27']</td> <td></td> </tr> <tr> - <td>componentExoContextMenu</td> - <td>//a[@title='test_page_name_27']</td> + <td>verifyElementPresent</td> + <td>xpath=//a[@title='test_page_name_27']</td> <td></td> </tr> <tr> - <td>echo</td> - <td>--------To fast</td> + <td>componentExoContextMenu</td> + <td>xpath=//a[@title='test_page_name_27']</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> + <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> + <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon DeleteNode16x16Icon']</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/unstable/Test_SNF_PRL_20.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/unstable/Test_SNF_PRL_20.html 2010-02-26 11:04:03 UTC (rev 1882) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/unstable/Test_SNF_PRL_20.html 2010-02-26 12:08:54 UTC (rev 1883) @@ -4,12 +4,12 @@ <head profile="http://selenium-ide.openqa.org/profiles/test-case"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="selenium.base" href="" /> -<title>SNF_PRL_20</title> +<title>Test_SNF_PRL_20</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">SNF_PRL_20</td></tr> +<tr><td rowspan="1" colspan="3">Test_SNF_PRL_20</td></tr> </thead><tbody> <tr> <td>open</td> @@ -43,7 +43,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>//div[@id='UIPortalLoginFormAction']/div/div/div</td> + <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td> <td></td> </tr> <tr> @@ -68,12 +68,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PortalSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PortalSetting')"]</td> + <td>xpath=//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PortalSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PortalSetting')"]</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PortalSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PortalSetting')"]</td> + <td>xpath=//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PortalSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PortalSetting')"]</td> <td></td> </tr> <tr> @@ -87,8 +87,13 @@ <td>test_portal_name_20</td> </tr> <tr> + <td>waitForElementPresent</td> + <td>xpath=//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'Properties');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=Properties')"]</td> + <td></td> +</tr> +<tr> <td>clickAt</td> - <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'Properties');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=Properties')"]</td> + <td>xpath=//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'Properties');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=Properties')"]</td> <td></td> </tr> <tr> @@ -98,7 +103,7 @@ </tr> <tr> <td>clickAt</td> - <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PermissionSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PermissionSetting')"]</td> + <td>xpath=//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPortalForm', 'PermissionSetting');javascript:eXo.webui.UIForm.submitEvent('UIPortalForm','SelectTab','&objectId=PermissionSetting')"]</td> <td></td> </tr> <tr> @@ -112,6 +117,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=Edit Permission Setting</td> <td></td> @@ -127,6 +137,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=Platform</td> <td></td> @@ -147,13 +162,8 @@ <td></td> </tr> <tr> - <td>setSpeed</td> - <td>1000</td> - <td></td> -</tr> -<tr> <td>waitForText</td> - <td>//div[@id='UIPermissionSelector']/div/div[2]/div[1]/div[3]/div[2]</td> + <td>xpath=//div[@id='UIPermissionSelector']/div/div[2]/div[1]/div[3]/div[2]</td> <td>exact:*</td> </tr> <tr> @@ -163,7 +173,7 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> + <td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> <td></td> </tr> <tr> @@ -177,8 +187,13 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> + <td></td> +</tr> +<tr> <td>clickAt</td> - <td>//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> + <td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> <td></td> </tr> <tr>

14 years, 2 months

1
0
0 / 0

gatein SVN: r1882 - portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-02-26 06:04:03 -0500 (Fri, 26 Feb 2010) New Revision: 1882 Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Visibility.java Log: minor on javadoc Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Visibility.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Visibility.java 2010-02-26 10:03:06 UTC (rev 1881) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Visibility.java 2010-02-26 11:04:03 UTC (rev 1882) @@ -27,12 +27,12 @@ { /** - * The object is visible. + * The object is displayed. */ DISPLAYED, /** - * The object is not visible. + * The object is hidden. */ HIDDEN,

14 years, 2 months

1
0
0 / 0

gatein SVN: r1881 - in portal/trunk/web: portal/src/main/webapp/groovy/portal/webui/page and 1 other directory.

by do-not-reply＠jboss.org

Author: tan_pham_dinh Date: 2010-02-26 05:03:06 -0500 (Fri, 26 Feb 2010) New Revision: 1881 Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl Log: GTNPORTAL-739: Bug JS when dragdrop pagebody Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js 2010-02-26 09:57:01 UTC (rev 1880) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js 2010-02-26 10:03:06 UTC (rev 1881) @@ -249,7 +249,6 @@ if(!targetElement) { if(!dndEvent.dragObject.isComponent) { dndEvent.dragObject.parentNode.removeChild(dndEvent.dragObject) ; - newComponent = true; } dndEvent.dragObject.style.width = "auto"; return; Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-02-26 09:57:01 UTC (rev 1880) +++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2010-02-26 10:03:06 UTC (rev 1881) @@ -106,15 +106,11 @@ } } - // Don't displat portlet control when View Container - var controlPortlet = DOMUtil.findFirstDescendantByClass(editBlock, "div", "CONTROL-PORTLET"); - if (controlPortlet) { - if(eXo.portal.portalMode == 4) { - controlPortlet.style.display = "none"; - } else { - controlPortlet.style.display = "block"; - } - } + // Don't display portlet control when View Container + var controlPortlet = DOMUtil.findFirstDescendantByClass(editBlock, "div", "CONTROL-PORTLET"); + if (controlPortlet) { + controlPortlet.style.display = eXo.portal.portalMode == 4 ? "none" : "block"; + } }; UIPortal.prototype.getUIPortlets = function() { @@ -351,8 +347,8 @@ this.showUIComponentControl(portal, false) ; var uiPageDesktop = document.getElementById("UIPageDesktop") ; + var pageBody = this.getUIPageBody() ; if(!uiPageDesktop) { - var pageBody = this.getUIPageBody() ; this.switchLayoutModeToViewMode(pageBody, true) ; this.showUIComponentControl(pageBody, false) ; } @@ -369,7 +365,7 @@ this.showUIComponentControl(portlet[i], true) ; var component = portlet[i].getUIComponentBlock(); var mask = eXo.core.DOMUtil.findFirstDescendantByClass(component, "div", "UIPortletMask"); - if(eXo.portal.portalMode && mask) { + if(eXo.portal.portalMode && mask && !eXo.core.DOMUtil.hasAncestor(portlet[i].getElement(), pageBody.getElement())) { mask.style.display = "block"; mask.style.height = component.offsetHeight + "px"; mask.style.width = component.offsetWidth + "px"; @@ -393,14 +389,9 @@ var pageBodyBlock = pageBody.getUIComponentBlock(); var mask = eXo.core.DOMUtil.findFirstDescendantByClass(pageBodyBlock, "div", "UIPageBodyMask"); if(mask) { - if(!(eXo.portal.portalMode%2)) { - mask.style.top = - pageBodyBlock.offsetHeight + "px"; - mask.style.height = pageBodyBlock.offsetHeight + "px"; - mask.style.width = pageBodyBlock.offsetWidth + "px"; - mask.style.display = "block"; - } else if(mask) { - mask.style.display = "none"; - } + mask.style.top = - pageBodyBlock.offsetHeight + "px"; + mask.style.height = pageBodyBlock.offsetHeight + "px"; + mask.style.width = pageBodyBlock.offsetWidth + "px"; } } }; @@ -428,17 +419,6 @@ for(var i = 0; i < portlet.length; i++) { this.switchViewModeToLayoutMode(portlet[i], false) ; this.showUIComponentControl(portlet[i], this.component == 'UIPortlet') ; - var component = portlet[i].getUIComponentBlock(); - var mask = eXo.core.DOMUtil.findFirstDescendantByClass(component, "div", "UIPortletMask"); - if(eXo.portal.portalMode && mask) { - mask.style.display = "block"; - mask.style.height = component.offsetHeight + "px"; - mask.style.width = component.offsetWidth + "px"; - mask.style.top = eXo.core.Browser.findPosY(component) + "px"; - mask.style.left = eXo.core.Browser.findPosX(component) + "px"; - } else if(mask) { - mask.style.display = "none"; - } } } ; Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl 2010-02-26 09:57:01 UTC (rev 1880) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/page/UIPageBody.gtmpl 2010-02-26 10:03:06 UTC (rev 1881) @@ -72,11 +72,16 @@ <div class="BMPagebody"><span></span></div> </div> </div> + + <%if(portalMode != UIPortalApplication.NORMAL_MODE) {%> + <div class="MaskParent" style="height: 0px;position:relative;"> + <div class="UIPageBodyMask" style="position:absolute;" onmousedown="eXo.portal.PortalDragDrop.init.call(this, event);"><span></span></div> + </div> + <%}%> </div> <%}%> <%if(portalMode != UIPortalApplication.NORMAL_MODE){%> <div class="EDITION-BLOCK EDITION-PAGEBODY" style="position:relative"> - <div class="UIPageBodyMask" style="position:absolute; display:none;" onmousedown="eXo.portal.PortalDragDrop.init.call(this, event);"><span></span></div> <div class="CONTROL-PAGEBODY CONTROL-BLOCK" style="display: none"><span></span></div> </div> <%} %>

14 years, 2 months

1
0
0 / 0

gatein SVN: r1880 - in portal/trunk/web: eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background and 1 other directories.

by do-not-reply＠jboss.org

Author: thuy.nguyen Date: 2010-02-26 04:57:01 -0500 (Fri, 26 Feb 2010) New Revision: 1880 Added: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/PortletLayoutDecoratorHidden.gif Removed: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/LayoutCBg1x56.gif portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/MiddlePortletLayout.gif Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/PortletLayoutDecorator.gif portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl Log: GTNPORTAL-715: the permission enhancement of container/application in the edit inline mode Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css =================================================================== --- portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2010-02-26 09:55:44 UTC (rev 1879) +++ portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/Stylesheet.css 2010-02-26 09:57:01 UTC (rev 1880) @@ -95,62 +95,31 @@ .PortletLayoutDecorator { } -.PortletLayoutDecorator .TopLeft { +.PortletLayoutDecorator .LPortletLayoutDecorator { background: url('background/PortletLayoutDecorator.gif') no-repeat left top; - padding-left: 7px; + padding: 0px 0px 0px 12px; } -.PortletLayoutDecorator .TopMiddle { - background: url('background/PortletLayoutDecorator.gif') repeat-x center -6px; -} - -.PortletLayoutDecorator .TopRight { +.PortletLayoutDecorator .RPortletLayoutDecorator { background: url('background/PortletLayoutDecorator.gif') no-repeat right top; - padding-right: 7px; + padding-right: 12px; } -.PortletLayoutDecorator .TopLeft .FixHeight { - height: 6px; +.PortletLayoutDecorator .CPortletLayoutDecorator { + background: url('background/PortletLayoutDecorator.gif') repeat-x center -89px; } -.PortletLayoutDecorator .MiddleLeft { - background: url('background/MiddlePortletLayout.gif') repeat-y left -22px; - padding: 0px 0px 0px 7px; +.PortletLayoutDecorator .FixHeight { + height: 69px; + padding: 10px 0; +} +.ProtectedPortlet .PortletLayoutDecorator { + background: white; +} +.ProtectedPortlet .PortletLayoutDecorator .LPortletLayoutDecorator { + opacity: 0.3; + filter: alpha(opacity=30); } - -.PortletLayoutDecorator .MiddleRight { - background: url('background/MiddlePortletLayout.gif') repeat-y right -22px; - padding-right: 7px; -} - -.PortletLayoutDecorator .CenterBackground { - background: white; -} - -.PortletLayoutDecorator .GardientBackground { - height: 64px; - background: url('background/LayoutCBg1x56.gif') repeat-x bottom; - padding: 6px; -} - -.PortletLayoutDecorator .BottomLeft { - background: url('background/PortletLayoutDecorator.gif') no-repeat left -12px; - padding-left:7px; -} - -.PortletLayoutDecorator .BottomMiddle { - background: url('background/PortletLayoutDecorator.gif') repeat-x center -17px; -} - -.PortletLayoutDecorator .BottomRight { - background: url('background/PortletLayoutDecorator.gif') no-repeat right -12px; - padding-right: 7px; -} - -.PortletLayoutDecorator .BottomLeft .FixHeight { - height: 5px; -} - /*############### End Decorator ###################################################*/ .LAYOUT-CONTAINER .UIContainer { @@ -277,8 +246,8 @@ .PortletBlockDecorator { -} - +} + .EdittingContainer { padding: 3px; } @@ -308,10 +277,22 @@ } .EdittingContainer .OverContainerBlock .LeftContainerBlock { - background: none; + background: white; } .EdittingContainer .OverContainerBlock .RightContainerBlock { background: none; padding: 2px; -} +} + +.ProtectedContainer .ProtectedContent { + opacity: 0.3; + filter: alpha(opacity=80); + height: 70px; + padding: 6px 10px; +} + +.UIPageBodyMask { + opacity: 0.3; + filter: alpha(opacity=30); +} Deleted: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/LayoutCBg1x56.gif =================================================================== (Binary files differ) Deleted: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/MiddlePortletLayout.gif =================================================================== (Binary files differ) Modified: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/PortletLayoutDecorator.gif =================================================================== (Binary files differ) Added: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/PortletLayoutDecoratorHidden.gif =================================================================== (Binary files differ) Property changes on: portal/trunk/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIPortalComponent/background/PortletLayoutDecoratorHidden.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2010-02-26 09:55:44 UTC (rev 1879) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2010-02-26 09:57:01 UTC (rev 1880) @@ -23,31 +23,19 @@ String portletId = uicomponent.getId(); if(!isDesktop && uiPortalApp.isEditing()) { %> - <div class="UIPortlet" id="UIPortlet-$portletId" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);" + <div class="UIPortlet <%=hasPermission?"":"ProtectedPortlet"%>" id="UIPortlet-$portletId" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);" style="top: 0px; left:0px;"> <div class="UIComponentBlock"> <%if(portalMode == uiPortalApp.CONTAINER_BLOCK_EDIT_MODE || portalMode == uiPortalApp.APP_BLOCK_EDIT_MODE) { %> <div class="LAYOUT-BLOCK LAYOUT-PORTLET"> <div class="PortletLayoutDecorator"> - - <%/*Begin Top Portlet Layout Decorator*/%> - <div class="TopLeft"> - <div class="TopRight"> - <div class="TopMiddle"> - <div class="TopMiddleCenter"> - <div class="FixHeight"><span></span></div> - </div> - </div> - </div> - </div> - <%/*Begin Middle Portlet Layout Decorator*/%> - <div class="MiddleLeft"> - <div class="MiddleRight"> - <div class="CenterBackground"> - <div class="GardientBackground"> - <% + <div class="LPortletLayoutDecorator"> + <div class="RPortletLayoutDecorator"> + <div class="CPortletLayoutDecorator"> + <div class="FixHeight"> + <% if(hasPermission) { try { String portletName = uicomponent.getProducedOfferedPortlet().getInfo().getName(); @@ -56,21 +44,12 @@ print uicomponent.getDisplayName(); } } else print "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>"; - %> + %> </div> </div> </div> </div> - <%/*Begin Bottom Portlet Layout Decorator*/%> - <div class="BottomLeft"> - <div class="BottomRight"> - <div class="BottomMiddle"> - <div class="FixHeight"><span></span></div> - </div> - </div> - </div> - </div> </div> <%} else { %> @@ -221,7 +200,7 @@ String portletIcon = uicomponent.getIcon(); if(portletIcon == null) portletIcon = "PortletIcon"; %> - <div class="$portletIcon WindowPortletIcon NovaPortletIcon WindowPortletInfo"><div class="PortletName">$title</div></div> + <div class="$portletIcon WindowPortletIcon NovaPortletIcon WindowPortletInfo"><div class="PortletName"><%=hasPermission ? title : _ctx.appRes("UIPortlet.label.protectedContent")%></div></div> </div> </div> @@ -237,7 +216,7 @@ <% if(windowState != WindowState.MINIMIZED) { if(hasPermission) println portletContent; - else println _ctx.appRes("UIPortlet.label.protectedContent"); + else println "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>"; } %> </div> @@ -275,7 +254,7 @@ <div class="PORTLET-FRAGMENT" ${cssStyle}> <% if(hasPermission) println portletContent; - else println _ctx.appRes("UIPortlet.label.protectedContent"); + else println "<div class='ProtectedContent'>"+_ctx.appRes("UIPortlet.label.protectedContent")+"</div>"; %> </div> </div>

14 years, 2 months

1
0
0 / 0

gatein SVN: r1879 - portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-02-26 04:55:44 -0500 (Fri, 26 Feb 2010) New Revision: 1879 Added: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Visibility.java Log: fixing missing class Added: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Visibility.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Visibility.java (rev 0) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/mop/Visibility.java 2010-02-26 09:55:44 UTC (rev 1879) @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.portal.mop; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public enum Visibility +{ + + /** + * The object is visible. + */ + DISPLAYED, + + /** + * The object is not visible. + */ + HIDDEN, + + /** + * The object visibility is defined by the validity in a related time range. + */ + TEMPORAL, + + /** + * The object visibility is system. + */ + SYSTEM + +}

14 years, 2 months

1
0
0 / 0

gatein SVN: r1878 - portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-02-26 03:00:47 -0500 (Fri, 26 Feb 2010) New Revision: 1878 Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml Log: GTNPORTAL-770: Enable JBoss Cache on the MOPSessionManager Change default values Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-02-26 07:55:31 UTC (rev 1877) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-02-26 08:00:47 UTC (rev 1878) @@ -313,10 +313,10 @@ <string>PomSessionManager</string> </field> <field name="maxNodes"> - <int>-1</int> + <int>10000</int> </field> <field name="minTimeToLive"> - <long>0</long> + <long>60000</long> </field> </object> </object-param>

14 years, 2 months

1
0
0 / 0

gatein SVN: r1877 - in portal/trunk: packaging/module/src/main/javascript and 1 other directories.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-02-26 02:55:31 -0500 (Fri, 26 Feb 2010) New Revision: 1877 Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml Log: GTNPORTAL-770: Enable JBoss Cache on the MOPSessionManager Configuring the POMSessionManager cache Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java 2010-02-26 06:48:02 UTC (rev 1876) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java 2010-02-26 07:55:31 UTC (rev 1877) @@ -47,7 +47,7 @@ public <V> V execute(POMSession session, POMTask<V> task) throws Exception { - if (task instanceof CacheableDataTask && !cluster) + if (task instanceof CacheableDataTask) { CacheableDataTask<?, V> loadTask = (CacheableDataTask<?, V>)task; switch (loadTask.getAccessMode()) Modified: portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js =================================================================== --- portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-02-26 06:48:02 UTC (rev 1876) +++ portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-02-26 07:55:31 UTC (rev 1877) @@ -163,6 +163,7 @@ addDependency(kernel.component.remote). addDependency(kernel.component.cache). addDependency(kernel.component.command). + addDependency(new Project("org.exoplatform.kernel", "exo.kernel.component.ext.cache.impl.jboss.v3", "jar", kernel.version)). addDependency(core.component.database). addDependency(core.component.organization). Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-02-26 06:48:02 UTC (rev 1876) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-02-26 07:55:31 UTC (rev 1877) @@ -194,6 +194,18 @@ </component-plugins> </component> + <component> + <key>org.exoplatform.services.cache.ExoCacheFactory</key> + <type>org.exoplatform.services.cache.impl.jboss.ExoCacheFactoryImpl + </type> + <init-params> + <value-param> + <name>cache.config.template</name> + <value>classpath:/conf/jcr/jbosscache/cluster/config.xml</value> + </value-param> + </init-params> + </component> + <external-component-plugins> <target-component>org.exoplatform.services.organization.OrganizationService</target-component> <component-plugin> @@ -263,4 +275,54 @@ </component-plugin> </external-component-plugins> + <external-component-plugins> + <target-component>org.exoplatform.services.cache.ExoCacheFactory + </target-component> + <component-plugin> + <name>addCreator</name> + <set-method>addCreator</set-method> + <type>org.exoplatform.services.cache.impl.jboss.ExoCacheCreatorPlugin + </type> + <description>add Exo Cache Creator</description> + <init-params> + <object-param> + <name>LRU</name> + <description>The LRU cache creator</description> + <object + type="org.exoplatform.services.cache.impl.jboss.lru.LRUExoCacheCreator"></object> + </object-param> + </init-params> + </component-plugin> + </external-component-plugins> + + <external-component-plugins> + <target-component>org.exoplatform.services.cache.CacheService + </target-component> + <component-plugin> + <name>addExoCacheConfig</name> + <set-method>addExoCacheConfig</set-method> + <type>org.exoplatform.services.cache.ExoCacheConfigPlugin</type> + <description>add Exo Cache Config</description> + <init-params> + <object-param> + <name>cache.config.PomSessionManager</name> + <description>The JBoss Cache LRU configuration</description> + <object + type="org.exoplatform.services.cache.impl.jboss.lru.LRUExoCacheConfig"> + <field name="name"> + <string>PomSessionManager</string> + </field> + <field name="maxNodes"> + <int>-1</int> + </field> + <field name="minTimeToLive"> + <long>0</long> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + </external-component-plugins> + + </configuration>

14 years, 2 months

1
0
0 / 0

gatein SVN: r1876 - portal/trunk/docs/user-guide/en/images.

by do-not-reply＠jboss.org

Author: smumford Date: 2010-02-26 01:48:02 -0500 (Fri, 26 Feb 2010) New Revision: 1876 Added: portal/trunk/docs/user-guide/en/images/BannerPortlet.png portal/trunk/docs/user-guide/en/images/Breadcrumbs.png portal/trunk/docs/user-guide/en/images/CodePaste.png portal/trunk/docs/user-guide/en/images/Dashboard.png portal/trunk/docs/user-guide/en/images/DashboardLink.png portal/trunk/docs/user-guide/en/images/Downloads.png portal/trunk/docs/user-guide/en/images/Footer.png portal/trunk/docs/user-guide/en/images/GateIn.png portal/trunk/docs/user-guide/en/images/GoogleGadgets.png portal/trunk/docs/user-guide/en/images/NavigationPortlet.png portal/trunk/docs/user-guide/en/images/NewGadget.png portal/trunk/docs/user-guide/en/images/Register.png portal/trunk/docs/user-guide/en/images/RememberMe.png portal/trunk/docs/user-guide/en/images/Signin.png portal/trunk/docs/user-guide/en/images/SiteMap.png portal/trunk/docs/user-guide/en/images/Videos.png portal/trunk/docs/user-guide/en/images/XMLURL.png Modified: portal/trunk/docs/user-guide/en/images/AccountSetting.png portal/trunk/docs/user-guide/en/images/ApplicationRegistry.png portal/trunk/docs/user-guide/en/images/Dash2.png portal/trunk/docs/user-guide/en/images/Dashboard1.png portal/trunk/docs/user-guide/en/images/StarPortlet.png Log: Edits and todos from Luc Modified: portal/trunk/docs/user-guide/en/images/AccountSetting.png =================================================================== (Binary files differ) Modified: portal/trunk/docs/user-guide/en/images/ApplicationRegistry.png =================================================================== (Binary files differ) Added: portal/trunk/docs/user-guide/en/images/BannerPortlet.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/BannerPortlet.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: portal/trunk/docs/user-guide/en/images/Breadcrumbs.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/Breadcrumbs.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: portal/trunk/docs/user-guide/en/images/CodePaste.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/CodePaste.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: portal/trunk/docs/user-guide/en/images/Dash2.png =================================================================== (Binary files differ) Added: portal/trunk/docs/user-guide/en/images/Dashboard.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/Dashboard.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: portal/trunk/docs/user-guide/en/images/Dashboard1.png =================================================================== (Binary files differ) Added: portal/trunk/docs/user-guide/en/images/DashboardLink.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/DashboardLink.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: portal/trunk/docs/user-guide/en/images/Downloads.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/Downloads.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: portal/trunk/docs/user-guide/en/images/Footer.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/Footer.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: portal/trunk/docs/user-guide/en/images/GateIn.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/GateIn.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: portal/trunk/docs/user-guide/en/images/GoogleGadgets.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/GoogleGadgets.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: portal/trunk/docs/user-guide/en/images/NavigationPortlet.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/NavigationPortlet.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: portal/trunk/docs/user-guide/en/images/NewGadget.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/NewGadget.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: portal/trunk/docs/user-guide/en/images/Register.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/Register.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: portal/trunk/docs/user-guide/en/images/RememberMe.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/RememberMe.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: portal/trunk/docs/user-guide/en/images/Signin.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/Signin.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: portal/trunk/docs/user-guide/en/images/SiteMap.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/SiteMap.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: portal/trunk/docs/user-guide/en/images/StarPortlet.png =================================================================== (Binary files differ) Added: portal/trunk/docs/user-guide/en/images/Videos.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/Videos.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: portal/trunk/docs/user-guide/en/images/XMLURL.png =================================================================== (Binary files differ) Property changes on: portal/trunk/docs/user-guide/en/images/XMLURL.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

14 years, 2 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