[gatein-commits] gatein SVN: r5817 - in portal/branches/wci: component/wsrp/src/main/java/org/gatein/portal/wsrp/structure and 12 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Jan 25 12:12:24 EST 2011
Author: alain_defrance
Date: 2011-01-25 12:12:23 -0500 (Tue, 25 Jan 2011)
New Revision: 5817
Modified:
portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java
portal/branches/wci/component/wsrp/src/main/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProvider.java
portal/branches/wci/component/wsrp/src/test/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProviderTestCase.java
portal/branches/wci/examples/extension/war/src/main/webapp/login/jsp/login.jsp
portal/branches/wci/examples/portal/war/src/main/webapp/login/jsp/login.jsp
portal/branches/wci/gadgets/eXoGadgets/src/main/webapp/META-INF/context.xml
portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_26_ChangeApplicationInPortal.html
portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_31_ManageNodePortal.html
portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html.html
portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_33_EditNodePageProperties.html
portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html
portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html
portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html
portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_40_EditPageForGroup.html
portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html
portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html
portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_45_ManageNodeGroup.html.html
portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html
portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html
portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html
portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_55_EditPageForUser.html
portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html
portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html
portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html
portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_63_ManagePageOfUser.html
portal/branches/wci/testsuite/selenium-tests-other/src/test/resources/org/jboss/gatein/selenium/jira/Test_GTNPORTAL_1257_SeamSessionOutlivesTheGateInSession-build.xml
portal/branches/wci/web/eXoResources/src/main/webapp/META-INF/context.xml
portal/branches/wci/web/portal/src/main/webapp/META-INF/context.xml
portal/branches/wci/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml
portal/branches/wci/web/portal/src/main/webapp/login/jsp/login.jsp
portal/branches/wci/web/rest/src/main/webapp/META-INF/context.xml
portal/branches/wci/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
Log:
merged from trunk 5801
Modified: portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java
===================================================================
--- portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java 2011-01-25 17:12:23 UTC (rev 5817)
@@ -71,13 +71,12 @@
resp.setContentType("text/html; charset=UTF-8");
// This allows the customer to define another login page without changing the portal
- //context.getRequestDispatcher("/login/jsp/login.jsp").include(req, resp);
showLoginForm(req, resp);
}
private void showLoginForm(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
- {
- String initialURI = (String)req.getAttribute("javax.servlet.forward.request_uri");
+ {
+ String initialURI = (String)req.getAttribute("javax.servlet.forward.request_uri");
if (initialURI == null)
{
throw new IllegalStateException("request attribute javax.servlet.forward.request_uri should not be null here");
Modified: portal/branches/wci/component/wsrp/src/main/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProvider.java
===================================================================
--- portal/branches/wci/component/wsrp/src/main/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProvider.java 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/component/wsrp/src/main/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProvider.java 2011-01-25 17:12:23 UTC (rev 5817)
@@ -88,7 +88,7 @@
private void addPage(Page page)
{
Described described = page.adapt(Described.class);
- PageInfo pageInfo = new PageInfo(page.getObjectId(), described.getName());
+ PageInfo pageInfo = new PageInfo(page.getObjectId(), described.getName(), page.getName());
pageInfos.put(pageInfo.getName(), pageInfo);
UIContainer container = page.getRootComponent();
processContainer(container, pageInfo);
@@ -194,6 +194,16 @@
org.exoplatform.portal.config.model.Page portalPage = event.getData();
Page page = structureAccess.getPageFrom(portalPage);
+ if (page == null && DataStorage.PAGE_REMOVED.equals(eventName))
+ {
+ // if we try to remove a page, when we get this event, the page has already been removed from JCR
+ // so we need to work around that fact by retrieving the corresponding PageInfo from the portal page title
+ // which should match the Described name and check that it matches the internal name before removing it
+ removePage(portalPage.getTitle(), portalPage.getName());
+
+ return;
+ }
+
if (page != null)
{
if (DataStorage.PAGE_CREATED.equals(eventName))
@@ -201,10 +211,6 @@
// add information for new page
addPage(page);
}
- else if (DataStorage.PAGE_REMOVED.equals(eventName))
- {
- removePage(page);
- }
else if (DataStorage.PAGE_UPDATED.equals(eventName))
{
removePage(page);
@@ -218,8 +224,13 @@
Described described = page.adapt(Described.class);
String name = described.getName();
+ removePage(name, page.getName());
+ }
+
+ private void removePage(String name, String internalName)
+ {
PageInfo pageInfo = pageInfos.get(name);
- if (pageInfo != null)
+ if (pageInfo != null && internalName.equals(pageInfo.getInternalName()))
{
// remove page info
pageInfos.remove(name);
@@ -230,12 +241,18 @@
{
private final String uuid;
private final Map<String, String> childrenWindows = new HashMap<String, String>();
+
+ /** Name as provided by Described */
private final String name;
- private PageInfo(String uuid, String name)
+ /** Name as automatically generated */
+ private final String internalName;
+
+ private PageInfo(String uuid, String name, String internalName)
{
this.uuid = uuid;
this.name = name;
+ this.internalName = internalName;
}
public String getUUID()
@@ -243,6 +260,11 @@
return uuid;
}
+ public String getInternalName()
+ {
+ return internalName;
+ }
+
public List<String> getChildrenWindows()
{
return new ArrayList<String>(childrenWindows.keySet());
Modified: portal/branches/wci/component/wsrp/src/test/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProviderTestCase.java
===================================================================
--- portal/branches/wci/component/wsrp/src/test/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProviderTestCase.java 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/component/wsrp/src/test/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProviderTestCase.java 2011-01-25 17:12:23 UTC (rev 5817)
@@ -132,9 +132,15 @@
public void testPageDeletionEvent() throws Exception
{
+ String pageToRemove = "page1";
+
org.exoplatform.portal.config.model.Page portalPage = mock(org.exoplatform.portal.config.model.Page.class);
- when(structureAccess.getPageFrom(portalPage)).thenReturn(page1);
+ when(portalPage.getName()).thenReturn(createInternalNameFrom(pageToRemove));
+ when(portalPage.getTitle()).thenReturn(pageToRemove);
+ // on delete, we actually get the event after the page has been removed from JCR so we don't have an actual page
+ when(structureAccess.getPageFrom(portalPage)).thenReturn(null);
+
int pageNumber = provider.getPageIdentifiers().size();
provider.onEvent(new Event<DataStorage, org.exoplatform.portal.config.model.Page>(DataStorage.PAGE_REMOVED, null, portalPage));
@@ -142,7 +148,7 @@
List<String> identifiers = provider.getPageIdentifiers();
assertEquals(pageNumber - 1, identifiers.size());
// deleting a page doesn't delete its children, see GTNPORTAL-1630
- assertFalse(identifiers.contains("page1"));
+ assertFalse(identifiers.contains(pageToRemove));
assertTrue(identifiers.contains("page11"));
assertTrue(identifiers.contains("page12"));
}
@@ -201,7 +207,7 @@
{
Page page = mock(Page.class);
- when(page.getName()).thenThrow(new RuntimeException("Page.getName returns the internal name, not the human readable one"));
+ when(page.getName()).thenReturn(createInternalNameFrom(name));
// mock call to adapt
Described described = mock(Described.class);
@@ -227,6 +233,11 @@
return page;
}
+ private String createInternalNameFrom(String name)
+ {
+ return name + "internal";
+ }
+
private void addWindows(Page page, String... windowNames)
{
if (windowNames != null)
Modified: portal/branches/wci/examples/extension/war/src/main/webapp/login/jsp/login.jsp
===================================================================
--- portal/branches/wci/examples/extension/war/src/main/webapp/login/jsp/login.jsp 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/examples/extension/war/src/main/webapp/login/jsp/login.jsp 2011-01-25 17:12:23 UTC (rev 5817)
@@ -26,7 +26,6 @@
<%@ page import="java.util.ResourceBundle"%>
<%@ page import="org.exoplatform.web.login.InitiateLoginServlet"%>
<%@ page import="org.gatein.common.text.EntityEncoder"%>
-<%--<%@ page import="javax.servlet.http.HttpSession"%>--%>
<%@ page language="java" %>
<%@ page contentType="text/html; charset=utf-8" %>
<%
@@ -41,10 +40,6 @@
ResourceBundleService service = (ResourceBundleService) portalContainer.getComponentInstanceOfType(ResourceBundleService.class);
ResourceBundle res = service.getResourceBundle(service.getSharedResourceBundleNames(), request.getLocale()) ;
- //String uri = (String)request.getAttribute("org.gatein.portal.login.initial_uri");
- /*HttpSession httpSession = request.getSession(true);
- String uri = (String)httpSession.getAttribute("org.gatein.portal.login.initial_uri");
- httpSession.removeAttribute("org.gatein.portal.login.initial_uri");*/
String uri = (String)request.getAttribute("org.gatein.portal.login.initial_uri");
Cookie cookie = new Cookie(InitiateLoginServlet.COOKIE_NAME, "");
Modified: portal/branches/wci/examples/portal/war/src/main/webapp/login/jsp/login.jsp
===================================================================
--- portal/branches/wci/examples/portal/war/src/main/webapp/login/jsp/login.jsp 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/examples/portal/war/src/main/webapp/login/jsp/login.jsp 2011-01-25 17:12:23 UTC (rev 5817)
@@ -26,7 +26,6 @@
<%@ page import="java.util.ResourceBundle"%>
<%@ page import="org.exoplatform.web.login.InitiateLoginServlet"%>
<%@ page import="org.gatein.common.text.EntityEncoder"%>
-<%--<%@ page import="javax.servlet.http.HttpSession"%>--%>
<%@ page language="java" %>
<%@ page contentType="text/html; charset=utf-8" %>
<%
@@ -41,10 +40,6 @@
ResourceBundleService service = (ResourceBundleService) portalContainer.getComponentInstanceOfType(ResourceBundleService.class);
ResourceBundle res = service.getResourceBundle(service.getSharedResourceBundleNames(), request.getLocale()) ;
- //String uri = (String)request.getAttribute("org.gatein.portal.login.initial_uri");
- /*HttpSession httpSession = request.getSession(true);
- String uri = (String)httpSession.getAttribute("org.gatein.portal.login.initial_uri");
- httpSession.removeAttribute("org.gatein.portal.login.initial_uri");*/
String uri = (String)request.getAttribute("org.gatein.portal.login.initial_uri");
Cookie cookie = new Cookie(InitiateLoginServlet.COOKIE_NAME, "");
Modified: portal/branches/wci/gadgets/eXoGadgets/src/main/webapp/META-INF/context.xml
===================================================================
--- portal/branches/wci/gadgets/eXoGadgets/src/main/webapp/META-INF/context.xml 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/gadgets/eXoGadgets/src/main/webapp/META-INF/context.xml 2011-01-25 17:12:23 UTC (rev 5817)
@@ -19,4 +19,4 @@
-->
-<Context path="/eXoResources" docBase="eXoResources" debug="0" reloadable="true" crossContext="true"/>
\ No newline at end of file
+<Context path="/eXoGadgetServer" docBase="eXoGadgetServer" debug="0" reloadable="true" crossContext="true"/>
Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_26_ChangeApplicationInPortal.html
===================================================================
--- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_26_ChangeApplicationInPortal.html 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_26_ChangeApplicationInPortal.html 2011-01-25 17:12:23 UTC (rev 5817)
@@ -467,6 +467,11 @@
<td>Test_SNF_PRL_26</td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[1]</td>
+ <td></td>
+</tr>
+<tr>
<td>dragAndDropToObject</td>
<td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[1]</td>
<td>UIPageBody</td>
@@ -503,17 +508,17 @@
</tr>
<tr>
<td>mouseOver</td>
- <td>//div[5]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td>
+ <td>//div[4]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td>
<td>Test_SNF_PRL_26</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[5]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
+ <td>//div[4]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[5]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
+ <td>//div[4]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
<td></td>
</tr>
<tr>
Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_31_ManageNodePortal.html
===================================================================
--- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_31_ManageNodePortal.html 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_31_ManageNodePortal.html 2011-01-25 17:12:23 UTC (rev 5817)
@@ -133,16 +133,46 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//tr[2]/td[5]/div/img</td>
+ <td>searchTerm</td>
<td></td>
</tr>
<tr>
+ <td>type</td>
+ <td>searchTerm</td>
+ <td>Group Navigation</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>searchOption</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>searchOption</td>
+ <td>label=Title</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
- <td>//tr[2]/td[5]/div/img</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
+ <td>//img[@title='Select Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//img[@title='Select Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
<td>link=Save</td>
<td></td>
</tr>
@@ -273,16 +303,46 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[@id='UIRepeater']/table/tbody/tr[4]/td[5]/div/img</td>
+ <td>searchTerm</td>
<td></td>
</tr>
<tr>
+ <td>type</td>
+ <td>searchTerm</td>
+ <td>Link</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>searchOption</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>searchOption</td>
+ <td>label=Title</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
- <td>//div[@id='UIRepeater']/table/tbody/tr[4]/td[5]/div/img</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
+ <td>//img[@title='Select Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//img[@title='Select Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
<td>link=Save</td>
<td></td>
</tr>
@@ -307,6 +367,11 @@
<td></td>
</tr>
<tr>
+ <td>echo</td>
+ <td>-- View node node after change page --</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td>
<td></td>
@@ -401,7 +466,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html.html
===================================================================
--- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html.html 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html.html 2011-01-25 17:12:23 UTC (rev 5817)
@@ -123,16 +123,46 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//tr[2]/td[5]/div/img</td>
+ <td>searchTerm</td>
<td></td>
</tr>
<tr>
+ <td>type</td>
+ <td>searchTerm</td>
+ <td>Group Navigation</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>searchOption</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>searchOption</td>
+ <td>label=Title</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
- <td>//tr[2]/td[5]/div/img</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
+ <td>//img[@title='Select Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//img[@title='Select Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
<td>link=Save</td>
<td></td>
</tr>
Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_33_EditNodePageProperties.html
===================================================================
--- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_33_EditNodePageProperties.html 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_33_EditNodePageProperties.html 2011-01-25 17:12:23 UTC (rev 5817)
@@ -128,6 +128,36 @@
</tr>
<tr>
<td>waitForElementPresent</td>
+ <td>searchTerm</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>searchTerm</td>
+ <td>Community Management</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>searchOption</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>searchOption</td>
+ <td>label=Title</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
<td>xpath=//img[@title='Select Page']</td>
<td></td>
</tr>
Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html
===================================================================
--- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html 2011-01-25 17:12:23 UTC (rev 5817)
@@ -107,6 +107,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td>
<td></td>
@@ -123,6 +128,36 @@
</tr>
<tr>
<td>waitForElementPresent</td>
+ <td>searchTerm</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>searchTerm</td>
+ <td>Community Management</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>searchOption</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>searchOption</td>
+ <td>label=Title</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
<td>xpath=//img[@title='Select Page']</td>
<td></td>
</tr>
@@ -252,16 +287,36 @@
<td></td>
</tr>
<tr>
- <td>waitForElementNotPresent</td>
- <td>css= div[@id="UIPortalApplication"]</td>
+ <td>waitForTextPresent</td>
+ <td>User Management</td>
<td></td>
</tr>
<tr>
- <td>verifyElementNotPresent</td>
- <td>css= div[@id="UIPortalApplication"]</td>
+ <td>verifyTextPresent</td>
+ <td>User Management</td>
<td></td>
</tr>
<tr>
+ <td>waitForTextPresent</td>
+ <td>Group Management</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>Group Management</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTextPresent</td>
+ <td>Membership Management</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>Membership Management</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Switch View mode</td>
<td></td>
@@ -394,7 +449,7 @@
<tr>
<td>dragAndDropToObject</td>
<td>//div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div</td>
- <td>//div[@class='LAYOUT-BLOCK LAYOUT-PORTLET']</td>
+ <td>//a[@title='mix']</td>
</tr>
<tr>
<td>echo</td>
@@ -576,7 +631,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html
===================================================================
--- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html 2011-01-25 17:12:23 UTC (rev 5817)
@@ -123,6 +123,36 @@
</tr>
<tr>
<td>waitForElementPresent</td>
+ <td>searchTerm</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>searchTerm</td>
+ <td>Community Management</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>searchOption</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>searchOption</td>
+ <td>label=Title</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
<td>xpath=//img[@title='Select Page']</td>
<td></td>
</tr>
Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html
===================================================================
--- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-01-25 17:12:23 UTC (rev 5817)
@@ -123,6 +123,36 @@
</tr>
<tr>
<td>waitForElementPresent</td>
+ <td>searchTerm</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>searchTerm</td>
+ <td>Community Management</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>searchOption</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>searchOption</td>
+ <td>label=Title</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
<td>xpath=//img[@title='Select Page']</td>
<td></td>
</tr>
@@ -252,16 +282,36 @@
<td></td>
</tr>
<tr>
- <td>waitForElementNotPresent</td>
- <td>css= div[@id="UIPortalApplication"]</td>
+ <td>waitForTextPresent</td>
+ <td>User Management</td>
<td></td>
</tr>
<tr>
- <td>verifyElementNotPresent</td>
- <td>css= div[@id="UIPortalApplication"]</td>
+ <td>verifyTextPresent</td>
+ <td>User Management</td>
<td></td>
</tr>
<tr>
+ <td>waitForTextPresent</td>
+ <td>Group Management</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>Group Management</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTextPresent</td>
+ <td>Membership Management</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>Membership Management</td>
+ <td></td>
+</tr>
+<tr>
<td>waitForElementPresent</td>
<td>link=Switch View mode</td>
<td></td>
@@ -566,7 +616,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_40_EditPageForGroup.html
===================================================================
--- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_40_EditPageForGroup.html 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_40_EditPageForGroup.html 2011-01-25 17:12:23 UTC (rev 5817)
@@ -177,13 +177,13 @@
<td></td>
</tr>
<tr>
- <td>waitForElementNotPresent</td>
- <td>css= div[@id="UIPortalApplication"]</td>
+ <td>waitForElementPresent</td>
+ <td>//div[@class="VIEW-PAGE"]</td>
<td></td>
</tr>
<tr>
- <td>verifyElementNotPresent</td>
- <td>css= div[@id="UIPortalApplication"]</td>
+ <td>verifyElementPresent</td>
+ <td>//div[@class="VIEW-PAGE"]</td>
<td></td>
</tr>
<tr>
@@ -589,7 +589,7 @@
<tr>
<td>waitForElementPresent</td>
<td>searchTerm</td>
- <td>Test_SNF_PRL_40</td>
+ <td></td>
</tr>
<tr>
<td>type</td>
@@ -671,7 +671,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html
===================================================================
--- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html 2011-01-25 17:12:23 UTC (rev 5817)
@@ -177,13 +177,13 @@
<td></td>
</tr>
<tr>
- <td>waitForElementNotPresent</td>
- <td>css= div[@id="UIPortalApplication"]</td>
+ <td>waitForElementPresent</td>
+ <td>// div[@id="UIPortalApplication"]</td>
<td></td>
</tr>
<tr>
- <td>verifyElementNotPresent</td>
- <td>css= div[@id="UIPortalApplication"]</td>
+ <td>verifyElementPresent</td>
+ <td>//div[@id="UIPortalApplication"]</td>
<td></td>
</tr>
<tr>
@@ -319,7 +319,7 @@
<tr>
<td>dragAndDropToObject</td>
<td>//div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div</td>
- <td>//div[@class='LAYOUT-BLOCK LAYOUT-PORTLET']</td>
+ <td>//div[@class='LAYOUT-PORTAL LAYOUT-BLOCK']</td>
</tr>
<tr>
<td>echo</td>
@@ -353,17 +353,17 @@
</tr>
<tr>
<td>mouseOver</td>
- <td>//div[2]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td>
+ <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td>
<td>Test_SNF_PRL_42</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[2]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
+ <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[2]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
+ <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
<td></td>
</tr>
<tr>
@@ -551,7 +551,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html
===================================================================
--- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html 2011-01-25 17:12:23 UTC (rev 5817)
@@ -177,13 +177,13 @@
<td></td>
</tr>
<tr>
- <td>waitForElementNotPresent</td>
- <td>css= div[@id="UIPortalApplication"]</td>
+ <td>waitForElementPresent</td>
+ <td>//div[@id="UIPortalApplication"]</td>
<td></td>
</tr>
<tr>
- <td>verifyElementNotPresent</td>
- <td>css= div[@id="UIPortalApplication"]</td>
+ <td>verifyElementPresent</td>
+ <td>//div[@id="UIPortalApplication"]</td>
<td></td>
</tr>
<tr>
@@ -531,7 +531,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_45_ManageNodeGroup.html.html
===================================================================
--- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_45_ManageNodeGroup.html.html 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_45_ManageNodeGroup.html.html 2011-01-25 17:12:23 UTC (rev 5817)
@@ -372,11 +372,6 @@
<td></td>
</tr>
<tr>
- <td>pause</td>
- <td>2000</td>
- <td></td>
-</tr>
-<tr>
<td>waitForElementPresent</td>
<td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td>
<td></td>
Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html
===================================================================
--- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html 2011-01-25 17:12:23 UTC (rev 5817)
@@ -123,6 +123,36 @@
</tr>
<tr>
<td>waitForElementPresent</td>
+ <td>searchTerm</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>searchTerm</td>
+ <td>Community Management</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>searchOption</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>searchOption</td>
+ <td>label=Title</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
<td>xpath=//img[@title='Select Page']</td>
<td></td>
</tr>
@@ -374,7 +404,7 @@
<tr>
<td>waitForElementPresent</td>
<td>height</td>
- <td>100px</td>
+ <td></td>
</tr>
<tr>
<td>type</td>
@@ -404,7 +434,7 @@
<tr>
<td>dragAndDropToObject</td>
<td>//div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div</td>
- <td>//div[@class='LAYOUT-BLOCK LAYOUT-PORTLET']</td>
+ <td>//a[@title='mix']</td>
</tr>
<tr>
<td>echo</td>
@@ -447,11 +477,6 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[2]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td>
- <td></td>
-</tr>
-<tr>
<td>mouseOver</td>
<td>//div[2]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td>
<td>Test_SNF_PRL_48</td>
Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html
===================================================================
--- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html 2011-01-25 17:12:23 UTC (rev 5817)
@@ -92,6 +92,11 @@
<td>Test_SNF_PRL_49</td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>label</td>
+ <td></td>
+</tr>
+<tr>
<td>type</td>
<td>label</td>
<td>Test_SNF_PRL_49</td>
@@ -123,6 +128,36 @@
</tr>
<tr>
<td>waitForElementPresent</td>
+ <td>searchTerm</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>searchTerm</td>
+ <td>Community Management</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>searchOption</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>searchOption</td>
+ <td>label=Title</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
<td>xpath=//img[@title='Select Page']</td>
<td></td>
</tr>
@@ -672,6 +707,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Test_SNF_PRL_49</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Test_SNF_PRL_49</td>
<td></td>
@@ -682,6 +722,11 @@
<td></td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Group</td>
+ <td></td>
+</tr>
+<tr>
<td>clickAndWait</td>
<td>link=Group</td>
<td></td>
Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html
===================================================================
--- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-01-25 17:12:23 UTC (rev 5817)
@@ -123,6 +123,36 @@
</tr>
<tr>
<td>waitForElementPresent</td>
+ <td>searchTerm</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>searchTerm</td>
+ <td>Community Management</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>searchOption</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>searchOption</td>
+ <td>label=Title</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
<td>xpath=//img[@title='Select Page']</td>
<td></td>
</tr>
Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_55_EditPageForUser.html
===================================================================
--- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_55_EditPageForUser.html 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_55_EditPageForUser.html 2011-01-25 17:12:23 UTC (rev 5817)
@@ -167,13 +167,13 @@
<td></td>
</tr>
<tr>
- <td>waitForElementNotPresent</td>
- <td>css= div[@id="UIPortalApplication"]</td>
+ <td>waitForElementPresent</td>
+ <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div</td>
<td></td>
</tr>
<tr>
- <td>verifyElementNotPresent</td>
- <td>css= div[@id="UIPortalApplication"]</td>
+ <td>verifyElementPresent</td>
+ <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div</td>
<td></td>
</tr>
<tr>
@@ -544,7 +544,7 @@
<tr>
<td>waitForElementPresent</td>
<td>searchTerm</td>
- <td>Test_SNF_PRL_55</td>
+ <td></td>
</tr>
<tr>
<td>type</td>
Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html
===================================================================
--- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html 2011-01-25 17:12:23 UTC (rev 5817)
@@ -132,11 +132,16 @@
<td></td>
</tr>
<tr>
- <td>assertLocation</td>
- <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_57</td>
+ <td>waitForTextPresent</td>
+ <td>Test_SNF_PRL_57</td>
<td></td>
</tr>
<tr>
+ <td>verifyTextPresent</td>
+ <td>Test_SNF_PRL_57</td>
+ <td></td>
+</tr>
+<tr>
<td>echo</td>
<td>-- Edit Layout --</td>
<td></td>
@@ -309,7 +314,7 @@
<tr>
<td>dragAndDropToObject</td>
<td>//div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div</td>
- <td>//div[@class='LAYOUT-BLOCK LAYOUT-PORTLET']</td>
+ <td>//div[@id='UIPortal-UIPortal']/div/div[1]</td>
</tr>
<tr>
<td>echo</td>
@@ -342,23 +347,18 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[2]/div/div/div/div[1]/div</td>
- <td></td>
-</tr>
-<tr>
<td>mouseOver</td>
- <td>//div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[2]/div/div/div/div[1]/div</td>
+ <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td>
<td>Test_SNF_PRL_57</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[2]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
+ <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[2]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
+ <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
<td></td>
</tr>
<tr>
Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html
===================================================================
--- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html 2011-01-25 17:12:23 UTC (rev 5817)
@@ -167,13 +167,13 @@
<td></td>
</tr>
<tr>
- <td>waitForElementNotPresent</td>
- <td>css= div[@id="UIPortalApplication"]</td>
+ <td>waitForElementPresent</td>
+ <td>// div[@id="UIPortalApplication"]</td>
<td></td>
</tr>
<tr>
- <td>verifyElementNotPresent</td>
- <td>css= div[@id="UIPortalApplication"]</td>
+ <td>verifyElementPresent</td>
+ <td>//div[@id="UIPortalApplication"]</td>
<td></td>
</tr>
<tr>
@@ -217,16 +217,26 @@
<td></td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>UIPortalApplication</td>
+ <td>waitForTextPresent</td>
+ <td>Test_SNF_PRL_58</td>
<td></td>
</tr>
<tr>
- <td>verifyElementPresent</td>
- <td>UIPortalApplication</td>
+ <td>verifyTextPresent</td>
+ <td>Test_SNF_PRL_58</td>
<td></td>
</tr>
<tr>
+ <td>waitForTextPresent</td>
+ <td>Calculator</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>Calculator</td>
+ <td></td>
+</tr>
+<tr>
<td>echo</td>
<td>-- Return to normal view --</td>
<td></td>
@@ -382,19 +392,9 @@
<td>Test_SNF_PRL_58</td>
</tr>
<tr>
- <td>waitForElementPresent</td>
- <td>//div[1]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[1]</td>
- <td></td>
-</tr>
-<tr>
- <td>mouseOver</td>
- <td>//html/body/div/div[2]/div/div[2]/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div[2]/div</td>
- <td></td>
-</tr>
-<tr>
<td>dragAndDropToObject</td>
- <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[1]</td>
- <td>//html/body/div/div[2]/div/div[2]/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div[3]/div/div/div</td>
+ <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[1]</td>
+ <td>//div[@class='LPortletLayoutDecorator']</td>
</tr>
<tr>
<td>echo</td>
@@ -438,17 +438,17 @@
</tr>
<tr>
<td>mouseOver</td>
- <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td>
<td>Test_SNF_PRL_58</td>
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td>
<td></td>
</tr>
<tr>
@@ -506,7 +506,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html
===================================================================
--- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html 2011-01-25 17:12:23 UTC (rev 5817)
@@ -167,13 +167,13 @@
<td></td>
</tr>
<tr>
- <td>waitForElementNotPresent</td>
- <td>css= div[@id="UIPortalApplication"]</td>
+ <td>waitForElementPresent</td>
+ <td>//div[@id="UIPortalApplication"]</td>
<td></td>
</tr>
<tr>
- <td>verifyElementNotPresent</td>
- <td>css= div[@id="UIPortalApplication"]</td>
+ <td>verifyElementPresent</td>
+ <td>//div[@id="UIPortalApplication"]</td>
<td></td>
</tr>
<tr>
@@ -396,7 +396,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_63_ManagePageOfUser.html
===================================================================
--- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_63_ManagePageOfUser.html 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_63_ManagePageOfUser.html 2011-01-25 17:12:23 UTC (rev 5817)
@@ -92,6 +92,11 @@
<td>Test_SNF_PRL_63</td>
</tr>
<tr>
+ <td>waitForElementPresent</td>
+ <td>title</td>
+ <td></td>
+</tr>
+<tr>
<td>type</td>
<td>title</td>
<td>Test_SNF_PRL_63</td>
@@ -276,7 +281,6 @@
<td>link=Sign out</td>
<td></td>
</tr>
-
</tbody></table>
</body>
</html>
Modified: portal/branches/wci/testsuite/selenium-tests-other/src/test/resources/org/jboss/gatein/selenium/jira/Test_GTNPORTAL_1257_SeamSessionOutlivesTheGateInSession-build.xml
===================================================================
--- portal/branches/wci/testsuite/selenium-tests-other/src/test/resources/org/jboss/gatein/selenium/jira/Test_GTNPORTAL_1257_SeamSessionOutlivesTheGateInSession-build.xml 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/testsuite/selenium-tests-other/src/test/resources/org/jboss/gatein/selenium/jira/Test_GTNPORTAL_1257_SeamSessionOutlivesTheGateInSession-build.xml 2011-01-25 17:12:23 UTC (rev 5817)
@@ -108,7 +108,7 @@
<arg value="-DconnectionUrl=${scm.url}"/>
<arg value="-Dbasedir=${testRoot.dir}"/>
<arg value="-DcheckoutDirectory=${checkout.dir}"/>
- <arg value="-Dgoals=install"/>
+ <arg value="-Dgoals=install -Dmaven.repo.local=${localRepository}"/>
</artifact:mvn>
</target>
Modified: portal/branches/wci/web/eXoResources/src/main/webapp/META-INF/context.xml
===================================================================
--- portal/branches/wci/web/eXoResources/src/main/webapp/META-INF/context.xml 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/web/eXoResources/src/main/webapp/META-INF/context.xml 2011-01-25 17:12:23 UTC (rev 5817)
@@ -19,4 +19,4 @@
-->
-<Context path="/eXoResources" docBase="eXoResources" debug="0" reloadable="true" crossContext="true"/>
\ No newline at end of file
+<Context path="/eXoResources" docBase="eXoResources" debug="0" reloadable="true" crossContext="true"/>
Modified: portal/branches/wci/web/portal/src/main/webapp/META-INF/context.xml
===================================================================
--- portal/branches/wci/web/portal/src/main/webapp/META-INF/context.xml 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/web/portal/src/main/webapp/META-INF/context.xml 2011-01-25 17:12:23 UTC (rev 5817)
@@ -20,12 +20,12 @@
-->
<Context path='/portal' docBase='portal' debug='0' reloadable='true' crossContext='true' privileged='true'>
- <Realm className='org.apache.catalina.realm.JAASRealm'
+ <Realm className='org.apache.catalina.realm.JAASRealm'
appName='gatein-domain'
userClassNames='org.exoplatform.services.security.jaas.UserPrincipal'
roleClassNames='org.exoplatform.services.security.jaas.RolePrincipal'
debug='0' cache='false'/>
- <Valve
+ <Valve
className='org.apache.catalina.authenticator.FormAuthenticator'
characterEncoding='UTF-8'/>
-</Context>
\ No newline at end of file
+</Context>
Modified: portal/branches/wci/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml
===================================================================
--- portal/branches/wci/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml 2011-01-25 17:12:23 UTC (rev 5817)
@@ -2,11 +2,12 @@
<!-- Eviction configuration -->
<eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
+ <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm"
eventQueueSize="1000000">
- <property name="maxNodes" value="1000000" />
+ <property name="maxNodes" value="100000" />
<property name="timeToLive" value="120000" />
+ <property name="warnNoExpirationKey" value="false" />
</default>
</eviction>
-</jbosscache>
\ No newline at end of file
+</jbosscache>
Modified: portal/branches/wci/web/portal/src/main/webapp/login/jsp/login.jsp
===================================================================
--- portal/branches/wci/web/portal/src/main/webapp/login/jsp/login.jsp 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/web/portal/src/main/webapp/login/jsp/login.jsp 2011-01-25 17:12:23 UTC (rev 5817)
@@ -26,7 +26,6 @@
<%@ page import="java.util.ResourceBundle"%>
<%@ page import="org.exoplatform.web.login.InitiateLoginServlet"%>
<%@ page import="org.gatein.common.text.EntityEncoder"%>
-<%--<%@ page import="javax.servlet.http.HttpSession"%>--%>
<%@ page language="java" %>
<%
String contextPath = request.getContextPath() ;
@@ -45,10 +44,6 @@
cookie.setMaxAge(0);
response.addCookie(cookie);
- //String uri = (String)request.getAttribute("org.gatein.portal.login.initial_uri");
- /*HttpSession httpSession = request.getSession(true);
- String uri = (String)httpSession.getAttribute("org.gatein.portal.login.initial_uri");
- httpSession.removeAttribute("org.gatein.portal.login.initial_uri");*/
String uri = (String)request.getAttribute("org.gatein.portal.login.initial_uri");
response.setCharacterEncoding("UTF-8");
Modified: portal/branches/wci/web/rest/src/main/webapp/META-INF/context.xml
===================================================================
--- portal/branches/wci/web/rest/src/main/webapp/META-INF/context.xml 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/web/rest/src/main/webapp/META-INF/context.xml 2011-01-25 17:12:23 UTC (rev 5817)
@@ -21,9 +21,9 @@
<Context path="/rest" docBase="rest" reloadable="true" crossContext="false">
- <Realm className='org.apache.catalina.realm.JAASRealm'
+ <Realm className='org.apache.catalina.realm.JAASRealm'
appName='gatein-domain'
userClassNames="org.exoplatform.services.security.jaas.UserPrincipal"
roleClassNames="org.exoplatform.services.security.jaas.RolePrincipal"
debug='0' cache='false'/>
-</Context>
\ No newline at end of file
+</Context>
Modified: portal/branches/wci/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
===================================================================
--- portal/branches/wci/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2011-01-25 15:56:22 UTC (rev 5816)
+++ portal/branches/wci/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2011-01-25 17:12:23 UTC (rev 5817)
@@ -440,11 +440,9 @@
}
Set<ModeInfo> modes = portlet.getInfo().getCapabilities().getModes(MediaType.create("text/html"));
- Iterator<ModeInfo> modeIter = modes.iterator();
- while (modeIter.hasNext())
+ for (ModeInfo mode : modes)
{
- ModeInfo info = modeIter.next();
- supportModes.add(info.getModeName());
+ supportModes.add(mode.getModeName());
}
if (supportModes.size() > 0)
@@ -497,16 +495,21 @@
supportedProcessingEvents_ = new ArrayList<QName>(consumedEvents.keySet());
}
- for (Iterator<QName> iter = supportedProcessingEvents_.iterator(); iter.hasNext();)
+ for (QName eventName : supportedProcessingEvents_)
{
- QName eventName = iter.next();
if (eventName.equals(name))
{
- log.info("The Portlet " + producerOfferedPortletContext + " supports comsuming the event : " + name);
+ if (log.isDebugEnabled())
+ {
+ log.debug("The Portlet " + producerOfferedPortletContext + " supports comsuming the event : " + name);
+ }
return true;
}
}
- log.info("The portlet " + producerOfferedPortletContext + " doesn't support consuming the event : " + name);
+ if (log.isDebugEnabled())
+ {
+ log.debug("The portlet " + producerOfferedPortletContext + " doesn't support consuming the event : " + name);
+ }
return false;
}
@@ -533,16 +536,21 @@
supportedPublishingEvents_ = new ArrayList<QName>(producedEvents.keySet());
}
- for (Iterator<QName> iter = supportedPublishingEvents_.iterator(); iter.hasNext();)
+ for (QName eventName : supportedPublishingEvents_)
{
- QName eventName = iter.next();
if (eventName.equals(name))
{
- log.info("The Portlet " + producerOfferedPortletContext + " supports producing the event : " + name);
+ if (log.isDebugEnabled())
+ {
+ log.debug("The Portlet " + producerOfferedPortletContext + " supports producing the event : " + name);
+ }
return true;
}
}
- log.info("The portlet " + producerOfferedPortletContext + " doesn't support producing the event : " + name);
+ if (log.isDebugEnabled())
+ {
+ log.debug("The portlet " + producerOfferedPortletContext + " doesn't support producing the event : " + name);
+ }
return false;
}
More information about the gatein-commits
mailing list