gatein SVN: r2096 - in components/common/trunk: common and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-10 06:44:07 -0500 (Wed, 10 Mar 2010)
New Revision: 2096
Modified:
components/common/trunk/common/pom.xml
components/common/trunk/logging/pom.xml
components/common/trunk/mc/pom.xml
components/common/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/common/trunk/common/pom.xml
===================================================================
--- components/common/trunk/common/pom.xml 2010-03-10 11:43:54 UTC (rev 2095)
+++ components/common/trunk/common/pom.xml 2010-03-10 11:44:07 UTC (rev 2096)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-common</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-logging</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
</dependency>
<dependency>
Modified: components/common/trunk/logging/pom.xml
===================================================================
--- components/common/trunk/logging/pom.xml 2010-03-10 11:43:54 UTC (rev 2095)
+++ components/common/trunk/logging/pom.xml 2010-03-10 11:44:07 UTC (rev 2096)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-logging</artifactId>
Modified: components/common/trunk/mc/pom.xml
===================================================================
--- components/common/trunk/mc/pom.xml 2010-03-10 11:43:54 UTC (rev 2095)
+++ components/common/trunk/mc/pom.xml 2010-03-10 11:44:07 UTC (rev 2096)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-mc</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-logging</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
</dependency>
<dependency>
Modified: components/common/trunk/pom.xml
===================================================================
--- components/common/trunk/pom.xml 2010-03-10 11:43:54 UTC (rev 2095)
+++ components/common/trunk/pom.xml 2010-03-10 11:44:07 UTC (rev 2096)
@@ -6,7 +6,7 @@
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
@@ -16,9 +16,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/tags/2.0....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/tags/2.0.0-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/common/tags/2.0.0-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/common/trunk</url>
</scm>
<!-- Import dependency management configuration -->
16 years, 1 month
gatein SVN: r2095 - components/common/tags.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-10 06:43:54 -0500 (Wed, 10 Mar 2010)
New Revision: 2095
Added:
components/common/tags/2.0.0-GA/
Log:
[maven-scm] copy for tag 2.0.0-GA
Copied: components/common/tags/2.0.0-GA (from rev 2094, components/common/trunk)
16 years, 1 month
gatein SVN: r2094 - in components/common/trunk: common and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-10 06:43:32 -0500 (Wed, 10 Mar 2010)
New Revision: 2094
Modified:
components/common/trunk/common/pom.xml
components/common/trunk/logging/pom.xml
components/common/trunk/mc/pom.xml
components/common/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 2.0.0-GA
Modified: components/common/trunk/common/pom.xml
===================================================================
--- components/common/trunk/common/pom.xml 2010-03-10 10:42:12 UTC (rev 2093)
+++ components/common/trunk/common/pom.xml 2010-03-10 11:43:32 UTC (rev 2094)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-CR04-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-common</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-logging</artifactId>
- <version>2.0.0-CR04-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
</dependency>
<dependency>
Modified: components/common/trunk/logging/pom.xml
===================================================================
--- components/common/trunk/logging/pom.xml 2010-03-10 10:42:12 UTC (rev 2093)
+++ components/common/trunk/logging/pom.xml 2010-03-10 11:43:32 UTC (rev 2094)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-CR04-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-logging</artifactId>
Modified: components/common/trunk/mc/pom.xml
===================================================================
--- components/common/trunk/mc/pom.xml 2010-03-10 10:42:12 UTC (rev 2093)
+++ components/common/trunk/mc/pom.xml 2010-03-10 11:43:32 UTC (rev 2094)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-CR04-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-mc</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-logging</artifactId>
- <version>2.0.0-CR04-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
</dependency>
<dependency>
Modified: components/common/trunk/pom.xml
===================================================================
--- components/common/trunk/pom.xml 2010-03-10 10:42:12 UTC (rev 2093)
+++ components/common/trunk/pom.xml 2010-03-10 11:43:32 UTC (rev 2094)
@@ -6,19 +6,19 @@
<groupId>org.gatein.common</groupId>
<artifactId>common-parent</artifactId>
- <version>2.0.0-CR04-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
<packaging>pom</packaging>
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-GA</version>
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/common/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/common/tags/2.0....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/common/tags/2.0.0-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/common/tags/2.0.0-GA</url>
</scm>
<!-- Import dependency management configuration -->
@@ -27,7 +27,7 @@
<dependency>
<groupId>org.gatein</groupId>
<artifactId>gatein-dep</artifactId>
- <version>1.0.0-Beta03</version>
+ <version>1.0.0-GA</version>
<type>pom</type>
<scope>import</scope>
</dependency>
16 years, 1 month
gatein SVN: r2093 - portal/trunk/component/common/src/main/java/conf.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-03-10 05:42:12 -0500 (Wed, 10 Mar 2010)
New Revision: 2093
Modified:
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
Log:
have arjuna put its tx data in a data directory in tomcat
Modified: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-03-10 10:38:45 UTC (rev 2092)
+++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-03-10 10:42:12 UTC (rev 2093)
@@ -35,3 +35,6 @@
# IDM
gatein.idm.datasource.name=jdbcidm
+
+# Arjuna configuration
+com.arjuna.ats.arjuna.objectstore.objectStoreDir=${gatein.data.dir}/jta
\ No newline at end of file
16 years, 1 month
gatein SVN: r2091 - maven/dep/tags.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-10 05:38:36 -0500 (Wed, 10 Mar 2010)
New Revision: 2091
Added:
maven/dep/tags/1.0.0-GA/
Log:
[maven-scm] copy for tag 1.0.0-GA
Copied: maven/dep/tags/1.0.0-GA (from rev 2090, maven/dep/trunk)
16 years, 1 month
gatein SVN: r2089 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-03-10 05:31:59 -0500 (Wed, 10 Mar 2010)
New Revision: 2089
Added:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_20_019.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_20_020.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_20_021.html
Log:
GTNPORTAL-839: Create new test for "POR_20_019"
GTNPORTAL-840: Create new test for "POR_20_020"
GTNPORTAL-841: Create new test for "POR_20_021"
Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_20_019.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_20_019.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_20_019.html 2010-03-10 10:31:59 UTC (rev 2089)
@@ -0,0 +1,282 @@
+<?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_20_019</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_POR_20_019</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Go to Page Management--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td>root</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>clickAndWait</td>
+ <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Select Page Mangement on menu item--</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>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//form[@id='UIPageForm']/div[3]/div[1]/div[1]/div/table</td>
+ <td>user portal group</td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>ownerType</td>
+ <td>label=group</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>name</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>name</td>
+ <td>POR_20_019</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>title</td>
+ <td>POR_20_019</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageForm', 'UIPageTemplateOptions');javascript:eXo.webui.UIForm.submitEvent('UIPageForm','SelectTab','&objectId=UIPageTemplateOptions')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageForm', 'PermissionSetting');javascript:eXo.webui.UIForm.submitEvent('UIPageForm','SelectTab','&objectId=PermissionSetting')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Access Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageForm', 'UIPageTemplateOptions');javascript:eXo.webui.UIForm.submitEvent('UIPageForm','SelectTab','&objectId=UIPageTemplateOptions')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Create same name group pages in the same group--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//form[@id='UIPageForm']/div[3]/div[1]/div[1]/div/table</td>
+ <td>user portal group</td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>ownerType</td>
+ <td>label=group</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>name</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>name</td>
+ <td>POR_20_019</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>title</td>
+ <td>POR_20_019</td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageForm', 'UIPageTemplateOptions');javascript:eXo.webui.UIForm.submitEvent('UIPageForm','SelectTab','&objectId=UIPageTemplateOptions')"]</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>--Verify Error message</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>This page name already exists.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Cancel</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Cancel</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Search new page created--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>searchTerm</td>
+ <td>POR_20_019</td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>searchOption</td>
+ <td>label=Title</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Delete page created--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//img[@title='Delete Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//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>waitForElementPresent</td>
+ <td>xpath=//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</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/candidate/Test_POR_20_020.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_20_020.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_20_020.html 2010-03-10 10:31:59 UTC (rev 2089)
@@ -0,0 +1,367 @@
+<?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_20_020</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_POR_20_020</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Go to Page Management--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td>root</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>clickAndWait</td>
+ <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Select Page Mangement on menu item--</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>echo</td>
+ <td>--Add new page for group 1--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>ownerType</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>ownerType</td>
+ <td>label=group</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//option[@value='group']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//option[@value='group']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>ownerId</td>
+ <td>label=/platform/users</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//option[@value='/platform/users']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//option[@value='/platform/users']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>name</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>ownerType</td>
+ <td>label=group</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>name</td>
+ <td>POR_20_020</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>title</td>
+ <td>POR_20_020</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageForm', 'UIPageTemplateOptions');javascript:eXo.webui.UIForm.submitEvent('UIPageForm','SelectTab','&objectId=UIPageTemplateOptions')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageForm', 'PermissionSetting');javascript:eXo.webui.UIForm.submitEvent('UIPageForm','SelectTab','&objectId=PermissionSetting')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Access Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageForm', 'UIPageTemplateOptions');javascript:eXo.webui.UIForm.submitEvent('UIPageForm','SelectTab','&objectId=UIPageTemplateOptions')"]</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>--Add new page for group 2--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>ownerType</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>ownerType</td>
+ <td>label=group</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//option[@value='group']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//option[@value='group']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>ownerId</td>
+ <td>label=/organization</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//option[@value='/organization']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//option[@value='/organization']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>name</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>name</td>
+ <td>POR_20_020</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>title</td>
+ <td>POR_20_020</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageForm', 'UIPageTemplateOptions');javascript:eXo.webui.UIForm.submitEvent('UIPageForm','SelectTab','&objectId=UIPageTemplateOptions')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageForm', 'PermissionSetting');javascript:eXo.webui.UIForm.submitEvent('UIPageForm','SelectTab','&objectId=PermissionSetting')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Access Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageForm', 'UIPageTemplateOptions');javascript:eXo.webui.UIForm.submitEvent('UIPageForm','SelectTab','&objectId=UIPageTemplateOptions')"]</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>--Search new page created--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>searchTerm</td>
+ <td>POR_20_020</td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>searchOption</td>
+ <td>label=Title</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Delete page of user--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//img[@title='Delete Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//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>waitForElementPresent</td>
+ <td>xpath=//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Delete page of group--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//img[@title='Delete Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//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>waitForElementPresent</td>
+ <td>xpath=//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</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/candidate/Test_POR_20_021.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_20_021.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_20_021.html 2010-03-10 10:31:59 UTC (rev 2089)
@@ -0,0 +1,312 @@
+<?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_20_021</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_POR_20_021</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Go to Page Management--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td>root</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>clickAndWait</td>
+ <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Select Page Mangement on menu item--</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>echo</td>
+ <td>--Add new page for user--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>name</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>name</td>
+ <td>POR_20_021</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>title</td>
+ <td>POR_20_021</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageForm', 'UIPageTemplateOptions');javascript:eXo.webui.UIForm.submitEvent('UIPageForm','SelectTab','&objectId=UIPageTemplateOptions')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageForm', 'UIPageTemplateOptions');javascript:eXo.webui.UIForm.submitEvent('UIPageForm','SelectTab','&objectId=UIPageTemplateOptions')"]</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>--Add new page for group --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UIPageBrowser']/div[2]/table/tbody/tr/td/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>ownerType</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>ownerType</td>
+ <td>label=group</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//option[@value='group']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//option[@value='group']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>ownerId</td>
+ <td>label=/organization/operations</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//option[@value='/organization/operations']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//option[@value='/organization/operations']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>name</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>name</td>
+ <td>POR_20_021</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>title</td>
+ <td>POR_20_021</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageForm', 'UIPageTemplateOptions');javascript:eXo.webui.UIForm.submitEvent('UIPageForm','SelectTab','&objectId=UIPageTemplateOptions')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageForm', 'PermissionSetting');javascript:eXo.webui.UIForm.submitEvent('UIPageForm','SelectTab','&objectId=PermissionSetting')"]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Access Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[(a)onclick="eXo.webui.UIHorizontalTabs.changeTabForUIFormTabpane(this, 'UIPageForm', 'UIPageTemplateOptions');javascript:eXo.webui.UIForm.submitEvent('UIPageForm','SelectTab','&objectId=UIPageTemplateOptions')"]</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>--Search new page created--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>searchTerm</td>
+ <td>POR_20_021</td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>searchOption</td>
+ <td>label=Title</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//form[@id='UIPageSearch']/div[2]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Delete page of user--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//img[@title='Delete Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//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>waitForElementPresent</td>
+ <td>xpath=//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Delete page of group--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//img[@title='Delete Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//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>waitForElementPresent</td>
+ <td>xpath=//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</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>
16 years, 1 month
gatein SVN: r2087 - in portal/trunk/component/portal/src: main/java/org/exoplatform/portal/pom/data and 1 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-03-10 05:28:10 -0500 (Wed, 10 Mar 2010)
New Revision: 2087
Added:
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSerialization.java
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ApplicationType.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/ComponentData.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/ModelData.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationNodeContainerData.java
Log:
GTNPORTAL-770 : make pom cache data sieralizable
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ApplicationType.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ApplicationType.java 2010-03-10 09:48:29 UTC (rev 2086)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ApplicationType.java 2010-03-10 10:28:10 UTC (rev 2087)
@@ -24,6 +24,9 @@
import org.exoplatform.portal.pom.spi.wsrp.WSRP;
import org.gatein.mop.api.content.ContentType;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+
/**
* The type of an application.
*
@@ -31,7 +34,7 @@
* @version $Revision$
* @param <S> the content state type of the application
*/
-public class ApplicationType<S>
+public class ApplicationType<S> implements Serializable
{
public static ApplicationType<?> getType(String name)
@@ -84,7 +87,7 @@
public static final ApplicationType<WSRP> WSRP_PORTLET = new ApplicationType<WSRP>(WSRP.CONTENT_TYPE, "wsrp");
/** . */
- private final ContentType<S> contentType;
+ private transient final ContentType<S> contentType;
/** . */
private final String name;
@@ -104,4 +107,15 @@
{
return name;
}
+
+ /**
+ * This is needed to preserve the enumation aspect of this class.
+ *
+ * @return the correct instance
+ * @throws ObjectStreamException never thrown
+ */
+ private Object readResolve() throws ObjectStreamException
+ {
+ return getType(name);
+ }
}
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/ComponentData.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/ComponentData.java 2010-03-10 09:48:29 UTC (rev 2086)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/ComponentData.java 2010-03-10 10:28:10 UTC (rev 2087)
@@ -22,7 +22,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class ComponentData extends ModelData
+public abstract class ComponentData extends ModelData
{
public ComponentData(String storageId, String storageName)
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/ModelData.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/ModelData.java 2010-03-10 09:48:29 UTC (rev 2086)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/ModelData.java 2010-03-10 10:28:10 UTC (rev 2087)
@@ -19,11 +19,13 @@
package org.exoplatform.portal.pom.data;
+import java.io.Serializable;
+
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public abstract class ModelData
+public abstract class ModelData implements Serializable
{
/** Storage id. */
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationNodeContainerData.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationNodeContainerData.java 2010-03-10 09:48:29 UTC (rev 2086)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationNodeContainerData.java 2010-03-10 10:28:10 UTC (rev 2087)
@@ -18,15 +18,13 @@
*/
package org.exoplatform.portal.pom.data;
-import org.exoplatform.portal.pom.data.ModelData;
-
import java.util.List;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class NavigationNodeContainerData extends ModelData
+public abstract class NavigationNodeContainerData extends ModelData
{
/** . */
Added: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSerialization.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSerialization.java (rev 0)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSerialization.java 2010-03-10 10:28:10 UTC (rev 2087)
@@ -0,0 +1,263 @@
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.portal.config;
+
+import org.exoplatform.component.test.AbstractGateInTest;
+import org.exoplatform.portal.config.model.ApplicationType;
+import org.exoplatform.portal.config.model.PersistentApplicationState;
+import org.exoplatform.portal.config.model.TransientApplicationState;
+import org.exoplatform.portal.mop.Visibility;
+import org.exoplatform.portal.pom.data.*;
+import org.exoplatform.portal.pom.spi.gadget.Gadget;
+import org.gatein.common.io.IOTools;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class TestSerialization extends AbstractGateInTest
+{
+ /** . */
+ private final BodyData body = new BodyData("foo", BodyType.PAGE);
+
+ /** . */
+ private final ContainerData container = new ContainerData(
+ "foo01",
+ "foo02",
+ "foo03",
+ "foo04",
+ "foo05",
+ "foo06",
+ "foo07",
+ "foo08",
+ "foo09",
+ "foo10",
+ Arrays.asList("foo11"),
+ Arrays.<ComponentData>asList(body)
+ );
+
+
+ public void testNavigationKey() throws Exception
+ {
+ NavigationKey key = new NavigationKey("foo", "bar");
+ assertEquals(key.hashCode(), IOTools.clone(key).hashCode());
+ assertEquals(key, IOTools.clone(key));
+ }
+
+ public void testPortalKey() throws Exception
+ {
+ PortalKey key = new PortalKey("foo", "bar");
+ assertEquals(key.hashCode(), IOTools.clone(key).hashCode());
+ assertEquals(key, IOTools.clone(key));
+ }
+
+ public void testPageKey() throws Exception
+ {
+ PageKey key = new PageKey("foo", "bar", "juu");
+ assertEquals(key.hashCode(), IOTools.clone(key).hashCode());
+ assertEquals(key, IOTools.clone(key));
+ }
+
+ public void testBody() throws Exception
+ {
+ BodyData clone = IOTools.clone(body);
+ assertEquals(body.getStorageId(), clone.getStorageId());
+ assertEquals(body.getStorageName(), clone.getStorageName());
+ assertEquals(body.getType(), clone.getType());
+ }
+
+ public void testContainer() throws Exception
+ {
+ ContainerData clone = IOTools.clone(container);
+ assertEquals(container.getStorageId(), clone.getStorageId());
+ assertEquals(container.getStorageName(), clone.getStorageName());
+ assertEquals(container.getId(), clone.getId());
+ assertEquals(container.getName(), clone.getName());
+ assertEquals(container.getIcon(), clone.getIcon());
+ assertEquals(container.getTemplate(), clone.getTemplate());
+ assertEquals(container.getFactoryId(), clone.getFactoryId());
+ assertEquals(container.getTitle(), clone.getTitle());
+ assertEquals(container.getDescription(), clone.getDescription());
+ assertEquals(container.getWidth(), clone.getWidth());
+ assertEquals(container.getHeight(), clone.getHeight());
+ assertEquals(container.getAccessPermissions(), clone.getAccessPermissions());
+ List<ComponentData> clonedChildren = container.getChildren();
+ assertEquals(1, clonedChildren.size());
+ assertEquals("foo", clonedChildren.get(0).getStorageId());
+ assertEquals(BodyType.PAGE, ((BodyData)clonedChildren.get(0)).getType());
+ }
+
+ public void testPage() throws Exception
+ {
+ PageData obj = new PageData(
+ "foo01",
+ "foo02",
+ "foo03",
+ "foo04",
+ "foo05",
+ "foo06",
+ "foo07",
+ "foo08",
+ "foo09",
+ "foo10",
+ Arrays.asList("foo11"),
+ Arrays.<ComponentData>asList(body),
+ "foo12",
+ "foo13",
+ "foo14",
+ true
+ );
+ PageData clone = IOTools.clone(obj);
+ assertEquals(obj.getStorageId(), clone.getStorageId());
+ assertEquals(obj.getStorageName(), clone.getStorageName());
+ assertEquals(obj.getId(), clone.getId());
+ assertEquals(obj.getName(), clone.getName());
+ assertEquals(obj.getIcon(), clone.getIcon());
+ assertEquals(obj.getTemplate(), clone.getTemplate());
+ assertEquals(obj.getFactoryId(), clone.getFactoryId());
+ assertEquals(obj.getTitle(), clone.getTitle());
+ assertEquals(obj.getDescription(), clone.getDescription());
+ assertEquals(obj.getWidth(), clone.getWidth());
+ assertEquals(obj.getHeight(), clone.getHeight());
+ assertEquals(obj.getAccessPermissions(), clone.getAccessPermissions());
+ List<ComponentData> clonedChildren = obj.getChildren();
+ assertEquals(1, clonedChildren.size());
+ assertEquals("foo", clonedChildren.get(0).getStorageId());
+ assertEquals(BodyType.PAGE, ((BodyData)clonedChildren.get(0)).getType());
+ assertEquals(obj.getOwnerType(), clone.getOwnerType());
+ assertEquals(obj.getOwnerId(), clone.getOwnerId());
+ assertEquals(obj.getEditPermission(), clone.getEditPermission());
+ assertEquals(obj.isShowMaxWindow(), clone.isShowMaxWindow());
+ }
+
+ public void testPortal() throws Exception
+ {
+ PortalData obj = new PortalData(
+ "foo01",
+ "foo02",
+ "foo03",
+ "foo04",
+ Arrays.asList("foo05"),
+ "foo06",
+ Collections.singletonMap("foo07", "foo08"),
+ "foo09",
+ container
+ );
+ PortalData clone = IOTools.clone(obj);
+ assertEquals(obj.getStorageId(), clone.getStorageId());
+ assertEquals(obj.getStorageName(), clone.getStorageName());
+ assertEquals(obj.getName(), clone.getName());
+ assertEquals(obj.getType(), clone.getType());
+ assertEquals(obj.getLocale(), clone.getLocale());
+ assertEquals(obj.getAccessPermissions(), clone.getAccessPermissions());
+ assertEquals(obj.getEditPermission(), clone.getEditPermission());
+ assertEquals(obj.getProperties(), clone.getProperties());
+ assertEquals(obj.getSkin(), clone.getSkin());
+ }
+
+ public void testNavigationNode() throws Exception
+ {
+ Date a = new Date();
+ Date b = new Date();
+ NavigationNodeData obj = new NavigationNodeData(
+ "foo01",
+ "foo02",
+ "foo03",
+ "foo04",
+ "foo05",
+ a,
+ b,
+ Visibility.SYSTEM,
+ "foo06",
+ Collections.<NavigationNodeData>emptyList()
+ );
+ NavigationNodeData clone = IOTools.clone(obj);
+ assertEquals(obj.getStorageId(), clone.getStorageId());
+ assertEquals(obj.getStorageName(), clone.getStorageName());
+ assertEquals(obj.getURI(), clone.getURI());
+ assertEquals(obj.getLabel(), clone.getLabel());
+ assertEquals(obj.getIcon(), clone.getIcon());
+ assertEquals(obj.getName(), clone.getName());
+ assertEquals(obj.getStartPublicationDate(), clone.getStartPublicationDate());
+ assertEquals(obj.getEndPublicationDate(), clone.getEndPublicationDate());
+ assertEquals(obj.getVisibility(), clone.getVisibility());
+ assertEquals(obj.getPageReference(), clone.getPageReference());
+ }
+
+ public void testNavigationData() throws Exception
+ {
+ NavigationData obj = new NavigationData(
+ "foo01",
+ "foo02",
+ "foo03",
+ 3,
+ Collections.<NavigationNodeData>emptyList()
+ );
+ NavigationData clone = IOTools.clone(obj);
+ assertEquals(obj.getStorageId(), clone.getStorageId());
+ assertEquals(obj.getStorageName(), clone.getStorageName());
+ assertEquals(obj.getOwnerType(), clone.getOwnerType());
+ assertEquals(obj.getOwnerId(), clone.getOwnerId());
+ assertEquals(obj.getPriority(), clone.getPriority());
+ }
+
+ public void testApplicationData() throws Exception
+ {
+ ApplicationData<?> obj = new ApplicationData<Gadget>(
+ "foo01",
+ "foo02",
+ ApplicationType.GADGET,
+ new PersistentApplicationState<Gadget>("bar"),
+ "foo03",
+ "foo04",
+ "foo05",
+ "foo06",
+ true,
+ true,
+ true,
+ "foo07",
+ "foo08",
+ "foo09",
+ Collections.singletonMap("foo10", "foo11"),
+ Arrays.asList("foo12")
+ );
+ ApplicationData clone = IOTools.clone(obj);
+ assertEquals(obj.getStorageId(), clone.getStorageId());
+ assertEquals(obj.getType(), clone.getType());
+ assertEquals(((PersistentApplicationState)obj.getState()).getStorageId(), ((PersistentApplicationState)clone.getState()).getStorageId());
+ assertEquals(obj.getId(), clone.getId());
+ assertEquals(obj.getTitle(), clone.getTitle());
+ assertEquals(obj.getIcon(), clone.getIcon());
+ assertEquals(obj.getDescription(), clone.getDescription());
+ assertEquals(obj.isShowInfoBar(), clone.isShowInfoBar());
+ assertEquals(obj.isShowApplicationState(), clone.isShowApplicationState());
+ assertEquals(obj.isShowApplicationMode(), clone.isShowApplicationMode());
+ assertEquals(obj.getTheme(), clone.getTheme());
+ assertEquals(obj.getWidth(), clone.getWidth());
+ assertEquals(obj.getHeight(), clone.getHeight());
+ assertEquals(obj.getProperties(), clone.getProperties());
+ assertEquals(obj.getAccessPermissions(), clone.getAccessPermissions());
+ }
+}
16 years, 1 month