gatein SVN: r4544 - in components/pc/trunk: api and 12 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-06 10:59:12 -0400 (Wed, 06 Oct 2010)
New Revision: 4544
Modified:
components/pc/trunk/api/pom.xml
components/pc/trunk/bridge/pom.xml
components/pc/trunk/controller/pom.xml
components/pc/trunk/docs/pom.xml
components/pc/trunk/docs/user-guide/pom.xml
components/pc/trunk/federation/pom.xml
components/pc/trunk/jsr168api/pom.xml
components/pc/trunk/management/pom.xml
components/pc/trunk/mc/pom.xml
components/pc/trunk/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portlet/pom.xml
components/pc/trunk/samples/pom.xml
components/pc/trunk/test/pom.xml
Log:
[maven-release-plugin] prepare release 2.2.0-Beta05
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
+++ components/pc/trunk/api/pom.xml 2010-10-06 14:59:12 UTC (rev 4544)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.pc</groupId>
Modified: components/pc/trunk/bridge/pom.xml
===================================================================
--- components/pc/trunk/bridge/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
+++ components/pc/trunk/bridge/pom.xml 2010-10-06 14:59:12 UTC (rev 4544)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-bridge</artifactId>
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
+++ components/pc/trunk/controller/pom.xml 2010-10-06 14:59:12 UTC (rev 4544)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-controller</artifactId>
Modified: components/pc/trunk/docs/pom.xml
===================================================================
--- components/pc/trunk/docs/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
+++ components/pc/trunk/docs/pom.xml 2010-10-06 14:59:12 UTC (rev 4544)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
Modified: components/pc/trunk/docs/user-guide/pom.xml
===================================================================
--- components/pc/trunk/docs/user-guide/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
+++ components/pc/trunk/docs/user-guide/pom.xml 2010-10-06 14:59:12 UTC (rev 4544)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<groupId>org.gatein.pc</groupId>
<artifactId>user-guide-${translation}</artifactId>
Modified: components/pc/trunk/federation/pom.xml
===================================================================
--- components/pc/trunk/federation/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
+++ components/pc/trunk/federation/pom.xml 2010-10-06 14:59:12 UTC (rev 4544)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-federation</artifactId>
Modified: components/pc/trunk/jsr168api/pom.xml
===================================================================
--- components/pc/trunk/jsr168api/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
+++ components/pc/trunk/jsr168api/pom.xml 2010-10-06 14:59:12 UTC (rev 4544)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-jsr168api</artifactId>
Modified: components/pc/trunk/management/pom.xml
===================================================================
--- components/pc/trunk/management/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
+++ components/pc/trunk/management/pom.xml 2010-10-06 14:59:12 UTC (rev 4544)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
Modified: components/pc/trunk/mc/pom.xml
===================================================================
--- components/pc/trunk/mc/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
+++ components/pc/trunk/mc/pom.xml 2010-10-06 14:59:12 UTC (rev 4544)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-mc</artifactId>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
+++ components/pc/trunk/pom.xml 2010-10-06 14:59:12 UTC (rev 4544)
@@ -29,7 +29,7 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
<packaging>pom</packaging>
<parent>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
+++ components/pc/trunk/portal/pom.xml 2010-10-06 14:59:12 UTC (rev 4544)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portal</artifactId>
Modified: components/pc/trunk/portlet/pom.xml
===================================================================
--- components/pc/trunk/portlet/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
+++ components/pc/trunk/portlet/pom.xml 2010-10-06 14:59:12 UTC (rev 4544)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portlet</artifactId>
Modified: components/pc/trunk/samples/pom.xml
===================================================================
--- components/pc/trunk/samples/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
+++ components/pc/trunk/samples/pom.xml 2010-10-06 14:59:12 UTC (rev 4544)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
+++ components/pc/trunk/test/pom.xml 2010-10-06 14:59:12 UTC (rev 4544)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
14 years, 3 months
- 1
- 0
gatein SVN: r4543 - in components/pc/trunk: api and 12 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-06 10:54:50 -0400 (Wed, 06 Oct 2010)
New Revision: 4543
Modified:
components/pc/trunk/api/pom.xml
components/pc/trunk/bridge/pom.xml
components/pc/trunk/controller/pom.xml
components/pc/trunk/docs/pom.xml
components/pc/trunk/docs/user-guide/pom.xml
components/pc/trunk/federation/pom.xml
components/pc/trunk/jsr168api/pom.xml
components/pc/trunk/management/pom.xml
components/pc/trunk/mc/pom.xml
components/pc/trunk/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portlet/pom.xml
components/pc/trunk/samples/pom.xml
components/pc/trunk/test/pom.xml
Log:
Revert improper version change
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
+++ components/pc/trunk/api/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05</version>
+ <version>2.2.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.pc</groupId>
Modified: components/pc/trunk/bridge/pom.xml
===================================================================
--- components/pc/trunk/bridge/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
+++ components/pc/trunk/bridge/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05</version>
+ <version>2.2.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-bridge</artifactId>
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
+++ components/pc/trunk/controller/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05</version>
+ <version>2.2.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-controller</artifactId>
Modified: components/pc/trunk/docs/pom.xml
===================================================================
--- components/pc/trunk/docs/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
+++ components/pc/trunk/docs/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05</version>
+ <version>2.2.0-Beta05-SNAPSHOT</version>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
Modified: components/pc/trunk/docs/user-guide/pom.xml
===================================================================
--- components/pc/trunk/docs/user-guide/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
+++ components/pc/trunk/docs/user-guide/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05</version>
+ <version>2.2.0-Beta05-SNAPSHOT</version>
</parent>
<groupId>org.gatein.pc</groupId>
<artifactId>user-guide-${translation}</artifactId>
Modified: components/pc/trunk/federation/pom.xml
===================================================================
--- components/pc/trunk/federation/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
+++ components/pc/trunk/federation/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05</version>
+ <version>2.2.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-federation</artifactId>
Modified: components/pc/trunk/jsr168api/pom.xml
===================================================================
--- components/pc/trunk/jsr168api/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
+++ components/pc/trunk/jsr168api/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05</version>
+ <version>2.2.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-jsr168api</artifactId>
Modified: components/pc/trunk/management/pom.xml
===================================================================
--- components/pc/trunk/management/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
+++ components/pc/trunk/management/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05</version>
+ <version>2.2.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
Modified: components/pc/trunk/mc/pom.xml
===================================================================
--- components/pc/trunk/mc/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
+++ components/pc/trunk/mc/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05</version>
+ <version>2.2.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-mc</artifactId>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
+++ components/pc/trunk/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
@@ -29,7 +29,7 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05</version>
+ <version>2.2.0-Beta05-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
+++ components/pc/trunk/portal/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05</version>
+ <version>2.2.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portal</artifactId>
Modified: components/pc/trunk/portlet/pom.xml
===================================================================
--- components/pc/trunk/portlet/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
+++ components/pc/trunk/portlet/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05</version>
+ <version>2.2.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portlet</artifactId>
Modified: components/pc/trunk/samples/pom.xml
===================================================================
--- components/pc/trunk/samples/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
+++ components/pc/trunk/samples/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05</version>
+ <version>2.2.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
+++ components/pc/trunk/test/pom.xml 2010-10-06 14:54:50 UTC (rev 4543)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05</version>
+ <version>2.2.0-Beta05-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
14 years, 3 months
- 1
- 0
gatein SVN: r4542 - in components/pc/trunk: api and 12 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-06 10:41:02 -0400 (Wed, 06 Oct 2010)
New Revision: 4542
Modified:
components/pc/trunk/api/pom.xml
components/pc/trunk/bridge/pom.xml
components/pc/trunk/controller/pom.xml
components/pc/trunk/docs/pom.xml
components/pc/trunk/docs/user-guide/pom.xml
components/pc/trunk/federation/pom.xml
components/pc/trunk/jsr168api/pom.xml
components/pc/trunk/management/pom.xml
components/pc/trunk/mc/pom.xml
components/pc/trunk/pom.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portlet/pom.xml
components/pc/trunk/samples/pom.xml
components/pc/trunk/test/pom.xml
Log:
[maven-release-plugin] prepare release 2.2.0-Beta05
Modified: components/pc/trunk/api/pom.xml
===================================================================
--- components/pc/trunk/api/pom.xml 2010-10-06 14:37:52 UTC (rev 4541)
+++ components/pc/trunk/api/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.pc</groupId>
Modified: components/pc/trunk/bridge/pom.xml
===================================================================
--- components/pc/trunk/bridge/pom.xml 2010-10-06 14:37:52 UTC (rev 4541)
+++ components/pc/trunk/bridge/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-bridge</artifactId>
Modified: components/pc/trunk/controller/pom.xml
===================================================================
--- components/pc/trunk/controller/pom.xml 2010-10-06 14:37:52 UTC (rev 4541)
+++ components/pc/trunk/controller/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-controller</artifactId>
Modified: components/pc/trunk/docs/pom.xml
===================================================================
--- components/pc/trunk/docs/pom.xml 2010-10-06 14:37:52 UTC (rev 4541)
+++ components/pc/trunk/docs/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
Modified: components/pc/trunk/docs/user-guide/pom.xml
===================================================================
--- components/pc/trunk/docs/user-guide/pom.xml 2010-10-06 14:37:52 UTC (rev 4541)
+++ components/pc/trunk/docs/user-guide/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<groupId>org.gatein.pc</groupId>
<artifactId>user-guide-${translation}</artifactId>
Modified: components/pc/trunk/federation/pom.xml
===================================================================
--- components/pc/trunk/federation/pom.xml 2010-10-06 14:37:52 UTC (rev 4541)
+++ components/pc/trunk/federation/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-federation</artifactId>
Modified: components/pc/trunk/jsr168api/pom.xml
===================================================================
--- components/pc/trunk/jsr168api/pom.xml 2010-10-06 14:37:52 UTC (rev 4541)
+++ components/pc/trunk/jsr168api/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-jsr168api</artifactId>
Modified: components/pc/trunk/management/pom.xml
===================================================================
--- components/pc/trunk/management/pom.xml 2010-10-06 14:37:52 UTC (rev 4541)
+++ components/pc/trunk/management/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
Modified: components/pc/trunk/mc/pom.xml
===================================================================
--- components/pc/trunk/mc/pom.xml 2010-10-06 14:37:52 UTC (rev 4541)
+++ components/pc/trunk/mc/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-mc</artifactId>
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2010-10-06 14:37:52 UTC (rev 4541)
+++ components/pc/trunk/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
@@ -29,7 +29,7 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
<packaging>pom</packaging>
<parent>
@@ -39,9 +39,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/pc/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/pc/tags/2.2.0-Be...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/pc/tags/2.2.0-Beta05</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/pc/tags/2.2.0-Beta05</url>
</scm>
<properties>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2010-10-06 14:37:52 UTC (rev 4541)
+++ components/pc/trunk/portal/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portal</artifactId>
Modified: components/pc/trunk/portlet/pom.xml
===================================================================
--- components/pc/trunk/portlet/pom.xml 2010-10-06 14:37:52 UTC (rev 4541)
+++ components/pc/trunk/portlet/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portlet</artifactId>
Modified: components/pc/trunk/samples/pom.xml
===================================================================
--- components/pc/trunk/samples/pom.xml 2010-10-06 14:37:52 UTC (rev 4541)
+++ components/pc/trunk/samples/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2010-10-06 14:37:52 UTC (rev 4541)
+++ components/pc/trunk/test/pom.xml 2010-10-06 14:41:02 UTC (rev 4542)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.2.0-Beta05-SNAPSHOT</version>
+ <version>2.2.0-Beta05</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
14 years, 3 months
- 1
- 0
gatein SVN: r4541 - in components/wsrp/trunk: wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1 and 1 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-10-06 10:37:52 -0400 (Wed, 06 Oct 2010)
New Revision: 4541
Modified:
components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/spec/v1/V1ToV2Converter.java
components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/MarkupEndpoint.java
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java
Log:
GTNWSRP-92: Setup the default values for RuntimeContext PortletInstanceKey and NamespacePrefix when converting from V1 (optional) to V2 (required).
Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/spec/v1/V1ToV2Converter.java
===================================================================
--- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/spec/v1/V1ToV2Converter.java 2010-10-06 14:23:40 UTC (rev 4540)
+++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/spec/v1/V1ToV2Converter.java 2010-10-06 14:37:52 UTC (rev 4541)
@@ -27,6 +27,7 @@
import com.google.common.collect.Lists;
import org.gatein.common.util.ParameterValidation;
import org.gatein.pc.api.OpaqueStateString;
+import org.gatein.pc.portlet.impl.jsr168.PortletUtils;
import org.gatein.wsrp.WSRPConstants;
import org.gatein.wsrp.WSRPExceptionFactory;
import org.gatein.wsrp.WSRPTypeFactory;
@@ -269,11 +270,31 @@
}
}
- public static RuntimeContext toV2RuntimeContext(V1RuntimeContext v1RuntimeContext)
+ public static RuntimeContext toV2RuntimeContext(V1RuntimeContext v1RuntimeContext, String portletHandle)
{
if (v1RuntimeContext != null)
{
- RuntimeContext runtimeContext = WSRPTypeFactory.createRuntimeContext(v1RuntimeContext.getUserAuthentication(), v1RuntimeContext.getPortletInstanceKey(), v1RuntimeContext.getNamespacePrefix());
+ String portletInstanceKey;
+ String namespacePrefix;
+ if (ParameterValidation.isNullOrEmpty(v1RuntimeContext.getPortletInstanceKey()))
+ {
+ portletInstanceKey = portletHandle;
+ }
+ else
+ {
+ portletInstanceKey = v1RuntimeContext.getPortletInstanceKey();
+ }
+
+ if (ParameterValidation.isNullOrEmpty(v1RuntimeContext.getNamespacePrefix()))
+ {
+ namespacePrefix = PortletUtils.generateNamespaceFrom(portletHandle);
+ }
+ else
+ {
+ namespacePrefix = v1RuntimeContext.getNamespacePrefix();
+ }
+
+ RuntimeContext runtimeContext = WSRPTypeFactory.createRuntimeContext(v1RuntimeContext.getUserAuthentication(), portletInstanceKey, namespacePrefix);
SessionParams sessionParams = WSRPTypeFactory.createSessionParams(v1RuntimeContext.getSessionID());
@@ -868,7 +889,7 @@
if (getMarkup != null)
{
PortletContext portletContext = toV2PortletContext(getMarkup.getPortletContext());
- RuntimeContext runtimeContext = toV2RuntimeContext(getMarkup.getRuntimeContext());
+ RuntimeContext runtimeContext = toV2RuntimeContext(getMarkup.getRuntimeContext(), portletContext.getPortletHandle());
MarkupParams markupParams = toV2MarkupParams(getMarkup.getMarkupParams());
RegistrationContext registrationContext = toV2RegistrationContext(getMarkup.getRegistrationContext());
UserContext userContext = toV2UserContext(getMarkup.getUserContext());
@@ -921,7 +942,7 @@
InteractionParams interactionParams = toV2InteractionParams(performBlockingInteraction.getInteractionParams());
MarkupParams markupParams = toV2MarkupParams(performBlockingInteraction.getMarkupParams());
PortletContext portletContext = toV2PortletContext(performBlockingInteraction.getPortletContext());
- RuntimeContext runtimeContext = toV2RuntimeContext(performBlockingInteraction.getRuntimeContext());
+ RuntimeContext runtimeContext = toV2RuntimeContext(performBlockingInteraction.getRuntimeContext(), portletContext.getPortletHandle());
return WSRPTypeFactory.createPerformBlockingInteraction(toV2RegistrationContext(performBlockingInteraction.getRegistrationContext()),
portletContext, runtimeContext, toV2UserContext(performBlockingInteraction.getUserContext()), markupParams, interactionParams);
Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/MarkupEndpoint.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/MarkupEndpoint.java 2010-10-06 14:23:40 UTC (rev 4540)
+++ components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/MarkupEndpoint.java 2010-10-06 14:37:52 UTC (rev 4541)
@@ -117,7 +117,7 @@
PerformBlockingInteraction performBlockingInteraction = WSRPTypeFactory.createPerformBlockingInteraction(
V1ToV2Converter.toV2RegistrationContext(registrationContext), V1ToV2Converter.toV2PortletContext(portletContext),
- V1ToV2Converter.toV2RuntimeContext(runtimeContext),
+ V1ToV2Converter.toV2RuntimeContext(runtimeContext, portletContext.getPortletHandle()),
V1ToV2Converter.toV2UserContext(userContext), V1ToV2Converter.toV2MarkupParams(markupParams),
V1ToV2Converter.toV2InteractionParams(interactionParams)
);
@@ -265,7 +265,7 @@
GetMarkup getMarkup = WSRPTypeFactory.createGetMarkup(
V1ToV2Converter.toV2RegistrationContext(registrationContext),
V1ToV2Converter.toV2PortletContext(portletContext),
- V1ToV2Converter.toV2RuntimeContext(runtimeContext),
+ V1ToV2Converter.toV2RuntimeContext(runtimeContext, portletContext.getPortletHandle()),
V1ToV2Converter.toV2UserContext(userContext),
V1ToV2Converter.toV2MarkupParams(markupParams)
);
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java 2010-10-06 14:23:40 UTC (rev 4540)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java 2010-10-06 14:37:52 UTC (rev 4541)
@@ -125,6 +125,31 @@
}
@Test
+ public void testGetMarkupNoPortletInstanceKeyNoNamespacePrefix() throws Exception
+ {
+ V1GetMarkup getMarkup = createMarkupRequest();
+ getMarkup.getRuntimeContext().setNamespacePrefix(null);
+ getMarkup.getRuntimeContext().setPortletInstanceKey(null);
+
+ assertNull(getMarkup.getRuntimeContext().getNamespacePrefix());
+ assertNull(getMarkup.getRuntimeContext().getPortletInstanceKey());
+
+ V1MarkupResponse response = producer.getMarkup(getMarkup);
+
+ checkMarkupResponse(response, DEFAULT_VIEW_MARKUP);
+
+ getMarkup.getRuntimeContext().setNamespacePrefix("");
+ getMarkup.getRuntimeContext().setPortletInstanceKey("");
+
+ assertSame("", getMarkup.getRuntimeContext().getNamespacePrefix());
+ assertSame("", getMarkup.getRuntimeContext().getPortletInstanceKey());
+
+ response = producer.getMarkup(getMarkup);
+
+ checkMarkupResponse(response, DEFAULT_VIEW_MARKUP);
+ }
+
+ @Test
public void testInvalidGetMarkup() throws Exception
{
V1GetMarkup getMarkup = createMarkupRequest();
14 years, 3 months
- 1
- 0
gatein SVN: r4540 - in epp/portal/branches/EPP_5_1_Branch: examples/portal/war/src/main/webapp/WEB-INF and 1 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-10-06 10:23:40 -0400 (Wed, 06 Oct 2010)
New Revision: 4540
Modified:
epp/portal/branches/EPP_5_1_Branch/component/web/api/src/main/java/org/exoplatform/web/GenericHttpListener.java
epp/portal/branches/EPP_5_1_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml
epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/web.xml
Log:
JBEPP-536: Avoid NPE when a portal container has been disabled
Modified: epp/portal/branches/EPP_5_1_Branch/component/web/api/src/main/java/org/exoplatform/web/GenericHttpListener.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/web/api/src/main/java/org/exoplatform/web/GenericHttpListener.java 2010-10-06 13:47:55 UTC (rev 4539)
+++ epp/portal/branches/EPP_5_1_Branch/component/web/api/src/main/java/org/exoplatform/web/GenericHttpListener.java 2010-10-06 14:23:40 UTC (rev 4540)
@@ -19,6 +19,7 @@
package org.exoplatform.web;
+import org.exoplatform.commons.utils.PropertyManager;
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.ExoContainerContext;
import org.exoplatform.container.PortalContainer;
@@ -140,7 +141,19 @@
PortalContainer.setInstance(portalContainer);
hasBeenSet = true;
}
- broadcast(portalContainer, CONTEXT_DESTROYED, event);
+ final String ctxName = event.getServletContext().getServletContextName();
+ if (!PortalContainer.isPortalContainerNameDisabled(ctxName) && portalContainer instanceof PortalContainer)
+ {
+ // The portal container corresponding to the current servlet context could be found
+ broadcast(portalContainer, CONTEXT_DESTROYED, event);
+ }
+ else if (PropertyManager.isDevelopping())
+ {
+ log.info("The portal environment could not be set for the webapp '" + ctxName
+ + "' because this servlet context has not been defined as a "
+ + "dependency of any portal container or it is a disabled portal"
+ + " container, the contextDestroyed event will be ignored");
+ }
}
catch (Exception ex)
{
Modified: epp/portal/branches/EPP_5_1_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2010-10-06 13:47:55 UTC (rev 4539)
+++ epp/portal/branches/EPP_5_1_Branch/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2010-10-06 14:23:40 UTC (rev 4540)
@@ -73,7 +73,15 @@
<filter-name>CacheUserProfileFilter</filter-name>
<filter-class>org.exoplatform.web.CacheUserProfileFilter</filter-class>
</filter>
+ <filter>
+ <filter-name>PortalContainerFilter</filter-name>
+ <filter-class>org.exoplatform.container.web.PortalContainerFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>PortalContainerFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
<filter-mapping>
<filter-name>GenericFilter</filter-name>
<url-pattern>/*</url-pattern>
Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/web.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/web.xml 2010-10-06 13:47:55 UTC (rev 4539)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/web.xml 2010-10-06 14:23:40 UTC (rev 4540)
@@ -94,8 +94,16 @@
<filter-name>ClusteredSSOFilter</filter-name>
<filter-class>org.exoplatform.web.login.ClusteredSSOFilter</filter-class>
</filter>
+ <filter>
+ <filter-name>PortalContainerFilter</filter-name>
+ <filter-class>org.exoplatform.container.web.PortalContainerFilter</filter-class>
+ </filter>
<filter-mapping>
+ <filter-name>PortalContainerFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
<filter-name>RememberMeFilter</filter-name>
<url-pattern>/public/*</url-pattern>
</filter-mapping>
14 years, 3 months
- 1
- 0
gatein SVN: r4539 - in components/wsrp/trunk/consumer/src: main/java/org/gatein/wsrp/consumer/handlers and 5 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-06 09:47:55 -0400 (Wed, 06 Oct 2010)
New Revision: 4539
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/InvocationDispatcher.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/MarkupService.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceFactory.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/v1/V1MarkupService.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/v2/V2MarkupService.java
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v2/BehaviorBackedServiceFactory.java
Log:
- GTNWSRP-85: Changed implementation of isUsingWSRP2 method so that it doesn't depend on the MarkupService but rather is determined by the underlying ServiceFactory which should prevent unneeded refreshes (and associated side-effects such as automatic registration).
- ServiceFactory now provides a getWSRPVersion method.
- Removed getVersion method on MarkupService.
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java 2010-10-06 12:37:59 UTC (rev 4538)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java 2010-10-06 13:47:55 UTC (rev 4539)
@@ -24,6 +24,7 @@
package org.gatein.wsrp.consumer;
import org.gatein.common.util.ParameterValidation;
+import org.gatein.common.util.Version;
import org.gatein.pc.api.InvokerUnavailableException;
import org.gatein.wsrp.services.MarkupService;
import org.gatein.wsrp.services.PortletManagementService;
@@ -233,4 +234,9 @@
{
return serviceFactory.getWSOperationTimeOut();
}
+
+ Version getWSRPVersion()
+ {
+ return serviceFactory.getWSRPVersion();
+ }
}
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java 2010-10-06 12:37:59 UTC (rev 4538)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java 2010-10-06 13:47:55 UTC (rev 4539)
@@ -25,6 +25,7 @@
import org.gatein.common.NotYetImplemented;
import org.gatein.common.util.ParameterValidation;
+import org.gatein.common.util.Version;
import org.gatein.pc.api.InvalidPortletIdException;
import org.gatein.pc.api.InvokerUnavailableException;
import org.gatein.pc.api.NoSuchPortletException;
@@ -989,13 +990,13 @@
public boolean isUsingWSRP2()
{
- try
+ Version wsrpVersion = getWSRPVersion();
+ if (wsrpVersion != null)
{
- return getMarkupService().getVersion() > 1;
+ return wsrpVersion.getMajor() >= 2;
}
- catch (PortletInvokerException e)
+ else
{
- log.debug("Couldn't determine WSRP version supported by this Consumer", e);
return false;
}
}
@@ -1004,4 +1005,9 @@
{
return migrationService;
}
+
+ public Version getWSRPVersion()
+ {
+ return producerInfo.getEndpointConfigurationInfo().getWSRPVersion();
+ }
}
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/InvocationDispatcher.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/InvocationDispatcher.java 2010-10-06 12:37:59 UTC (rev 4538)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/handlers/InvocationDispatcher.java 2010-10-06 13:47:55 UTC (rev 4539)
@@ -97,8 +97,7 @@
String preferOperationAsString = resourceMap.get(WSRP2RewritingConstants.RESOURCE_PREFER_OPERATION);
boolean preferOperation = (preferOperationAsString != null && Boolean.parseBoolean(preferOperationAsString));
- int version = consumer.getMarkupService().getVersion();
- if (version == 2 && (preferOperation || resourceURL == null || (resourceId != null && resourceId.length() > 0)))
+ if (consumer.isUsingWSRP2() && (preferOperation || resourceURL == null || (resourceId != null && resourceId.length() > 0)))
{
handler = resourceHandler;
}
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/MarkupService.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/MarkupService.java 2010-10-06 12:37:59 UTC (rev 4538)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/MarkupService.java 2010-10-06 13:47:55 UTC (rev 4539)
@@ -1,24 +1,25 @@
/*
-* JBoss, a division of Red Hat
-* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+ * JBoss, a division of Red Hat
+ * Copyright 2010, Red Hat Middleware, LLC, and individual
+ * contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.gatein.wsrp.services;
@@ -136,6 +137,4 @@
UserContext userContext)
throws AccessDenied, InvalidRegistration, ModifyRegistrationRequired, OperationFailed, OperationNotSupported,
ResourceSuspended;
-
- public abstract int getVersion();
}
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2010-10-06 12:37:59 UTC (rev 4538)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2010-10-06 13:47:55 UTC (rev 4539)
@@ -24,6 +24,7 @@
package org.gatein.wsrp.services;
import org.gatein.common.util.ParameterValidation;
+import org.gatein.common.util.Version;
import org.gatein.wsrp.services.v1.V1MarkupService;
import org.gatein.wsrp.services.v1.V1PortletManagementService;
import org.gatein.wsrp.services.v1.V1RegistrationService;
@@ -356,6 +357,25 @@
}
}
+ public Version getWSRPVersion()
+ {
+ if (isAvailable())
+ {
+ if (isV2)
+ {
+ return WSRP2;
+ }
+ else
+ {
+ return WSRP1;
+ }
+ }
+ else
+ {
+ return null;
+ }
+ }
+
protected class WSDLInfo
{
private final QName wsrp2ServiceQName;
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceFactory.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceFactory.java 2010-10-06 12:37:59 UTC (rev 4538)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceFactory.java 2010-10-06 13:47:55 UTC (rev 4539)
@@ -1,6 +1,6 @@
/*
* JBoss, a division of Red Hat
- * Copyright 2009, Red Hat Middleware, LLC, and individual
+ * Copyright 2010, Red Hat Middleware, LLC, and individual
* contributors as indicated by the @authors tag. See the
* copyright.txt in the distribution for a full listing of
* individual contributors.
@@ -22,6 +22,8 @@
*/
package org.gatein.wsrp.services;
+import org.gatein.common.util.Version;
+
/**
* A factory that gives access to remote services.
*
@@ -31,6 +33,8 @@
public interface ServiceFactory
{
int DEFAULT_TIMEOUT_MS = 10000;
+ Version WSRP2 = new Version("WSRP", 2, 0, 0, new Version.Qualifier(Version.Qualifier.Prefix.GA), "WSRP2");
+ Version WSRP1 = new Version("WSRP", 1, 0, 0, new Version.Qualifier(Version.Qualifier.Prefix.GA), "WSRP1");
<T> T getService(Class<T> clazz) throws Exception;
@@ -77,4 +81,12 @@
PortletManagementService getPortletManagementService() throws Exception;
RegistrationService getRegistrationService() throws Exception;
+
+ /**
+ * Returns the WSRP version of the remote service that this ServiceFactory connects to or <code>null</code> if the
+ * ServiceFactory is not available.
+ *
+ * @return
+ */
+ Version getWSRPVersion();
}
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/v1/V1MarkupService.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/v1/V1MarkupService.java 2010-10-06 12:37:59 UTC (rev 4538)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/v1/V1MarkupService.java 2010-10-06 13:47:55 UTC (rev 4539)
@@ -307,10 +307,4 @@
throw V1ToV2Converter.toV2Exception(OperationFailed.class, operationFailed);
}
}
-
- @Override
- public int getVersion()
- {
- return 1;
- }
}
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/v2/V2MarkupService.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/v2/V2MarkupService.java 2010-10-06 12:37:59 UTC (rev 4538)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/v2/V2MarkupService.java 2010-10-06 13:47:55 UTC (rev 4539)
@@ -106,10 +106,4 @@
{
return service.initCookie(registrationContext, userContext);
}
-
- @Override
- public int getVersion()
- {
- return 2;
- }
}
Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java 2010-10-06 12:37:59 UTC (rev 4538)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java 2010-10-06 13:47:55 UTC (rev 4539)
@@ -24,6 +24,7 @@
package org.gatein.wsrp.test.protocol.v1;
import org.gatein.common.NotYetImplemented;
+import org.gatein.common.util.Version;
import org.gatein.pc.api.Mode;
import org.gatein.pc.api.WindowState;
import org.gatein.wsrp.services.MarkupService;
@@ -173,6 +174,11 @@
return new V1RegistrationService(getService(WSRPV1RegistrationPortType.class));
}
+ public Version getWSRPVersion()
+ {
+ return ServiceFactory.WSRP1;
+ }
+
public void create() throws Exception
{
throw new NotYetImplemented();
Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v2/BehaviorBackedServiceFactory.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v2/BehaviorBackedServiceFactory.java 2010-10-06 12:37:59 UTC (rev 4538)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v2/BehaviorBackedServiceFactory.java 2010-10-06 13:47:55 UTC (rev 4539)
@@ -24,6 +24,7 @@
package org.gatein.wsrp.test.protocol.v2;
import org.gatein.common.NotYetImplemented;
+import org.gatein.common.util.Version;
import org.gatein.pc.api.Mode;
import org.gatein.pc.api.WindowState;
import org.gatein.wsrp.services.MarkupService;
@@ -132,6 +133,11 @@
return new V2RegistrationService(getService(WSRPV2RegistrationPortType.class));
}
+ public Version getWSRPVersion()
+ {
+ return ServiceFactory.WSRP2;
+ }
+
public BehaviorRegistry getRegistry()
{
return registry;
14 years, 3 months
- 1
- 0
gatein SVN: r4538 - components/wci/branches/adf/test/core/src/main/java/org/gatein/wci.
by do-not-reply＠jboss.org
Author: alain_defrance
Date: 2010-10-06 08:37:59 -0400 (Wed, 06 Oct 2010)
New Revision: 4538
Removed:
components/wci/branches/adf/test/core/src/main/java/org/gatein/wci/authentication/
Log:
Remove unused tests.
14 years, 3 months
- 1
- 0
gatein SVN: r4537 - in portal/branches/wci: component/web/security/src/main/java/org/exoplatform/web/security and 3 other directories.
by do-not-reply＠jboss.org
Author: alain_defrance
Date: 2010-10-06 07:08:45 -0400 (Wed, 06 Oct 2010)
New Revision: 4537
Removed:
portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/Credentials.java
Modified:
portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/login/ClusteredSSOFilter.java
portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java
portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/GateInToken.java
portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginModule.java
portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/Token.java
portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/TokenStore.java
portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/AbstractTokenService.java
portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/CookieTokenService.java
portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenContainer.java
portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenEntry.java
portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/TransientTokenService.java
portal/branches/wci/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetToken.java
portal/branches/wci/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenInfoService.java
portal/branches/wci/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java
Log:
Only use the WCI Credentials
Modified: portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/login/ClusteredSSOFilter.java
===================================================================
--- portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/login/ClusteredSSOFilter.java 2010-10-06 11:01:49 UTC (rev 4536)
+++ portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/login/ClusteredSSOFilter.java 2010-10-06 11:08:45 UTC (rev 4537)
@@ -25,9 +25,9 @@
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.web.AbstractFilter;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.PortalLoginModule;
+import org.gatein.wci.security.Credentials;
import org.jboss.web.tomcat.security.login.WebAuthentication;
import javax.servlet.FilterChain;
Modified: portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java
===================================================================
--- portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2010-10-06 11:01:49 UTC (rev 4536)
+++ portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/login/InitiateLoginServlet.java 2010-10-06 11:08:45 UTC (rev 4537)
@@ -21,14 +21,13 @@
import org.exoplatform.container.PortalContainer;
import org.exoplatform.container.web.AbstractHttpServlet;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.security.AbstractTokenService;
import org.exoplatform.web.security.security.CookieTokenService;
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
import org.gatein.wci.authentication.AuthenticationResult;
import org.gatein.wci.authentication.GenericAuthenticationResult;
-import org.gatein.wci.authentication.WCICredentials;
+import org.gatein.wci.security.Credentials;
import org.gatein.wci.impl.DefaultServletContainerFactory;
import java.io.IOException;
@@ -62,7 +61,7 @@
HttpSession session = req.getSession();
// Looking for credentials stored in the session
- WCICredentials credentials = (WCICredentials)session.getAttribute(WCICredentials.CREDENTIALS);
+ Credentials credentials = (Credentials)session.getAttribute(Credentials.CREDENTIALS);
//
if (credentials == null)
@@ -75,7 +74,7 @@
if (token != null)
{
AbstractTokenService tokenService = AbstractTokenService.getInstance(CookieTokenService.class);
- credentials = tokenService.validateToken(token, false).getWCICredentials();
+ credentials = tokenService.validateToken(token, false);
if (credentials == null)
{
log.debug("Login initiated with no credentials in session but found token an invalid " + token + " " +
@@ -127,7 +126,7 @@
{
//Create token
AbstractTokenService tokenService = AbstractTokenService.getInstance(CookieTokenService.class);
- String cookieToken = tokenService.createToken(new Credentials(credentials));
+ String cookieToken = tokenService.createToken(credentials);
log.debug("Found a remember me request parameter, created a persistent token " + cookieToken + " for it and set it up " +
"in the next response");
Deleted: portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/Credentials.java
===================================================================
--- portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/Credentials.java 2010-10-06 11:01:49 UTC (rev 4536)
+++ portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/Credentials.java 2010-10-06 11:08:45 UTC (rev 4537)
@@ -1,97 +0,0 @@
-/**
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.exoplatform.web.security;
-
-import org.gatein.wci.authentication.WCICredentials;
-
-import java.io.Serializable;
-
-/**
- * An immutable object that contains a username and a password.
- *
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-public class Credentials implements Serializable
-{
-
-
-
- /** . */
- private final String username;
-
- /** . */
- private final String password;
-
- /**
- * Construct a new instance.
- *
- * @param username the username value
- * @param password the password value
- * @throws NullPointerException if any argument is null
- */
- public Credentials(String username, String password) throws NullPointerException
- {
- if (username == null)
- {
- throw new NullPointerException("Username is null");
- }
- if (password == null)
- {
- throw new NullPointerException("Password is null");
- }
- this.username = username;
- this.password = password;
- }
-
- public Credentials(WCICredentials wciCredentials)
- {
- if (wciCredentials == null) {
- throw new IllegalArgumentException("wciCredentials is null");
- }
- this.username = wciCredentials.getUsername();
- this.password = wciCredentials.getPassword();
- }
-
- /**
- * Returns the username.
- *
- * @return the username
- */
- public String getUsername()
- {
- return username;
- }
-
- /**
- * Returns the password.
- *
- * @return the password
- */
- public String getPassword()
- {
- return password;
- }
-
- public WCICredentials getWCICredentials()
- {
- return new WCICredentials(username, password);
- }
-}
Modified: portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/GateInToken.java
===================================================================
--- portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/GateInToken.java 2010-10-06 11:01:49 UTC (rev 4536)
+++ portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/GateInToken.java 2010-10-06 11:08:45 UTC (rev 4537)
@@ -19,7 +19,9 @@
package org.exoplatform.web.security;
+import org.gatein.wci.security.Credentials;
+
/**
* Created by The eXo Platform SAS
* Author : Tan Pham Dinh
Modified: portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginModule.java
===================================================================
--- portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginModule.java 2010-10-06 11:01:49 UTC (rev 4536)
+++ portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/PortalLoginModule.java 2010-10-06 11:08:45 UTC (rev 4537)
@@ -25,6 +25,7 @@
import org.exoplatform.services.security.jaas.AbstractLoginModule;
import org.exoplatform.web.login.InitiateLoginServlet;
import org.exoplatform.web.security.security.CookieTokenService;
+import org.gatein.wci.security.Credentials;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.NameCallback;
Modified: portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/Token.java
===================================================================
--- portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/Token.java 2010-10-06 11:01:49 UTC (rev 4536)
+++ portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/Token.java 2010-10-06 11:08:45 UTC (rev 4537)
@@ -18,6 +18,8 @@
*/
package org.exoplatform.web.security;
+import org.gatein.wci.security.Credentials;
+
/**
* A token.
*/
Modified: portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/TokenStore.java
===================================================================
--- portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/TokenStore.java 2010-10-06 11:01:49 UTC (rev 4536)
+++ portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/TokenStore.java 2010-10-06 11:08:45 UTC (rev 4537)
@@ -19,6 +19,8 @@
package org.exoplatform.web.security;
+import org.gatein.wci.security.Credentials;
+
/**
* The token store is a place where temporary tokens are held.
*
Modified: portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/AbstractTokenService.java
===================================================================
--- portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/AbstractTokenService.java 2010-10-06 11:01:49 UTC (rev 4536)
+++ portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/AbstractTokenService.java 2010-10-06 11:08:45 UTC (rev 4537)
@@ -25,9 +25,9 @@
import org.exoplatform.management.jmx.annotations.NameTemplate;
import org.exoplatform.management.jmx.annotations.Property;
import org.exoplatform.web.login.InitiateLoginServlet;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.Token;
import org.exoplatform.web.security.TokenStore;
+import org.gatein.wci.security.Credentials;
import org.picocontainer.Startable;
import java.util.List;
Modified: portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/CookieTokenService.java
===================================================================
--- portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/CookieTokenService.java 2010-10-06 11:01:49 UTC (rev 4536)
+++ portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/CookieTokenService.java 2010-10-06 11:08:45 UTC (rev 4537)
@@ -25,8 +25,8 @@
import org.exoplatform.commons.chromattic.ContextualTask;
import org.exoplatform.commons.chromattic.SessionContext;
import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.GateInToken;
+import org.gatein.wci.security.Credentials;
import java.util.Collection;
import java.util.Date;
Modified: portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenContainer.java
===================================================================
--- portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenContainer.java 2010-10-06 11:01:49 UTC (rev 4536)
+++ portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenContainer.java 2010-10-06 11:08:45 UTC (rev 4537)
@@ -21,8 +21,8 @@
import org.chromattic.api.annotations.Create;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.GateInToken;
+import org.gatein.wci.security.Credentials;
import java.util.Collection;
import java.util.Date;
Modified: portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenEntry.java
===================================================================
--- portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenEntry.java 2010-10-06 11:01:49 UTC (rev 4536)
+++ portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/TokenEntry.java 2010-10-06 11:08:45 UTC (rev 4537)
@@ -22,8 +22,8 @@
import org.chromattic.api.annotations.Name;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.GateInToken;
+import org.gatein.wci.security.Credentials;
import java.util.Date;
Modified: portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/TransientTokenService.java
===================================================================
--- portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/TransientTokenService.java 2010-10-06 11:01:49 UTC (rev 4536)
+++ portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/security/security/TransientTokenService.java 2010-10-06 11:08:45 UTC (rev 4537)
@@ -20,8 +20,8 @@
package org.exoplatform.web.security.security;
import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.GateInToken;
+import org.gatein.wci.security.Credentials;
import java.util.concurrent.ConcurrentHashMap;
Modified: portal/branches/wci/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetToken.java
===================================================================
--- portal/branches/wci/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetToken.java 2010-10-06 11:01:49 UTC (rev 4536)
+++ portal/branches/wci/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetToken.java 2010-10-06 11:08:45 UTC (rev 4537)
@@ -1,8 +1,8 @@
package org.exoplatform.portal.gadget.core;
import org.apache.shindig.gadgets.oauth.OAuthStore.TokenInfo;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.Token;
+import org.gatein.wci.security.Credentials;
public class GadgetToken extends TokenInfo implements Token
Modified: portal/branches/wci/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenInfoService.java
===================================================================
--- portal/branches/wci/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenInfoService.java 2010-10-06 11:01:49 UTC (rev 4536)
+++ portal/branches/wci/gadgets/core/src/main/java/org/exoplatform/portal/gadget/core/GadgetTokenInfoService.java 2010-10-06 11:08:45 UTC (rev 4537)
@@ -27,8 +27,8 @@
import org.exoplatform.commons.chromattic.ContextualTask;
import org.exoplatform.commons.chromattic.SessionContext;
import org.exoplatform.container.xml.InitParams;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.security.AbstractTokenService;
+import org.gatein.wci.security.Credentials;
import java.util.Collection;
Modified: portal/branches/wci/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java
===================================================================
--- portal/branches/wci/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java 2010-10-06 11:01:49 UTC (rev 4536)
+++ portal/branches/wci/webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java 2010-10-06 11:08:45 UTC (rev 4537)
@@ -27,7 +27,6 @@
import org.exoplatform.services.organization.Query;
import org.exoplatform.services.organization.User;
import org.exoplatform.web.application.ApplicationMessage;
-import org.exoplatform.web.security.Credentials;
import org.exoplatform.web.security.security.RemindPasswordTokenService;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
@@ -40,6 +39,7 @@
import org.exoplatform.webui.form.UIFormStringInput;
import org.exoplatform.webui.form.validator.EmailAddressValidator;
import org.exoplatform.webui.form.validator.MandatoryValidator;
+import org.gatein.wci.security.Credentials;
import java.net.URLEncoder;
import java.util.MissingResourceException;
14 years, 3 months
- 1
- 0
gatein SVN: r4536 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-10-06 07:01:49 -0400 (Wed, 06 Oct 2010)
New Revision: 4536
Added:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_007_EditCurrentPortalWithNoOneForEditRight.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_021_CheckEditingContainerWithNewValidTitleWhileEditCurrentPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_032_CheckFinishFunctionAfterChangePortletLayout.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_035_CheckWhenChangeTitleOfPortletWithvalidValueWhileEditingPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_036_CheckWhenChangeTitleOfPortletWithInvalidValueWhileEditingPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_037_CheckWhenChangeWidthHeightOfPortletWithValidValueWhileEditingPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_038_CheckWhenChangeWidthHeightOfPortletWithInValidValueWhileEditingPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_049_CheckFinishFunctionAfterEditedPortlet.html
Log:
TESTVN-1635 - Manage folders in selegen with GTNPORTAL product
Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_007_EditCurrentPortalWithNoOneForEditRight.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_007_EditCurrentPortalWithNoOneForEditRight.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_007_EditCurrentPortalWithNoOneForEditRight.html 2010-10-06 11:01:49 UTC (rev 4536)
@@ -0,0 +1,187 @@
+<?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_12_02_007_EditCurrentPortalWithNoOneForEditRight</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_POR_12_02_007_EditCurrentPortalWithNoOneForEditRight</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Edit current portal with no one for edit right--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>windowMaximize</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Click Edit layout --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Layout</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Edit Layout</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>Choose Site's Config on Edit inline composer --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site's Config</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Site's Config</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Choose Permission Setting --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[2]/div/div/div/div/div/div/div/div/div/div/div/div[3]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Choose Edit Permission--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Edit Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Delete Permission</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Delete Permission</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTextPresent</td>
+ <td>The "Edit Permission Setting" list can not be empty.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>The "Edit Permission Setting" list can not be empty.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=OK</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=OK</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Cancel</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Cancel</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</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_12_02_021_CheckEditingContainerWithNewValidTitleWhileEditCurrentPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_021_CheckEditingContainerWithNewValidTitleWhileEditCurrentPortal.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_021_CheckEditingContainerWithNewValidTitleWhileEditCurrentPortal.html 2010-10-06 11:01:49 UTC (rev 4536)
@@ -0,0 +1,197 @@
+<?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_12_02_021_CheckEditingContainerWithNewValidTitleWhileEditCurrentPortal</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_POR_12_02_021_CheckEditingContainerWithNewValidTitleWhileEditCurrentPortal</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Check editing container with new valid title while edit current portal--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>windowMaximize</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Layout</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Edit Layout</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Choose Containers tab on Edit Inline Composer --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td>20000</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseOver</td>
+ <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIPortalComposerTab']/div[1]/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='oneRow']/div</td>
+ <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div/div[1]/div</td>
+</tr>
+<tr>
+ <td>dragAndDropToObject</td>
+ <td>//div[@id='oneRow']/div</td>
+ <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div/div/div[1]/div</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td>
+ <td>Container</td>
+</tr>
+<tr>
+ <td>mouseOver</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td>
+ <td>Container</td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Click Edit container --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>title</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>title</td>
+ <td>Test_POR_12_02_021</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseOver</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td>
+ <td>Test_POR_12_02_021</td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Delete container --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForConfirmationPresent</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertConfirmation</td>
+ <td>Are you sure you want to delete this Container?</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</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_12_02_032_CheckFinishFunctionAfterChangePortletLayout.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_032_CheckFinishFunctionAfterChangePortletLayout.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_032_CheckFinishFunctionAfterChangePortletLayout.html 2010-10-06 11:01:49 UTC (rev 4536)
@@ -0,0 +1,152 @@
+<?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_12_02_032_CheckFinishFunctionAfterChangePortletLayout</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_POR_12_02_032_CheckFinishFunctionAfterChangePortletLayout</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>windowMaximize</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Go to edit layout of portal--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Layout</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Edit Layout</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Change current portal's portlet layout--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Administration</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Administration</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='Administration/ApplicationRegistryPortlet']/div/div/img</td>
+ <td>//div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[2]/div/div[1]/div/div/div/div/div</td>
+</tr>
+<tr>
+ <td>dragAndDropToObject</td>
+ <td>//div[@id='Administration/ApplicationRegistryPortlet']/div/div/img</td>
+ <td>//div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[2]/div/div[1]/div/div/div/div/div</td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Return to Default layout--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Layout</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Edit Layout</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseOver</td>
+ <td>//div/div/div[2]/div/div[2]/div/div/div[1]</td>
+ <td></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></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></td>
+</tr>
+<tr>
+ <td>assertConfirmation</td>
+ <td>Are you sure you want to delete this portlet?</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</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_12_02_035_CheckWhenChangeTitleOfPortletWithvalidValueWhileEditingPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_035_CheckWhenChangeTitleOfPortletWithvalidValueWhileEditingPortal.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_035_CheckWhenChangeTitleOfPortletWithvalidValueWhileEditingPortal.html 2010-10-06 11:01:49 UTC (rev 4536)
@@ -0,0 +1,212 @@
+<?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_12_02_035_CheckWhenChangeTitleOfPortletWithvalidValueWhileEditingPortal</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_POR_12_02_035_CheckWhenChangeTitleOfPortletWithvalidValueWhileEditingPortal</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Check when change title of portlet with valid value while editing portal--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>windowMaximize</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Edit layout's portal --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Layout</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Edit Layout</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Edit portlet --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseOver</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td>
+ <td>Banner Portlet</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Choose Portlet Setting --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Change current value of Title with new value --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>title</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>title</td>
+ <td>Test_POR_12_02_035</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseOver</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td>
+ <td>Test_POR_12_02_035</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Choose Portlet Setting --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Return to defautl title--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>title</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>title</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseOver</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td>
+ <td>Banner Portlet</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</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_12_02_036_CheckWhenChangeTitleOfPortletWithInvalidValueWhileEditingPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_036_CheckWhenChangeTitleOfPortletWithInvalidValueWhileEditingPortal.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_036_CheckWhenChangeTitleOfPortletWithInvalidValueWhileEditingPortal.html 2010-10-06 11:01:49 UTC (rev 4536)
@@ -0,0 +1,227 @@
+<?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_12_02_036_CheckWhenChangeTitleOfPortletWithInvalidValueWhileEditingPortal</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_POR_12_02_036_CheckWhenChangeTitleOfPortletWithInvalidValueWhileEditingPortal</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Check when change title of portlet with invalid value while editing portal --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>windowMaximize</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Edit layout's portal --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Layout</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Edit Layout</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Edit portlet --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseOver</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td>
+ <td>Banner Portlet</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Choose Portlet Setting --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Change current value of Title with new value less than 3 chars--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>title</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>title</td>
+ <td>PO</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTextPresent</td>
+ <td>The length of the text in field "Portlet Title :" must be between "3" and "60" characters.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>The length of the text in field "Portlet Title :" must be between "3" and "60" characters.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Change current value of Title with new value over 60 characters --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>title</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>title</td>
+ <td>Test_POR_12_02_036 Test_POR_12_02_036 Test_POR_12_02_036 Test_POR_12_02_036 Test_POR_12_02_036 Test_POR_12_02_036 Test_POR_12_02_036 Test_POR_12_02_036</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTextPresent</td>
+ <td>The length of the text in field "Portlet Title :" must be between "3" and "60" characters.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>The length of the text in field "Portlet Title :" must be between "3" and "60" characters.</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</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_12_02_037_CheckWhenChangeWidthHeightOfPortletWithValidValueWhileEditingPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_037_CheckWhenChangeWidthHeightOfPortletWithValidValueWhileEditingPortal.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_037_CheckWhenChangeWidthHeightOfPortletWithValidValueWhileEditingPortal.html 2010-10-06 11:01:49 UTC (rev 4536)
@@ -0,0 +1,247 @@
+<?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_12_02_037_CheckWhenChangeWidthHeightOfPortletWithValidValueWhileEditingPortal</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_POR_12_02_037_CheckWhenChangeWidthHeightOfPortletWithValidValueWhileEditingPortal</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Check when change width/height of portlet with valid value while editing portal--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>windowMaximize</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Edit layout's portal --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Layout</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Edit Layout</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Edit portlet --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseOver</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td>
+ <td>Banner Portlet</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>width</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>width</td>
+ <td>300px</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>height</td>
+ <td>500px</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPortalComposer']/div[3]/div/div/div[1]/table/tbody/tr/td/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIPortalComposer']/div[3]/div/div/div[1]/table/tbody/tr/td/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForText</td>
+ <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div[2]/div/div/div[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- View after change width/height of portlet --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Switch View Mode</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Switch View Mode</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Check when change width/height of portlet with blank while editing portal--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseOver</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td>
+ <td>Banner Portlet</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>width</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>width</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>height</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- view when change width/height of portlet with blank --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Switch View Mode</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Switch View Mode</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</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_12_02_038_CheckWhenChangeWidthHeightOfPortletWithInValidValueWhileEditingPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_038_CheckWhenChangeWidthHeightOfPortletWithInValidValueWhileEditingPortal.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_038_CheckWhenChangeWidthHeightOfPortletWithInValidValueWhileEditingPortal.html 2010-10-06 11:01:49 UTC (rev 4536)
@@ -0,0 +1,197 @@
+<?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_12_02_038_CheckWhenChangeWidthHeightOfPortletWithInValidValueWhileEditingPortal</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_POR_12_02_038_CheckWhenChangeWidthHeightOfPortletWithInValidValueWhileEditingPortal</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Check when change width/height of portlet with invalid value while editing portal--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>windowMaximize</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Edit layout's portal --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Layout</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Edit Layout</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Edit portlet --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseOver</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td>
+ <td>Banner Portlet</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Portlet Setting --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[5]/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Change current value of Width/height with invalid value (number no have with “px”) --</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>width</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>width</td>
+ <td>300</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>height</td>
+ <td>500</td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTextPresent</td>
+ <td>You must enter a pixel value in field "Width:".</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>You must enter a pixel value in field "Width:".</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTextPresent</td>
+ <td>You must enter a pixel value in field "Height:".</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>You must enter a pixel value in field "Height:".</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=OK</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=OK</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</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_12_02_049_CheckFinishFunctionAfterEditedPortlet.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_049_CheckFinishFunctionAfterEditedPortlet.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/candidate/Test_POR_12_02_049_CheckFinishFunctionAfterEditedPortlet.html 2010-10-06 11:01:49 UTC (rev 4536)
@@ -0,0 +1,322 @@
+<?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_12_02_049_CheckFinishFunctionAfterEditedPortlet</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_POR_12_02_049_CheckFinishFunctionAfterEditedPortlet</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>windowMaximize</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>//div[@id='UIPortalLoginFormAction']/div/div/div/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Go to Edit layout--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UISiteManagement']/table/tbody/tr/td[3]/a[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div[2]/div/div/div[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseOver</td>
+ <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div[2]/div/div/div[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Go to Portlet Setting--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>title</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>title</td>
+ <td>POR_Test_12_02_049</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>description</td>
+ <td>POR_Test_12_02_049</td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Go to Select Icon--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[3]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//form[@id='UIPortletForm']/div[4]/div/div/div[2]/div[2]/div/a[1]/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//form[@id='UIPortletForm']/div[4]/div/div/div[2]/div[2]/div/a[1]/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[4]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Go to Decoration Themes--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[4]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIItemThemeSelector']/div[2]/div[1]/div/div[2]/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIItemThemeSelector']/div[2]/div[1]/div/div[2]/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIPortalComposer']/div[1]/div/div/div/a[2]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Return to default--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Layout</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Edit Layout</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div[2]/div/div/div[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseOver</td>
+ <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[1]/div/div[2]/div/div/div[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div/div/div[2]/div/div/div/div/div/div/a[1]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-- Choose Portlet Setting--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[2]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>title</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>title</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>description</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Choose Select Icon--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[3]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[3]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Get Default</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Get Default</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Choose Decoration Themes--</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[4]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='UIMaskWorkspace']/div[2]/div/div/div/div/div/div/div[1]/div/div/div/div/div[4]/div/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@id='Theme']/div/div[2]/div[1]/div[3]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//div[@id='Theme']/div/div[2]/div[1]/div[3]/a</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>link=Save And Close</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//a[contains(@href, "javascript:ajaxGet('/portal/private/classic/portalnavigation?portal:componentId=UIPortalComposer&portal:action=Finish&ajaxRequest=true')")]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>//a[contains(@href, "javascript:ajaxGet('/portal/private/classic/portalnavigation?portal:componentId=UIPortalComposer&portal:action=Finish&ajaxRequest=true')")]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
14 years, 3 months
- 1
- 0
gatein SVN: r4535 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-10-06 07:00:02 -0400 (Wed, 06 Oct 2010)
New Revision: 4535
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_036_CheckWhenChangeTitleOfPortletWithInvalidValueWhileEditingPortal.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_038_CheckWhenChangeWidthHeightOfPortletWithInValidValueWhileEditingPortal.html
Log:
TestVN-356:Clean and Improve existing Selenium for GateIn
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_036_CheckWhenChangeTitleOfPortletWithInvalidValueWhileEditingPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_036_CheckWhenChangeTitleOfPortletWithInvalidValueWhileEditingPortal.html 2010-10-06 10:50:51 UTC (rev 4534)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_036_CheckWhenChangeTitleOfPortletWithInvalidValueWhileEditingPortal.html 2010-10-06 11:00:02 UTC (rev 4535)
@@ -138,12 +138,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[3]/div/table/tbody/tr/td/div/div/div/div</td>
+ <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[3]/div/table/tbody/tr/td/div/div/div/div</td>
+ <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
<td></td>
</tr>
<tr>
@@ -183,12 +183,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>link=OK</td>
+ <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>link=OK</td>
+ <td>//div[6]/div/div[2]/div/div/div/div/div/div[3]/div/table/tbody/tr/td/div/div/div/div/a</td>
<td></td>
</tr>
<tr>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_038_CheckWhenChangeWidthHeightOfPortletWithInValidValueWhileEditingPortal.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_038_CheckWhenChangeWidthHeightOfPortletWithInValidValueWhileEditingPortal.html 2010-10-06 10:50:51 UTC (rev 4534)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_12_02_038_CheckWhenChangeWidthHeightOfPortletWithInValidValueWhileEditingPortal.html 2010-10-06 11:00:02 UTC (rev 4535)
@@ -153,12 +153,12 @@
</tr>
<tr>
<td>waitForElementPresent</td>
- <td>//div[3]/div/table/tbody/tr/td/div/div/div/div</td>
+ <td>link=OK</td>
<td></td>
</tr>
<tr>
<td>click</td>
- <td>//div[3]/div/table/tbody/tr/td/div/div/div/div</td>
+ <td>link=OK</td>
<td></td>
</tr>
<tr>
14 years, 3 months
- 1
- 0