April 2010 - gatein-commits - Jboss List Archives

gatein SVN: r2531 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design.

by do-not-reply＠jboss.org

Author: hangnguyen Date: 2010-04-08 06:24:32 -0400 (Thu, 08 Apr 2010) New Revision: 2531 Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_14_01_044_CheckWhenUserDoesNotHaveRightToAddNewPage.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_25_04_004_CopyPasteNodeToSamePlace.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_25_05_001_CutPasteNodeToSamePlace.html Log: GTNPORTAL-1029: Create new test for "POR_25_05_001" GTNPORTAL-1031: Create new test for "POR_25_004_004" GTNPORTAL-1047: Create new test for "POR_14_001_044" Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_14_01_044_CheckWhenUserDoesNotHaveRightToAddNewPage.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_14_01_044_CheckWhenUserDoesNotHaveRightToAddNewPage.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_14_01_044_CheckWhenUserDoesNotHaveRightToAddNewPage.html 2010-04-08 10:24:32 UTC (rev 2531) @@ -0,0 +1,582 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<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>Test_POR_14_01_044_CheckWhenUserDoesNotHaveRightToAddNewPage</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_14_01_044_CheckWhenUserDoesNotHaveRightToAddNewPage</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Register new user</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Register</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>POR_14_01_044-user</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>POR_14_01_044-user</td> +</tr> +<tr> + <td>type</td> + <td>confirmPassword</td> + <td>POR_14_01_044-user</td> +</tr> +<tr> + <td>type</td> + <td>firstName</td> + <td>hoa</td> +</tr> +<tr> + <td>type</td> + <td>lastName</td> + <td>nguyen</td> +</tr> +<tr> + <td>type</td> + <td>emailAddress</td> + <td>POR_14_01_044-user(a)gmail.com</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Subscribe</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Subscribe</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPage']//div[@class='ExoMessageDecorator']//table[@class='ActionContainer']//div</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPage']//div[@class='ExoMessageDecorator']//table[@class='ActionContainer']//div</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Add new user into group</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPortalComponentLogin']//table[@class='UIFormGrid']/tbody/tr[@class='UserNameField']/td/input</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>//form[@id='UIPortalComponentLogin']//table[@class='UIFormGrid']/tbody/tr[@class='UserNameField']/td/input</td> + <td>root</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPortalComponentLogin']//table[@class='UIFormGrid']/tbody/tr[@id='UIPortalLoginFormControl']/td/input</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>//form[@id='UIPortalComponentLogin']//table[@class='UIFormGrid']/tbody/tr[@id='UIPortalLoginFormControl']/td/input</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIOrganizationPortlet']//a[@class='GroupButton']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIOrganizationPortlet']//a[@class='GroupButton']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='UIGroupManagement']/div[@class='GroupPanel']/div[@class='GroupNavigation']/div[@class='GroupNavigationContainer']/div[@class='UITrees ScrollArea']/div[@class='TreeContainer JSContainer']/div/div[2]/div[@class='ExpandIcon']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@class='UIGroupManagement']/div[@class='GroupPanel']/div[@class='GroupNavigation']/div[@class='GroupNavigationContainer']/div[@class='UITrees ScrollArea']/div[@class='TreeContainer JSContainer']/div/div[2]/div[@class='ExpandIcon']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>POR_14_01_044-user</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Add new page</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPageBrowser']/div[@class='UIAction']/table[@class='ActionContainer']//div[@class='ActionButton LightBlueStyle']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPageBrowser']/div[@class='UIAction']/table[@class='ActionContainer']//div[@class='ActionButton LightBlueStyle']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='UIFormTabPane']//form[@id='UIPageForm']//div[@class='UITabContentContainer']/div[@class='UITabContent']/div[@class='UIFormInputSet']/table[@class='UIFormGrid']/tbody/tr[2]/td[2]/select[@class='selectbox']</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>//div[@class='UIFormTabPane']//form[@id='UIPageForm']//div[@class='UITabContentContainer']/div[@class='UITabContent']/div[@class='UIFormInputSet']/table[@class='UIFormGrid']/tbody/tr[2]/td[2]/select[@class='selectbox']</td> + <td>label=portal</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='UIFormTabPane']//form[@id='UIPageForm']//div[@class='UITabContentContainer']/div[@class='UITabContent']/div[@class='UIFormInputSet']/table[@class='UIFormGrid']/tbody/tr[4]/td[2]/input</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>//div[@class='UIFormTabPane']//form[@id='UIPageForm']//div[@class='UITabContentContainer']/div[@class='UITabContent']/div[@class='UIFormInputSet']/table[@class='UIFormGrid']/tbody/tr[4]/td[2]/input</td> + <td>POR_14_01_044-page</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Add new node</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Add Node</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Add Node</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='UIFormTabPane']//form[@id='UIPageNodeForm2']//div[@class='UITabContentContainer']/div[@class='UITabContent']/div[@class='UIFormInputSet']/table[@class='UIFormGrid']/tbody/tr[2]/td[2]/input</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>//div[@class='UIFormTabPane']//form[@id='UIPageNodeForm2']//div[@class='UITabContentContainer']/div[@class='UITabContent']/div[@class='UIFormInputSet']/table[@class='UIFormGrid']/tbody/tr[2]/td[2]/input</td> + <td>POR_14_01_044-node</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@class='UIFormTabPane']/div[@class='UITabPane']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@class='UIFormTabPane']/div[@class='UITabPane']//div[@class='TabsContainer']/div[2]//div[@class='MiddleTab']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Search and Select Page</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Search and Select Page</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='SelectPage']//div[@id='UIVirtualList']//table[@class='UIGrid']/tbody[@class='FeedBox']/tr[1]/td[5]/div[@class='ActionContainer']/img[@class='SelectPageIcon']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='SelectPage']//div[@id='UIVirtualList']//table[@class='UIGrid']/tbody[@class='FeedBox']/tr[1]/td[5]/div[@class='ActionContainer']/img[@class='SelectPageIcon']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Login by new user</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>username</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>POR_14_01_044-user</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>POR_14_01_044-user</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--View created node</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Check Add new page by user have not right</td> + <td></td> +</tr> +<tr> + <td>waitForText</td> + <td>xpath=//div[@class='UIRowContainer']/div[3]//a[@class='Selected']</td> + <td>POR_14_01_044-node</td> +</tr> +<tr> + <td>verifyTextNotPresent</td> + <td>Add New Page</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Delete new user</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPortalComponentLogin']//table[@class='UIFormGrid']/tbody/tr[@class='UserNameField']/td/input</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>//form[@id='UIPortalComponentLogin']//table[@class='UIFormGrid']/tbody/tr[@class='UserNameField']/td/input</td> + <td>root</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPortalComponentLogin']//table[@class='UIFormGrid']/tbody/tr[@id='UIPortalLoginFormControl']/td/input</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>//form[@id='UIPortalComponentLogin']//table[@class='UIFormGrid']/tbody/tr[@id='UIPortalLoginFormControl']/td/input</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Users and groups management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//img[@alt='DeleteUser']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//img[@alt='DeleteUser']</td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Are you sure you want to delete POR_14_01_044-user user?</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> + <td>POR_14_01_044-user</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Delete node</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UINavigationManagement']//a[@title='POR_14_01_044-node']</td> + <td></td> +</tr> +<tr> + <td>componentExoContextMenu</td> + <td>//div[@id='UINavigationManagement']//a[@title='POR_14_01_044-node']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Delete Node</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Delete Node</td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Are you sure you want to delete this node?</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForElementNotPresent</td> + <td>//div[@id='UINavigationManagement']//a[@title='POR_14_01_044-node']</td> + <td></td> +</tr> +<tr> + <td>verifyElementNotPresent</td> + <td>//div[@id='UINavigationManagement']//a[@title='POR_14_01_044-node']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Delete page</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Page Management</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//img[@title='Delete Page']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//img[@title='Delete Page']</td> + <td></td> +</tr> +<tr> + <td>assertConfirmation</td> + <td>Do you want to delete this page?</td> + <td></td> +</tr> +<tr> + <td>waitForElementNotPresent</td> + <td>POR_14_01_044-page</td> + <td></td> +</tr> +<tr> + <td>verifyTextNotPresent</td> + <td>POR_14_01_044-page</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_25_04_004_CopyPasteNodeToSamePlace.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_25_04_004_CopyPasteNodeToSamePlace.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_25_04_004_CopyPasteNodeToSamePlace.html 2010-04-08 10:24:32 UTC (rev 2531) @@ -0,0 +1,162 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<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>Test_POR_25_04_003_CopyPasteNodeToSamePlace</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_25_04_003_CopyPasteNodeToSamePlace</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Login portal--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Open Navigation Management pop-up --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Copy node--</td> + <td></td> +</tr> +<tr> + <td>componentExoContextMenu</td> + <td>xpath=//div[@id="UINavigationNodeSelector"]/div/div/div/div[2]/div/div/div[6]//a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Copy Node</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Copy Node</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Paste node to same place--</td> + <td></td> +</tr> +<tr> + <td>componentExoContextMenu</td> + <td>xpath=//div[@id="UINavigationNodeSelector"]/div/div/div/div[2]/div/div/div[6]//a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='NavigationNodePopupMenu']/div[@class='UIContextMenuContainer']/div[2]/div/div/div[7]//a</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='NavigationNodePopupMenu']/div/div[2]/div/div/div[7]//a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Verify text Message--</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>The source and the destination must be different.</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPortalApplication']//div[@class='ExoMessageDecorator']//div[@class='MiddleRightSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPortalApplication']//div[@class='ExoMessageDecorator']//div[@class='MiddleRightSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Sign out--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_25_05_001_CutPasteNodeToSamePlace.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_25_05_001_CutPasteNodeToSamePlace.html (rev 0) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_25_05_001_CutPasteNodeToSamePlace.html 2010-04-08 10:24:32 UTC (rev 2531) @@ -0,0 +1,162 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<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>Test_POR_25_05_001_CutPasteNodeToSamePlace</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">Test_POR_25_05_001_CutPasteNodeToSamePlace</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/portal/public/classic/</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Login portal--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>username</td> + <td>root</td> +</tr> +<tr> + <td>type</td> + <td>password</td> + <td>gtn</td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Open Navigation Management pop-up --</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Edit Navigation</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Cut node--</td> + <td></td> +</tr> +<tr> + <td>componentExoContextMenu</td> + <td>xpath=//div[@id="UINavigationNodeSelector"]/div/div/div/div[2]/div/div/div[6]//a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Cut Node</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Cut Node</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Paste node to same place--</td> + <td></td> +</tr> +<tr> + <td>componentExoContextMenu</td> + <td>xpath=//div[@id="UINavigationNodeSelector"]/div/div/div/div[2]/div/div/div[6]//a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='NavigationNodePopupMenu']/div[@class='UIContextMenuContainer']/div[2]/div/div/div[7]//a</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='NavigationNodePopupMenu']/div/div[2]/div/div/div[7]//a</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>--Verify text Message--</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>This node name already exists. </td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//div[@id='UIPortalApplication']//div[@class='ExoMessageDecorator']//div[@class='MiddleRightSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//div[@id='UIPortalApplication']//div[@class='ExoMessageDecorator']//div[@class='MiddleRightSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>echo</td> + <td>-- Sign out--</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign out</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html>

