gatein SVN: r4411 - in components/wsrp/trunk: admin-gui and 9 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-09-28 09:09:32 -0400 (Tue, 28 Sep 2010)
New Revision: 4411
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/hibernate-impl/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
components/wsrp/trunk/wsrp2-ws/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-09-28 13:09:13 UTC (rev 4410)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-09-28 13:09:32 UTC (rev 4411)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2010-09-28 13:09:13 UTC (rev 4410)
+++ components/wsrp/trunk/api/pom.xml 2010-09-28 13:09:32 UTC (rev 4411)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2010-09-28 13:09:13 UTC (rev 4410)
+++ components/wsrp/trunk/common/pom.xml 2010-09-28 13:09:32 UTC (rev 4411)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2010-09-28 13:09:13 UTC (rev 4410)
+++ components/wsrp/trunk/consumer/pom.xml 2010-09-28 13:09:32 UTC (rev 4411)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/trunk/hibernate-impl/pom.xml 2010-09-28 13:09:13 UTC (rev 4410)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-09-28 13:09:32 UTC (rev 4411)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-09-28 13:09:13 UTC (rev 4410)
+++ components/wsrp/trunk/pom.xml 2010-09-28 13:09:32 UTC (rev 4411)
@@ -29,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -40,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-Alp...</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.0.0-Alpha03</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-09-28 13:09:13 UTC (rev 4410)
+++ components/wsrp/trunk/producer/pom.xml 2010-09-28 13:09:32 UTC (rev 4411)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2010-09-28 13:09:13 UTC (rev 4410)
+++ components/wsrp/trunk/test/pom.xml 2010-09-28 13:09:32 UTC (rev 4411)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-09-28 13:09:13 UTC (rev 4410)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-09-28 13:09:32 UTC (rev 4411)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-09-28 13:09:13 UTC (rev 4410)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-09-28 13:09:32 UTC (rev 4411)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/trunk/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp2-ws/pom.xml 2010-09-28 13:09:13 UTC (rev 4410)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2010-09-28 13:09:32 UTC (rev 4411)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.0.0-Alpha03</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
14 years, 3 months
- 1
- 0
gatein SVN: r4410 - components/wsrp/tags.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-09-28 09:09:13 -0400 (Tue, 28 Sep 2010)
New Revision: 4410
Added:
components/wsrp/tags/2.0.0-Alpha03/
Log:
[maven-scm] copy for tag 2.0.0-Alpha03
Copied: components/wsrp/tags/2.0.0-Alpha03 (from rev 4409, components/wsrp/trunk)
14 years, 3 months
- 1
- 0
gatein SVN: r4409 - in components/wsrp/trunk: admin-gui and 9 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-09-28 09:08:54 -0400 (Tue, 28 Sep 2010)
New Revision: 4409
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/hibernate-impl/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
components/wsrp/trunk/wsrp2-ws/pom.xml
Log:
[maven-release-plugin] prepare release 2.0.0-Alpha03
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-09-28 13:08:54 UTC (rev 4409)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03-SNAPSHOT</version>
+ <version>2.0.0-Alpha03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
+++ components/wsrp/trunk/api/pom.xml 2010-09-28 13:08:54 UTC (rev 4409)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03-SNAPSHOT</version>
+ <version>2.0.0-Alpha03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
+++ components/wsrp/trunk/common/pom.xml 2010-09-28 13:08:54 UTC (rev 4409)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03-SNAPSHOT</version>
+ <version>2.0.0-Alpha03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
+++ components/wsrp/trunk/consumer/pom.xml 2010-09-28 13:08:54 UTC (rev 4409)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03-SNAPSHOT</version>
+ <version>2.0.0-Alpha03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/trunk/hibernate-impl/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-09-28 13:08:54 UTC (rev 4409)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03-SNAPSHOT</version>
+ <version>2.0.0-Alpha03</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
+++ components/wsrp/trunk/pom.xml 2010-09-28 13:08:54 UTC (rev 4409)
@@ -29,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03-SNAPSHOT</version>
+ <version>2.0.0-Alpha03</version>
<packaging>pom</packaging>
@@ -40,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-Alp...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.0.0-Alpha03</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
+++ components/wsrp/trunk/producer/pom.xml 2010-09-28 13:08:54 UTC (rev 4409)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03-SNAPSHOT</version>
+ <version>2.0.0-Alpha03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
+++ components/wsrp/trunk/test/pom.xml 2010-09-28 13:08:54 UTC (rev 4409)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03-SNAPSHOT</version>
+ <version>2.0.0-Alpha03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-09-28 13:08:54 UTC (rev 4409)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03-SNAPSHOT</version>
+ <version>2.0.0-Alpha03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-09-28 13:08:54 UTC (rev 4409)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Alpha03-SNAPSHOT</version>
+ <version>2.0.0-Alpha03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/trunk/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp2-ws/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2010-09-28 13:08:54 UTC (rev 4409)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.0.0-Alpha03-SNAPSHOT</version>
+ <version>2.0.0-Alpha03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
14 years, 3 months
- 1
- 0
gatein SVN: r4408 - in exo/portal/branches/3.1.4-PLF-perf: component and 72 other directories.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2010-09-28 07:35:03 -0400 (Tue, 28 Sep 2010)
New Revision: 4408
Modified:
exo/portal/branches/3.1.4-PLF-perf/component/application-registry/pom.xml
exo/portal/branches/3.1.4-PLF-perf/component/common/pom.xml
exo/portal/branches/3.1.4-PLF-perf/component/dashboard/pom.xml
exo/portal/branches/3.1.4-PLF-perf/component/identity/pom.xml
exo/portal/branches/3.1.4-PLF-perf/component/management/pom.xml
exo/portal/branches/3.1.4-PLF-perf/component/pc/pom.xml
exo/portal/branches/3.1.4-PLF-perf/component/pom.xml
exo/portal/branches/3.1.4-PLF-perf/component/portal/pom.xml
exo/portal/branches/3.1.4-PLF-perf/component/resources/pom.xml
exo/portal/branches/3.1.4-PLF-perf/component/scripting/pom.xml
exo/portal/branches/3.1.4-PLF-perf/component/test/core/pom.xml
exo/portal/branches/3.1.4-PLF-perf/component/test/jcr/pom.xml
exo/portal/branches/3.1.4-PLF-perf/component/test/organization/pom.xml
exo/portal/branches/3.1.4-PLF-perf/component/test/pom.xml
exo/portal/branches/3.1.4-PLF-perf/component/web/pom.xml
exo/portal/branches/3.1.4-PLF-perf/component/wsrp/pom.xml
exo/portal/branches/3.1.4-PLF-perf/component/xml-parser/pom.xml
exo/portal/branches/3.1.4-PLF-perf/docs/pom.xml
exo/portal/branches/3.1.4-PLF-perf/docs/reference-guide/pom.xml
exo/portal/branches/3.1.4-PLF-perf/docs/user-guide/pom.xml
exo/portal/branches/3.1.4-PLF-perf/examples/extension/config/pom.xml
exo/portal/branches/3.1.4-PLF-perf/examples/extension/ear/pom.xml
exo/portal/branches/3.1.4-PLF-perf/examples/extension/jar/pom.xml
exo/portal/branches/3.1.4-PLF-perf/examples/extension/pom.xml
exo/portal/branches/3.1.4-PLF-perf/examples/extension/war/pom.xml
exo/portal/branches/3.1.4-PLF-perf/examples/pom.xml
exo/portal/branches/3.1.4-PLF-perf/examples/portal/config/pom.xml
exo/portal/branches/3.1.4-PLF-perf/examples/portal/ear/pom.xml
exo/portal/branches/3.1.4-PLF-perf/examples/portal/jar/pom.xml
exo/portal/branches/3.1.4-PLF-perf/examples/portal/pom.xml
exo/portal/branches/3.1.4-PLF-perf/examples/portal/rest-war/pom.xml
exo/portal/branches/3.1.4-PLF-perf/examples/portal/war/pom.xml
exo/portal/branches/3.1.4-PLF-perf/examples/portlets/jsfhellouser/pom.xml
exo/portal/branches/3.1.4-PLF-perf/examples/portlets/jsphellouser/pom.xml
exo/portal/branches/3.1.4-PLF-perf/examples/portlets/pom.xml
exo/portal/branches/3.1.4-PLF-perf/examples/portlets/simplesthelloworld/pom.xml
exo/portal/branches/3.1.4-PLF-perf/examples/portlets/struts-jpetstore/pom.xml
exo/portal/branches/3.1.4-PLF-perf/examples/skins/pom.xml
exo/portal/branches/3.1.4-PLF-perf/examples/skins/simpleskin/pom.xml
exo/portal/branches/3.1.4-PLF-perf/gadgets/core/pom.xml
exo/portal/branches/3.1.4-PLF-perf/gadgets/eXoGadgets/pom.xml
exo/portal/branches/3.1.4-PLF-perf/gadgets/pom.xml
exo/portal/branches/3.1.4-PLF-perf/gadgets/server/pom.xml
exo/portal/branches/3.1.4-PLF-perf/packaging/module/pom.xml
exo/portal/branches/3.1.4-PLF-perf/packaging/pkg/pom.xml
exo/portal/branches/3.1.4-PLF-perf/packaging/pom.xml
exo/portal/branches/3.1.4-PLF-perf/packaging/product/pom.xml
exo/portal/branches/3.1.4-PLF-perf/packaging/reports/pom.xml
exo/portal/branches/3.1.4-PLF-perf/pom.xml
exo/portal/branches/3.1.4-PLF-perf/portlet/dashboard/pom.xml
exo/portal/branches/3.1.4-PLF-perf/portlet/exoadmin/pom.xml
exo/portal/branches/3.1.4-PLF-perf/portlet/pom.xml
exo/portal/branches/3.1.4-PLF-perf/portlet/web/pom.xml
exo/portal/branches/3.1.4-PLF-perf/server/jboss/patch-ear/pom.xml
exo/portal/branches/3.1.4-PLF-perf/server/jboss/plugin/pom.xml
exo/portal/branches/3.1.4-PLF-perf/server/jboss/pom.xml
exo/portal/branches/3.1.4-PLF-perf/server/pom.xml
exo/portal/branches/3.1.4-PLF-perf/server/tomcat/patch/pom.xml
exo/portal/branches/3.1.4-PLF-perf/server/tomcat/plugin/pom.xml
exo/portal/branches/3.1.4-PLF-perf/server/tomcat/pom.xml
exo/portal/branches/3.1.4-PLF-perf/starter/ear/pom.xml
exo/portal/branches/3.1.4-PLF-perf/starter/pom.xml
exo/portal/branches/3.1.4-PLF-perf/starter/war/pom.xml
exo/portal/branches/3.1.4-PLF-perf/testsuite/pom.xml
exo/portal/branches/3.1.4-PLF-perf/testsuite/selenium-snifftests/pom.xml
exo/portal/branches/3.1.4-PLF-perf/testsuite/webuibasedsamples/pom.xml
exo/portal/branches/3.1.4-PLF-perf/web/eXoResources/pom.xml
exo/portal/branches/3.1.4-PLF-perf/web/pom.xml
exo/portal/branches/3.1.4-PLF-perf/web/portal/pom.xml
exo/portal/branches/3.1.4-PLF-perf/web/rest/pom.xml
exo/portal/branches/3.1.4-PLF-perf/webui/core/pom.xml
exo/portal/branches/3.1.4-PLF-perf/webui/eXo/pom.xml
exo/portal/branches/3.1.4-PLF-perf/webui/pom.xml
exo/portal/branches/3.1.4-PLF-perf/webui/portal/pom.xml
Log:
TESTFR-3 : Update versions and deps
Modified: exo/portal/branches/3.1.4-PLF-perf/component/application-registry/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/component/application-registry/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/component/application-registry/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/component/common/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/component/common/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/component/common/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.portal.component.common</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/component/dashboard/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/component/dashboard/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/component/dashboard/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/component/identity/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/component/identity/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/component/identity/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/component/management/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/component/management/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/component/management/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/component/pc/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/component/pc/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/component/pc/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/component/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/component/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/component/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.component</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/component/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/component/portal/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/component/portal/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/component/resources/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/component/resources/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/component/resources/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/component/scripting/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/component/scripting/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/component/scripting/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/component/test/core/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/component/test/core/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/component/test/core/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/component/test/jcr/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/component/test/jcr/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/component/test/jcr/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/component/test/organization/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/component/test/organization/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/component/test/organization/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/component/test/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/component/test/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/component/test/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/component/web/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/component/web/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/component/web/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/component/wsrp/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/component/wsrp/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/component/wsrp/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/component/xml-parser/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/component/xml-parser/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/component/xml-parser/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/docs/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/docs/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/docs/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<groupId>org.gatein.doc</groupId>
Modified: exo/portal/branches/3.1.4-PLF-perf/docs/reference-guide/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/docs/reference-guide/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/docs/reference-guide/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.doc</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<groupId>org.gatein.doc</groupId>
Modified: exo/portal/branches/3.1.4-PLF-perf/docs/user-guide/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/docs/user-guide/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/docs/user-guide/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.doc</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>gatein-user-guide-en</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/examples/extension/config/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/examples/extension/config/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/examples/extension/config/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/examples/extension/ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/examples/extension/ear/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/examples/extension/ear/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,23 +37,23 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.config</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.jar</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.war</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/3.1.4-PLF-perf/examples/extension/jar/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/examples/extension/jar/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/examples/extension/jar/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/examples/extension/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/examples/extension/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/examples/extension/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample.extension.root</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/examples/extension/war/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/examples/extension/war/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/examples/extension/war/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/examples/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/examples/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/examples/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/examples/portal/config/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/examples/portal/config/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/examples/portal/config/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/examples/portal/ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/examples/portal/ear/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/examples/portal/ear/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,29 +37,29 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.config</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.jar</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.war</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.rest-war</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/3.1.4-PLF-perf/examples/portal/jar/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/examples/portal/jar/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/examples/portal/jar/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/examples/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/examples/portal/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/examples/portal/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample.portal.root</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/examples/portal/rest-war/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/examples/portal/rest-war/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/examples/portal/rest-war/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/examples/portal/war/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/examples/portal/war/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/examples/portal/war/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/examples/portlets/jsfhellouser/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/examples/portlets/jsfhellouser/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/examples/portlets/jsfhellouser/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsf-hellouser</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/examples/portlets/jsphellouser/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/examples/portlets/jsphellouser/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/examples/portlets/jsphellouser/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsp-hellouser</artifactId>
@@ -36,4 +36,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: exo/portal/branches/3.1.4-PLF-perf/examples/portlets/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/examples/portlets/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/examples/portlets/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
Modified: exo/portal/branches/3.1.4-PLF-perf/examples/portlets/simplesthelloworld/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/examples/portlets/simplesthelloworld/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/examples/portlets/simplesthelloworld/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>gatein-simplest-helloworld</artifactId>
@@ -37,4 +37,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: exo/portal/branches/3.1.4-PLF-perf/examples/portlets/struts-jpetstore/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/examples/portlets/struts-jpetstore/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/examples/portlets/struts-jpetstore/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>struts-jpetstore</artifactId>
@@ -172,4 +172,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: exo/portal/branches/3.1.4-PLF-perf/examples/skins/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/examples/skins/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/examples/skins/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<groupId>org.gatein.portal.examples.skins</groupId>
Modified: exo/portal/branches/3.1.4-PLF-perf/examples/skins/simpleskin/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/examples/skins/simpleskin/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/examples/skins/simpleskin/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.portal.examples.skins</groupId>
<artifactId>parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>gatein-sample-skin</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/gadgets/core/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/gadgets/core/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/gadgets/core/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -14,7 +14,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-core</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/gadgets/eXoGadgets/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/gadgets/eXoGadgets/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/gadgets/eXoGadgets/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/gadgets/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/gadgets/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/gadgets/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/gadgets/server/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/gadgets/server/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/gadgets/server/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-server</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/packaging/module/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/packaging/module/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/packaging/module/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/packaging/pkg/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/packaging/pkg/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/packaging/pkg/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -67,13 +67,13 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>portal.packaging.module</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
<type>js</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>portal.packaging.product</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
<type>js</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/3.1.4-PLF-perf/packaging/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/packaging/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/packaging/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/packaging/product/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/packaging/product/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/packaging/product/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/packaging/reports/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/packaging/reports/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/packaging/reports/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -31,16 +31,16 @@
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GateIn - Portal</name>
<properties>
- <org.exoplatform.kernel.version>2.2.4-GA</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.4-GA</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.4-GA</org.exoplatform.ws.version>
- <org.exoplatform.jcr.version>1.12.4-GA</org.exoplatform.jcr.version>
+ <org.exoplatform.kernel.version>2.2.5-GA-PERF-SNAPSHOT</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.5-GA-PERF-SNAPSHOT</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.1.5-GA-PERF-SNAPSHOT</org.exoplatform.ws.version>
+ <org.exoplatform.jcr.version>1.12.5-GA-PERF-SNAPSHOT</org.exoplatform.jcr.version>
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>1.0-r790473-Patch02</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
@@ -324,110 +324,110 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.pc</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.application-registry</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.xml-parser</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.scripting</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.dashboard</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.core</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-core</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
@@ -809,7 +809,7 @@
<profile>
<id>stable</id>
<properties>
- <org.exoplatform.kernel.version>2.2.4-GA</org.exoplatform.kernel.version>
+ <org.exoplatform.kernel.version>2.2.4-GA</org.exoplatform.kernel.version>
<org.exoplatform.core.version>2.3.4-GA</org.exoplatform.core.version>
<org.exoplatform.ws.version>2.1.4-GA</org.exoplatform.ws.version>
<org.exoplatform.jcr.version>1.12.4-GA</org.exoplatform.jcr.version>
Modified: exo/portal/branches/3.1.4-PLF-perf/portlet/dashboard/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/portlet/dashboard/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/portlet/dashboard/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/portlet/exoadmin/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/portlet/exoadmin/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/portlet/exoadmin/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/portlet/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/portlet/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/portlet/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.portlet</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/portlet/web/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/portlet/web/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/portlet/web/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/server/jboss/patch-ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/server/jboss/patch-ear/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/server/jboss/patch-ear/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/server/jboss/plugin/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/server/jboss/plugin/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/server/jboss/plugin/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/server/jboss/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/server/jboss/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/server/jboss/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server.jboss</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/server/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/server/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/server/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/server/tomcat/patch/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/server/tomcat/patch/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/server/tomcat/patch/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.tomcat</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/server/tomcat/plugin/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/server/tomcat/plugin/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/server/tomcat/plugin/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.tomcat</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/server/tomcat/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/server/tomcat/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/server/tomcat/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server.tomcat</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/starter/ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/starter/ear/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/starter/ear/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.starter.war</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/3.1.4-PLF-perf/starter/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/starter/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/starter/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.starter.root</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/starter/war/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/starter/war/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/starter/war/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/testsuite/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/testsuite/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/testsuite/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.testsuite</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/testsuite/selenium-snifftests/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/testsuite/selenium-snifftests/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/testsuite/selenium-snifftests/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.selenium.snifftests</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/testsuite/webuibasedsamples/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/testsuite/webuibasedsamples/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/testsuite/webuibasedsamples/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.webui.based.samples</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/web/eXoResources/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/web/eXoResources/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/web/eXoResources/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/web/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/web/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/web/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.web</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/web/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/web/portal/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/web/portal/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/web/rest/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/web/rest/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/web/rest/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/webui/core/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/webui/core/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/webui/core/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/webui/eXo/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/webui/eXo/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/webui/eXo/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.4-PLF-perf/webui/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/webui/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/webui/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.webui</artifactId>
Modified: exo/portal/branches/3.1.4-PLF-perf/webui/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.4-PLF-perf/webui/portal/pom.xml 2010-09-28 11:14:05 UTC (rev 4407)
+++ exo/portal/branches/3.1.4-PLF-perf/webui/portal/pom.xml 2010-09-28 11:35:03 UTC (rev 4408)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-PERF-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
14 years, 3 months
- 1
- 0
gatein SVN: r4407 - portal/branches/branch-GTNPORTAL-1493/webui/core/src/main/java/org/exoplatform/webui/form/validator.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2010-09-28 07:14:05 -0400 (Tue, 28 Sep 2010)
New Revision: 4407
Modified:
portal/branches/branch-GTNPORTAL-1493/webui/core/src/main/java/org/exoplatform/webui/form/validator/DateTimeValidator.java
Log:
GTNPORTAL-1502 Remove the remains of DateTimeValidator that cause validator is incorrect
Modified: portal/branches/branch-GTNPORTAL-1493/webui/core/src/main/java/org/exoplatform/webui/form/validator/DateTimeValidator.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1493/webui/core/src/main/java/org/exoplatform/webui/form/validator/DateTimeValidator.java 2010-09-28 09:51:48 UTC (rev 4406)
+++ portal/branches/branch-GTNPORTAL-1493/webui/core/src/main/java/org/exoplatform/webui/form/validator/DateTimeValidator.java 2010-09-28 11:14:05 UTC (rev 4407)
@@ -19,6 +19,9 @@
package org.exoplatform.webui.form.validator;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+
import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.core.UIComponent;
import org.exoplatform.webui.exception.MessageException;
@@ -26,12 +29,6 @@
import org.exoplatform.webui.form.UIFormDateTimeInput;
import org.exoplatform.webui.form.UIFormInput;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
/**
* Created by The eXo Platform SARL
* Author : Tran The Trong
@@ -79,24 +76,9 @@
{
throw new MessageException(new ApplicationMessage("DateTimeValidator.msg.Invalid-input", args, ApplicationMessage.WARNING));
}
- if (s.matches(DATETIME_REGEX) && isValidDateTime(s))
+ if (s.matches(DATETIME_REGEX))
return;
throw new MessageException(new ApplicationMessage("DateTimeValidator.msg.Invalid-input", args, ApplicationMessage.WARNING));
}
-
- private boolean isValidDateTime(String dateTime)
- {
- String[] arr = dateTime.split(SPLIT_REGEX, 7);
- int valid = Integer.parseInt(arr[0]);
- if (valid < 1 || valid > 12)
- return false;
- Calendar date = new GregorianCalendar(Integer.parseInt(arr[2]), valid - 1, 1);
- if (Integer.parseInt(arr[1]) > date.getActualMaximum(Calendar.DAY_OF_MONTH))
- return false;
- if (arr.length > 3
- && (Integer.parseInt(arr[3]) > 23 || Integer.parseInt(arr[4]) > 59 || Integer.parseInt(arr[5]) > 59))
- return false;
- return true;
- }
}
14 years, 3 months
- 1
- 0
gatein SVN: r4406 - exo/portal/branches.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2010-09-28 05:51:48 -0400 (Tue, 28 Sep 2010)
New Revision: 4406
Added:
exo/portal/branches/3.1.4-PLF-perf/
Log:
[TESTFR-3] Create perf branch
Copied: exo/portal/branches/3.1.4-PLF-perf (from rev 4405, exo/portal/tags/3.1.4-PLF)
14 years, 3 months
- 1
- 0
gatein SVN: r4405 - in epp/portal/branches/EPP_5_1_Branch: web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/background and 1 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-09-28 04:45:19 -0400 (Tue, 28 Sep 2010)
New Revision: 4405
Modified:
epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/PlImg.gif
epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/background/ChangeSkinForm.jpg
epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl
Log:
JBEPP-512: Change skin previews for EPP skin
Modified: epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/background/PlImg.gif
===================================================================
(Binary files differ)
Modified: epp/portal/branches/EPP_5_1_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/background/ChangeSkinForm.jpg
===================================================================
(Binary files differ)
Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl 2010-09-28 07:36:11 UTC (rev 4404)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/templates/groovy/webui/component/UIHomePagePortlet.gtmpl 2010-09-28 08:45:19 UTC (rev 4405)
@@ -4,16 +4,6 @@
%>
<div class="UIHomePagePortlet" id="$uicomponent.id">
- <div class="TRContainer">
- <div class="PortletDecoration">
- <div class="GuideText"><%=_ctx.appRes("UIHomePagePortlet.Label.IntroText")%></div>
- <a class="VersionIcon" href="http://www.jboss.org/gatein/" target="_blank"></a>
- <div class="DotLine"><span></span></div>
- <div class="GuideText"><%=_ctx.appRes("UIHomePagePortlet.Label.GuideText")%></div>
- <a class="ContactIcon" href="http://community.jboss.org/en/gatein?view=discussions" target="_blank"></a>
-
- </div>
- </div>
<div class="TLContainer">
<div class="PortletDecoration">
@@ -93,4 +83,4 @@
</div>
<div class="ClearBoth"><span></span></div>
</div>
-<map id="epp-main" name="epp-main"><area shape="rect" alt="" title="" coords="34,150,300,172" href="/portal/docs/gatein-3-10.pdf" target="_blank" /><area shape="rect" alt="" title="" coords="34,175,220,199" href="/portal/docs/JBoss_Portals_0310.pdf" target="_blank" /><area shape="rect" alt="" title="" coords="33,205,129,222" href="http://www.jboss.com/products/platforms/portals/" target="_blank" /><area shape="rect" alt="" title="" coords="147,5,312,31" href="http://vimeo.com/channels/gatein" target="" /></map>
\ No newline at end of file
+<map id="epp-main" name="epp-main"><area shape="rect" alt="" title="" coords="34,150,300,172" href="/portal/docs/gatein-3-10.pdf" target="_blank" /><area shape="rect" alt="" title="" coords="34,175,220,199" href="/portal/docs/JBoss_Portals_0310.pdf" target="_blank" /><area shape="rect" alt="" title="" coords="33,205,129,222" href="http://www.jboss.com/products/platforms/portals/" target="_blank" /><area shape="rect" alt="" title="" coords="147,5,312,31" href="http://vimeo.com/channels/gatein" target="" /></map>
14 years, 3 months
- 1
- 0
gatein SVN: r4404 - in epp/portal/branches/EPP_5_1_Branch: examples/extension and 7 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-09-28 03:36:11 -0400 (Tue, 28 Sep 2010)
New Revision: 4404
Removed:
epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/configuration-tomcat.properties
epp/portal/branches/EPP_5_1_Branch/packaging/pkg/src/main/assembly/tomcat-zip.xml
epp/portal/branches/EPP_5_1_Branch/server/tomcat/
Modified:
epp/portal/branches/EPP_5_1_Branch/examples/extension/README.txt
epp/portal/branches/EPP_5_1_Branch/examples/portal/README.txt
epp/portal/branches/EPP_5_1_Branch/packaging/module/src/main/javascript/portal.packaging.module.js
epp/portal/branches/EPP_5_1_Branch/packaging/product/src/main/javascript/portal.packaging.product.js
epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml
epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml.template
epp/portal/branches/EPP_5_1_Branch/packaging/reports/build.xml
epp/portal/branches/EPP_5_1_Branch/packaging/reports/pom.xml
epp/portal/branches/EPP_5_1_Branch/server/pom.xml
Log:
JBEPP-511: Remove Tomcat specific files
Deleted: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/configuration-tomcat.properties
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/configuration-tomcat.properties 2010-09-28 07:34:35 UTC (rev 4403)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/configuration-tomcat.properties 2010-09-28 07:36:11 UTC (rev 4404)
@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2009 eXo Platform SAS.
-#
-# This is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free
-# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-#
-
-# Data
-gatein.data.dir=../gatein/data
-
-# DB
-gatein.db.data.dir=${gatein.data.dir}/db
-
-# JCR
-gatein.jcr.config.type=local
-gatein.jcr.datasource.name=jdbcjcr
-gatein.jcr.datasource.dialect=auto
-gatein.jcr.datasource.driver=org.hsqldb.jdbcDriver
-gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr_${name}
-gatein.jcr.datasource.username=sa
-gatein.jcr.datasource.password=
-
-gatein.jcr.data.dir=${gatein.data.dir}/jcr
-gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values
-gatein.jcr.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml
-gatein.jcr.lock.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml
-gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene
-gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
-gatein.jcr.index.cache.config=classpath:/conf/jcr/jbosscache/cluster/indexer-config.xml
-gatein.jcr.jgroups.config=classpath:/conf/jcr/jbosscache/cluster/udp-mux.xml
-
-# IDM
-gatein.idm.datasource.name=jdbcidm
-gatein.idm.datasource.driver=org.hsqldb.jdbcDriver
-gatein.idm.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm_${name}
-gatein.idm.datasource.username=sa
-gatein.idm.datasource.password=
-
-# Arjuna configuration
-com.arjuna.ats.arjuna.objectstore.objectStoreDir=${gatein.data.dir}/jta
-
-# EMail
-gatein.email.smtp.username=
-gatein.email.smtp.password=
-gatein.email.smtp.host=smtp.gmail.com
-gatein.email.smtp.port=465
-gatein.email.smtp.starttls.enable=true
-gatein.email.smtp.auth=true
-gatein.email.smtp.socketFactory.port=465
-gatein.email.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_1_Branch/examples/extension/README.txt
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/extension/README.txt 2010-09-28 07:34:35 UTC (rev 4403)
+++ epp/portal/branches/EPP_5_1_Branch/examples/extension/README.txt 2010-09-28 07:36:11 UTC (rev 4404)
@@ -22,7 +22,7 @@
########################################
########################################
-# On JBoss (tested on JBoss 5.1.0.GA)
+# On JBoss
########################################
We assume that you have a clean JBoss version of GateIn: ie We assume that you have already the file gatein.ear in the deploy directory
@@ -37,22 +37,6 @@
the load order is first the exoplatform.ear then the sample-ext.ear and finally the starter.ear
########################################
-# On Tomcat (tested on Tomcat 6.0.20)
-########################################
-
-We assume that you have a clean Tomcat version of GateIn: ie We assume that you have already all the jar files of GateIn and their dependencies
-into tomcat/lib and you have the related relam name "gatein-domain" defined in the file tomcat/conf/jaas.conf
-
-1. Add the file sample-ext.war from sample/extension/war/target/ to the tomcat/webapps directory
-2. Add the folder starter from starter/war/target/ to the tomcat/webapps directory
-3. Rename the directory (unzipped folder) starter to "starter.war" (for more details see the warning below)
-4. Add the jar file exo.portal.sample.extension.config-X.Y.Z.jar from sample/extension/config/target/ to the tomcat/lib directory
-5. Add the jar file exo.portal.sample.extension.jar-X.Y.Z.jar from sample/extension/jar/target/ to the tomcat/lib directory
-
-WARNING: This can only work if the starter.war is the last war file to be loaded, so don't hesitate to rename it if your war files are loaded
-following to the alphabetic order
-
-########################################
# HOW TO TEST
########################################
@@ -65,13 +49,3 @@
1. Go to the bin directory of jboss
2. Launch "./run.sh" or "run.bat"
3. When jboss is ready, you can launch your web browser and access to http://localhost:8080/portal
-
-########################################
-# On Tomcat (tested on Tomcat 6.0.20)
-########################################
-
-You need to:
-
-1. Go to the bin directory of tomcat
-2. Launch "./gatein.sh run" or "gatein.bat run"
-3. When tomcat is ready, you can launch your web browser and access to http://localhost:8080/portal
Modified: epp/portal/branches/EPP_5_1_Branch/examples/portal/README.txt
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/examples/portal/README.txt 2010-09-28 07:34:35 UTC (rev 4403)
+++ epp/portal/branches/EPP_5_1_Branch/examples/portal/README.txt 2010-09-28 07:36:11 UTC (rev 4404)
@@ -22,7 +22,7 @@
########################################
########################################
-# On JBoss (tested on JBoss 5.1.0.GA)
+# On JBoss
########################################
We assume that you have a clean JBoss version of GateIn: ie We assume that you have already the file gatein.ear in the deploy directory
@@ -37,62 +37,6 @@
the load order is first the gatein.ear then the sample-portal.ear and finally the starter.ear
########################################
-# On Tomcat (tested on Tomcat 6.0.20)
-########################################
-
-We assume that you have a clean Tomcat version of GateIn: ie We assume that you have already all the jar files of GateIn and their dependencies
-into tomcat/lib and you have the related relam name "gatein-domain" defined in the file tomcat/conf/jaas.conf
-
-1. Add the file sample-portal.war from sample/portal/war/target/ to the tomcat/webapps directory
-2. Add the file rest-sample-portal.war from sample/portal/rest-war/target/ to the tomcat/webapps directory
-3. Add the folder starter from starter/war/target/ to the tomcat/webapps directory
-4. Rename the directory (unzipped folder) starter to "starter.war" (for more details see the warning below)
-5. Add the jar file exo.portal.sample.portal.config-X.Y.Z.jar from sample/portal/config/target/ to the tomcat/lib directory
-6. Add the jar file exo.portal.sample.portal.jar-X.Y.Z.jar from sample/portal/jar/target/ to the tomcat/lib directory
-7. Define the related realm in your file tomcat/conf/jaas.conf, as below:
-
-gatein-domain-sample-portal {
- org.exoplatform.web.security.PortalLoginModule required
- portalContainerName="sample-portal"
- realmName="gatein-domain-sample-portal";
- org.exoplatform.services.security.jaas.SharedStateLoginModule required
- portalContainerName="sample-portal"
- realmName="gatein-domain-sample-portal";
- org.exoplatform.services.security.j2ee.TomcatLoginModule required
- portalContainerName="sample-portal"
- realmName="gatein-domain-sample-portal";
-};
-8. Define the context of sample-portal by creating a file called "sample-portal.xml" in tomcat/conf/Catalina/localhost/ with the following content
-
-<Context path='/sample-portal' docBase='sample-portal' debug='0' reloadable='true' crossContext='true' privileged='true'>
- <Logger className='org.apache.catalina.logger.SystemOutLogger'
- prefix='localhost_portal_log.' suffix='.txt' timestamp='true'/>
- <Manager className='org.apache.catalina.session.PersistentManager' saveOnRestart='false'/>
- <Realm className='org.apache.catalina.realm.JAASRealm'
- appName='gatein-domain-sample-portal'
- userClassNames='org.exoplatform.services.security.jaas.UserPrincipal'
- roleClassNames='org.exoplatform.services.security.jaas.RolePrincipal'
- debug='0' cache='false'/>
- <Valve className='org.apache.catalina.authenticator.FormAuthenticator' characterEncoding='UTF-8'/></Context>
-
-9. Define the context of rest-sample-portal by creating a file called "rest-sample-portal.xml" in tomcat/conf/Catalina/localhost/ with the following content
-
-<Context path="/rest-sample-portal" docBase="rest-sample-portal" reloadable="true" crossContext="false">
-
- <Logger className='org.apache.catalina.logger.SystemOutLogger'
- prefix='localhost_portal_log.' suffix='.txt' timestamp='true'/>
- <Manager className='org.apache.catalina.session.PersistentManager' saveOnRestart='false'/>
- <Realm className='org.apache.catalina.realm.JAASRealm'
- appName='gatein-domain-sample-portal'
- userClassNames="org.exoplatform.services.security.jaas.UserPrincipal"
- roleClassNames="org.exoplatform.services.security.jaas.RolePrincipal"
- debug='0' cache='false'/>
-</Context>
-
-WARNING: This can only work if the starter.war is the last war file to be loaded, so don't hesitate to rename it if your war files are loaded
-following to the alphabetic order
-
-########################################
# HOW TO TEST
########################################
@@ -105,13 +49,3 @@
1. Go to the bin directory of jboss
2. Launch "./run.sh" or "run.bat"
3. When jboss is ready, you can launch your web browser and access to http://localhost:8080/sample-portal
-
-########################################
-# On Tomcat (tested on Tomcat 6.0.20)
-########################################
-
-You need to:
-
-1. Go to the bin directory of tomcat
-2. Launch "./gatein.sh run" or "gatein.bat run"
-3. When tomcat is ready, you can launch your web browser and access to http://localhost:8080/sample-portal
Modified: epp/portal/branches/EPP_5_1_Branch/packaging/module/src/main/javascript/portal.packaging.module.js
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/packaging/module/src/main/javascript/portal.packaging.module.js 2010-09-28 07:34:35 UTC (rev 4403)
+++ epp/portal/branches/EPP_5_1_Branch/packaging/module/src/main/javascript/portal.packaging.module.js 2010-09-28 07:36:11 UTC (rev 4404)
@@ -275,14 +275,6 @@
module.server = {}
- module.server.tomcat = {}
- module.server.tomcat.patch =
- new Project("org.exoplatform.portal", "exo.portal.server.tomcat.patch", "jar", module.version);
-
- module.server.jboss = {}
- module.server.jboss.patch =
- new Project("org.exoplatform.portal", "exo.portal.server.jboss.patch", "jar", module.version);
-
module.server.jbossear = {}
module.server.jbossear.patch =
new Project("org.exoplatform.portal", "exo.portal.server.jboss.patch-ear", "jar", module.version);
Deleted: epp/portal/branches/EPP_5_1_Branch/packaging/pkg/src/main/assembly/tomcat-zip.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/packaging/pkg/src/main/assembly/tomcat-zip.xml 2010-09-28 07:34:35 UTC (rev 4403)
+++ epp/portal/branches/EPP_5_1_Branch/packaging/pkg/src/main/assembly/tomcat-zip.xml 2010-09-28 07:36:11 UTC (rev 4404)
@@ -1,49 +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.
-
--->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
- <id>tomcat</id>
- <formats>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>target/tomcat</directory>
- <outputDirectory>${project.build.finalName}</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <excludes>
- <exclude>**/*.sh</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>target/tomcat</directory>
- <outputDirectory>${project.build.finalName}</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <includes>
- <include>**/*.sh</include>
- </includes>
- <fileMode>755</fileMode>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_1_Branch/packaging/product/src/main/javascript/portal.packaging.product.js
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/packaging/product/src/main/javascript/portal.packaging.product.js 2010-09-28 07:34:35 UTC (rev 4403)
+++ epp/portal/branches/EPP_5_1_Branch/packaging/product/src/main/javascript/portal.packaging.product.js 2010-09-28 07:36:11 UTC (rev 4404)
@@ -49,8 +49,6 @@
product.addDependencies(portal.ibm.jdk.support);
- product.addServerPatch("tomcat", portal.server.tomcat.patch) ;
- product.addServerPatch("jboss", portal.server.jboss.patch) ;
product.addServerPatch("jbossear", portal.server.jbossear.patch) ;
/* cleanup duplicated lib */
Modified: epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml 2010-09-28 07:34:35 UTC (rev 4403)
+++ epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml 2010-09-28 07:36:11 UTC (rev 4404)
@@ -30,7 +30,6 @@
ex: On Linux '/home/user/AS'
-->
<exo.projects.directory.dependencies>REPLACE_WITH_YOUR_OWN_DIRECTORY</exo.projects.directory.dependencies>
-
<!--
If you want that the server is deployed always at the same place (not in packaging/pkg/target/<server> dir)
Uncomment and Replace with the directory you prefer
@@ -39,10 +38,6 @@
<gatein.working.dir>REPLACE_WITH_SERVER_DIR</gatein.working.dir>
-->
<!--
- Replace with the name of the directory containing Tomcat 6
- -->
- <exo.projects.app.tomcat.version>apache-tomcat-6.0.20</exo.projects.app.tomcat.version>
- <!--
Replace with the name of the directory containing JBoss AS 5.1
-->
<exo.projects.app.jboss.version>jboss-5.1.0.GA</exo.projects.app.jboss.version>
Modified: epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml.template
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml.template 2010-09-28 07:34:35 UTC (rev 4403)
+++ epp/portal/branches/EPP_5_1_Branch/packaging/profiles.xml.template 2010-09-28 07:36:11 UTC (rev 4404)
@@ -38,12 +38,7 @@
<!--
<gatein.working.dir>REPLACE_WITH_SERVER_DIR</gatein.working.dir>
-->
-
<!--
- Replace with the name of the directory containing Tomcat 6
- -->
- <exo.projects.app.tomcat.version>apache-tomcat-6.0.20</exo.projects.app.tomcat.version>
- <!--
Replace with the name of the directory containing JBoss AS 5.1
-->
<exo.projects.app.jboss.version>jboss-5.1.0.GA</exo.projects.app.jboss.version>
Modified: epp/portal/branches/EPP_5_1_Branch/packaging/reports/build.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/packaging/reports/build.xml 2010-09-28 07:34:35 UTC (rev 4403)
+++ epp/portal/branches/EPP_5_1_Branch/packaging/reports/build.xml 2010-09-28 07:36:11 UTC (rev 4404)
@@ -28,7 +28,6 @@
<target name="generate-report">
<available file="${jboss_scan_dir}" property="perform_jboss_scan"/>
- <available file="${tomcat_scan_dir}" property="perform_tomcat_scan"/>
<contrib:if>
<contrib:equals arg1="${perform_jboss_scan}" arg2="true"/>
@@ -36,13 +35,6 @@
<antcall target="generate-report-from-jboss" />
</contrib:then>
</contrib:if>
-
- <contrib:if>
- <contrib:equals arg1="${perform_tomcat_scan}" arg2="true"/>
- <contrib:then>
- <antcall target="generate-report-from-tomcat" />
- </contrib:then>
- </contrib:if>
</target>
<target name="generate-report-from-jboss">
@@ -53,14 +45,5 @@
<tattletale:report scanDir="${jboss_scan_dir}" outputDir="${jboss_output_dir}" />
</target>
-
- <target name="generate-report-from-tomcat">
- <echo message="Report based on Tomcat deploy" />
- <echo message="Tattletale scan dir: ${tomcat_scan_dir}" />
- <echo message="Tattletale output dir: ${tomcat_output_dir}" />
- <echo message="Generating ..." />
-
- <tattletale:report scanDir="${tomcat_scan_dir}" outputDir="${tomcat_output_dir}" />
- </target>
</project>
Modified: epp/portal/branches/EPP_5_1_Branch/packaging/reports/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/packaging/reports/pom.xml 2010-09-28 07:34:35 UTC (rev 4403)
+++ epp/portal/branches/EPP_5_1_Branch/packaging/reports/pom.xml 2010-09-28 07:36:11 UTC (rev 4404)
@@ -68,10 +68,7 @@
<configuration>
<tasks>
<property name="jboss_output_dir" value="${project.build.directory}/jboss-tattletale" />
- <property name="tomcat_output_dir" value="${project.build.directory}/tomcat-tattletale" />
- <property name="jboss_scan_dir" value="${basedir}/../pkg/target/jboss/server/default/deploy/gatein.ear/lib" />
- <property name="tomcat_scan_dir" value="${basedir}/../pkg/target/tomcat/lib" />
-
+ <property name="jboss_scan_dir" value="${basedir}/../pkg/target/jboss/server/default/deploy/gatein.ear/lib" />
<ant antfile="build.xml">
<target name="generate-report" />
</ant>
Modified: epp/portal/branches/EPP_5_1_Branch/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/server/pom.xml 2010-09-28 07:34:35 UTC (rev 4403)
+++ epp/portal/branches/EPP_5_1_Branch/server/pom.xml 2010-09-28 07:36:11 UTC (rev 4404)
@@ -35,7 +35,6 @@
<name>GateIn Portal Server</name>
<modules>
- <module>tomcat</module>
<module>jboss</module>
</modules>
14 years, 3 months
- 1
- 0
gatein SVN: r4403 - in epp/portal/branches/EPP_5_1_Branch: component/wsrp and 9 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-09-28 03:34:35 -0400 (Tue, 28 Sep 2010)
New Revision: 4403
Added:
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/StoresByPathManager.java
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportErrorMapping.java
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfoMapping.java
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfosMapping.java
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportedStateMapping.java
epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml
Removed:
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportErrorMapping.java
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfoMapping.java
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfosMapping.java
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportedStateMapping.java
Modified:
epp/portal/branches/EPP_5_1_Branch/component/wsrp/pom.xml
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/WSRPServiceIntegration.java
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java
epp/portal/branches/EPP_5_1_Branch/pom.xml
epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml
Log:
JBEPP-506: Merge WSRP-2 changes
Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/pom.xml 2010-09-28 03:32:25 UTC (rev 4402)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/pom.xml 2010-09-28 07:34:35 UTC (rev 4403)
@@ -46,6 +46,10 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.gatein.mop</groupId>
+ <artifactId>mop-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-integration-api</artifactId>
<scope>provided</scope>
@@ -75,6 +79,11 @@
<artifactId>exo.portal.component.common</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.component.portal</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.exoplatform.jcr</groupId>
Copied: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java (from rev 4359, portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java 2010-09-28 07:34:35 UTC (rev 4403)
@@ -0,0 +1,214 @@
+/*
+ * 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.portal.wsrp;
+
+import org.exoplatform.container.ExoContainer;
+import org.exoplatform.portal.mop.Described;
+import org.exoplatform.portal.pom.config.POMSession;
+import org.exoplatform.portal.pom.config.POMSessionManager;
+import org.exoplatform.portal.pom.data.PageKey;
+import org.exoplatform.portal.pom.spi.wsrp.WSRP;
+import org.gatein.common.util.ParameterValidation;
+import org.gatein.mop.api.content.Customization;
+import org.gatein.mop.api.workspace.ObjectType;
+import org.gatein.mop.api.workspace.Page;
+import org.gatein.mop.api.workspace.Site;
+import org.gatein.mop.api.workspace.Workspace;
+import org.gatein.mop.api.workspace.ui.UIComponent;
+import org.gatein.mop.api.workspace.ui.UIContainer;
+import org.gatein.mop.api.workspace.ui.UIWindow;
+import org.gatein.pc.api.PortletContext;
+import org.gatein.pc.api.PortletStateType;
+import org.gatein.pc.api.StatefulPortletContext;
+import org.gatein.wsrp.api.PortalStructureProvider;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class MOPPortalStructureProvider implements PortalStructureProvider
+{
+ private final POMSessionManager pomManager;
+ private Map<String, PageInfo> pageInfos;
+ private Map<String, String> windowIdToUUIDs;
+
+ public MOPPortalStructureProvider(ExoContainer container)
+ {
+ pomManager = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class);
+ windowIdToUUIDs = new HashMap<String, String>();
+ }
+
+ public List<String> getPageIdentifiers()
+ {
+ if (pageInfos == null)
+ {
+ POMSession session = pomManager.getSession();
+ Workspace workspace = session.getWorkspace();
+ Collection<Site> sites = workspace.getSites(ObjectType.PORTAL_SITE);
+
+ pageInfos = new HashMap<String, PageInfo>();
+ for (Site site : sites)
+ {
+ Page page = site.getRootPage().getChild("pages");
+ if (page != null)
+ {
+ processPage(page, true);
+ }
+ }
+ }
+
+ LinkedList<String> identifiers = new LinkedList<String>(pageInfos.keySet());
+ Collections.sort(identifiers);
+ return identifiers;
+ }
+
+ private void processPage(Page page, boolean ignoreCurrent)
+ {
+ if (!ignoreCurrent)
+ {
+ Described described = page.adapt(Described.class);
+ PageInfo pageInfo = new PageInfo(page.getObjectId());
+ pageInfos.put(described.getName(), pageInfo);
+ UIContainer container = page.getRootComponent();
+ processContainer(container, pageInfo);
+ }
+
+ Collection<Page> children = page.getChildren();
+ if (ParameterValidation.existsAndIsNotEmpty(children))
+ {
+ for (Page child : children)
+ {
+ processPage(child, false);
+ }
+ }
+ }
+
+ public List<String> getWindowIdentifiersFor(String pageId)
+ {
+ PageInfo pageInfo = pageInfos.get(pageId);
+ ParameterValidation.throwIllegalArgExceptionIfNull(pageInfo, "PageInfo for " + pageId);
+
+ return pageInfo.getChildrenWindows();
+ }
+
+ private void processContainer(UIContainer container, PageInfo pageInfo)
+ {
+ List<UIComponent> components = container.getComponents();
+ for (UIComponent component : components)
+ {
+ ObjectType<? extends UIComponent> type = component.getObjectType();
+ if (ObjectType.WINDOW.equals(type))
+ {
+ Described described = component.adapt(Described.class);
+ String name = described.getName();
+ windowIdToUUIDs.put(name, component.getObjectId());
+ pageInfo.addWindow(name);
+ }
+ else if (ObjectType.CONTAINER.equals(type))
+ {
+ processContainer((UIContainer)component, pageInfo);
+ }
+ else
+ {
+ // ignore
+ }
+ }
+ }
+
+ public void assignPortletToWindow(PortletContext portletContext, String windowId, String pageId)
+ {
+ String uuid = windowIdToUUIDs.get(windowId);
+ ParameterValidation.throwIllegalArgExceptionIfNull(uuid, "UUID for " + windowId);
+
+ // get the window
+ POMSession session = pomManager.getSession();
+ UIWindow window = session.findObjectById(ObjectType.WINDOW, uuid);
+
+ // construct the new customization state
+ WSRP wsrp = new WSRP();
+ String portletId = portletContext.getId();
+ wsrp.setPortletId(portletId);
+ if (portletContext instanceof StatefulPortletContext)
+ {
+ StatefulPortletContext context = (StatefulPortletContext)portletContext;
+ if (PortletStateType.OPAQUE.equals(context.getType()))
+ {
+ wsrp.setState((byte[])context.getState());
+ }
+ else
+ {
+ throw new IllegalArgumentException("Don't know how to deal with state: " + context.getState());
+ }
+ }
+
+ // destroy existing customization as otherwise re-customizing will fail
+ Customization<?> customization = window.getCustomization();
+ customization.destroy();
+
+ // and re-customize
+ window.customize(WSRP.CONTENT_TYPE, portletId, wsrp);
+
+ // mark page for cache invalidation otherwise DataCache will use the previous customization id when trying to set
+ // the portlet state in UIPortlet.setState and will not find it resulting in an error
+ Page page = window.getPage();
+ session.scheduleForEviction(new PageKey("portal", page.getSite().getName(), page.getName()));
+
+ // save
+ session.close(true);
+ }
+
+ private static class PageInfo
+ {
+ private String uuid;
+ private List<String> childrenWindows;
+
+ private PageInfo(String uuid)
+ {
+ this.uuid = uuid;
+ childrenWindows = new LinkedList<String>();
+ }
+
+ public String getUUID()
+ {
+ return uuid;
+ }
+
+ public List<String> getChildrenWindows()
+ {
+ return childrenWindows;
+ }
+
+ public void addWindow(String windowName)
+ {
+ childrenWindows.add(windowName);
+ }
+ }
+}
Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/WSRPServiceIntegration.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/WSRPServiceIntegration.java 2010-09-28 03:32:25 UTC (rev 4402)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/WSRPServiceIntegration.java 2010-09-28 07:34:35 UTC (rev 4403)
@@ -40,6 +40,7 @@
import org.gatein.pc.portlet.state.producer.PortletStatePersistenceManager;
import org.gatein.pc.portlet.state.producer.ProducerPortletInvoker;
import org.gatein.portal.wsrp.state.consumer.JCRConsumerRegistry;
+import org.gatein.portal.wsrp.state.migration.JCRMigrationService;
import org.gatein.portal.wsrp.state.producer.configuration.JCRProducerConfigurationService;
import org.gatein.portal.wsrp.state.producer.registrations.JCRRegistrationPersistenceManager;
import org.gatein.portal.wsrp.state.producer.state.JCRPortletStatePersistenceManager;
@@ -54,9 +55,11 @@
import org.gatein.wci.WebAppListener;
import org.gatein.wci.impl.DefaultServletContainerFactory;
import org.gatein.wsrp.WSRPConstants;
+import org.gatein.wsrp.consumer.migration.MigrationService;
import org.gatein.wsrp.consumer.registry.ActivatingNullInvokerHandler;
import org.gatein.wsrp.consumer.registry.ConsumerRegistry;
import org.gatein.wsrp.producer.ProducerHolder;
+import org.gatein.wsrp.producer.WSRPPortletInvoker;
import org.gatein.wsrp.producer.WSRPProducer;
import org.gatein.wsrp.producer.config.ProducerConfigurationService;
import org.picocontainer.Startable;
@@ -198,10 +201,15 @@
producerPortletInvoker.setPersistenceManager(producerPersistenceManager);
producerPortletInvoker.setStateManagementPolicy(producerStateManagementPolicy);
producerPortletInvoker.setStateConverter(producerStateConverter);
+
+ WSRPPortletInvoker wsrpPortletInvoker = new WSRPPortletInvoker();
+ wsrpPortletInvoker.setNext(producerPortletInvoker);
+ wsrpPortletInvoker.setRegistrationManager(registrationManager);
+
// create and wire WSRP producer
producer = ProducerHolder.getProducer(true);
- producer.setPortletInvoker(producerPortletInvoker);
+ producer.setPortletInvoker(wsrpPortletInvoker);
producer.setRegistrationManager(registrationManager);
producer.setConfigurationService(producerConfigurationService);
@@ -227,6 +235,12 @@
consumerRegistry = new JCRConsumerRegistry(container);
consumerRegistry.setFederatingPortletInvoker(federatingPortletInvoker);
consumerRegistry.setSessionEventBroadcaster(sessionEventBroadcaster);
+
+ // migration service
+ MigrationService migrationService = new JCRMigrationService(container);
+ migrationService.setStructureProvider(new MOPPortalStructureProvider(container));
+ consumerRegistry.setMigrationService(migrationService);
+
consumerRegistry.start();
// set up a NullInvokerHandler so that when a remote producer is queried, we can start it if needed
Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java 2010-09-28 03:32:25 UTC (rev 4402)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java 2010-09-28 07:34:35 UTC (rev 4403)
@@ -100,7 +100,26 @@
session.save();
}
+ public <T> boolean delete(T toDelete, StoresByPathManager<T> manager)
+ {
+ ChromatticSession session = getSession();
+ Object old = session.findByPath(toDelete.getClass(), manager.getChildPath(toDelete));
+
+ if (old != null)
+ {
+ session.remove(old);
+ closeSession(session, true);
+ return true;
+ }
+ else
+ {
+ closeSession(session, false);
+ return false;
+ }
+
+ }
+
public static class WSRPSessionLifeCycle implements SessionLifeCycle
{
private ManageableRepository repository;
@@ -234,12 +253,12 @@
return encode(s);
}
- private String decode(String s)
+ public static String decode(String s)
{
return s.replace(CLOSE_BRACE_REPLACEMENT, CLOSE_BRACE).replace(OPEN_BRACE_REPLACEMENT, OPEN_BRACE).replace(COLON_REPLACEMENT, COLON);
}
- private String encode(String s)
+ public static String encode(String s)
{
return s.replace(OPEN_BRACE, OPEN_BRACE_REPLACEMENT).replace(CLOSE_BRACE, CLOSE_BRACE_REPLACEMENT).replace(COLON, COLON_REPLACEMENT);
}
@@ -252,6 +271,11 @@
public String decodeNodeName(FormatterContext formatterContext, String s)
{
+ return decode(s);
+ }
+
+ public static String decode(String s)
+ {
return s.replace(SLASH_REPLACEMENT, SLASH);
}
Copied: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/StoresByPathManager.java (from rev 4359, portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/StoresByPathManager.java)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/StoresByPathManager.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/StoresByPathManager.java 2010-09-28 07:34:35 UTC (rev 4403)
@@ -0,0 +1,33 @@
+/*
+ * 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.portal.wsrp.state;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public interface StoresByPathManager<C>
+{
+ String getChildPath(C needsComputedPath);
+}
Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java 2010-09-28 03:32:25 UTC (rev 4402)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java 2010-09-28 07:34:35 UTC (rev 4403)
@@ -26,6 +26,7 @@
import org.chromattic.api.ChromatticSession;
import org.exoplatform.container.ExoContainer;
import org.gatein.portal.wsrp.state.JCRPersister;
+import org.gatein.portal.wsrp.state.StoresByPathManager;
import org.gatein.portal.wsrp.state.consumer.mapping.EndpointInfoMapping;
import org.gatein.portal.wsrp.state.consumer.mapping.ProducerInfoMapping;
import org.gatein.portal.wsrp.state.consumer.mapping.ProducerInfosMapping;
@@ -46,7 +47,7 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-public class JCRConsumerRegistry extends AbstractConsumerRegistry
+public class JCRConsumerRegistry extends AbstractConsumerRegistry implements StoresByPathManager<ProducerInfo>
{
// private NewJCRPersister persister;
private JCRPersister persister;
@@ -89,10 +90,7 @@
@Override
protected void delete(ProducerInfo info)
{
- ChromatticSession session = persister.getSession();
- delete(session, getPathFor(info));
-
- persister.closeSession(session, true);
+ persister.delete(info, this);
}
@Override
@@ -168,14 +166,9 @@
return producerInfosMapping;
}
- private void delete(ChromatticSession session, String path)
+ public String getChildPath(ProducerInfo needsComputedPath)
{
- ProducerInfoMapping old = session.findByPath(ProducerInfoMapping.class, path);
-
- if (old != null)
- {
- session.remove(old);
- }
+ return getPathFor(needsComputedPath);
}
private static String getPathFor(ProducerInfo info)
Copied: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration (from rev 4359, portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration)
Deleted: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java 2010-09-23 13:34:42 UTC (rev 4359)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java 2010-09-28 07:34:35 UTC (rev 4403)
@@ -1,186 +0,0 @@
-/*
- * 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.portal.wsrp.state.migration;
-
-import org.chromattic.api.ChromatticSession;
-import org.exoplatform.container.ExoContainer;
-import org.gatein.common.util.ParameterValidation;
-import org.gatein.portal.wsrp.state.JCRPersister;
-import org.gatein.portal.wsrp.state.StoresByPathManager;
-import org.gatein.portal.wsrp.state.migration.mapping.ExportErrorMapping;
-import org.gatein.portal.wsrp.state.migration.mapping.ExportInfoMapping;
-import org.gatein.portal.wsrp.state.migration.mapping.ExportInfosMapping;
-import org.gatein.portal.wsrp.state.migration.mapping.ExportedStateMapping;
-import org.gatein.wsrp.api.PortalStructureProvider;
-import org.gatein.wsrp.consumer.migration.ExportInfo;
-import org.gatein.wsrp.consumer.migration.MigrationService;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
- * @version $Revision$
- */
-public class JCRMigrationService implements MigrationService, StoresByPathManager<ExportInfo>
-{
- private PortalStructureProvider structureProvider;
- private JCRPersister persister;
- private static final String EXPORT_INFOS_PATH = ExportInfosMapping.NODE_NAME;
- private int exportInfosCount = -1;
-
- public JCRMigrationService(ExoContainer container) throws Exception
- {
- List<Class> mappingClasses = new ArrayList<Class>(4);
- Collections.addAll(mappingClasses, ExportInfosMapping.class, ExportInfoMapping.class, ExportedStateMapping.class,
- ExportErrorMapping.class);
-
- persister = new JCRPersister(container, JCRPersister.WSRP_WORKSPACE_NAME);
- persister.initializeBuilderFor(mappingClasses);
- }
-
- public PortalStructureProvider getStructureProvider()
- {
- return structureProvider;
- }
-
- public void setStructureProvider(PortalStructureProvider structureProvider)
- {
- ParameterValidation.throwIllegalArgExceptionIfNull(structureProvider, "PortalStructureProvider");
- this.structureProvider = structureProvider;
- }
-
- public List<ExportInfo> getAvailableExportInfos()
- {
- ChromatticSession session = persister.getSession();
-
- ExportInfosMapping exportInfosMapping = getExportInfosMapping(session);
-
- List<ExportInfoMapping> exportInfoMappings = exportInfosMapping.getExportInfos();
- List<ExportInfo> exportInfos = new ArrayList<ExportInfo>(exportInfoMappings.size());
- for (ExportInfoMapping eim : exportInfoMappings)
- {
- exportInfos.add(eim.toExportInfo());
- }
-
- persister.closeSession(session, false);
-
- exportInfosCount = exportInfos.size();
-
- return exportInfos;
- }
-
- private ExportInfosMapping getExportInfosMapping(ChromatticSession session)
- {
- ExportInfosMapping exportInfosMapping = session.findByPath(ExportInfosMapping.class, ExportInfosMapping.NODE_NAME);
- if(exportInfosMapping == null)
- {
- exportInfosMapping = session.insert(ExportInfosMapping.class, ExportInfosMapping.NODE_NAME);
- exportInfosCount = 0;
- }
-
- return exportInfosMapping;
- }
-
- public ExportInfo getExportInfo(long exportTime)
- {
- ChromatticSession session = persister.getSession();
-
- ExportInfoMapping eim = session.findByPath(ExportInfoMapping.class, getPathFor(exportTime));
-
- if(eim != null)
- {
- return eim.toExportInfo();
- }
- else
- {
- return null;
- }
- }
-
- public void add(ExportInfo info)
- {
- ChromatticSession session = persister.getSession();
-
- ExportInfoMapping eim = session.findByPath(ExportInfoMapping.class, getChildPath(info));
- long exportTime = info.getExportTime();
- if(eim != null)
- {
- throw new IllegalArgumentException("An ExportInfo with export time "
- + exportTime + " already exists!");
- }
- else
- {
- ExportInfosMapping exportInfosMapping = getExportInfosMapping(session);
- String exportTimeAsString = "" + exportTime;
- ExportInfoMapping exportInfo = exportInfosMapping.createExportInfo(exportTimeAsString);
- session.persist(exportInfosMapping, exportInfo, exportTimeAsString);
- exportInfo.initFrom(info);
-
- persister.closeSession(session, true);
- exportInfosCount++;
- }
- }
-
- public ExportInfo remove(ExportInfo info)
- {
- if (persister.delete(info, this))
- {
- exportInfosCount--;
- return info;
- }
- else
- {
- return null;
- }
- }
-
- public boolean isAvailableExportInfosEmpty()
- {
- if(exportInfosCount == -1)
- {
- ChromatticSession session = persister.getSession();
- ExportInfosMapping mappings = getExportInfosMapping(session);
- exportInfosCount = mappings.getExportInfos().size();
- }
-
- return exportInfosCount == 0;
- }
-
- public String getParentPath()
- {
- return EXPORT_INFOS_PATH;
- }
-
- public String getChildPath(ExportInfo exportInfo)
- {
- return getPathFor(exportInfo.getExportTime());
- }
-
- private String getPathFor(final long exportTime)
- {
- return getParentPath() + "/" + exportTime;
- }
-}
Copied: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java (from rev 4359, portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java 2010-09-28 07:34:35 UTC (rev 4403)
@@ -0,0 +1,186 @@
+/*
+ * 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.portal.wsrp.state.migration;
+
+import org.chromattic.api.ChromatticSession;
+import org.exoplatform.container.ExoContainer;
+import org.gatein.common.util.ParameterValidation;
+import org.gatein.portal.wsrp.state.JCRPersister;
+import org.gatein.portal.wsrp.state.StoresByPathManager;
+import org.gatein.portal.wsrp.state.migration.mapping.ExportErrorMapping;
+import org.gatein.portal.wsrp.state.migration.mapping.ExportInfoMapping;
+import org.gatein.portal.wsrp.state.migration.mapping.ExportInfosMapping;
+import org.gatein.portal.wsrp.state.migration.mapping.ExportedStateMapping;
+import org.gatein.wsrp.api.PortalStructureProvider;
+import org.gatein.wsrp.consumer.migration.ExportInfo;
+import org.gatein.wsrp.consumer.migration.MigrationService;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class JCRMigrationService implements MigrationService, StoresByPathManager<ExportInfo>
+{
+ private PortalStructureProvider structureProvider;
+ private JCRPersister persister;
+ private static final String EXPORT_INFOS_PATH = ExportInfosMapping.NODE_NAME;
+ private int exportInfosCount = -1;
+
+ public JCRMigrationService(ExoContainer container) throws Exception
+ {
+ List<Class> mappingClasses = new ArrayList<Class>(4);
+ Collections.addAll(mappingClasses, ExportInfosMapping.class, ExportInfoMapping.class, ExportedStateMapping.class,
+ ExportErrorMapping.class);
+
+ persister = new JCRPersister(container, JCRPersister.WSRP_WORKSPACE_NAME);
+ persister.initializeBuilderFor(mappingClasses);
+ }
+
+ public PortalStructureProvider getStructureProvider()
+ {
+ return structureProvider;
+ }
+
+ public void setStructureProvider(PortalStructureProvider structureProvider)
+ {
+ ParameterValidation.throwIllegalArgExceptionIfNull(structureProvider, "PortalStructureProvider");
+ this.structureProvider = structureProvider;
+ }
+
+ public List<ExportInfo> getAvailableExportInfos()
+ {
+ ChromatticSession session = persister.getSession();
+
+ ExportInfosMapping exportInfosMapping = getExportInfosMapping(session);
+
+ List<ExportInfoMapping> exportInfoMappings = exportInfosMapping.getExportInfos();
+ List<ExportInfo> exportInfos = new ArrayList<ExportInfo>(exportInfoMappings.size());
+ for (ExportInfoMapping eim : exportInfoMappings)
+ {
+ exportInfos.add(eim.toExportInfo());
+ }
+
+ persister.closeSession(session, false);
+
+ exportInfosCount = exportInfos.size();
+
+ return exportInfos;
+ }
+
+ private ExportInfosMapping getExportInfosMapping(ChromatticSession session)
+ {
+ ExportInfosMapping exportInfosMapping = session.findByPath(ExportInfosMapping.class, ExportInfosMapping.NODE_NAME);
+ if(exportInfosMapping == null)
+ {
+ exportInfosMapping = session.insert(ExportInfosMapping.class, ExportInfosMapping.NODE_NAME);
+ exportInfosCount = 0;
+ }
+
+ return exportInfosMapping;
+ }
+
+ public ExportInfo getExportInfo(long exportTime)
+ {
+ ChromatticSession session = persister.getSession();
+
+ ExportInfoMapping eim = session.findByPath(ExportInfoMapping.class, getPathFor(exportTime));
+
+ if(eim != null)
+ {
+ return eim.toExportInfo();
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ public void add(ExportInfo info)
+ {
+ ChromatticSession session = persister.getSession();
+
+ ExportInfoMapping eim = session.findByPath(ExportInfoMapping.class, getChildPath(info));
+ long exportTime = info.getExportTime();
+ if(eim != null)
+ {
+ throw new IllegalArgumentException("An ExportInfo with export time "
+ + exportTime + " already exists!");
+ }
+ else
+ {
+ ExportInfosMapping exportInfosMapping = getExportInfosMapping(session);
+ String exportTimeAsString = "" + exportTime;
+ ExportInfoMapping exportInfo = exportInfosMapping.createExportInfo(exportTimeAsString);
+ session.persist(exportInfosMapping, exportInfo, exportTimeAsString);
+ exportInfo.initFrom(info);
+
+ persister.closeSession(session, true);
+ exportInfosCount++;
+ }
+ }
+
+ public ExportInfo remove(ExportInfo info)
+ {
+ if (persister.delete(info, this))
+ {
+ exportInfosCount--;
+ return info;
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ public boolean isAvailableExportInfosEmpty()
+ {
+ if(exportInfosCount == -1)
+ {
+ ChromatticSession session = persister.getSession();
+ ExportInfosMapping mappings = getExportInfosMapping(session);
+ exportInfosCount = mappings.getExportInfos().size();
+ }
+
+ return exportInfosCount == 0;
+ }
+
+ public String getParentPath()
+ {
+ return EXPORT_INFOS_PATH;
+ }
+
+ public String getChildPath(ExportInfo exportInfo)
+ {
+ return getPathFor(exportInfo.getExportTime());
+ }
+
+ private String getPathFor(final long exportTime)
+ {
+ return getParentPath() + "/" + exportTime;
+ }
+}
Copied: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping (from rev 4359, portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping)
Deleted: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportErrorMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportErrorMapping.java 2010-09-23 13:34:42 UTC (rev 4359)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportErrorMapping.java 2010-09-28 07:34:35 UTC (rev 4403)
@@ -1,84 +0,0 @@
-/*
- * 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.portal.wsrp.state.migration.mapping;
-
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.Property;
-import org.gatein.common.util.ParameterValidation;
-
-import javax.xml.namespace.QName;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
- * @version $Revision$
- */
-@PrimaryType(name = ExportErrorMapping.NODE_NAME)
-public abstract class ExportErrorMapping
-{
- public static final String NODE_NAME = "wsrp:exporterror";
- private static final String COMMA = ",";
-
- @Property(name = "errorcode")
- public abstract String getCode();
-
- public abstract void setCode(String code);
-
- @Property(name = "handles")
- public abstract String getHandles();
-
- public abstract void setHandles(String handles);
-
- public QName getErrorCode()
- {
- return QName.valueOf(getCode());
- }
-
- public List<String> getPortletHandles()
- {
- return Arrays.asList(getHandles().split(COMMA));
- }
-
- public void initFrom(QName errorCode, List<String> handles)
- {
- setCode(errorCode.toString());
-
- if (ParameterValidation.existsAndIsNotEmpty(handles))
- {
- StringBuilder sb = new StringBuilder();
- int size = handles.size();
- int index = 0;
- for (String handle : handles)
- {
- sb.append(handle);
- if (index++ < size)
- {
- sb.append(COMMA);
- }
- }
- setHandles(sb.toString());
- }
- }
-}
Copied: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportErrorMapping.java (from rev 4359, portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportErrorMapping.java)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportErrorMapping.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportErrorMapping.java 2010-09-28 07:34:35 UTC (rev 4403)
@@ -0,0 +1,84 @@
+/*
+ * 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.portal.wsrp.state.migration.mapping;
+
+import org.chromattic.api.annotations.PrimaryType;
+import org.chromattic.api.annotations.Property;
+import org.gatein.common.util.ParameterValidation;
+
+import javax.xml.namespace.QName;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+@PrimaryType(name = ExportErrorMapping.NODE_NAME)
+public abstract class ExportErrorMapping
+{
+ public static final String NODE_NAME = "wsrp:exporterror";
+ private static final String COMMA = ",";
+
+ @Property(name = "errorcode")
+ public abstract String getCode();
+
+ public abstract void setCode(String code);
+
+ @Property(name = "handles")
+ public abstract String getHandles();
+
+ public abstract void setHandles(String handles);
+
+ public QName getErrorCode()
+ {
+ return QName.valueOf(getCode());
+ }
+
+ public List<String> getPortletHandles()
+ {
+ return Arrays.asList(getHandles().split(COMMA));
+ }
+
+ public void initFrom(QName errorCode, List<String> handles)
+ {
+ setCode(errorCode.toString());
+
+ if (ParameterValidation.existsAndIsNotEmpty(handles))
+ {
+ StringBuilder sb = new StringBuilder();
+ int size = handles.size();
+ int index = 0;
+ for (String handle : handles)
+ {
+ sb.append(handle);
+ if (index++ < size)
+ {
+ sb.append(COMMA);
+ }
+ }
+ setHandles(sb.toString());
+ }
+ }
+}
Deleted: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfoMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfoMapping.java 2010-09-23 13:34:42 UTC (rev 4359)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfoMapping.java 2010-09-28 07:34:35 UTC (rev 4403)
@@ -1,139 +0,0 @@
-/*
- * 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.portal.wsrp.state.migration.mapping;
-
-import org.chromattic.api.annotations.Create;
-import org.chromattic.api.annotations.OneToMany;
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.Property;
-import org.exoplatform.commons.utils.Safe;
-import org.gatein.portal.wsrp.state.JCRPersister;
-import org.gatein.wsrp.consumer.migration.ExportInfo;
-
-import javax.xml.namespace.QName;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-/**
- * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
- * @version $Revision$
- */
-@PrimaryType(name = ExportInfoMapping.NODE_NAME)
-public abstract class ExportInfoMapping
-{
- public static final String NODE_NAME = "wsrp:exportinfo";
-
- @Property(name = "exporttime")
- public abstract long getExportTime();
- public abstract void setExportTime(long exportTime);
-
- @Property(name = "expirationtime")
- public abstract long getExpirationTime();
- public abstract void setExpirationTime(long expirationTime);
-
- @Property(name = "exportcontext")
- public abstract InputStream getExportContext();
- public abstract void setExportContext(InputStream exportContext);
-
- @OneToMany
- public abstract List<ExportedStateMapping> getExportedStates();
-
- @Create
- public abstract ExportedStateMapping internalCreateExportedState(String portletHandle);
-
- public ExportedStateMapping createExportedState(String portletHandle)
- {
- return internalCreateExportedState(JCRPersister.PortletNameFormatter.encode(portletHandle));
- }
-
- @OneToMany
- protected abstract List<ExportErrorMapping> getErrors();
-
- @Create
- public abstract ExportErrorMapping internalCreateError(String errorCode);
-
- public ExportErrorMapping createError(String errorCode)
- {
- return internalCreateError(JCRPersister.QNameFormatter.encode(errorCode));
- }
-
- public void initFrom(ExportInfo exportInfo)
- {
- setExportTime(exportInfo.getExportTime());
- setExpirationTime(exportInfo.getExpirationTime());
-
- byte[] exportContext = exportInfo.getExportContext();
- if(exportContext != null && exportContext.length > 0)
- {
- ByteArrayInputStream is = new ByteArrayInputStream(exportContext);
- setExportContext(is);
- }
-
- List<ExportedStateMapping> exportedStates = getExportedStates();
- exportedStates.clear();
- for (String handle : exportInfo.getExportedPortletHandles())
- {
- ExportedStateMapping exportedState = createExportedState(handle);
-
- // add then init idiom
- exportedStates.add(exportedState);
- exportedState.initFrom(handle, exportInfo.getPortletStateFor(handle));
- }
-
- List<ExportErrorMapping> errors = getErrors();
- errors.clear();
- for (Map.Entry<QName, List<String>> entry : exportInfo.getErrorCodesToFailedPortletHandlesMapping().entrySet())
- {
- QName errorCode = entry.getKey();
- ExportErrorMapping error = createError(errorCode.toString());
-
- // add then init idiom
- errors.add(error);
- error.initFrom(errorCode, entry.getValue());
- }
- }
-
- public ExportInfo toExportInfo()
- {
- List<ExportedStateMapping> exportedStates = getExportedStates();
- SortedMap<String, byte[]> states = new TreeMap<String,byte[]>();
- for (ExportedStateMapping exportedState : exportedStates)
- {
- states.put(JCRPersister.PortletNameFormatter.decode(exportedState.getHandle()), Safe.getBytes(exportedState.getState()));
- }
-
- List<ExportErrorMapping> errors = getErrors();
- SortedMap<QName, List<String>> errorCodesToHandles = new TreeMap<QName, List<String>>();
- for (ExportErrorMapping error : errors)
- {
- errorCodesToHandles.put(error.getErrorCode(), error.getPortletHandles());
- }
-
- return new ExportInfo(getExportTime(), errorCodesToHandles, states, Safe.getBytes(getExportContext()));
- }
-}
Copied: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfoMapping.java (from rev 4359, portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfoMapping.java)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfoMapping.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfoMapping.java 2010-09-28 07:34:35 UTC (rev 4403)
@@ -0,0 +1,139 @@
+/*
+ * 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.portal.wsrp.state.migration.mapping;
+
+import org.chromattic.api.annotations.Create;
+import org.chromattic.api.annotations.OneToMany;
+import org.chromattic.api.annotations.PrimaryType;
+import org.chromattic.api.annotations.Property;
+import org.exoplatform.commons.utils.Safe;
+import org.gatein.portal.wsrp.state.JCRPersister;
+import org.gatein.wsrp.consumer.migration.ExportInfo;
+
+import javax.xml.namespace.QName;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+@PrimaryType(name = ExportInfoMapping.NODE_NAME)
+public abstract class ExportInfoMapping
+{
+ public static final String NODE_NAME = "wsrp:exportinfo";
+
+ @Property(name = "exporttime")
+ public abstract long getExportTime();
+ public abstract void setExportTime(long exportTime);
+
+ @Property(name = "expirationtime")
+ public abstract long getExpirationTime();
+ public abstract void setExpirationTime(long expirationTime);
+
+ @Property(name = "exportcontext")
+ public abstract InputStream getExportContext();
+ public abstract void setExportContext(InputStream exportContext);
+
+ @OneToMany
+ public abstract List<ExportedStateMapping> getExportedStates();
+
+ @Create
+ public abstract ExportedStateMapping internalCreateExportedState(String portletHandle);
+
+ public ExportedStateMapping createExportedState(String portletHandle)
+ {
+ return internalCreateExportedState(JCRPersister.PortletNameFormatter.encode(portletHandle));
+ }
+
+ @OneToMany
+ protected abstract List<ExportErrorMapping> getErrors();
+
+ @Create
+ public abstract ExportErrorMapping internalCreateError(String errorCode);
+
+ public ExportErrorMapping createError(String errorCode)
+ {
+ return internalCreateError(JCRPersister.QNameFormatter.encode(errorCode));
+ }
+
+ public void initFrom(ExportInfo exportInfo)
+ {
+ setExportTime(exportInfo.getExportTime());
+ setExpirationTime(exportInfo.getExpirationTime());
+
+ byte[] exportContext = exportInfo.getExportContext();
+ if(exportContext != null && exportContext.length > 0)
+ {
+ ByteArrayInputStream is = new ByteArrayInputStream(exportContext);
+ setExportContext(is);
+ }
+
+ List<ExportedStateMapping> exportedStates = getExportedStates();
+ exportedStates.clear();
+ for (String handle : exportInfo.getExportedPortletHandles())
+ {
+ ExportedStateMapping exportedState = createExportedState(handle);
+
+ // add then init idiom
+ exportedStates.add(exportedState);
+ exportedState.initFrom(handle, exportInfo.getPortletStateFor(handle));
+ }
+
+ List<ExportErrorMapping> errors = getErrors();
+ errors.clear();
+ for (Map.Entry<QName, List<String>> entry : exportInfo.getErrorCodesToFailedPortletHandlesMapping().entrySet())
+ {
+ QName errorCode = entry.getKey();
+ ExportErrorMapping error = createError(errorCode.toString());
+
+ // add then init idiom
+ errors.add(error);
+ error.initFrom(errorCode, entry.getValue());
+ }
+ }
+
+ public ExportInfo toExportInfo()
+ {
+ List<ExportedStateMapping> exportedStates = getExportedStates();
+ SortedMap<String, byte[]> states = new TreeMap<String,byte[]>();
+ for (ExportedStateMapping exportedState : exportedStates)
+ {
+ states.put(JCRPersister.PortletNameFormatter.decode(exportedState.getHandle()), Safe.getBytes(exportedState.getState()));
+ }
+
+ List<ExportErrorMapping> errors = getErrors();
+ SortedMap<QName, List<String>> errorCodesToHandles = new TreeMap<QName, List<String>>();
+ for (ExportErrorMapping error : errors)
+ {
+ errorCodesToHandles.put(error.getErrorCode(), error.getPortletHandles());
+ }
+
+ return new ExportInfo(getExportTime(), errorCodesToHandles, states, Safe.getBytes(getExportContext()));
+ }
+}
Deleted: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfosMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfosMapping.java 2010-09-23 13:34:42 UTC (rev 4359)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfosMapping.java 2010-09-28 07:34:35 UTC (rev 4403)
@@ -1,47 +0,0 @@
-/*
- * 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.portal.wsrp.state.migration.mapping;
-
-import org.chromattic.api.annotations.Create;
-import org.chromattic.api.annotations.OneToMany;
-import org.chromattic.api.annotations.PrimaryType;
-
-import java.util.List;
-
-/**
- * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
- * @version $Revision$
- */
-@PrimaryType(name = ExportInfosMapping.NODE_NAME)
-public abstract class ExportInfosMapping
-{
-
- public static final String NODE_NAME = "wsrp:exportinfos";
-
- @OneToMany
- public abstract List<ExportInfoMapping> getExportInfos();
-
- @Create
- public abstract ExportInfoMapping createExportInfo(String exportTimeAsString);
-}
Copied: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfosMapping.java (from rev 4359, portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfosMapping.java)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfosMapping.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfosMapping.java 2010-09-28 07:34:35 UTC (rev 4403)
@@ -0,0 +1,47 @@
+/*
+ * 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.portal.wsrp.state.migration.mapping;
+
+import org.chromattic.api.annotations.Create;
+import org.chromattic.api.annotations.OneToMany;
+import org.chromattic.api.annotations.PrimaryType;
+
+import java.util.List;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+@PrimaryType(name = ExportInfosMapping.NODE_NAME)
+public abstract class ExportInfosMapping
+{
+
+ public static final String NODE_NAME = "wsrp:exportinfos";
+
+ @OneToMany
+ public abstract List<ExportInfoMapping> getExportInfos();
+
+ @Create
+ public abstract ExportInfoMapping createExportInfo(String exportTimeAsString);
+}
Deleted: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportedStateMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportedStateMapping.java 2010-09-23 13:34:42 UTC (rev 4359)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportedStateMapping.java 2010-09-28 07:34:35 UTC (rev 4403)
@@ -1,59 +0,0 @@
-/*
- * 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.portal.wsrp.state.migration.mapping;
-
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.Property;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-/**
- * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
- * @version $Revision$
- */
-@PrimaryType(name = ExportedStateMapping.NODE_NAME)
-public abstract class ExportedStateMapping
-{
- public static final String NODE_NAME = "wsrp:exportedstate";
-
- @Property(name = "handle")
- public abstract String getHandle();
- public abstract void setHandle(String handle);
-
- @Property(name = "state")
- public abstract InputStream getState();
- public abstract void setState(InputStream state);
-
- public void initFrom(String handle, byte[] state)
- {
- setHandle(handle);
-
- if(state != null && state.length > 0)
- {
- ByteArrayInputStream is = new ByteArrayInputStream(state);
- setState(is);
- }
- }
-}
Copied: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportedStateMapping.java (from rev 4359, portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportedStateMapping.java)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportedStateMapping.java (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportedStateMapping.java 2010-09-28 07:34:35 UTC (rev 4403)
@@ -0,0 +1,59 @@
+/*
+ * 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.portal.wsrp.state.migration.mapping;
+
+import org.chromattic.api.annotations.PrimaryType;
+import org.chromattic.api.annotations.Property;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+@PrimaryType(name = ExportedStateMapping.NODE_NAME)
+public abstract class ExportedStateMapping
+{
+ public static final String NODE_NAME = "wsrp:exportedstate";
+
+ @Property(name = "handle")
+ public abstract String getHandle();
+ public abstract void setHandle(String handle);
+
+ @Property(name = "state")
+ public abstract InputStream getState();
+ public abstract void setState(InputStream state);
+
+ public void initFrom(String handle, byte[] state)
+ {
+ setHandle(handle);
+
+ if(state != null && state.length > 0)
+ {
+ ByteArrayInputStream is = new ByteArrayInputStream(state);
+ setState(is);
+ }
+ }
+}
Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java 2010-09-28 03:32:25 UTC (rev 4402)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java 2010-09-28 07:34:35 UTC (rev 4403)
@@ -185,6 +185,26 @@
return consumerSPI;
}
+
+ protected RegistrationSPI internalSaveChangesTo(Registration registration)
+ {
+ RegistrationSPI registrationSPI = super.internalSaveChangesTo(registration);
+
+ ChromatticSession session = persister.getSession();
+ try
+ {
+ RegistrationMapping cm = session.findById(RegistrationMapping.class, registration.getPersistentKey());
+ cm.initFrom(registration);
+ persister.closeSession(session, true);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace(); //todo: fix me
+ persister.closeSession(session, false);
+ }
+
+ return registrationSPI;
+ }
@Override
protected ConsumerGroupSPI internalRemoveConsumerGroup(String name)
Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java 2010-09-28 03:32:25 UTC (rev 4402)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java 2010-09-28 07:34:35 UTC (rev 4403)
@@ -40,6 +40,7 @@
import javax.xml.namespace.QName;
import java.util.Collections;
+import java.util.List;
import java.util.Map;
/**
@@ -63,6 +64,11 @@
public abstract String getRegistrationHandle();
public abstract void setRegistrationHandle(String handle);
+
+ @Property(name="portletHandles")
+ public abstract List<String> getPortletHandles();
+
+ public abstract void setPortletHandles(List<String> portletHandles);
@OneToOne
@Owner
@@ -83,7 +89,8 @@
{
setStatus(registration.getStatus());
setRegistrationHandle(registration.getRegistrationHandle());
-
+ setPortletHandles(registration.getPortletHandles());
+
Map<QName, Object> properties = registration.getProperties();
if (ParameterValidation.existsAndIsNotEmpty(properties))
{
@@ -109,6 +116,7 @@
RegistrationSPI reg = persistenceManager.newRegistrationSPI(consumer, props, getPersistentKey());
reg.setStatus(getStatus());
reg.setRegistrationHandle(getRegistrationHandle());
+ reg.getPortletHandles().addAll(getPortletHandles());
return reg;
}
Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/pom.xml 2010-09-28 03:32:25 UTC (rev 4402)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2010-09-28 07:34:35 UTC (rev 4403)
@@ -48,7 +48,7 @@
<org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.2.0-Beta03</org.gatein.pc.version>
<org.picketlink.idm>1.1.5.GA</org.picketlink.idm>
- <org.gatein.wsrp.version>2.0.0-Alpha01</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>2.0.0-Alpha02</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-09-28 03:32:25 UTC (rev 4402)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-09-28 07:34:35 UTC (rev 4403)
@@ -123,6 +123,7 @@
<value>war:/conf/wsrp/producer-configuration-nodetypes.xml</value>
<value>war:/conf/wsrp/producer-registrations-nodetypes.xml</value>
<value>war:/conf/wsrp/producer-pc-nodetypes.xml</value>
+ <value>war:/conf/wsrp/migration-nodetypes.xml</value>
</values-param>
</init-params>
</component-plugin>
Copied: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml (from rev 4359, portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/wsrp/migration-nodetypes.xml 2010-09-28 07:34:35 UTC (rev 4403)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ ~ 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.
+ -->
+
+<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0"
+ xmlns:jcr="http://www.jcp.org/jcr/1.0">
+
+ <nodeType name="wsrp:exportinfos" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="wsrp:exportinfo" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>wsrp:exportinfo</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="wsrp:exportinfo" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exporttime" requiredType="Long" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="expirationtime" requiredType="Long" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="exportcontext" requiredType="Binary" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ </propertyDefinitions>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="wsrp:exportedstate" autoCreated="false"
+ mandatory="false"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>wsrp:exportedstate</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ <childNodeDefinition name="*" defaultPrimaryType="wsrp:exporterror" autoCreated="false"
+ mandatory="false"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>wsrp:exporterror</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="wsrp:exportedstate" isMixin="false" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="handle" requiredType="String" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="state" requiredType="Binary" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="wsrp:exporterror" isMixin="false" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="errorcode" requiredType="String" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ <propertyDefinition name="handles" requiredType="String" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="false">
+ <valueConstraints/>
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+</nodeTypes>
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml 2010-09-28 03:32:25 UTC (rev 4402)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml 2010-09-28 07:34:35 UTC (rev 4403)
@@ -111,6 +111,9 @@
onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
+ <propertyDefinition name="portletHandles" requiredType="String" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="true">
+ </propertyDefinition>
</propertyDefinitions>
<childNodeDefinitions>
<childNodeDefinition name="properties" defaultPrimaryType="wsrp:registrationproperties" autoCreated="false"
14 years, 3 months
- 1
- 0
gatein SVN: r4402 - exo/portal/branches/3.1.x/webui/portal/src/main/java/org/exoplatform/portal/webui/portal.
by do-not-reply＠jboss.org
Author: ndkhoiits
Date: 2010-09-27 23:32:25 -0400 (Mon, 27 Sep 2010)
New Revision: 4402
Modified:
exo/portal/branches/3.1.x/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
Log:
EXOGTN-74 Cannot change Locale of site to language having particular country
Modified: exo/portal/branches/3.1.x/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
===================================================================
--- exo/portal/branches/3.1.x/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2010-09-28 02:25:12 UTC (rev 4401)
+++ exo/portal/branches/3.1.x/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2010-09-28 03:32:25 UTC (rev 4402)
@@ -19,6 +19,8 @@
package org.exoplatform.portal.webui.portal;
+import org.exoplatform.container.ExoContainer;
+import org.exoplatform.container.ExoContainerContext;
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.UserPortalConfig;
@@ -37,6 +39,7 @@
import org.exoplatform.services.organization.OrganizationService;
import org.exoplatform.services.resources.LocaleConfig;
import org.exoplatform.services.resources.LocaleConfigService;
+import org.exoplatform.services.resources.ResourceBundleService;
import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.InitParams;
@@ -71,6 +74,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
+import java.util.ResourceBundle;
+import java.util.MissingResourceException;
@ComponentConfigs({
@ComponentConfig(lifecycle = UIFormLifecycle.class, template = "system:/groovy/webui/form/UIFormTabPane.gtmpl", events = {
@@ -119,7 +124,7 @@
}
WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
Param param = initParams.getParam("PortalTemplateConfigOption");
- List<SelectItemCategory> portalTemplates = (List<SelectItemCategory>)param.getMapGroovyObject(context);
+ List<SelectItemCategory> portalTemplates = (List<SelectItemCategory>)param.getFreshObject(context);
for (SelectItemCategory itemCategory : portalTemplates)
{
uiTemplateInput.getItemCategories().add(itemCategory);
@@ -166,8 +171,13 @@
LocaleConfigService localeConfigService = getApplicationComponent(LocaleConfigService.class);
LocaleConfig localeConfig = localeConfigService.getLocaleConfig(editPortal.getLocale());
- this.<UIFormInputSet> getChildById("PortalSetting").<UIFormSelectBox> getChildById(FIELD_LOCALE).setValue(
- localeConfig.getLanguage());
+ String lang = localeConfig.getLanguage();
+ if (localeConfig.getLocale().getCountry() != null && localeConfig.getLocale().getCountry().length() > 0)
+ {
+ lang += "_" + localeConfig.getLocale().getCountry();
+ }
+
+ this.<UIFormInputSet> getChildById("PortalSetting").<UIFormSelectBox> getChildById(FIELD_LOCALE).setValue(lang);
setActions(new String[]{"Save", "Close"});
}
@@ -182,21 +192,38 @@
private void createDefaultItem() throws Exception
{
- UIPortal uiPortal = Util.getUIPortal();
LocaleConfigService localeConfigService = getApplicationComponent(LocaleConfigService.class);
Collection<?> listLocaleConfig = localeConfigService.getLocalConfigs();
LocaleConfig defaultLocale = localeConfigService.getDefaultLocaleConfig();
String defaultLanguage = defaultLocale.getLanguage();
- Locale currentLocate = Util.getPortalRequestContext().getLocale();
+ Locale currentLocale = Util.getPortalRequestContext().getLocale();
Iterator<?> iterator = listLocaleConfig.iterator();
while (iterator.hasNext())
{
LocaleConfig localeConfig = (LocaleConfig)iterator.next();
- SelectItemOption<String> option =
- new SelectItemOption<String>(localeConfig.getLocale().getDisplayName(currentLocate), localeConfig
- .getLanguage());
- if (defaultLanguage.equals(localeConfig.getLanguage()))
+ ResourceBundle localeResourceBundle = getResourceBundle(currentLocale);
+ Locale local = localeConfig.getLocale();
+ String lang = local.getLanguage();
+ if (local.getCountry() != null && local.getCountry().length() > 0)
{
+ lang += "_" + local.getCountry();
+ }
+
+ String displayName = null;
+ try
+ {
+ String key = "Locale." + lang;
+ String translation = localeResourceBundle.getString(key);
+ displayName = translation;
+ }
+ catch (MissingResourceException e)
+ {
+ displayName = capitalizeFirstLetter(local.getDisplayName(currentLocale));;
+ }
+
+ SelectItemOption<String> option = new SelectItemOption<String>(displayName, lang);
+ if (defaultLanguage.equals(lang))
+ {
option.setSelected(true);
}
languages.add(option);
@@ -280,14 +307,12 @@
{
UIPortal uiPortal = uiForm.createUIComponent(UIPortal.class, null, null);
PortalDataMapper.toUIPortal(uiPortal, userConfig);
-
UIPortalApplication uiPortalApp = (UIPortalApplication)prContext.getUIApplication();
uiForm.invokeSetBindingBean(uiPortal);
//uiPortal.refreshNavigation(localeConfigService.getLocaleConfig(uiPortal.getLocale()).getLocale()) ;
if (uiPortalApp.getModeState() == UIPortalApplication.NORMAL_MODE)
{
PortalConfig portalConfig = (PortalConfig)PortalDataMapper.buildModelObject(uiPortal);
- UserPortalConfigService configService = uiForm.getApplicationComponent(UserPortalConfigService.class);
dataService.save(portalConfig);
}
else
@@ -319,7 +344,7 @@
{
UIPortalForm uiForm = event.getSource();
PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext();
- String template = "classic";
+ String template = "classic";
// String template = uiForm.getChild(UIFormInputItemSelector.class).getSelectedItemOption().getValue().toString();
String portalName = uiForm.getUIStringInput(FIELD_NAME).getValue();
DataStorage dataService = uiForm.getApplicationComponent(DataStorage.class);
@@ -370,4 +395,27 @@
}
}
+ private String capitalizeFirstLetter(String word)
+ {
+ if (word == null)
+ {
+ return null;
+ }
+ if (word.length() == 0)
+ {
+ return word;
+ }
+ StringBuilder result = new StringBuilder(word);
+ result.replace(0, 1, result.substring(0, 1).toUpperCase());
+ return result.toString();
+ }
+
+ private ResourceBundle getResourceBundle(Locale locale) throws Exception
+ {
+ ExoContainer appContainer = ExoContainerContext.getCurrentContainer();
+ ResourceBundleService service =
+ (ResourceBundleService)appContainer.getComponentInstanceOfType(ResourceBundleService.class);
+ ResourceBundle res = service.getResourceBundle("locale.portal.webui", locale);
+ return res;
+ }
}
14 years, 3 months
- 1
- 0