gatein SVN: r4201 - in exo/portal/branches/3.1.x: component and 72 other directories.
by do-not-reply@jboss.org
Author: aheritier
Date: 2010-09-14 18:33:56 -0400 (Tue, 14 Sep 2010)
New Revision: 4201
Modified:
exo/portal/branches/3.1.x/component/application-registry/pom.xml
exo/portal/branches/3.1.x/component/common/pom.xml
exo/portal/branches/3.1.x/component/dashboard/pom.xml
exo/portal/branches/3.1.x/component/identity/pom.xml
exo/portal/branches/3.1.x/component/management/pom.xml
exo/portal/branches/3.1.x/component/pc/pom.xml
exo/portal/branches/3.1.x/component/pom.xml
exo/portal/branches/3.1.x/component/portal/pom.xml
exo/portal/branches/3.1.x/component/resources/pom.xml
exo/portal/branches/3.1.x/component/scripting/pom.xml
exo/portal/branches/3.1.x/component/test/core/pom.xml
exo/portal/branches/3.1.x/component/test/jcr/pom.xml
exo/portal/branches/3.1.x/component/test/organization/pom.xml
exo/portal/branches/3.1.x/component/test/pom.xml
exo/portal/branches/3.1.x/component/web/pom.xml
exo/portal/branches/3.1.x/component/wsrp/pom.xml
exo/portal/branches/3.1.x/component/xml-parser/pom.xml
exo/portal/branches/3.1.x/docs/pom.xml
exo/portal/branches/3.1.x/docs/reference-guide/pom.xml
exo/portal/branches/3.1.x/docs/user-guide/pom.xml
exo/portal/branches/3.1.x/examples/extension/config/pom.xml
exo/portal/branches/3.1.x/examples/extension/ear/pom.xml
exo/portal/branches/3.1.x/examples/extension/jar/pom.xml
exo/portal/branches/3.1.x/examples/extension/pom.xml
exo/portal/branches/3.1.x/examples/extension/war/pom.xml
exo/portal/branches/3.1.x/examples/pom.xml
exo/portal/branches/3.1.x/examples/portal/config/pom.xml
exo/portal/branches/3.1.x/examples/portal/ear/pom.xml
exo/portal/branches/3.1.x/examples/portal/jar/pom.xml
exo/portal/branches/3.1.x/examples/portal/pom.xml
exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml
exo/portal/branches/3.1.x/examples/portal/war/pom.xml
exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml
exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml
exo/portal/branches/3.1.x/examples/portlets/pom.xml
exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml
exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml
exo/portal/branches/3.1.x/examples/skins/pom.xml
exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml
exo/portal/branches/3.1.x/gadgets/core/pom.xml
exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml
exo/portal/branches/3.1.x/gadgets/pom.xml
exo/portal/branches/3.1.x/gadgets/server/pom.xml
exo/portal/branches/3.1.x/packaging/module/pom.xml
exo/portal/branches/3.1.x/packaging/pkg/pom.xml
exo/portal/branches/3.1.x/packaging/pom.xml
exo/portal/branches/3.1.x/packaging/product/pom.xml
exo/portal/branches/3.1.x/packaging/reports/pom.xml
exo/portal/branches/3.1.x/pom.xml
exo/portal/branches/3.1.x/portlet/dashboard/pom.xml
exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml
exo/portal/branches/3.1.x/portlet/pom.xml
exo/portal/branches/3.1.x/portlet/web/pom.xml
exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml
exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml
exo/portal/branches/3.1.x/server/jboss/pom.xml
exo/portal/branches/3.1.x/server/pom.xml
exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml
exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml
exo/portal/branches/3.1.x/server/tomcat/pom.xml
exo/portal/branches/3.1.x/starter/ear/pom.xml
exo/portal/branches/3.1.x/starter/pom.xml
exo/portal/branches/3.1.x/starter/war/pom.xml
exo/portal/branches/3.1.x/testsuite/pom.xml
exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml
exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml
exo/portal/branches/3.1.x/web/eXoResources/pom.xml
exo/portal/branches/3.1.x/web/pom.xml
exo/portal/branches/3.1.x/web/portal/pom.xml
exo/portal/branches/3.1.x/web/rest/pom.xml
exo/portal/branches/3.1.x/webui/core/pom.xml
exo/portal/branches/3.1.x/webui/eXo/pom.xml
exo/portal/branches/3.1.x/webui/pom.xml
exo/portal/branches/3.1.x/webui/portal/pom.xml
Log:
[maven-release-plugin] [EXOGTN-76]prepare for next development iteration
Modified: exo/portal/branches/3.1.x/component/application-registry/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/application-registry/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/component/application-registry/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/common/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/common/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/component/common/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.portal.component.common</artifactId>
Modified: exo/portal/branches/3.1.x/component/dashboard/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/dashboard/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/component/dashboard/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/identity/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/identity/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/component/identity/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/management/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/management/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/component/management/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/pc/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/pc/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/component/pc/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/component/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.component</artifactId>
Modified: exo/portal/branches/3.1.x/component/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/portal/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/component/portal/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/resources/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/resources/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/component/resources/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/scripting/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/scripting/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/component/scripting/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/test/core/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/test/core/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/component/test/core/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/test/jcr/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/test/jcr/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/component/test/jcr/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/test/organization/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/test/organization/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/component/test/organization/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/test/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/test/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/component/test/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/web/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/web/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/component/web/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/wsrp/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/wsrp/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/component/wsrp/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/xml-parser/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/xml-parser/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/component/xml-parser/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/docs/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/docs/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/docs/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<groupId>org.gatein.doc</groupId>
Modified: exo/portal/branches/3.1.x/docs/reference-guide/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/docs/reference-guide/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/docs/reference-guide/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<groupId>org.gatein.doc</groupId>
Modified: exo/portal/branches/3.1.x/docs/user-guide/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/docs/user-guide/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/docs/user-guide/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>gatein-user-guide-en</artifactId>
Modified: exo/portal/branches/3.1.x/examples/extension/config/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/extension/config/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/examples/extension/config/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/examples/extension/ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/extension/ear/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/examples/extension/ear/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-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-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-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-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-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/3.1.x/examples/extension/jar/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/extension/jar/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/examples/extension/jar/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/examples/extension/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/extension/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/examples/extension/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample.extension.root</artifactId>
Modified: exo/portal/branches/3.1.x/examples/extension/war/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/extension/war/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/examples/extension/war/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/examples/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/examples/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample</artifactId>
Modified: exo/portal/branches/3.1.x/examples/portal/config/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portal/config/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/examples/portal/config/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/examples/portal/ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portal/ear/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/examples/portal/ear/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-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-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-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-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-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-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/3.1.x/examples/portal/jar/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portal/jar/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/examples/portal/jar/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/examples/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portal/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/examples/portal/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample.portal.root</artifactId>
Modified: exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/examples/portal/war/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portal/war/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/examples/portal/war/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsf-hellouser</artifactId>
Modified: exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsp-hellouser</artifactId>
Modified: exo/portal/branches/3.1.x/examples/portlets/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portlets/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/examples/portlets/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
Modified: exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>gatein-simplest-helloworld</artifactId>
Modified: exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>struts-jpetstore</artifactId>
Modified: exo/portal/branches/3.1.x/examples/skins/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/skins/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/examples/skins/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<groupId>org.gatein.portal.examples.skins</groupId>
Modified: exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>gatein-sample-skin</artifactId>
Modified: exo/portal/branches/3.1.x/gadgets/core/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/gadgets/core/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/gadgets/core/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-core</artifactId>
Modified: exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/gadgets/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/gadgets/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/gadgets/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets</artifactId>
Modified: exo/portal/branches/3.1.x/gadgets/server/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/gadgets/server/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/gadgets/server/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-server</artifactId>
Modified: exo/portal/branches/3.1.x/packaging/module/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/packaging/module/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/packaging/module/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/packaging/pkg/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/packaging/pkg/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/packaging/pkg/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-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-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-SNAPSHOT</version>
<type>js</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/3.1.x/packaging/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/packaging/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/packaging/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/packaging/product/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/packaging/product/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/packaging/product/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/packaging/reports/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/packaging/reports/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/packaging/reports/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -31,7 +31,7 @@
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF</version>
+ <version>3.1.5-PLF-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GateIn - Portal</name>
@@ -84,9 +84,9 @@
</distributionManagement>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/exo/portal/tags/3.1.4-PLF</connection>
- <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/exo/portal/tags/3.1.4-PLF</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/exo/portal/tags/3.1.4-PLF</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/exo/portal/branches/3.1.x</connection>
+ <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/exo/portal/branches/3.1.x</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/exo/portal/branches/3.1.x</url>
</scm>
<modules>
@@ -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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
Modified: exo/portal/branches/3.1.x/portlet/dashboard/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/portlet/dashboard/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/portlet/dashboard/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/portlet/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/portlet/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/portlet/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.portlet</artifactId>
Modified: exo/portal/branches/3.1.x/portlet/web/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/portlet/web/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/portlet/web/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/server/jboss/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/jboss/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/server/jboss/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server.jboss</artifactId>
Modified: exo/portal/branches/3.1.x/server/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/server/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server</artifactId>
Modified: exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/server/tomcat/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/tomcat/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/server/tomcat/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server.tomcat</artifactId>
Modified: exo/portal/branches/3.1.x/starter/ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/starter/ear/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/starter/ear/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-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-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/3.1.x/starter/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/starter/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/starter/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.starter.root</artifactId>
Modified: exo/portal/branches/3.1.x/starter/war/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/starter/war/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/starter/war/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/testsuite/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/testsuite/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/testsuite/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.testsuite</artifactId>
Modified: exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.selenium.snifftests</artifactId>
Modified: exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>exo.webui.based.samples</artifactId>
Modified: exo/portal/branches/3.1.x/web/eXoResources/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/web/eXoResources/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/web/eXoResources/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/web/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/web/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/web/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.web</artifactId>
Modified: exo/portal/branches/3.1.x/web/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/web/portal/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/web/portal/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/web/rest/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/web/rest/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/web/rest/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/webui/core/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/webui/core/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/webui/core/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/webui/eXo/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/webui/eXo/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/webui/eXo/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/webui/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/webui/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/webui/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.webui</artifactId>
Modified: exo/portal/branches/3.1.x/webui/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/webui/portal/pom.xml 2010-09-14 22:31:15 UTC (rev 4200)
+++ exo/portal/branches/3.1.x/webui/portal/pom.xml 2010-09-14 22:33:56 UTC (rev 4201)
@@ -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-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
14 years, 3 months
gatein SVN: r4200 - exo/portal/tags.
by do-not-reply@jboss.org
Author: aheritier
Date: 2010-09-14 18:31:15 -0400 (Tue, 14 Sep 2010)
New Revision: 4200
Added:
exo/portal/tags/3.1.4-PLF/
Log:
[maven-release-plugin] [EXOGTN-76] copy for tag 3.1.4-PLF
Copied: exo/portal/tags/3.1.4-PLF (from rev 4199, exo/portal/branches/3.1.x)
14 years, 3 months
gatein SVN: r4199 - in exo/portal/branches/3.1.x: component and 72 other directories.
by do-not-reply@jboss.org
Author: aheritier
Date: 2010-09-14 18:30:53 -0400 (Tue, 14 Sep 2010)
New Revision: 4199
Modified:
exo/portal/branches/3.1.x/component/application-registry/pom.xml
exo/portal/branches/3.1.x/component/common/pom.xml
exo/portal/branches/3.1.x/component/dashboard/pom.xml
exo/portal/branches/3.1.x/component/identity/pom.xml
exo/portal/branches/3.1.x/component/management/pom.xml
exo/portal/branches/3.1.x/component/pc/pom.xml
exo/portal/branches/3.1.x/component/pom.xml
exo/portal/branches/3.1.x/component/portal/pom.xml
exo/portal/branches/3.1.x/component/resources/pom.xml
exo/portal/branches/3.1.x/component/scripting/pom.xml
exo/portal/branches/3.1.x/component/test/core/pom.xml
exo/portal/branches/3.1.x/component/test/jcr/pom.xml
exo/portal/branches/3.1.x/component/test/organization/pom.xml
exo/portal/branches/3.1.x/component/test/pom.xml
exo/portal/branches/3.1.x/component/web/pom.xml
exo/portal/branches/3.1.x/component/wsrp/pom.xml
exo/portal/branches/3.1.x/component/xml-parser/pom.xml
exo/portal/branches/3.1.x/docs/pom.xml
exo/portal/branches/3.1.x/docs/reference-guide/pom.xml
exo/portal/branches/3.1.x/docs/user-guide/pom.xml
exo/portal/branches/3.1.x/examples/extension/config/pom.xml
exo/portal/branches/3.1.x/examples/extension/ear/pom.xml
exo/portal/branches/3.1.x/examples/extension/jar/pom.xml
exo/portal/branches/3.1.x/examples/extension/pom.xml
exo/portal/branches/3.1.x/examples/extension/war/pom.xml
exo/portal/branches/3.1.x/examples/pom.xml
exo/portal/branches/3.1.x/examples/portal/config/pom.xml
exo/portal/branches/3.1.x/examples/portal/ear/pom.xml
exo/portal/branches/3.1.x/examples/portal/jar/pom.xml
exo/portal/branches/3.1.x/examples/portal/pom.xml
exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml
exo/portal/branches/3.1.x/examples/portal/war/pom.xml
exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml
exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml
exo/portal/branches/3.1.x/examples/portlets/pom.xml
exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml
exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml
exo/portal/branches/3.1.x/examples/skins/pom.xml
exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml
exo/portal/branches/3.1.x/gadgets/core/pom.xml
exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml
exo/portal/branches/3.1.x/gadgets/pom.xml
exo/portal/branches/3.1.x/gadgets/server/pom.xml
exo/portal/branches/3.1.x/packaging/module/pom.xml
exo/portal/branches/3.1.x/packaging/pkg/pom.xml
exo/portal/branches/3.1.x/packaging/pom.xml
exo/portal/branches/3.1.x/packaging/product/pom.xml
exo/portal/branches/3.1.x/packaging/reports/pom.xml
exo/portal/branches/3.1.x/pom.xml
exo/portal/branches/3.1.x/portlet/dashboard/pom.xml
exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml
exo/portal/branches/3.1.x/portlet/pom.xml
exo/portal/branches/3.1.x/portlet/web/pom.xml
exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml
exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml
exo/portal/branches/3.1.x/server/jboss/pom.xml
exo/portal/branches/3.1.x/server/pom.xml
exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml
exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml
exo/portal/branches/3.1.x/server/tomcat/pom.xml
exo/portal/branches/3.1.x/starter/ear/pom.xml
exo/portal/branches/3.1.x/starter/pom.xml
exo/portal/branches/3.1.x/starter/war/pom.xml
exo/portal/branches/3.1.x/testsuite/pom.xml
exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml
exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml
exo/portal/branches/3.1.x/web/eXoResources/pom.xml
exo/portal/branches/3.1.x/web/pom.xml
exo/portal/branches/3.1.x/web/portal/pom.xml
exo/portal/branches/3.1.x/web/rest/pom.xml
exo/portal/branches/3.1.x/webui/core/pom.xml
exo/portal/branches/3.1.x/webui/eXo/pom.xml
exo/portal/branches/3.1.x/webui/pom.xml
exo/portal/branches/3.1.x/webui/portal/pom.xml
Log:
[maven-release-plugin] [EXOGTN-76]prepare release 3.1.4-PLF
Modified: exo/portal/branches/3.1.x/component/application-registry/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/application-registry/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/component/application-registry/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/common/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/common/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/component/common/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.portal.component.common</artifactId>
Modified: exo/portal/branches/3.1.x/component/dashboard/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/dashboard/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/component/dashboard/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/identity/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/identity/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/component/identity/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/management/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/management/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/component/management/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/pc/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/pc/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/component/pc/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/component/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>exo.portal.component</artifactId>
Modified: exo/portal/branches/3.1.x/component/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/portal/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/component/portal/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/resources/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/resources/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/component/resources/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/scripting/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/scripting/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/component/scripting/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/test/core/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/test/core/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/component/test/core/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/test/jcr/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/test/jcr/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/component/test/jcr/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/test/organization/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/test/organization/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/component/test/organization/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/test/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/test/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/component/test/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/web/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/web/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/component/web/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/wsrp/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/wsrp/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/component/wsrp/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/component/xml-parser/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/component/xml-parser/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/component/xml-parser/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/docs/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/docs/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/docs/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<groupId>org.gatein.doc</groupId>
Modified: exo/portal/branches/3.1.x/docs/reference-guide/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/docs/reference-guide/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/docs/reference-guide/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.doc</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<groupId>org.gatein.doc</groupId>
Modified: exo/portal/branches/3.1.x/docs/user-guide/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/docs/user-guide/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/docs/user-guide/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.doc</groupId>
<artifactId>docs-aggregator</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>gatein-user-guide-en</artifactId>
Modified: exo/portal/branches/3.1.x/examples/extension/config/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/extension/config/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/examples/extension/config/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/examples/extension/ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/extension/ear/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/examples/extension/ear/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</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-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.jar</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.war</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/3.1.x/examples/extension/jar/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/extension/jar/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/examples/extension/jar/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/examples/extension/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/extension/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/examples/extension/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>exo.portal.sample.extension.root</artifactId>
Modified: exo/portal/branches/3.1.x/examples/extension/war/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/extension/war/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/examples/extension/war/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/examples/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/examples/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>exo.portal.sample</artifactId>
Modified: exo/portal/branches/3.1.x/examples/portal/config/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portal/config/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/examples/portal/config/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/examples/portal/ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portal/ear/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/examples/portal/ear/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</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-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.jar</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.war</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.rest-war</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/3.1.x/examples/portal/jar/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portal/jar/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/examples/portal/jar/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/examples/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portal/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/examples/portal/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>exo.portal.sample.portal.root</artifactId>
Modified: exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/examples/portal/war/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portal/war/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/examples/portal/war/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>gatein-jsf-hellouser</artifactId>
Modified: exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>gatein-jsp-hellouser</artifactId>
Modified: exo/portal/branches/3.1.x/examples/portlets/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portlets/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/examples/portlets/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
Modified: exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>gatein-simplest-helloworld</artifactId>
Modified: exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>struts-jpetstore</artifactId>
Modified: exo/portal/branches/3.1.x/examples/skins/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/skins/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/examples/skins/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<groupId>org.gatein.portal.examples.skins</groupId>
Modified: exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.portal.examples.skins</groupId>
<artifactId>parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>gatein-sample-skin</artifactId>
Modified: exo/portal/branches/3.1.x/gadgets/core/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/gadgets/core/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/gadgets/core/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -14,7 +14,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>exo.portal.gadgets-core</artifactId>
Modified: exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/gadgets/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/gadgets/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/gadgets/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>exo.portal.gadgets</artifactId>
Modified: exo/portal/branches/3.1.x/gadgets/server/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/gadgets/server/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/gadgets/server/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>exo.portal.gadgets-server</artifactId>
Modified: exo/portal/branches/3.1.x/packaging/module/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/packaging/module/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/packaging/module/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/packaging/pkg/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/packaging/pkg/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/packaging/pkg/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</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-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
<type>js</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>portal.packaging.product</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
<type>js</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/3.1.x/packaging/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/packaging/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/packaging/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/packaging/product/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/packaging/product/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/packaging/product/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/packaging/reports/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/packaging/reports/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/packaging/reports/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -31,7 +31,7 @@
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
<packaging>pom</packaging>
<name>GateIn - Portal</name>
@@ -84,9 +84,9 @@
</distributionManagement>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/exo/portal/branches/3.1.x</connection>
- <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/exo/portal/branches/3.1.x</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/exo/portal/branches/3.1.x</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/exo/portal/tags/3.1.4-PLF</connection>
+ <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/exo/portal/tags/3.1.4-PLF</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/exo/portal/tags/3.1.4-PLF</url>
</scm>
<modules>
@@ -324,110 +324,110 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.pc</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.application-registry</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.xml-parser</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.scripting</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.dashboard</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.core</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-core</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
<type>test-jar</type>
</dependency>
Modified: exo/portal/branches/3.1.x/portlet/dashboard/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/portlet/dashboard/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/portlet/dashboard/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/portlet/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/portlet/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/portlet/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>exo.portal.portlet</artifactId>
Modified: exo/portal/branches/3.1.x/portlet/web/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/portlet/web/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/portlet/web/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/server/jboss/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/jboss/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/server/jboss/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>exo.portal.server.jboss</artifactId>
Modified: exo/portal/branches/3.1.x/server/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/server/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>exo.portal.server</artifactId>
Modified: exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.tomcat</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.tomcat</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/server/tomcat/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/server/tomcat/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/server/tomcat/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>exo.portal.server.tomcat</artifactId>
Modified: exo/portal/branches/3.1.x/starter/ear/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/starter/ear/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/starter/ear/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</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-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
<type>war</type>
</dependency>
</dependencies>
Modified: exo/portal/branches/3.1.x/starter/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/starter/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/starter/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>exo.portal.starter.root</artifactId>
Modified: exo/portal/branches/3.1.x/starter/war/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/starter/war/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/starter/war/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/testsuite/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/testsuite/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/testsuite/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>exo.portal.testsuite</artifactId>
Modified: exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>exo.portal.selenium.snifftests</artifactId>
Modified: exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>exo.webui.based.samples</artifactId>
Modified: exo/portal/branches/3.1.x/web/eXoResources/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/web/eXoResources/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/web/eXoResources/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/web/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/web/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/web/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>exo.portal.web</artifactId>
Modified: exo/portal/branches/3.1.x/web/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/web/portal/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/web/portal/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/web/rest/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/web/rest/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/web/rest/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/webui/core/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/webui/core/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/webui/core/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/webui/eXo/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/webui/eXo/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/webui/eXo/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: exo/portal/branches/3.1.x/webui/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/webui/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/webui/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<artifactId>exo.portal.webui</artifactId>
Modified: exo/portal/branches/3.1.x/webui/portal/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/webui/portal/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
+++ exo/portal/branches/3.1.x/webui/portal/pom.xml 2010-09-14 22:30:53 UTC (rev 4199)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.1.4-PLF-SNAPSHOT</version>
+ <version>3.1.4-PLF</version>
</parent>
<modelVersion>4.0.0</modelVersion>
14 years, 3 months
gatein SVN: r4198 - in portal/branches/wsrp2-integration: component/wsrp/src/main/java/org/gatein/portal/wsrp and 1 other directory.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-09-14 17:54:15 -0400 (Tue, 14 Sep 2010)
New Revision: 4198
Modified:
portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java
portal/branches/wsrp2-integration/pom.xml
Log:
- Save session after assigning a new customization to a window in an attempt to make sure the new state is properly recorded. Doesn't seem to work. Mostly synchronization commit, actually.
- Use PC 2.2.0-Beta02-SNAPSHOT.
Modified: portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java
===================================================================
--- portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java 2010-09-14 21:52:06 UTC (rev 4197)
+++ portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java 2010-09-14 21:54:15 UTC (rev 4198)
@@ -147,7 +147,8 @@
String uuid = windowIdToUUIDs.get(windowId);
ParameterValidation.throwIllegalArgExceptionIfNull(uuid, "UUID for " + windowId);
- UIWindow window = pomManager.getSession().findObjectById(ObjectType.WINDOW, uuid);
+ POMSession session = pomManager.getSession();
+ UIWindow window = session.findObjectById(ObjectType.WINDOW, uuid);
WSRP wsrp = new WSRP();
String portletId = portletContext.getId();
wsrp.setPortletId(portletId);
@@ -170,6 +171,7 @@
// and re-customize
window.customize(WSRP.CONTENT_TYPE, portletId, wsrp);
+ session.close(true);
}
private static class PageInfo
Modified: portal/branches/wsrp2-integration/pom.xml
===================================================================
--- portal/branches/wsrp2-integration/pom.xml 2010-09-14 21:52:06 UTC (rev 4197)
+++ portal/branches/wsrp2-integration/pom.xml 2010-09-14 21:54:15 UTC (rev 4198)
@@ -46,7 +46,7 @@
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.3-GA</org.gatein.common.version>
<org.gatein.wci.version>2.0.1-GA</org.gatein.wci.version>
- <org.gatein.pc.version>2.2.0-Beta01</org.gatein.pc.version>
+ <org.gatein.pc.version>2.2.0-Beta02-SNAPSHOT</org.gatein.pc.version>
<org.picketlink.idm>1.1.5.GA</org.picketlink.idm>
<org.gatein.wsrp.version>2.0.0-Alpha02-SNAPSHOT</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version>
14 years, 3 months
gatein SVN: r4197 - in components/wsrp/trunk: admin-gui/src/main/java/org/gatein/wsrp/admin/ui and 1 other directories.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-09-14 17:52:06 -0400 (Tue, 14 Sep 2010)
New Revision: 4197
Modified:
components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java
components/wsrp/trunk/pom.xml
Log:
- GTNWSRP-61: Minor improvements, mostly synchronization commit.
+ Updated to use PC 2.2.0-Beta02-SNAPSHOT to access reference method.
+ Reference portlet contexts (so that the portal can find the proper PortletInvoker). Not sure this is actually needed seeing it doesn't seem to improve the problem of portal not finding the portlet state when displaying an imported portlet. Need to investigate more.
+ Sort portlet displays.
+ Do not show error message if there are no failed portlets.
Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2010-09-14 21:28:47 UTC (rev 4196)
+++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2010-09-14 21:52:06 UTC (rev 4197)
@@ -526,6 +526,7 @@
selectableHandles.add(new SelectablePortletHandle(portlet.getContext().getId(), consumer.getMigrationService().getStructureProvider()));
}
}
+ Collections.sort(selectableHandles);
portletHandles = new ListDataModel(selectableHandles);
}
@@ -627,7 +628,11 @@
}
beanContext.createLocalizedMessage(BeanContext.STATUS, IMPORT_SUCCESS, beanContext.getInfoSeverity(), importCount);
- beanContext.createErrorMessage(FAILED_PORTLETS, info.getErrorCodesToFailedPortletHandlesMapping());
+ SortedMap<QName, List<String>> errorCodesToFailedPortletHandlesMapping = info.getErrorCodesToFailedPortletHandlesMapping();
+ if (!errorCodesToFailedPortletHandlesMapping.isEmpty())
+ {
+ beanContext.createErrorMessage(FAILED_PORTLETS, errorCodesToFailedPortletHandlesMapping);
+ }
return ConsumerManagerBean.CONSUMERS;
}
@@ -671,7 +676,7 @@
return consumer.getMigrationService().isAvailableExportInfosEmpty();
}
- public static class SelectablePortletHandle
+ public static class SelectablePortletHandle implements Comparable<SelectablePortletHandle>
{
private String handle;
private boolean selected;
@@ -753,6 +758,11 @@
{
selected = (Boolean)event.getNewValue();
}
+
+ public int compareTo(SelectablePortletHandle o)
+ {
+ return handle.compareTo(o.handle);
+ }
}
public static class ExportInfoDisplay
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java 2010-09-14 21:28:47 UTC (rev 4196)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java 2010-09-14 21:52:06 UTC (rev 4197)
@@ -38,6 +38,7 @@
import org.gatein.pc.api.state.DestroyCloneFailure;
import org.gatein.pc.api.state.PropertyChange;
import org.gatein.pc.api.state.PropertyMap;
+import org.gatein.pc.federation.impl.FederatingPortletInvokerService;
import org.gatein.pc.portlet.impl.spi.AbstractPortletInvocationContext;
import org.gatein.pc.portlet.state.SimplePropertyMap;
import org.gatein.wsrp.UserContextConverter;
@@ -917,8 +918,9 @@
for (ImportedPortlet importedPortlet : importedPortlets)
{
org.oasis.wsrp.v2.PortletContext portletContext = importedPortlet.getNewPortletContext();
- importIdToPortletContext.put(importedPortlet.getImportID(),
- PortletContext.createPortletContext(portletContext.getPortletHandle(), portletContext.getPortletState()));
+ PortletContext apiPC = PortletContext.createPortletContext(portletContext.getPortletHandle(), portletContext.getPortletState());
+ // we need to reference the resulting PortletContext so that it can then be used properly
+ importIdToPortletContext.put(importedPortlet.getImportID(), FederatingPortletInvokerService.reference(apiPC, getProducerId()));
}
}
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-09-14 21:28:47 UTC (rev 4196)
+++ components/wsrp/trunk/pom.xml 2010-09-14 21:52:06 UTC (rev 4197)
@@ -47,7 +47,7 @@
</scm>
<properties>
- <version.gatein.pc>2.2.0-Beta01</version.gatein.pc>
+ <version.gatein.pc>2.2.0-Beta02-SNAPSHOT</version.gatein.pc>
<version.gatein.common>2.0.3-GA</version.gatein.common>
<version.gatein.wci>2.0.1-GA</version.gatein.wci>
14 years, 3 months
gatein SVN: r4196 - portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2010-09-14 17:28:47 -0400 (Tue, 14 Sep 2010)
New Revision: 4196
Modified:
portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/router.xml
Log:
move the /foo alias example to the right place
Modified: portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/router.xml
===================================================================
--- portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/router.xml 2010-09-14 21:08:10 UTC (rev 4195)
+++ portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/router.xml 2010-09-14 21:28:47 UTC (rev 4196)
@@ -4,16 +4,32 @@
xmlns="http://www.gatein.org/xml/ns/gatein_router_1_0">
<route path="/">
+
+ <!-- Use the portal handler -->
<param name="{gtn}handler" value="portal"/>
+
+ <!-- Webui parameters -->
<request-param name="{gtn}componentid" matchName="portal:componentId" required="false"/>
<request-param name="{gtn}action" matchName="portal:action" required="false"/>
<request-param name="{gtn}objectid" matchName="objectId" required="false"/>
+
+ <!-- Map the sitemap navigation on the /foo path -->
+ <route path="/foo">
+ <param name="{gtn}access" value="public"/>
+ <param name="{gtn}sitename" value="classic"/>
+ <param name="{gtn}path" value="/sitemap"/>
+ </route>
+
+ <!-- The public access -->
<route path="/public/{{gtn}sitename}{{gtn}path:.*}">
<param name="{gtn}access" value="public"/>
</route>
+
+ <!-- The private access -->
<route path="/private/{{gtn}sitename}{{gtn}path:.*}">
<param name="{gtn}access" value="private"/>
</route>
+
</route>
<route path="/upload">
@@ -24,11 +40,4 @@
<param name="{gtn}handler" value="download"/>
</route>
- <!-- Map the sitemap navigation on the /foo path -->
- <route path="/foo">
- <param name="{gtn}sitename" value="classic"/>
- <param name="{gtn}path" value="/sitemap"/>
- <param name="{gtn}handler" value="portal"/>
- </route>
-
</router>
\ No newline at end of file
14 years, 3 months
gatein SVN: r4195 - in portal/branches/navcontroller: component/web/controller/src/main/java/org/exoplatform/web/controller/router and 2 other directories.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2010-09-14 17:08:10 -0400 (Tue, 14 Sep 2010)
New Revision: 4195
Added:
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestLegacyPortal.java
Modified:
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteDescriptor.java
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestHierarchy.java
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRequestParam.java
portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/router.xml
Log:
- fix a bug in router
- rewrote the router table to be more concise
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteDescriptor.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteDescriptor.java 2010-09-14 18:44:36 UTC (rev 4194)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/RouteDescriptor.java 2010-09-14 21:08:10 UTC (rev 4195)
@@ -90,7 +90,7 @@
return requestParams;
}
- public RouteDescriptor addChild(RouteDescriptor child)
+ public RouteDescriptor addRoute(RouteDescriptor child)
{
children.add(child);
return this;
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-09-14 18:44:36 UTC (rev 4194)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-09-14 21:08:10 UTC (rev 4195)
@@ -70,7 +70,7 @@
this.requestParamDefs = new HashMap<String, RequestParamDef>();
}
- /**
+ /*
* Ok, so this is not the fastest way to do it, but for now it's OK, it's what is needed, we'll find
* a way to optimize it later with some precompilation.
*/
@@ -79,15 +79,15 @@
Route r = find(blah);
if (r != null)
{
- r._render(blah, renderContext);
+ r._render(blah, renderContext, false);
}
}
- private void _render(Map<QualifiedName, String> blah, RenderContext renderContext)
+ private void _render(Map<QualifiedName, String> blah, RenderContext renderContext, boolean hasChildren)
{
- if (parent != null && parent.parent != null)
+ if (parent != null)
{
- parent._render(blah, renderContext);
+ parent._render(blah, renderContext, true);
}
//
@@ -126,7 +126,10 @@
}
else
{
- renderContext.appendPath("/");
+ if (!hasChildren)
+ {
+ renderContext.appendPath("/");
+ }
}
}
Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestHierarchy.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestHierarchy.java 2010-09-14 18:44:36 UTC (rev 4194)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestHierarchy.java 2010-09-14 21:08:10 UTC (rev 4195)
@@ -39,7 +39,7 @@
RouteDescriptor descriptor = new RouteDescriptor("/a").
addParam("foo", "bar").
- addChild(new RouteDescriptor("/b").addParam("juu", "daa"));
+ addRoute(new RouteDescriptor("/b").addParam("juu", "daa"));
//
Router router = new Router(new RouterDescriptor().addRoute(descriptor));
Added: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestLegacyPortal.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestLegacyPortal.java (rev 0)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestLegacyPortal.java 2010-09-14 21:08:10 UTC (rev 4195)
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2010 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.web.controller.router;
+
+import junit.framework.TestCase;
+import org.exoplatform.web.controller.QualifiedName;
+import org.exoplatform.web.controller.metadata.RouteDescriptor;
+import org.exoplatform.web.controller.metadata.RouterDescriptor;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class TestLegacyPortal extends TestCase
+{
+
+ /** . */
+ private Router router;
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ RouterDescriptor routerMD = new RouterDescriptor();
+
+ RouteDescriptor portal = new RouteDescriptor("/").
+ addParam(QualifiedName.parse("{gtn}handler"), "portal").
+ addRequestParam(QualifiedName.parse("{gtn}componentid"), "portal:componentId", null, false).
+ addRequestParam(QualifiedName.parse("{gtn}action"), "portal:action", null, false).
+ addRequestParam(QualifiedName.parse("{gtn}objectid"), "portal:objectId", null, false).
+ addRoute(new RouteDescriptor("/public/{{gtn}sitename}{{gtn}path:.*}").
+ addParam(QualifiedName.parse("{gtn}access"), "public")).
+ addRoute(new RouteDescriptor("/private/{{gtn}sitename}{{gtn}path:.*}").
+ addParam(QualifiedName.parse("{gtn}access"), "private"));
+
+ //
+ routerMD.addRoute(portal);
+
+ //
+ this.router = new Router(routerMD);
+ }
+
+ public void testPrivateClassicComponent() throws Exception
+ {
+ Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>();
+ expectedParameters.put(new QualifiedName("gtn", "handler"), "portal");
+ expectedParameters.put(new QualifiedName("gtn", "sitename"), "classic");
+ expectedParameters.put(new QualifiedName("gtn", "access"), "private");
+ expectedParameters.put(new QualifiedName("gtn", "path"), "");
+ expectedParameters.put(new QualifiedName("gtn", "componentid"), "foo");
+
+ //
+ assertEquals(expectedParameters, router.route("/private/classic", Collections.singletonMap("portal:componentId", new String[]{"foo"})));
+ assertEquals("/private/classic", router.render(expectedParameters));
+ }
+
+ public void testPrivateClassic() throws Exception
+ {
+ Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>();
+ expectedParameters.put(new QualifiedName("gtn", "handler"), "portal");
+ expectedParameters.put(new QualifiedName("gtn", "sitename"), "classic");
+ expectedParameters.put(new QualifiedName("gtn", "access"), "private");
+ expectedParameters.put(new QualifiedName("gtn", "path"), "");
+
+ //
+ assertEquals(expectedParameters, router.route("/private/classic"));
+ assertEquals("/private/classic", router.render(expectedParameters));
+ }
+
+ public void testPrivateClassicSlash() throws Exception
+ {
+ Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>();
+ expectedParameters.put(new QualifiedName("gtn", "handler"), "portal");
+ expectedParameters.put(new QualifiedName("gtn", "sitename"), "classic");
+ expectedParameters.put(new QualifiedName("gtn", "access"), "private");
+ expectedParameters.put(new QualifiedName("gtn", "path"), "/");
+
+ //
+ assertEquals(expectedParameters, router.route("/private/classic/"));
+ assertEquals("/private/classic/", router.render(expectedParameters));
+ }
+
+ public void testPrivateClassicSlashComponent() throws Exception
+ {
+ Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>();
+ expectedParameters.put(new QualifiedName("gtn", "handler"), "portal");
+ expectedParameters.put(new QualifiedName("gtn", "sitename"), "classic");
+ expectedParameters.put(new QualifiedName("gtn", "access"), "private");
+ expectedParameters.put(new QualifiedName("gtn", "path"), "/");
+ expectedParameters.put(new QualifiedName("gtn", "componentid"), "foo");
+
+ //
+ assertEquals(expectedParameters, router.route("/private/classic/", Collections.singletonMap("portal:componentId", new String[]{"foo"})));
+ assertEquals("/private/classic/", router.render(expectedParameters));
+ }
+
+ public void testPrivateClassicHome() throws Exception
+ {
+ Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>();
+ expectedParameters.put(new QualifiedName("gtn", "handler"), "portal");
+ expectedParameters.put(new QualifiedName("gtn", "sitename"), "classic");
+ expectedParameters.put(new QualifiedName("gtn", "access"), "private");
+ expectedParameters.put(new QualifiedName("gtn", "path"), "/home");
+
+ //
+ assertEquals(expectedParameters, router.route("/private/classic/home"));
+ assertEquals("/private/classic/home", router.render(expectedParameters));
+ }
+
+ public void testPrivateClassicHomeComponent() throws Exception
+ {
+ Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>();
+ expectedParameters.put(new QualifiedName("gtn", "handler"), "portal");
+ expectedParameters.put(new QualifiedName("gtn", "sitename"), "classic");
+ expectedParameters.put(new QualifiedName("gtn", "access"), "private");
+ expectedParameters.put(new QualifiedName("gtn", "path"), "/home");
+ expectedParameters.put(new QualifiedName("gtn", "componentid"), "foo");
+
+ //
+ assertEquals(expectedParameters, router.route("/private/classic/home", Collections.singletonMap("portal:componentId", new String[]{"foo"})));
+ assertEquals("/private/classic/home", router.render(expectedParameters));
+ }
+}
Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRequestParam.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRequestParam.java 2010-09-14 18:44:36 UTC (rev 4194)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRequestParam.java 2010-09-14 21:08:10 UTC (rev 4195)
@@ -117,7 +117,7 @@
public void testInheritance() throws Exception
{
RouterDescriptor descriptor = new RouterDescriptor();
- descriptor.addRoute(new RouteDescriptor("/a").addRequestParam(QualifiedName.parse("foo"), "a", "a", true).addChild(new RouteDescriptor("/b").addRequestParam(QualifiedName.parse("bar"), "b", "b", true)));
+ descriptor.addRoute(new RouteDescriptor("/a").addRequestParam(QualifiedName.parse("foo"), "a", "a", true).addRoute(new RouteDescriptor("/b").addRequestParam(QualifiedName.parse("bar"), "b", "b", true)));
Router router = new Router(descriptor);
//
@@ -168,4 +168,28 @@
assertEquals(Collections.singletonMap("a", "a"), renderContext2.getQueryParams());
}
+ public void testMatchDescendantOfRootParameters() throws Exception
+ {
+ RouterDescriptor descriptor = new RouterDescriptor();
+ descriptor.
+ addRoute(new RouteDescriptor("/").
+ addRequestParam(QualifiedName.parse("foo"), "a", "a", false).
+ addRoute(new RouteDescriptor("/a").
+ addRequestParam(QualifiedName.parse("bar"), "b", "b", false))
+ );
+ Router router = new Router(descriptor);
+
+ //
+ SimpleRenderContext renderContext = new SimpleRenderContext();
+ Map<QualifiedName, String> parameters = new HashMap<QualifiedName, String>();
+ parameters.put(QualifiedName.parse("foo"), "a");
+ parameters.put(QualifiedName.parse("bar"), "b");
+ router.render(parameters, renderContext);
+ assertEquals("/a", renderContext.getPath());
+ Map<String, String> expectedRequestParameters = new HashMap<String, String>();
+ expectedRequestParameters.put("a", "a");
+ expectedRequestParameters.put("b", "b");
+ assertEquals(expectedRequestParameters, renderContext.getQueryParams());
+ }
+
}
Modified: portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/router.xml
===================================================================
--- portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/router.xml 2010-09-14 18:44:36 UTC (rev 4194)
+++ portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/router.xml 2010-09-14 21:08:10 UTC (rev 4195)
@@ -3,22 +3,19 @@
xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_router_1_0 http://www.gatein.org/xml/ns/gatein_router_1_0"
xmlns="http://www.gatein.org/xml/ns/gatein_router_1_0">
- <route path="/public/{{gtn}sitename}{{gtn}path:.*}">
+ <route path="/">
<param name="{gtn}handler" value="portal"/>
- <param name="{gtn}access" value="public"/>
<request-param name="{gtn}componentid" matchName="portal:componentId" required="false"/>
<request-param name="{gtn}action" matchName="portal:action" required="false"/>
<request-param name="{gtn}objectid" matchName="objectId" required="false"/>
+ <route path="/public/{{gtn}sitename}{{gtn}path:.*}">
+ <param name="{gtn}access" value="public"/>
+ </route>
+ <route path="/private/{{gtn}sitename}{{gtn}path:.*}">
+ <param name="{gtn}access" value="private"/>
+ </route>
</route>
- <route path="/private/{{gtn}sitename}{{gtn}path:.*}">
- <param name="{gtn}handler" value="portal"/>
- <param name="{gtn}access" value="private"/>
- <request-param name="{gtn}componentid" matchName="portal:componentId" required="false"/>
- <request-param name="{gtn}action" matchName="portal:action" required="false"/>
- <request-param name="{gtn}objectid" matchName="objectId" required="false"/>
- </route>
-
<route path="/upload">
<param name="{gtn}handler" value="upload"/>
</route>
14 years, 3 months
gatein SVN: r4194 - in portal/branches/navcontroller: component/web/controller/src/test/java/org/exoplatform/web/controller/router and 7 other directories.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2010-09-14 14:44:36 -0400 (Tue, 14 Sep 2010)
New Revision: 4194
Added:
portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/component/
portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/component/ComponentLocatorPlugin.java
Modified:
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java
portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/SimpleRenderContext.java
portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRequestParam.java
portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/router.xml
portal/branches/navcontroller/webui/framework/src/main/java/org/exoplatform/webui/application/UIComponentURLBuilder.java
portal/branches/navcontroller/webui/framework/src/main/java/org/exoplatform/webui/url/ComponentLocator.java
portal/branches/navcontroller/webui/portal/src/main/java/conf/portal/configuration.xml
portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalURLBuilder.java
portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURL.java
Log:
use component locator for webui portal side
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-09-14 16:47:03 UTC (rev 4193)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-09-14 18:44:36 UTC (rev 4194)
@@ -96,7 +96,10 @@
for (RequestParamDef requestParamDef : requestParamDefs.values())
{
String s = blah.get(requestParamDef.getName());
- renderContext.appendQueryParameter(requestParamDef.getMatchName(), s);
+ if (s != null)
+ {
+ renderContext.appendQueryParameter(requestParamDef.getMatchName(), s);
+ }
}
}
@@ -157,11 +160,14 @@
{
if (requestParamDef.matchValue(a))
{
- //
abc.remove(requestParamDef.name);
continue;
}
}
+ else if (!requestParamDef.isRequired())
+ {
+ continue;
+ }
return null;
}
}
Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/SimpleRenderContext.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/SimpleRenderContext.java 2010-09-14 16:47:03 UTC (rev 4193)
+++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/SimpleRenderContext.java 2010-09-14 18:44:36 UTC (rev 4194)
@@ -31,18 +31,23 @@
{
/** . */
- private StringBuilder sb = null;
+ private static final Map<String, String> EMPTY = Collections.emptyMap();
/** . */
- private Map<String, String> queryParams = Collections.emptyMap();
+ private StringBuilder sb;
+ /** . */
+ private Map<String, String> queryParams;
+
public SimpleRenderContext()
{
+ this(null);
}
public SimpleRenderContext(StringBuilder sb)
{
this.sb = sb;
+ this.queryParams = EMPTY;
}
public String getPath()
@@ -87,7 +92,7 @@
public void appendQueryParameter(String parameterName, String paramaterValue)
{
- if (queryParams.isEmpty())
+ if (queryParams == EMPTY)
{
queryParams = new HashMap<String, String>();
}
Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRequestParam.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRequestParam.java 2010-09-14 16:47:03 UTC (rev 4193)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRequestParam.java 2010-09-14 18:44:36 UTC (rev 4194)
@@ -138,7 +138,6 @@
router.render(Collections.singletonMap(QualifiedName.parse("foo"), "a"), renderContext1);
assertEquals("/a", renderContext1.getPath());
assertEquals(Collections.singletonMap("a", "a"), renderContext1.getQueryParams());
-
SimpleRenderContext renderContext2 = new SimpleRenderContext();
router.render(expectedParameters, renderContext2);
assertEquals("/a/b", renderContext2.getPath());
@@ -157,6 +156,16 @@
//
assertEquals(Collections.<QualifiedName, String>emptyMap(), router.route("/", Collections.<String, String[]>emptyMap()));
assertEquals(Collections.singletonMap(QualifiedName.parse("foo"), "a"), router.route("/", Collections.singletonMap("a", new String[]{"a"})));
+
+ //
+ SimpleRenderContext renderContext1 = new SimpleRenderContext();
+ router.render(Collections.<QualifiedName, String>emptyMap(), renderContext1);
+ assertEquals("/", renderContext1.getPath());
+ assertEquals(Collections.<String, String>emptyMap(), renderContext1.getQueryParams());
+ SimpleRenderContext renderContext2 = new SimpleRenderContext();
+ router.render(Collections.singletonMap(QualifiedName.parse("foo"), "a"), renderContext2);
+ assertEquals("/", renderContext2.getPath());
+ assertEquals(Collections.singletonMap("a", "a"), renderContext2.getQueryParams());
}
}
Modified: portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/router.xml
===================================================================
--- portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/router.xml 2010-09-14 16:47:03 UTC (rev 4193)
+++ portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/router.xml 2010-09-14 18:44:36 UTC (rev 4194)
@@ -6,21 +6,17 @@
<route path="/public/{{gtn}sitename}{{gtn}path:.*}">
<param name="{gtn}handler" value="portal"/>
<param name="{gtn}access" value="public"/>
-<!--
<request-param name="{gtn}componentid" matchName="portal:componentId" required="false"/>
<request-param name="{gtn}action" matchName="portal:action" required="false"/>
<request-param name="{gtn}objectid" matchName="objectId" required="false"/>
--->
</route>
<route path="/private/{{gtn}sitename}{{gtn}path:.*}">
<param name="{gtn}handler" value="portal"/>
<param name="{gtn}access" value="private"/>
-<!--
<request-param name="{gtn}componentid" matchName="portal:componentId" required="false"/>
<request-param name="{gtn}action" matchName="portal:action" required="false"/>
<request-param name="{gtn}objectid" matchName="objectId" required="false"/>
--->
</route>
<route path="/upload">
Modified: portal/branches/navcontroller/webui/framework/src/main/java/org/exoplatform/webui/application/UIComponentURLBuilder.java
===================================================================
--- portal/branches/navcontroller/webui/framework/src/main/java/org/exoplatform/webui/application/UIComponentURLBuilder.java 2010-09-14 16:47:03 UTC (rev 4193)
+++ portal/branches/navcontroller/webui/framework/src/main/java/org/exoplatform/webui/application/UIComponentURLBuilder.java 2010-09-14 18:44:36 UTC (rev 4194)
@@ -35,19 +35,12 @@
/** . */
private final ResourceURL<UIComponent, ComponentLocator> url;
-/*
public UIComponentURLBuilder(ResourceURL<UIComponent, ComponentLocator> url)
{
- this.url = url;
- }
-*/
+ super("foo");
- public UIComponentURLBuilder(String baseURL)
- {
- super(baseURL);
-
//
- url = null;
+ this.url = url;
}
@Override
@@ -74,9 +67,14 @@
//
locator.setAction(action);
locator.setTargetBeanId(targetBeanId);
- for (Parameter param : params)
+
+ //
+ if (params != null)
{
- locator.addParameter(param);
+ for (Parameter param : params)
+ {
+ locator.addParameter(param);
+ }
}
//
Modified: portal/branches/navcontroller/webui/framework/src/main/java/org/exoplatform/webui/url/ComponentLocator.java
===================================================================
--- portal/branches/navcontroller/webui/framework/src/main/java/org/exoplatform/webui/url/ComponentLocator.java 2010-09-14 16:47:03 UTC (rev 4193)
+++ portal/branches/navcontroller/webui/framework/src/main/java/org/exoplatform/webui/url/ComponentLocator.java 2010-09-14 18:44:36 UTC (rev 4194)
@@ -59,18 +59,6 @@
this.parameters = new HashMap<QualifiedName, String>();
}
- private void setParameter(QualifiedName parameterName, String parameterValue)
- {
- if (parameterValue == null)
- {
- parameters.remove(parameterName);
- }
- else
- {
- parameters.put(parameterName, parameterValue);
- }
- }
-
public UIComponent getResource()
{
return resource;
@@ -78,7 +66,7 @@
public void setResource(UIComponent resource)
{
- setParameter(COMPONENT, resource != null ? resource.getId() : null);
+ setParameterValue(COMPONENT, resource != null ? resource.getId() : null);
//
this.resource = resource;
@@ -91,7 +79,7 @@
public void setAction(String action)
{
- setParameter(ACTION, action);
+ setParameterValue(ACTION, action);
}
public String getTargetBeanId()
@@ -101,7 +89,7 @@
public void setTargetBeanId(String targetBeanId)
{
- setParameter(TARGET, targetBeanId);
+ setParameterValue(TARGET, targetBeanId);
}
public void addParameter(Parameter param)
@@ -118,4 +106,16 @@
{
return parameters.get(parameterName);
}
+
+ public void setParameterValue(QualifiedName parameterName, String parameterValue)
+ {
+ if (parameterValue == null)
+ {
+ parameters.remove(parameterName);
+ }
+ else
+ {
+ parameters.put(parameterName, parameterValue);
+ }
+ }
}
Modified: portal/branches/navcontroller/webui/portal/src/main/java/conf/portal/configuration.xml
===================================================================
--- portal/branches/navcontroller/webui/portal/src/main/java/conf/portal/configuration.xml 2010-09-14 16:47:03 UTC (rev 4193)
+++ portal/branches/navcontroller/webui/portal/src/main/java/conf/portal/configuration.xml 2010-09-14 18:44:36 UTC (rev 4194)
@@ -46,6 +46,11 @@
<set-method>addPlugin</set-method>
<type>org.exoplatform.portal.url.navigation.NavigationLocatorPlugin</type>
</component-plugin>
+ <component-plugin>
+ <name>navigation.locator.plugin</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.portal.url.component.ComponentLocatorPlugin</type>
+ </component-plugin>
</component-plugins>
</component>
</configuration>
Modified: portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
===================================================================
--- portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-09-14 16:47:03 UTC (rev 4193)
+++ portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-09-14 18:44:36 UTC (rev 4194)
@@ -47,6 +47,7 @@
import org.exoplatform.webui.application.WebuiApplication;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.core.UIComponent;
+import org.exoplatform.webui.url.ComponentLocator;
import org.gatein.common.http.QueryStringParser;
import org.w3c.dom.Element;
@@ -260,8 +261,7 @@
}
//
- urlBuilder = new PortalURLBuilder(requestURI_);
-// urlBuilder = new PortalURLBuilder(createURL(ComponentLocator.TYPE));
+ urlBuilder = new PortalURLBuilder(this, createURL(ComponentLocator.TYPE));
}
@Override
Modified: portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalURLBuilder.java
===================================================================
--- portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalURLBuilder.java 2010-09-14 16:47:03 UTC (rev 4193)
+++ portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalURLBuilder.java 2010-09-14 18:44:36 UTC (rev 4194)
@@ -20,8 +20,10 @@
package org.exoplatform.portal.application;
import org.exoplatform.web.application.Parameter;
-import org.exoplatform.web.application.URLBuilder;
+import org.exoplatform.web.url.ResourceURL;
+import org.exoplatform.webui.application.UIComponentURLBuilder;
import org.exoplatform.webui.core.UIComponent;
+import org.exoplatform.webui.url.ComponentLocator;
import java.net.URLEncoder;
@@ -29,14 +31,24 @@
* Created by The eXo Platform SAS
* Apr 3, 2007
*/
-public class PortalURLBuilder extends URLBuilder<UIComponent>
+public class PortalURLBuilder extends UIComponentURLBuilder
{
- public PortalURLBuilder(String baseURL)
+ public PortalURLBuilder(PortalRequestContext ctx, ResourceURL<UIComponent, ComponentLocator> url)
{
- super(baseURL);
+ super(configure(ctx, url));
}
+ /*
+ * This is a hack.
+ */
+ private static ResourceURL<UIComponent, ComponentLocator> configure(PortalRequestContext prc, ResourceURL<UIComponent, ComponentLocator> url)
+ {
+ String path = prc.getNodePath();
+ url.getResourceLocator().setParameterValue(PortalRequestHandler.REQUEST_PATH, path);
+ return url;
+ }
+
@SuppressWarnings("unused")
public String createURL(String action, Parameter[] params)
{
Modified: portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURL.java
===================================================================
--- portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURL.java 2010-09-14 16:47:03 UTC (rev 4193)
+++ portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/PortalURL.java 2010-09-14 18:44:36 UTC (rev 4194)
@@ -91,12 +91,30 @@
}
//
+
+ //
if (ajax)
{
- buffer.append("javascript:ajaxGet('");
+ buffer.append("javascript:");
+ if (confirm != null && confirm.length() > 0)
+ {
+ buffer.append("if(confirm('").append(confirm.replaceAll("'", "\\\\'")).append("'))");
+ }
+ buffer.append("ajaxGet('");
}
+ else
+ {
+ if (confirm != null && confirm.length() > 0)
+ {
+ // Need to find a way to make the confirm message appear
+ // I think we could use :
+ // 1/ the if(confirm('')) ...
+ // 2/ a call function that updates window.location
+ // for now it is disabled
+ }
+ }
- // julien : find out how to change the hardcoded "classic"
+ //
Map<QualifiedName, String> parameters = new HashMap<QualifiedName, String>();
parameters.put(WebAppController.HANDLER_PARAM, "portal");
parameters.put(PortalRequestHandler.ACCESS, access);
@@ -113,9 +131,26 @@
requestContext.getControllerContext().renderURL(parameters, renderContext);
//
+ boolean questionMarkDone = false;
+ Map<String, String> queryParams = renderContext.getQueryParams();
+ System.out.println("queryParams = " + queryParams);
+ if (queryParams.size() > 0)
+ {
+ for (Map.Entry<String, String> entry : queryParams.entrySet())
+ {
+ buffer.append(questionMarkDone ? "&" : "?");
+ buffer.append(entry.getKey());
+ buffer.append('=');
+ buffer.append(entry.getValue());
+ questionMarkDone = true;
+ }
+ }
+
+ //
if (ajax)
{
- buffer.append("?ajaxRequest=true");
+ buffer.append(questionMarkDone ? "&" : "?");
+ buffer.append("ajaxRequest=true");
buffer.append("')");
}
Added: portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/component/ComponentLocatorPlugin.java
===================================================================
--- portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/component/ComponentLocatorPlugin.java (rev 0)
+++ portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/component/ComponentLocatorPlugin.java 2010-09-14 18:44:36 UTC (rev 4194)
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2010 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.portal.url.component;
+
+import org.exoplatform.portal.url.ResourceLocatorPlugin;
+import org.exoplatform.web.url.ResourceType;
+import org.exoplatform.webui.core.UIComponent;
+import org.exoplatform.webui.url.ComponentLocator;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class ComponentLocatorPlugin extends ResourceLocatorPlugin<UIComponent, ComponentLocator>
+{
+
+ @Override
+ protected ResourceType<UIComponent, ComponentLocator> getResourceType()
+ {
+ return ComponentLocator.TYPE;
+ }
+
+ @Override
+ protected ComponentLocator newLocator()
+ {
+ return new ComponentLocator();
+ }
+}
14 years, 3 months
gatein SVN: r4193 - components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-09-14 12:47:03 -0400 (Tue, 14 Sep 2010)
New Revision: 4193
Modified:
components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java
components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java
Log:
- Made reference and dereference methods static and moved them to FederatingPortletInvokerService so that they can be used by client classes if needed (in particular, WSRPConsumerImpl ^_^)
Modified: components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java
===================================================================
--- components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java 2010-09-14 14:57:36 UTC (rev 4192)
+++ components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatedPortletInvokerService.java 2010-09-14 16:47:03 UTC (rev 4193)
@@ -28,7 +28,6 @@
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.pc.api.PortletStateType;
import org.gatein.pc.api.StateEvent;
-import org.gatein.pc.api.StatefulPortletContext;
import org.gatein.pc.api.invocation.InvocationException;
import org.gatein.pc.api.invocation.PortletInvocation;
import org.gatein.pc.api.invocation.response.PortletInvocationResponse;
@@ -191,7 +190,7 @@
{
DestroyCloneFailure failure = failures.get(i);
String cloneId = failure.getPortletId();
- failure = new DestroyCloneFailure(reference(cloneId));
+ failure = new DestroyCloneFailure(FederatingPortletInvokerService.reference(cloneId, id));
failures.set(i, failure);
}
@@ -220,13 +219,13 @@
public PortletContext exportPortlet(PortletStateType stateType, PortletContext compoundPortletContext)
- throws PortletInvokerException
+ throws PortletInvokerException
{
PortletContext portletContext = dereference(compoundPortletContext);
portletContext = portletInvoker.exportPortlet(stateType, portletContext);
return reference(portletContext);
}
-
+
public PortletContext importPortlet(PortletStateType stateType, PortletContext compoundPortletContext) throws PortletInvokerException
{
PortletContext portletContext = dereference(compoundPortletContext);
@@ -236,35 +235,13 @@
private PortletContext dereference(PortletContext compoundPortletContext)
{
- String portletId = compoundPortletContext.getId().substring(id.length() + 1);
- if (compoundPortletContext instanceof StatefulPortletContext)
- {
- StatefulPortletContext<?> compoundStatefulPortletContext = (StatefulPortletContext<?>)compoundPortletContext;
- return StatefulPortletContext.create(portletId, compoundStatefulPortletContext);
- }
- else
- {
- return PortletContext.createPortletContext(portletId);
- }
+ return FederatingPortletInvokerService.dereference(compoundPortletContext, id);
}
private PortletContext reference(PortletContext portletContext)
{
- String compoundPortletId = reference(portletContext.getId());
- if (portletContext instanceof StatefulPortletContext)
- {
- StatefulPortletContext<?> statefulPortletContext = (StatefulPortletContext<?>)portletContext;
- return StatefulPortletContext.create(compoundPortletId, statefulPortletContext);
- }
- else
- {
- return PortletContext.createPortletContext(compoundPortletId);
- }
+ return FederatingPortletInvokerService.reference(portletContext, id);
}
- private String reference(String portletId)
- {
- return id + FederatingPortletInvokerService.SEPARATOR + portletId;
- }
}
\ No newline at end of file
Modified: components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java
===================================================================
--- components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java 2010-09-14 14:57:36 UTC (rev 4192)
+++ components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java 2010-09-14 16:47:03 UTC (rev 4193)
@@ -31,6 +31,7 @@
import org.gatein.pc.api.PortletInvoker;
import org.gatein.pc.api.PortletInvokerException;
import org.gatein.pc.api.PortletStateType;
+import org.gatein.pc.api.StatefulPortletContext;
import org.gatein.pc.api.invocation.PortletInvocation;
import org.gatein.pc.api.invocation.response.PortletInvocationResponse;
import org.gatein.pc.api.state.DestroyCloneFailure;
@@ -68,6 +69,39 @@
private NullInvokerHandler nullHandler = NullInvokerHandler.DEFAULT_HANDLER;
+ public static PortletContext dereference(PortletContext compoundPortletContext, String invokerId)
+ {
+ String portletId = compoundPortletContext.getId().substring(invokerId.length() + 1);
+ if (compoundPortletContext instanceof StatefulPortletContext)
+ {
+ StatefulPortletContext<?> compoundStatefulPortletContext = (StatefulPortletContext<?>)compoundPortletContext;
+ return StatefulPortletContext.create(portletId, compoundStatefulPortletContext);
+ }
+ else
+ {
+ return PortletContext.createPortletContext(portletId);
+ }
+ }
+
+ public static PortletContext reference(PortletContext portletContext, String invokerId)
+ {
+ String compoundPortletId = reference(portletContext.getId(), invokerId);
+ if (portletContext instanceof StatefulPortletContext)
+ {
+ StatefulPortletContext<?> statefulPortletContext = (StatefulPortletContext<?>)portletContext;
+ return StatefulPortletContext.create(compoundPortletId, statefulPortletContext);
+ }
+ else
+ {
+ return PortletContext.createPortletContext(compoundPortletId);
+ }
+ }
+
+ static String reference(String portletId, String invokerId)
+ {
+ return invokerId + SEPARATOR + portletId;
+ }
+
public synchronized FederatedPortletInvoker registerInvoker(String federatedId, PortletInvoker federatedInvoker)
{
if (federatedId == null)
@@ -232,19 +266,19 @@
}
public PortletContext exportPortlet(PortletStateType stateType, PortletContext compoundPortletContext)
- throws PortletInvokerException
+ throws PortletInvokerException
{
PortletInvoker federated = getFederatedPortletInvokerFor(compoundPortletContext);
return federated.exportPortlet(stateType, compoundPortletContext);
}
public PortletContext importPortlet(PortletStateType stateType, PortletContext compoundPortletContext)
- throws PortletInvokerException
+ throws PortletInvokerException
{
PortletInvoker federated = getFederatedPortletInvokerFor(compoundPortletContext);
return federated.importPortlet(stateType, compoundPortletContext);
}
-
+
public synchronized void setNullInvokerHandler(NullInvokerHandler nullHandler)
{
if (nullHandler == null)
14 years, 3 months
gatein SVN: r4192 - components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-09-14 10:57:36 -0400 (Tue, 14 Sep 2010)
New Revision: 4192
Modified:
components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml
Log:
- Fixed stupid formatting error. >_<
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml 2010-09-14 14:29:17 UTC (rev 4191)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/exports/exportDetail.xhtml 2010-09-14 14:57:36 UTC (rev 4192)
@@ -80,8 +80,7 @@
<div class="ButtonRight">
<div class="ButtonMiddle">
<h:commandLink action="import" id="use">
- #{i18n.exports_
- actions_use}
+ #{i18n.exports_actions_use}
</h:commandLink>
</div>
</div>
14 years, 3 months