14 years, 8 months

1
0
0 / 0

gatein SVN: r2530 - in portal/trunk/portlet/exoadmin/src/main: webapp/WEB-INF/classes/locale/portlet/exoadmin and 1 other directory.

by do-not-reply＠jboss.org

Author: ndkhoiits Date: 2010-04-08 05:51:17 -0400 (Thu, 08 Apr 2010) New Revision: 2530 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties Log: GTNPORTAL-1033 Change warning message and add ResourceValidator for gadget name field Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2010-04-08 07:34:10 UTC (rev 2529) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetEditor.java 2010-04-08 09:51:17 UTC (rev 2530) @@ -47,6 +47,8 @@ import org.exoplatform.webui.form.validator.ExpressionValidator; import org.exoplatform.webui.form.validator.IdentifierValidator; import org.exoplatform.webui.form.validator.MandatoryValidator; +import org.exoplatform.webui.form.validator.ResourceValidator; +import org.exoplatform.webui.form.validator.StringLengthValidator; import org.exoplatform.webui.form.validator.Validator; import java.io.Serializable; @@ -79,8 +81,10 @@ Param param = initParams.getParam("SampleGadget"); WebuiRequestContext context = WebuiRequestContext.getCurrentInstance(); String sample = (String)param.getMapGroovyObject(context); - addUIFormInput(new UIFormStringInput(FIELD_NAME, null, null).addValidator(MandatoryValidator.class).addValidator(ExpressionValidator.class, "^[\\p{L}][\\p{ASCII}]+$", - "UIGadgetEditor.msg.Invalid")); + addUIFormInput(new UIFormStringInput(FIELD_NAME, FIELD_NAME, null).addValidator(MandatoryValidator.class) + .addValidator(StringLengthValidator.class, 2, 50) + .addValidator(ResourceValidator.class) + .addValidator(ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\-\\d]+$","UIGadgetEditor.msg.Invalid-firstChar")); addUIFormInput(new UIFormTextAreaInput(FIELD_SOURCE, FIELD_SOURCE, sample).addValidator(MandatoryValidator.class) .addValidator(GadgetSpecValidator.class)); } Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2010-04-08 07:34:10 UTC (rev 2529) +++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/ApplicationRegistryPortlet_en.properties 2010-04-08 09:51:17 UTC (rev 2530) @@ -145,7 +145,7 @@ UIGadgetEditor.action.Cancel=#{word.cancel} UIGadgetEditor.msg.invalidSpec=This source is invalid gadget specification. UIGadgetEditor.gadget.msg.gadgetIsExist=This name already exists, please enter a different name. -UIGadgetEditor.msg.Invalid=The "{0}" field must not contains special characters. +UIGadgetEditor.msg.Invalid-firstChar=The "{0}" field must start with a character. ##package org.exoplatform.organization.webui.component.UIListPermissionSelector UIListPermissionSelector.header.groupId=Group UIListPermissionSelector.header.membership=Membership

14 years, 8 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: ndkhoiits Date: 2010-04-08 03:34:10 -0400 (Thu, 08 Apr 2010) New Revision: 2529 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java Log: GTNPORTAL-1043 UIPage in UIPageBody didn't instance after create a new portal for edit inline. The code add UIPage into UIPageBody was deleted by Trong Tran in revision 2519 because it's processed in processRender, it's not good. I recommend to add this code into UIMainActionListener's action Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-04-08 06:34:59 UTC (rev 2528) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2010-04-08 07:34:10 UTC (rev 2529) @@ -160,6 +160,9 @@ newPortal.setSelectedNode(uiPortal.getSelectedNode()); newPortal.setSelectedNavigation(uiPortal.getSelectedNavigation()); newPortal.setSelectedPath(uiPortal.getSelectedPath()); + + // Get instance of UIPage + newPortal.getChild(UIPageBody.class).setPageBody(newPortal.getSelectedNode(), newPortal); UIEditInlineWorkspace uiEditWS = uiWorkingWS.getChild(UIEditInlineWorkspace.class); uiEditWS.setUIComponent(newPortal);

14 years, 8 months

1
0
0 / 0

gatein SVN: r2526 - portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf.

by do-not-reply＠jboss.org

Author: mpodolin Date: 2010-04-07 10:42:23 -0400 (Wed, 07 Apr 2010) New Revision: 2526 Removed: portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/configuration-tomcat.properties Modified: portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/configuration-jboss.properties Log: configuration properties altered according to EPP config.; removed tomcat related stuff Modified: portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/configuration-jboss.properties =================================================================== --- portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2010-04-07 13:29:49 UTC (rev 2525) +++ portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2010-04-07 14:42:23 UTC (rev 2526) @@ -25,12 +25,8 @@ # JCR gatein.jcr.config.type=local -gatein.jcr.datasource.name=java:jdbcjcr +gatein.jcr.datasource.name=java:gatein-jcr gatein.jcr.datasource.dialect=auto -gatein.jcr.datasource.driver=org.hsqldb.jdbcDriver -gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr_${name} -gatein.jcr.datasource.username=sa -gatein.jcr.datasource.password= gatein.jcr.data.dir=${gatein.data.dir}/jcr gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values @@ -38,11 +34,7 @@ gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter # IDM -gatein.idm.datasource.name=java:jdbcidm -gatein.idm.datasource.driver=org.hsqldb.jdbcDriver -gatein.idm.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm_${name} -gatein.idm.datasource.username=sa -gatein.idm.datasource.password= +gatein.idm.datasource.name=java:gatein-idm # EMail gatein.email.smtp.username= @@ -53,4 +45,3 @@ gatein.email.smtp.auth=true gatein.email.smtp.socketFactory.port=465 gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory - Deleted: portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/configuration-tomcat.properties =================================================================== --- portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/configuration-tomcat.properties 2010-04-07 13:29:49 UTC (rev 2525) +++ portal/branches/EPP_5_0_Branch/component/common/src/main/java/conf/configuration-tomcat.properties 2010-04-07 14:42:23 UTC (rev 2526) @@ -1,58 +0,0 @@ -# -# Copyright (C) 2009 eXo Platform SAS. -# -# This is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 2.1 of -# the License, or (at your option) any later version. -# -# This software is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this software; if not, write to the Free -# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -# 02110-1301 USA, or see the FSF site: http://www.fsf.org. -# - -# Data -gatein.data.dir=../gatein/data - -# DB -gatein.db.data.dir=${gatein.data.dir}/db - -# JCR -gatein.jcr.config.type=local -gatein.jcr.datasource.name=jdbcjcr -gatein.jcr.datasource.dialect=auto -gatein.jcr.datasource.driver=org.hsqldb.jdbcDriver -gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr_${name} -gatein.jcr.datasource.username=sa -gatein.jcr.datasource.password= - -gatein.jcr.data.dir=${gatein.data.dir}/jcr -gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values -gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene -gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter - -# IDM -gatein.idm.datasource.name=jdbcidm -gatein.idm.datasource.driver=org.hsqldb.jdbcDriver -gatein.idm.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm_${name} -gatein.idm.datasource.username=sa -gatein.idm.datasource.password= - -# Arjuna configuration -com.arjuna.ats.arjuna.objectstore.objectStoreDir=${gatein.data.dir}/jta - -# EMail -gatein.email.smtp.username= -gatein.email.smtp.password= -gatein.email.smtp.host=smtp.gmail.com -gatein.email.smtp.port=465 -gatein.email.smtp.starttls.enable=true -gatein.email.smtp.auth=true -gatein.email.smtp.socketFactory.port=465 -gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory \ No newline at end of file

14 years, 8 months

1
0
0 / 0

gatein SVN: r2525 - in portal/branches/EPP_5_0_Branch: webui/portal/src/main/java/org/exoplatform/portal/webui/page and 1 other directories.

by do-not-reply＠jboss.org

Author: mpodolin Date: 2010-04-07 09:29:49 -0400 (Wed, 07 Apr 2010) New Revision: 2525 Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java Log: JBEPP-286: GTNPORTAL-1020 ported to the branch Modified: portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl =================================================================== --- portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2010-04-07 12:16:12 UTC (rev 2524) +++ portal/branches/EPP_5_0_Branch/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2010-04-07 13:29:49 UTC (rev 2525) @@ -15,13 +15,15 @@ <div class="<%=uicomponent.isCollapsed ? "CollapseIcon" : "ExpandIcon"%>" onclick="eXo.portal.UIPortal.toggleComposer(this)"><span></span></div> <% if(uicomponent.isShowControl) { %> <a class="CloseButton" title="<%=_ctx.appRes("word.abort")%>" href="<%=uicomponent.event("Abort")%>"><span></span></a> - <a class="<%= isEditted ? "EdittedSaveButton" : "SaveButton" %>" title="<%=_ctx.appRes("word.finish")%>" href="<%=uicomponent.event("Finish")%>"><span></span></a> <% if (uicomponent.isUsedInWizard()) { %> + <a class="<%= isEditted ? "EdittedSaveButton" : "SaveButton" %>" title="<%=_ctx.appRes("word.finish")%>" href="<%=uicomponent.url("Finish")%>"><span></span></a> <a class="BackButton"" title="<%=_ctx.appRes("word.back")%>" href="<%=uicomponent.event("Back")%>"> <span></span> </a> - <% } %> - <% } %> + <% } else {%> + <a class="<%= isEditted ? "EdittedSaveButton" : "SaveButton" %>" title="<%=_ctx.appRes("word.finish")%>" href="<%=uicomponent.event("Finish")%>"><span></span></a> + <% } + } %> <div class="PopupTitle"><%=_ctx.appRes(popupId + ".title."+ popupId)%></div> </div> </div> Modified: portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java =================================================================== --- portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2010-04-07 12:16:12 UTC (rev 2524) +++ portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBody.java 2010-04-07 13:29:49 UTC (rev 2525) @@ -76,40 +76,12 @@ public void setPageBody(PageNode pageNode, UIPortal uiPortal) throws Exception { WebuiRequestContext context = Util.getPortalRequestContext(); - ExoContainer appContainer = context.getApplication().getApplicationServiceContainer(); - UserPortalConfigService userPortalConfigService = - (UserPortalConfigService)appContainer.getComponentInstanceOfType(UserPortalConfigService.class); - Page page = null; - UIPage uiPage; - - String pageReference = null; - - if (pageNode != null) - { - pageReference = pageNode.getPageReference(); - try - { - if (pageReference != null) - { - page = userPortalConfigService.getPage(pageReference, context.getRemoteUser()); - } - } - catch (Exception e) - { - UIPortalApplication uiApp = getAncestorOfType(UIPortalApplication.class); - uiApp.addMessage(new ApplicationMessage(e.getMessage(), new Object[]{})); - } - } - uiPortal.setMaximizedUIComponent(null); - try + UIPage uiPage; + uiPage = getUIPage(pageNode, uiPortal, context); + if (uiPage == null) { - uiPage = getUIPage(pageReference, page, uiPortal, context); - } - catch (Exception ex) - { - // TODO: Print evokable message setUIComponent(null); return; } @@ -142,15 +114,30 @@ * @param uiPortal * @return */ - private UIPage getUIPage(String pageReference, Page page, UIPortal uiPortal, WebuiRequestContext context) + private UIPage getUIPage(PageNode pageNode, UIPortal uiPortal, WebuiRequestContext context) throws Exception { + Page page = null; + String pageReference = null; + + if (pageNode != null) + { + pageReference = pageNode.getPageReference(); + if (pageReference != null) + { + ExoContainer appContainer = context.getApplication().getApplicationServiceContainer(); + UserPortalConfigService userPortalConfigService = + (UserPortalConfigService)appContainer.getComponentInstanceOfType(UserPortalConfigService.class); + page = userPortalConfigService.getPage(pageReference, context.getRemoteUser()); + } + } + //The page has been deleted if(page == null) { //Clear the UIPage from cache in UIPortal uiPortal.clearUIPage(pageReference); - throw new Exception("The page with id " + pageReference + " has been removed"); + return null; } UIPage uiPage = uiPortal.getUIPage(pageReference); @@ -173,11 +160,6 @@ return uiPage; } - public void renderChildren() throws Exception - { - uicomponent_.processRender((WebuiRequestContext)WebuiRequestContext.getCurrentInstance()); - } - public void processRender(WebuiRequestContext context) throws Exception { if (maximizedUIComponent != null && Util.getUIPortalApplication().getModeState() % 2 == 0) @@ -186,11 +168,6 @@ return; } - //TODO: Remove beneath block - if (uicomponent_ == null) - { - setPageBody(Util.getUIPortal().getSelectedNode(), Util.getUIPortal()); - } super.processRender(context); } Modified: portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java =================================================================== --- portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2010-04-07 12:16:12 UTC (rev 2524) +++ portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2010-04-07 13:29:49 UTC (rev 2525) @@ -19,6 +19,7 @@ package org.exoplatform.portal.webui.page; +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; @@ -85,7 +86,7 @@ { UIPagePreview uiPagePreview = getChild(UIPagePreview.class); UIPage uiPage = (UIPage)uiPagePreview.getUIComponent(); - UIPortal uiPortal = Util.getUIPortal(); + UIWizardPageSetInfo uiPageInfo = getChild(UIWizardPageSetInfo.class); UIPageNodeSelector uiNodeSelector = uiPageInfo.getChild(UIPageNodeSelector.class); @@ -116,9 +117,8 @@ DataStorage dataService = getApplicationComponent(DataStorage.class); dataService.create(page); dataService.save(pageNav); + UIPortal uiPortal = Util.getUIPortal(); setNavigation(uiPortal.getNavigations(), uiNodeSelector.getSelectedNavigation()); - PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, pageNode.getUri()); - uiPortal.broadcast(pnevent, Event.Phase.PROCESS); } private void setNavigation(List<PageNavigation> navs, PageNavigation nav) @@ -342,7 +342,11 @@ if (isDesktopPage) { uiWizard.saveData(); - uiWizard.updateUIPortal(uiPortalApp, event); + PageNode selectedNode = uiNodeSelector.getSelectedPageNode(); + UIPortal uiPortal = Util.getUIPortal(); + PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, selectedNode.getUri()); + uiPortal.broadcast(pnevent, Event.Phase.PROCESS); + uiWizard.updateUIPortal(event); return; } @@ -372,17 +376,14 @@ uiWizard.saveData(); UIPortalToolPanel toolPanel = uiWorkingWS.findFirstComponentOfType(UIPortalToolPanel.class); toolPanel.setUIComponent(null); - uiWizard.updateUIPortal(uiPortalApp, event); - JavascriptManager jsManager = event.getRequestContext().getJavascriptManager(); - jsManager.addJavascript("eXo.portal.portalMode=" + UIPortalApplication.NORMAL_MODE + ";"); - + uiWizard.updateUIPortal(event); UIWizardPageSetInfo uiPageInfo = uiWizard.getChild(UIWizardPageSetInfo.class); UIPageNodeSelector uiNodeSelector = uiPageInfo.getChild(UIPageNodeSelector.class); PageNode selectedNode = uiNodeSelector.getSelectedPageNode(); - - String uri = Util.getPortalRequestContext().getPortalURI() + selectedNode.getUri(); - //Util.getPortalRequestContext().sendRedirect(uri); - jsManager.addJavascript("window.location = '" + uri + "';"); + + PortalRequestContext pcontext = Util.getPortalRequestContext(); + String uri = pcontext.getPortalURI() + selectedNode.getUri(); + pcontext.getResponse().sendRedirect(uri); } } Modified: portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java =================================================================== --- portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java 2010-04-07 12:16:12 UTC (rev 2524) +++ portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java 2010-04-07 13:29:49 UTC (rev 2525) @@ -94,7 +94,7 @@ return uiHelpWindow; } - void updateUIPortal(UIPortalApplication uiPortalApp, Event<? extends UIPageWizard> event) throws Exception + protected void updateUIPortal(Event<? extends UIPageWizard> event) throws Exception { PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext(); Modified: portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java =================================================================== --- portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2010-04-07 12:16:12 UTC (rev 2524) +++ portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2010-04-07 13:29:49 UTC (rev 2525) @@ -199,6 +199,12 @@ return listNavs; } + /** + * Return cached UIPage associated to the specified pageReference + * + * @param pageReference key whose associated UIPage is to be returned + * @return the UIPage associated to the specified pageReference or null if not any + */ public UIPage getUIPage(String pageReference) { if(all_UIPages == null)

14 years, 8 months

1
0
0 / 0

gatein SVN: r2524 - components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-04-07 08:16:12 -0400 (Wed, 07 Apr 2010) New Revision: 2524 Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java Log: - GTNPORTAL-947: check that the federating invoker actually knows the consumer before attempting to unregister it. - Added some documentation. Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java 2010-04-07 11:41:02 UTC (rev 2523) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java 2010-04-07 12:16:12 UTC (rev 2524) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2009, Red Hat Middleware, LLC, and individual + * 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. @@ -274,10 +274,12 @@ for (WSRPConsumer consumer : getConsumers()) { // if producer is not active, it shouldn't be registered with the federating portlet invoker, hence do not - // unregister it. - if (consumer.getProducerInfo().isActive()) + // unregister it. We have changed how consumers are registered (active consumers are not automatically + // registered anymore), we also need to check if the consumer is known by the federating portlet invoker... + String producerId = consumer.getProducerId(); + if (consumer.getProducerInfo().isActive() && federatingPortletInvoker.getFederatedInvoker(producerId) != null) { - federatingPortletInvoker.unregisterInvoker(consumer.getProducerId()); + federatingPortletInvoker.unregisterInvoker(producerId); } try @@ -389,6 +391,12 @@ protected abstract void delete(ProducerInfo info); + /** + * Persists the changes made to ProducerInfo. + * + * @param producerInfo + * @return the previous value of the ProducerInfo's id if it has changed, <code>null</code> otherwise + */ protected abstract String update(ProducerInfo producerInfo); protected abstract Iterator<ProducerInfo> getProducerInfosFromStorage();

14 years, 8 months

1
0
0 / 0

gatein SVN: r2523 - in portal/branches/EPP_5_0_Branch: portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet and 2 other directories.

by do-not-reply＠jboss.org

Author: mpodolin Date: 2010-04-07 07:41:02 -0400 (Wed, 07 Apr 2010) New Revision: 2523 Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css portal/branches/EPP_5_0_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIGadget/Stylesheet.css Log: JBEPP-227: GTNPORTAL-812 ported to the branch Modified: portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css =================================================================== --- portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2010-04-07 10:04:06 UTC (rev 2522) +++ portal/branches/EPP_5_0_Branch/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2010-04-07 11:41:02 UTC (rev 2523) @@ -267,7 +267,8 @@ .UIApplicationRegistryPortlet .UIVerticalSlideTabs .UIVTabContent .ControlIcon { float: right; /* orientation=lt */ - float: left; /* orientation=rt */ + float: left; /* orientation=rt */ + cursor: pointer; } /**************************** AppWorkingArea *****************************/ @@ -310,7 +311,8 @@ .UIApplicationRegistryPortlet .UIBreadcumb .ControlIcon { float: right; /* orientation=lt */ float: left; /* orientation=rt */ - margin: 0px 5px; + margin: 0px 5px; + cursor: pointer; } .UIApplicationRegistryPortlet .ApplicationContainer { Modified: portal/branches/EPP_5_0_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css =================================================================== --- portal/branches/EPP_5_0_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css 2010-04-07 10:04:06 UTC (rev 2522) +++ portal/branches/EPP_5_0_Branch/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css 2010-04-07 11:41:02 UTC (rev 2523) @@ -161,7 +161,7 @@ padding-left: 0; /* orientation=rt */ background: url('DefaultSkin/background/NavDownArrow.gif') no-repeat right; /* orientation=lt */ background: url('DefaultSkin/background/NavDownArrow.gif') no-repeat left; /* orientation=rt */ - cursor: pointer; + cursor: default; } /*###############-Selected Navigation Tab-################*/ @@ -218,7 +218,7 @@ border: solid #b7b7b7 1px; /*fix for IE*/ text-align: left; /* orientation=lt */ text-align: right; /* orientation=rt */ - z-index: 1; + z-index: 1; } .UINavigationPortlet .MenuItemContainer .MenuItemDecorator { Modified: portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css =================================================================== --- portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2010-04-07 10:04:06 UTC (rev 2522) +++ portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIDashboard/Stylesheet.css 2010-04-07 11:41:02 UTC (rev 2523) @@ -330,6 +330,7 @@ padding: 0 9px; border: 1px solid #dbdbdb; border-top: none; + cursor: move; } .UIDashboard .UIGadget .GadgetControl .GadgetDragHandleArea { Modified: portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIGadget/Stylesheet.css =================================================================== --- portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIGadget/Stylesheet.css 2010-04-07 10:04:06 UTC (rev 2522) +++ portal/branches/EPP_5_0_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/view/UIGadget/Stylesheet.css 2010-04-07 11:41:02 UTC (rev 2523) @@ -169,6 +169,10 @@ margin-left: 101px; } +.UIGadgetContent .gadgets-gadget-user-prefs-dialog-action-bar input { + cursor: pointer; +} + .UIGadgetContent .devToolbar { width: 56%; }

14 years, 8 months

1
0
0 / 0

gatein SVN: r2522 - portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal.

by do-not-reply＠jboss.org

Author: trong.tran Date: 2010-04-07 06:04:06 -0400 (Wed, 07 Apr 2010) New Revision: 2522 Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl Log: GTNPORTAL-1020 missing commit file Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl =================================================================== --- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2010-04-07 10:03:24 UTC (rev 2521) +++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/portal/UIPortalComposer.gtmpl 2010-04-07 10:04:06 UTC (rev 2522) @@ -15,13 +15,15 @@ <div class="<%=uicomponent.isCollapsed ? "CollapseIcon" : "ExpandIcon"%>" onclick="eXo.portal.UIPortal.toggleComposer(this)"><span></span></div> <% if(uicomponent.isShowControl) { %> <a class="CloseButton" title="<%=_ctx.appRes("word.abort")%>" href="<%=uicomponent.event("Abort")%>"><span></span></a> - <a class="<%= isEditted ? "EdittedSaveButton" : "SaveButton" %>" title="<%=_ctx.appRes("word.finish")%>" href="<%=uicomponent.event("Finish")%>"><span></span></a> <% if (uicomponent.isUsedInWizard()) { %> + <a class="<%= isEditted ? "EdittedSaveButton" : "SaveButton" %>" title="<%=_ctx.appRes("word.finish")%>" href="<%=uicomponent.url("Finish")%>"><span></span></a> <a class="BackButton"" title="<%=_ctx.appRes("word.back")%>" href="<%=uicomponent.event("Back")%>"> <span></span> </a> - <% } %> - <% } %> + <% } else {%> + <a class="<%= isEditted ? "EdittedSaveButton" : "SaveButton" %>" title="<%=_ctx.appRes("word.finish")%>" href="<%=uicomponent.event("Finish")%>"><span></span></a> + <% } + } %> <div class="PopupTitle"><%=_ctx.appRes(popupId + ".title."+ popupId)%></div> </div> </div>

14 years, 8 months

1
0
0 / 0

gatein SVN: r2521 - portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-04-07 06:03:24 -0400 (Wed, 07 Apr 2010) New Revision: 2521 Modified: portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java Log: JBEPP-290: Error when adding remote portlet in page - "Does not make sense" Modified: portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java =================================================================== --- portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2010-04-07 09:09:54 UTC (rev 2520) +++ portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2010-04-07 10:03:24 UTC (rev 2521) @@ -228,10 +228,14 @@ WSRP wsrp = dataStorage.load(state, ApplicationType.WSRP_PORTLET); if (wsrp == null) { - // create and save state + // create wsrp = new WSRP(); wsrp.setPortletId(applicationId); - dataStorage.save(state, wsrp); + if (!(state instanceof TransientApplicationState)) + { + // only save state if it's not transient + dataStorage.save(state, wsrp); + } } return StatefulPortletContext.create(wsrp.getPortletId(), WSRPPortletStateType.instance, wsrp); }

14 years, 8 months

1
0
0 / 0

gatein SVN: r2520 - portal/branches/EPP_5_0_Branch/packaging.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-04-07 05:09:54 -0400 (Wed, 07 Apr 2010) New Revision: 2520 Modified: portal/branches/EPP_5_0_Branch/packaging/profiles.xml Log: Revert profiles.xml Modified: portal/branches/EPP_5_0_Branch/packaging/profiles.xml =================================================================== --- portal/branches/EPP_5_0_Branch/packaging/profiles.xml 2010-04-07 08:49:03 UTC (rev 2519) +++ portal/branches/EPP_5_0_Branch/packaging/profiles.xml 2010-04-07 09:09:54 UTC (rev 2520) @@ -29,7 +29,7 @@ ex: On Windows 'c:/AS' ex: On Linux '/home/user/AS' --> - <exo.projects.directory.dependencies>/home/theute/AS</exo.projects.directory.dependencies> + <exo.projects.directory.dependencies>REPLACE_WITH_YOUR_OWN_DIRECTORY</exo.projects.directory.dependencies>   + <exo.projects.app.tomcat.version>apache-tomcat-6.0.20</exo.projects.app.tomcat.version> +  <exo.projects.app.jboss.version>jboss-5.1.0.GA</exo.projects.app.jboss.version>

14 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits April 2010