gatein SVN: r2116 - in components/wci/trunk: exo and 12 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-10 11:57:26 -0500 (Wed, 10 Mar 2010)
New Revision: 2116
Modified:
components/wci/trunk/exo/pom.xml
components/wci/trunk/jetty/pom.xml
components/wci/trunk/pom.xml
components/wci/trunk/test/core/pom.xml
components/wci/trunk/test/pom.xml
components/wci/trunk/test/portlets/exo-portlet/pom.xml
components/wci/trunk/test/portlets/gatein-portlet/pom.xml
components/wci/trunk/test/portlets/native-portlet/pom.xml
components/wci/trunk/test/servers/jboss42/pom.xml
components/wci/trunk/test/servers/jboss51/pom.xml
components/wci/trunk/test/servers/pom.xml
components/wci/trunk/test/servers/tomcat6/pom.xml
components/wci/trunk/tomcat/pom.xml
components/wci/trunk/wci/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/wci/trunk/exo/pom.xml
===================================================================
--- components/wci/trunk/exo/pom.xml 2010-03-10 16:56:48 UTC (rev 2115)
+++ components/wci/trunk/exo/pom.xml 2010-03-10 16:57:26 UTC (rev 2116)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-exo</artifactId>
Modified: components/wci/trunk/jetty/pom.xml
===================================================================
--- components/wci/trunk/jetty/pom.xml 2010-03-10 16:56:48 UTC (rev 2115)
+++ components/wci/trunk/jetty/pom.xml 2010-03-10 16:57:26 UTC (rev 2116)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jetty</artifactId>
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2010-03-10 16:56:48 UTC (rev 2115)
+++ components/wci/trunk/pom.xml 2010-03-10 16:57:26 UTC (rev 2116)
@@ -6,7 +6,7 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
@@ -16,9 +16,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/tags/2.0.0-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/tags/2.0.0-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wci/tags/2.0.0-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wci/trunk/</url>
</scm>
<properties>
Modified: components/wci/trunk/test/core/pom.xml
===================================================================
--- components/wci/trunk/test/core/pom.xml 2010-03-10 16:56:48 UTC (rev 2115)
+++ components/wci/trunk/test/core/pom.xml 2010-03-10 16:57:26 UTC (rev 2116)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-core</artifactId>
Modified: components/wci/trunk/test/pom.xml
===================================================================
--- components/wci/trunk/test/pom.xml 2010-03-10 16:56:48 UTC (rev 2115)
+++ components/wci/trunk/test/pom.xml 2010-03-10 16:57:26 UTC (rev 2116)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-parent</artifactId>
Modified: components/wci/trunk/test/portlets/exo-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/exo-portlet/pom.xml 2010-03-10 16:56:48 UTC (rev 2115)
+++ components/wci/trunk/test/portlets/exo-portlet/pom.xml 2010-03-10 16:57:26 UTC (rev 2116)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-exo-portlet</artifactId>
Modified: components/wci/trunk/test/portlets/gatein-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2010-03-10 16:56:48 UTC (rev 2115)
+++ components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2010-03-10 16:57:26 UTC (rev 2116)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-gatein-portlet</artifactId>
Modified: components/wci/trunk/test/portlets/native-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/native-portlet/pom.xml 2010-03-10 16:56:48 UTC (rev 2115)
+++ components/wci/trunk/test/portlets/native-portlet/pom.xml 2010-03-10 16:57:26 UTC (rev 2116)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-native-portlet</artifactId>
Modified: components/wci/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss42/pom.xml 2010-03-10 16:56:48 UTC (rev 2115)
+++ components/wci/trunk/test/servers/jboss42/pom.xml 2010-03-10 16:57:26 UTC (rev 2116)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss42</artifactId>
Modified: components/wci/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss51/pom.xml 2010-03-10 16:56:48 UTC (rev 2115)
+++ components/wci/trunk/test/servers/jboss51/pom.xml 2010-03-10 16:57:26 UTC (rev 2116)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss51</artifactId>
Modified: components/wci/trunk/test/servers/pom.xml
===================================================================
--- components/wci/trunk/test/servers/pom.xml 2010-03-10 16:56:48 UTC (rev 2115)
+++ components/wci/trunk/test/servers/pom.xml 2010-03-10 16:57:26 UTC (rev 2116)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-server-parent</artifactId>
Modified: components/wci/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat6/pom.xml 2010-03-10 16:56:48 UTC (rev 2115)
+++ components/wci/trunk/test/servers/tomcat6/pom.xml 2010-03-10 16:57:26 UTC (rev 2116)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat6</artifactId>
Modified: components/wci/trunk/tomcat/pom.xml
===================================================================
--- components/wci/trunk/tomcat/pom.xml 2010-03-10 16:56:48 UTC (rev 2115)
+++ components/wci/trunk/tomcat/pom.xml 2010-03-10 16:57:26 UTC (rev 2116)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat</artifactId>
Modified: components/wci/trunk/wci/pom.xml
===================================================================
--- components/wci/trunk/wci/pom.xml 2010-03-10 16:56:48 UTC (rev 2115)
+++ components/wci/trunk/wci/pom.xml 2010-03-10 16:57:26 UTC (rev 2116)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-GA</version>
+ <version>2.0.1-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-wci</artifactId>
14 years, 9 months
gatein SVN: r2115 - components/wci/tags.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-10 11:56:48 -0500 (Wed, 10 Mar 2010)
New Revision: 2115
Added:
components/wci/tags/2.0.0-GA/
Log:
[maven-scm] copy for tag 2.0.0-GA
Copied: components/wci/tags/2.0.0-GA (from rev 2114, components/wci/trunk)
14 years, 9 months
gatein SVN: r2114 - in components/wci/trunk: exo and 12 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-10 11:56:17 -0500 (Wed, 10 Mar 2010)
New Revision: 2114
Modified:
components/wci/trunk/exo/pom.xml
components/wci/trunk/jetty/pom.xml
components/wci/trunk/pom.xml
components/wci/trunk/test/core/pom.xml
components/wci/trunk/test/pom.xml
components/wci/trunk/test/portlets/exo-portlet/pom.xml
components/wci/trunk/test/portlets/gatein-portlet/pom.xml
components/wci/trunk/test/portlets/native-portlet/pom.xml
components/wci/trunk/test/servers/jboss42/pom.xml
components/wci/trunk/test/servers/jboss51/pom.xml
components/wci/trunk/test/servers/pom.xml
components/wci/trunk/test/servers/tomcat6/pom.xml
components/wci/trunk/tomcat/pom.xml
components/wci/trunk/wci/pom.xml
Log:
[maven-release-plugin] prepare release 2.0.0-GA
Modified: components/wci/trunk/exo/pom.xml
===================================================================
--- components/wci/trunk/exo/pom.xml 2010-03-10 16:27:29 UTC (rev 2113)
+++ components/wci/trunk/exo/pom.xml 2010-03-10 16:56:17 UTC (rev 2114)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-exo</artifactId>
Modified: components/wci/trunk/jetty/pom.xml
===================================================================
--- components/wci/trunk/jetty/pom.xml 2010-03-10 16:27:29 UTC (rev 2113)
+++ components/wci/trunk/jetty/pom.xml 2010-03-10 16:56:17 UTC (rev 2114)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jetty</artifactId>
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2010-03-10 16:27:29 UTC (rev 2113)
+++ components/wci/trunk/pom.xml 2010-03-10 16:56:17 UTC (rev 2114)
@@ -6,7 +6,7 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
<packaging>pom</packaging>
<parent>
@@ -16,9 +16,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wci/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/tags/2.0.0-GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/tags/2.0.0-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wci/tags/2.0.0-GA</url>
</scm>
<properties>
Modified: components/wci/trunk/test/core/pom.xml
===================================================================
--- components/wci/trunk/test/core/pom.xml 2010-03-10 16:27:29 UTC (rev 2113)
+++ components/wci/trunk/test/core/pom.xml 2010-03-10 16:56:17 UTC (rev 2114)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-core</artifactId>
Modified: components/wci/trunk/test/pom.xml
===================================================================
--- components/wci/trunk/test/pom.xml 2010-03-10 16:27:29 UTC (rev 2113)
+++ components/wci/trunk/test/pom.xml 2010-03-10 16:56:17 UTC (rev 2114)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-parent</artifactId>
Modified: components/wci/trunk/test/portlets/exo-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/exo-portlet/pom.xml 2010-03-10 16:27:29 UTC (rev 2113)
+++ components/wci/trunk/test/portlets/exo-portlet/pom.xml 2010-03-10 16:56:17 UTC (rev 2114)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-exo-portlet</artifactId>
Modified: components/wci/trunk/test/portlets/gatein-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2010-03-10 16:27:29 UTC (rev 2113)
+++ components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2010-03-10 16:56:17 UTC (rev 2114)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-gatein-portlet</artifactId>
Modified: components/wci/trunk/test/portlets/native-portlet/pom.xml
===================================================================
--- components/wci/trunk/test/portlets/native-portlet/pom.xml 2010-03-10 16:27:29 UTC (rev 2113)
+++ components/wci/trunk/test/portlets/native-portlet/pom.xml 2010-03-10 16:56:17 UTC (rev 2114)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-native-portlet</artifactId>
Modified: components/wci/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss42/pom.xml 2010-03-10 16:27:29 UTC (rev 2113)
+++ components/wci/trunk/test/servers/jboss42/pom.xml 2010-03-10 16:56:17 UTC (rev 2114)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss42</artifactId>
Modified: components/wci/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/wci/trunk/test/servers/jboss51/pom.xml 2010-03-10 16:27:29 UTC (rev 2113)
+++ components/wci/trunk/test/servers/jboss51/pom.xml 2010-03-10 16:56:17 UTC (rev 2114)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss51</artifactId>
Modified: components/wci/trunk/test/servers/pom.xml
===================================================================
--- components/wci/trunk/test/servers/pom.xml 2010-03-10 16:27:29 UTC (rev 2113)
+++ components/wci/trunk/test/servers/pom.xml 2010-03-10 16:56:17 UTC (rev 2114)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-server-parent</artifactId>
Modified: components/wci/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/wci/trunk/test/servers/tomcat6/pom.xml 2010-03-10 16:27:29 UTC (rev 2113)
+++ components/wci/trunk/test/servers/tomcat6/pom.xml 2010-03-10 16:56:17 UTC (rev 2114)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat6</artifactId>
Modified: components/wci/trunk/tomcat/pom.xml
===================================================================
--- components/wci/trunk/tomcat/pom.xml 2010-03-10 16:27:29 UTC (rev 2113)
+++ components/wci/trunk/tomcat/pom.xml 2010-03-10 16:56:17 UTC (rev 2114)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat</artifactId>
Modified: components/wci/trunk/wci/pom.xml
===================================================================
--- components/wci/trunk/wci/pom.xml 2010-03-10 16:27:29 UTC (rev 2113)
+++ components/wci/trunk/wci/pom.xml 2010-03-10 16:56:17 UTC (rev 2114)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-CR03-SNAPSHOT</version>
+ <version>2.0.0-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-wci</artifactId>
14 years, 9 months
gatein SVN: r2113 - in components/wci/trunk: test/src/test and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-10 11:27:29 -0500 (Wed, 10 Mar 2010)
New Revision: 2113
Modified:
components/wci/trunk/pom.xml
components/wci/trunk/test/src/test/build.xml
Log:
- Update dependencies
- Change Cargo timeout for JBoss AS 5.1
- Use failOnError to avoid bad releases
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2010-03-10 15:22:33 UTC (rev 2112)
+++ components/wci/trunk/pom.xml 2010-03-10 16:27:29 UTC (rev 2113)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-GA</version>
</parent>
<scm>
@@ -22,7 +22,7 @@
</scm>
<properties>
- <version.gatein.common>2.0.0-CR02</version.gatein.common>
+ <version.gatein.common>2.0.0-GA</version.gatein.common>
<version.junit>3.8.2-brew</version.junit>
<version.jaxb>2.1</version.jaxb>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.gatein</groupId>
<artifactId>gatein-dep</artifactId>
- <version>1.0.0-Beta03</version>
+ <version>1.0.0-GA</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Modified: components/wci/trunk/test/src/test/build.xml
===================================================================
--- components/wci/trunk/test/src/test/build.xml 2010-03-10 15:22:33 UTC (rev 2112)
+++ components/wci/trunk/test/src/test/build.xml 2010-03-10 16:27:29 UTC (rev 2113)
@@ -867,7 +867,8 @@
log="${cargo.log.dir}/cargo.${test.id}.startup.log"
output="${cargo.log.dir}/cargo.${test.id}.server.log"
action="start"
- wait="false">
+ wait="false"
+ timeout="240000">
<sharedClasspath>
<path refid="jboss-5.1-shared"/>
@@ -1207,7 +1208,7 @@
<taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/>
- <jboss-unit>
+ <jboss-unit failOnError="true">
<tests config="${target}/test-classes/local-jboss-unit.xml">
</tests>
@@ -1236,7 +1237,7 @@
<taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/>
- <jboss-unit>
+ <jboss-unit failOnError="true">
<tests config="${target}/test-classes/remote-jboss-unit.xml">
<property name="archivePath" value="${test.temp.lib}/${test.remote.archive.path}"/>
14 years, 9 months
gatein SVN: r2112 - portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-03-10 10:22:33 -0500 (Wed, 10 Mar 2010)
New Revision: 2112
Modified:
portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LoginContext.java
Log:
package protected is enough
Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LoginContext.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LoginContext.java 2010-03-10 15:06:56 UTC (rev 2111)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LoginContext.java 2010-03-10 15:22:33 UTC (rev 2112)
@@ -26,7 +26,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public interface LoginContext
+interface LoginContext
{
void loggedIn(Session session);
14 years, 9 months
gatein SVN: r2111 - components/wsrp/trunk.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-03-10 10:06:56 -0500 (Wed, 10 Mar 2010)
New Revision: 2111
Modified:
components/wsrp/trunk/pom.xml
Log:
- Updated to use common 2.0.0-GA and 1.0.0-GA versions of gatein-parent and gatein-dep.
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-03-10 15:04:03 UTC (rev 2110)
+++ components/wsrp/trunk/pom.xml 2010-03-10 15:06:56 UTC (rev 2111)
@@ -37,7 +37,7 @@
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-GA</version>
</parent>
<scm>
@@ -48,7 +48,7 @@
<properties>
<version.gatein.pc>2.1.0-CR06-SNAPSHOT</version.gatein.pc>
- <version.gatein.common>2.0.0-CR04-SNAPSHOT</version.gatein.common>
+ <version.gatein.common>2.0.0-GA</version.gatein.common>
<version.gatein.wci>2.0.0-CR02</version.gatein.wci>
<version.jsf>1.2_12</version.jsf>
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.gatein</groupId>
<artifactId>gatein-dep</artifactId>
- <version>1.0.0-Beta03</version>
+ <version>1.0.0-GA</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -163,7 +163,6 @@
<module>test</module>
<module>producer</module>
<module>consumer</module>
- <!--<module>consumer-proxy</module>-->
<module>admin-gui</module>
<module>wsrp-producer-war</module>
<module>hibernate-impl</module>
14 years, 9 months
gatein SVN: r2110 - components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-03-10 10:04:03 -0500 (Wed, 10 Mar 2010)
New Revision: 2110
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RenderHandler.java
Log:
- Use constant for URL marking.
- Removed incorrect replacement of - by _. Thought it was needed by JS but it's only needed in identifiers. Plus, the conversion was lossy.
- Use encodeXWWWFormURL instead of safeEncodeForHTMLId to encode URLs.
- Cleaned-up in preparation of reverting to previous handling of resource URLs for release.
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RenderHandler.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RenderHandler.java 2010-03-10 14:55:56 UTC (rev 2109)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/RenderHandler.java 2010-03-10 15:04:03 UTC (rev 2110)
@@ -184,18 +184,18 @@
private String processMarkup(String markup, PortletInvocation invocation, boolean needsRewriting)
{
-
if (needsRewriting)
{
// fix-me: how to deal with fragment header? => interceptor?
+
+ // Replace rewrite token by namespace
String prefix = getNamespaceFrom(invocation.getWindowContext());
markup = TextTools.replace(markup, WSRPRewritingConstants.WSRP_REWRITE_TOKEN, prefix);
+
URLFormat format = new URLFormat(invocation.getSecurityContext().isSecure(),
invocation.getSecurityContext().isAuthenticated(), true, true);
- /*WSRPURLRewriter rewriter = new WSRPURLRewriter(invocation.getContext(), format, consumer);
- markup = URLTools.replaceURLsBy(markup, rewriter);*/
-
+ // replace URL marked for rewriting by proper ones
markup = TextTools.replaceBoundedString(markup, WSRPRewritingConstants.BEGIN_WSRP_REWRITE,
WSRPRewritingConstants.END_WSRP_REWRITE, new ResourceURLStringReplacementGenerator(invocation.getContext(), format, consumer), true, false);
}
@@ -265,41 +265,33 @@
WSRPResourceURL resource = (WSRPResourceURL)portletURL;
- // get the parsed URL and add gtnresource to it so that the consumer can know it needs to be intercepted
+ // get the parsed URL and add marker to it so that the consumer can know it needs to be intercepted
URL url = resource.getResourceURL();
+ String query = url.getQuery();
+ if (ParameterValidation.isNullOrEmpty(query))
+ {
+ query = WSRPRewritingConstants.GTNRESOURCE;
+ }
+ else
+ {
+ query = "+" + WSRPRewritingConstants.GTNRESOURCE;
+ }
+
try
{
- String query = url.getQuery();
- if (ParameterValidation.isNullOrEmpty(query))
- {
- query = "gtnresource";
- }
- else
- {
- query = "+gtnresource";
- }
URI uri = new URI(url.getProtocol(), url.getUserInfo(), url.getHost(), url.getPort(),
url.getPath(), query, url.getRef());
// set the resulting URI as the new resource ID, must be encoded as it will be used in URLs
- String s = URLTools.safeEncodeForHTMLId(uri.toString());
- s = s.replace('-', '_');
+ String s = URLTools.encodeXWWWFormURL(uri.toString());
resource.setResourceId(s);
}
catch (Exception e)
{
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ throw new IllegalArgumentException("Cannot parse specified Resource as a URI: " + url);
}
-
-
- /*// todo: this is a hack to circumvent frameworks that don't properly request resource encoding (icefaces)
- if (resource.getResourceURL().toExternalForm().startsWith(SLASH))
- {
- return info.getEndpointConfigurationInfo().getRemoteHostAddress() + match;
- }*/
}
-
return context.renderURL(portletURL, format);
}
}
14 years, 9 months
gatein SVN: r2109 - components/wsrp/trunk/common/src/main/java/org/gatein/wsrp.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-03-10 09:55:56 -0500 (Wed, 10 Mar 2010)
New Revision: 2109
Modified:
components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPRewritingConstants.java
Log:
- Added constant to mark resource URLs that need to be proxied by the consumer. Not sure it is actually needed...
Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPRewritingConstants.java
===================================================================
--- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPRewritingConstants.java 2010-03-10 14:39:31 UTC (rev 2108)
+++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPRewritingConstants.java 2010-03-10 14:55:56 UTC (rev 2109)
@@ -180,6 +180,7 @@
public static final String FAKE_RESOURCE_START = "GTN_RES_REW=";
public static final String FAKE_RESOURCE_REQ_REW = "GTN_REQ_REW";
public static final String FAKE_RESOURCE_URL = FAKE_RESOURCE_START + "{wsrp-url}" + FAKE_RESOURCE_REQ_REW + "{wsrp-requiresRewrite}";
+ public static final String GTNRESOURCE = "gtnresource";
private WSRPRewritingConstants()
{
14 years, 9 months
gatein SVN: r2108 - portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-03-10 09:39:31 -0500 (Wed, 10 Mar 2010)
New Revision: 2108
Modified:
portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticImpl.java
portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LocalContext.java
portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/SynchronizedContext.java
Log:
changing package visibility of a few classes that don't need to be visible globally
Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticImpl.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticImpl.java 2010-03-10 14:36:27 UTC (rev 2107)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticImpl.java 2010-03-10 14:39:31 UTC (rev 2108)
@@ -30,7 +30,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class ChromatticImpl implements Chromattic
+class ChromatticImpl implements Chromattic
{
/** . */
Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LocalContext.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LocalContext.java 2010-03-10 14:36:27 UTC (rev 2107)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LocalContext.java 2010-03-10 14:39:31 UTC (rev 2108)
@@ -26,7 +26,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class LocalContext extends AbstractContext implements LoginContext
+class LocalContext extends AbstractContext implements LoginContext
{
/** The related JCR session. */
Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/SynchronizedContext.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/SynchronizedContext.java 2010-03-10 14:36:27 UTC (rev 2107)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/SynchronizedContext.java 2010-03-10 14:39:31 UTC (rev 2108)
@@ -24,7 +24,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class SynchronizedContext extends AbstractContext
+class SynchronizedContext extends AbstractContext
{
/** The related synchronization when it is not null. */
14 years, 9 months
gatein SVN: r2107 - portal/trunk.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-10 09:36:27 -0500 (Wed, 10 Mar 2010)
New Revision: 2107
Modified:
portal/trunk/pom.xml
Log:
Updating parent and common
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-03-10 14:23:12 UTC (rev 2106)
+++ portal/trunk/pom.xml 2010-03-10 14:36:27 UTC (rev 2107)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.0-Beta04</version>
+ <version>1.0.0-GA</version>
</parent>
<groupId>org.exoplatform.portal</groupId>
@@ -43,7 +43,7 @@
<org.exoplatform.jcr.version>1.12.0-CR2</org.exoplatform.jcr.version>
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>1.0-r790473-Patch01</org.shindig.version>
- <org.gatein.common.version>2.0.0-CR03</org.gatein.common.version>
+ <org.gatein.common.version>2.0.0-GA</org.gatein.common.version>
<org.gatein.wci.version>2.0.0-CR02</org.gatein.wci.version>
<org.gatein.pc.version>2.1.0-CR05</org.gatein.pc.version>
<org.picketlink.idm>1.1.0.GA</org.picketlink.idm>
14 years, 9 months