February 2012 - gatein-commits - Jboss List Archives

gatein SVN: r8357 - in components/mop/trunk: api and 2 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2012-02-02 05:38:52 -0500 (Thu, 02 Feb 2012) New Revision: 8357 Modified: components/mop/trunk/api/pom.xml components/mop/trunk/core/pom.xml components/mop/trunk/pom.xml components/mop/trunk/spi/pom.xml Log: [maven-release-plugin] prepare release 1.1.1-GA Modified: components/mop/trunk/api/pom.xml =================================================================== --- components/mop/trunk/api/pom.xml 2012-02-02 10:23:29 UTC (rev 8356) +++ components/mop/trunk/api/pom.xml 2012-02-02 10:38:52 UTC (rev 8357) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.1.1-GA-SNAPSHOT</version> + <version>1.1.1-GA</version> </parent>  Modified: components/mop/trunk/core/pom.xml =================================================================== --- components/mop/trunk/core/pom.xml 2012-02-02 10:23:29 UTC (rev 8356) +++ components/mop/trunk/core/pom.xml 2012-02-02 10:38:52 UTC (rev 8357) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.1.1-GA-SNAPSHOT</version> + <version>1.1.1-GA</version> </parent>  Modified: components/mop/trunk/pom.xml =================================================================== --- components/mop/trunk/pom.xml 2012-02-02 10:23:29 UTC (rev 8356) +++ components/mop/trunk/pom.xml 2012-02-02 10:38:52 UTC (rev 8357) @@ -34,16 +34,16 @@ <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.1.1-GA-SNAPSHOT</version> + <version>1.1.1-GA</version> <packaging>pom</packaging> <name>GateIn - MOP</name> <description>Model Object for Portal</description> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.1.1-GA</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.1.1-GA</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.1.1-GA</url> </scm> <dependencyManagement> Modified: components/mop/trunk/spi/pom.xml =================================================================== --- components/mop/trunk/spi/pom.xml 2012-02-02 10:23:29 UTC (rev 8356) +++ components/mop/trunk/spi/pom.xml 2012-02-02 10:38:52 UTC (rev 8357) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.mop</groupId> <artifactId>mop-parent</artifactId> - <version>1.1.1-GA-SNAPSHOT</version> + <version>1.1.1-GA</version> </parent>

12 years, 10 months

1
0
0 / 0

gatein SVN: r8356 - components/mop/trunk.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2012-02-02 05:23:29 -0500 (Thu, 02 Feb 2012) New Revision: 8356 Modified: components/mop/trunk/pom.xml Log: GTNMOP-47 : Update Chromattic to 1.1.2 Modified: components/mop/trunk/pom.xml =================================================================== --- components/mop/trunk/pom.xml 2012-02-01 22:40:21 UTC (rev 8355) +++ components/mop/trunk/pom.xml 2012-02-02 10:23:29 UTC (rev 8356) @@ -124,7 +124,7 @@   - <org.chromattic.version>1.1.1</org.chromattic.version> + <org.chromattic.version>1.1.2</org.chromattic.version> <!-- Current testuite doesn't work with surefire 2.7 defined in parent pom

12 years, 10 months

1
0
0 / 0

gatein SVN: r8355 - epp/portal/branches/EPP_5_2_Branch.

by do-not-reply＠jboss.org

Author: nscavell Date: 2012-02-01 17:40:21 -0500 (Wed, 01 Feb 2012) New Revision: 8355 Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml Log: JBEPP-1498: Update gatein-management to 1.0.1-GA Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-02-01 22:29:47 UTC (rev 8354) +++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2012-02-01 22:40:21 UTC (rev 8355) @@ -55,7 +55,7 @@ <org.picketlink.idm>1.3.0.GA</org.picketlink.idm> <org.gatein.wsrp.version>2.1.0-EPP520-GA</org.gatein.wsrp.version> <org.gatein.mop.version>1.1.0-GA</org.gatein.mop.version> - <org.gatein.mgmt.version>1.0.0-GA</org.gatein.mgmt.version> + <org.gatein.mgmt.version>1.0.1-GA</org.gatein.mgmt.version> <org.slf4j.version>1.5.8</org.slf4j.version> <commons-pool.version>1.5.5</commons-pool.version> <rhino.version>1.6R5</rhino.version>

12 years, 11 months

1
0
0 / 0

gatein SVN: r8354 - portal/trunk.

by do-not-reply＠jboss.org

Author: nscavell Date: 2012-02-01 17:29:47 -0500 (Wed, 01 Feb 2012) New Revision: 8354 Modified: portal/trunk/pom.xml Log: GTNPORTAL-2343: Update gatein-management to 1.0.1-GA Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) +++ portal/trunk/pom.xml 2012-02-01 22:29:47 UTC (rev 8354) @@ -49,7 +49,7 @@ <org.picketlink.idm>1.3.0.GA</org.picketlink.idm> <org.gatein.wsrp.version>2.1.0-GA</org.gatein.wsrp.version> <org.gatein.mop.version>1.1.0-GA</org.gatein.mop.version> - <org.gatein.mgmt.version>1.0.0-GA</org.gatein.mgmt.version> + <org.gatein.mgmt.version>1.0.1-GA</org.gatein.mgmt.version> <org.slf4j.version>1.5.8</org.slf4j.version> <commons-pool.version>1.5.5</commons-pool.version> <rhino.version>1.6R5</rhino.version>

12 years, 11 months

1
0
0 / 0

gatein SVN: r8353 - in components/wci/trunk: exo and 21 other directories.

by do-not-reply＠jboss.org

Author: mwringe Date: 2012-02-01 16:20:30 -0500 (Wed, 01 Feb 2012) New Revision: 8353 Modified: components/wci/trunk/exo/pom.xml components/wci/trunk/jboss/jboss6/pom.xml components/wci/trunk/jboss/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/portlets/native-skipped-portlet/pom.xml components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml components/wci/trunk/test/portlets/pom.xml components/wci/trunk/test/servers/jboss51/pom.xml components/wci/trunk/test/servers/jboss6/pom.xml components/wci/trunk/test/servers/jetty6/pom.xml components/wci/trunk/test/servers/pom.xml components/wci/trunk/test/servers/tomcat6/pom.xml components/wci/trunk/test/servers/tomcat7/pom.xml components/wci/trunk/tomcat/pom.xml components/wci/trunk/tomcat/tomcat6/pom.xml components/wci/trunk/tomcat/tomcat7/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 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/exo/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-exo</artifactId> Modified: components/wci/trunk/jboss/jboss6/pom.xml =================================================================== --- components/wci/trunk/jboss/jboss6/pom.xml 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/jboss/jboss6/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-jboss</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-jboss6</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> <packaging>jar</packaging> <name>GateIn - WCI JBoss 6 compatibility component</name> Modified: components/wci/trunk/jboss/pom.xml =================================================================== --- components/wci/trunk/jboss/pom.xml 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/jboss/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-jboss</artifactId> Modified: components/wci/trunk/jetty/pom.xml =================================================================== --- components/wci/trunk/jetty/pom.xml 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/jetty/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-jetty</artifactId> Modified: components/wci/trunk/pom.xml =================================================================== --- components/wci/trunk/pom.xml 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -6,7 +6,7 @@ <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-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.1.1-B...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/tags/2.1.1-Beta01</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/components/wci/tags/2.1.1-Beta01</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 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/test/core/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-parent</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-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 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/test/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-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 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/test/portlets/exo-portlet/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-portlets</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-exo-portlet</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> <packaging>war</packaging> <name>GateIn - WCI eXo Backwards Compatibility Test Portlet</name> </project> Modified: components/wci/trunk/test/portlets/gatein-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-portlets</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-gatein-portlet</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> <packaging>war</packaging> <name>GateIn - WCI Gatein Test Portlet</name> </project> Modified: components/wci/trunk/test/portlets/native-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/native-portlet/pom.xml 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/test/portlets/native-portlet/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-portlets</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-native-portlet</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> <packaging>war</packaging> <name>GateIn - WCI Native Test Portlet</name> </project> Modified: components/wci/trunk/test/portlets/native-skipped-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/native-skipped-portlet/pom.xml 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/test/portlets/native-skipped-portlet/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-portlets</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-native-skipped-portlet</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> <packaging>war</packaging> <name>GateIn - WCI Native Skip Test Portlet</name> </project> Modified: components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-portlets</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> <packaging>war</packaging> <name>GateIn - WCI Native Skip Test Portlet With GateInServlet Registration</name> </project> Modified: components/wci/trunk/test/portlets/pom.xml =================================================================== --- components/wci/trunk/test/portlets/pom.xml 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/test/portlets/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-parent</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-portlets</artifactId> Modified: components/wci/trunk/test/servers/jboss51/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/pom.xml 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/test/servers/jboss51/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-server-parent</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-jboss51</artifactId> Modified: components/wci/trunk/test/servers/jboss6/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/pom.xml 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/test/servers/jboss6/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-server-parent</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-jboss6</artifactId> Modified: components/wci/trunk/test/servers/jetty6/pom.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/pom.xml 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/test/servers/jetty6/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-server-parent</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-jetty6</artifactId> Modified: components/wci/trunk/test/servers/pom.xml =================================================================== --- components/wci/trunk/test/servers/pom.xml 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/test/servers/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-parent</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-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 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/test/servers/tomcat6/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-server-parent</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-tomcat6</artifactId> Modified: components/wci/trunk/test/servers/tomcat7/pom.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/pom.xml 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/test/servers/tomcat7/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-server-parent</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-tomcat7</artifactId> Modified: components/wci/trunk/tomcat/pom.xml =================================================================== --- components/wci/trunk/tomcat/pom.xml 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/tomcat/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-tomcat</artifactId> Modified: components/wci/trunk/tomcat/tomcat6/pom.xml =================================================================== --- components/wci/trunk/tomcat/tomcat6/pom.xml 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/tomcat/tomcat6/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-tomcat</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-tomcat6</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> <packaging>jar</packaging> <name>GateIn - WCI Tomcat 6 compatibility component</name> Modified: components/wci/trunk/tomcat/tomcat7/pom.xml =================================================================== --- components/wci/trunk/tomcat/tomcat7/pom.xml 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/tomcat/tomcat7/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-tomcat</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-tomcat7</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> <packaging>jar</packaging> <name>GateIn - WCI Tomcat 7 compatibility component</name> Modified: components/wci/trunk/wci/pom.xml =================================================================== --- components/wci/trunk/wci/pom.xml 2012-02-01 21:20:06 UTC (rev 8352) +++ components/wci/trunk/wci/pom.xml 2012-02-01 21:20:30 UTC (rev 8353) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.1-Beta01</version> + <version>2.1.1-Beta02-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-wci</artifactId>

12 years, 11 months

1
0
0 / 0

gatein SVN: r8352 - components/wci/tags.

by do-not-reply＠jboss.org

Author: mwringe Date: 2012-02-01 16:20:06 -0500 (Wed, 01 Feb 2012) New Revision: 8352 Added: components/wci/tags/2.1.1-Beta01/ Log: [maven-release-plugin] copy for tag 2.1.1-Beta01

12 years, 11 months

1
0
0 / 0

gatein SVN: r8351 - in components/wci/trunk: exo and 21 other directories.

by do-not-reply＠jboss.org

Author: mwringe Date: 2012-02-01 16:19:55 -0500 (Wed, 01 Feb 2012) New Revision: 8351 Modified: components/wci/trunk/exo/pom.xml components/wci/trunk/jboss/jboss6/pom.xml components/wci/trunk/jboss/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/portlets/native-skipped-portlet/pom.xml components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml components/wci/trunk/test/portlets/pom.xml components/wci/trunk/test/servers/jboss51/pom.xml components/wci/trunk/test/servers/jboss6/pom.xml components/wci/trunk/test/servers/jetty6/pom.xml components/wci/trunk/test/servers/pom.xml components/wci/trunk/test/servers/tomcat6/pom.xml components/wci/trunk/test/servers/tomcat7/pom.xml components/wci/trunk/tomcat/pom.xml components/wci/trunk/tomcat/tomcat6/pom.xml components/wci/trunk/tomcat/tomcat7/pom.xml components/wci/trunk/wci/pom.xml Log: [maven-release-plugin] prepare release 2.1.1-Beta01 Modified: components/wci/trunk/exo/pom.xml =================================================================== --- components/wci/trunk/exo/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/exo/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-exo</artifactId> Modified: components/wci/trunk/jboss/jboss6/pom.xml =================================================================== --- components/wci/trunk/jboss/jboss6/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/jboss/jboss6/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-jboss</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-jboss6</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> <packaging>jar</packaging> <name>GateIn - WCI JBoss 6 compatibility component</name> Modified: components/wci/trunk/jboss/pom.xml =================================================================== --- components/wci/trunk/jboss/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/jboss/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-jboss</artifactId> Modified: components/wci/trunk/jetty/pom.xml =================================================================== --- components/wci/trunk/jetty/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/jetty/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-jetty</artifactId> Modified: components/wci/trunk/pom.xml =================================================================== --- components/wci/trunk/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -6,7 +6,7 @@ <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</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.1.1-B...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/tags/2.1.1-Beta01</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/components/wci/tags/2.1.1-Beta01</url> </scm> <properties> Modified: components/wci/trunk/test/core/pom.xml =================================================================== --- components/wci/trunk/test/core/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/test/core/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-parent</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</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 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/test/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</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 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/test/portlets/exo-portlet/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-portlets</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-exo-portlet</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> <packaging>war</packaging> <name>GateIn - WCI eXo Backwards Compatibility Test Portlet</name> </project> Modified: components/wci/trunk/test/portlets/gatein-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/test/portlets/gatein-portlet/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-portlets</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-gatein-portlet</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> <packaging>war</packaging> <name>GateIn - WCI Gatein Test Portlet</name> </project> Modified: components/wci/trunk/test/portlets/native-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/native-portlet/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/test/portlets/native-portlet/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-portlets</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-native-portlet</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> <packaging>war</packaging> <name>GateIn - WCI Native Test Portlet</name> </project> Modified: components/wci/trunk/test/portlets/native-skipped-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/native-skipped-portlet/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/test/portlets/native-skipped-portlet/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-portlets</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-native-skipped-portlet</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> <packaging>war</packaging> <name>GateIn - WCI Native Skip Test Portlet</name> </project> Modified: components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml =================================================================== --- components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/test/portlets/native-skipped-with-gateinservlet-portlet/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-portlets</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-native-skipped-with-gateinservlet-portlet</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> <packaging>war</packaging> <name>GateIn - WCI Native Skip Test Portlet With GateInServlet Registration</name> </project> Modified: components/wci/trunk/test/portlets/pom.xml =================================================================== --- components/wci/trunk/test/portlets/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/test/portlets/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-parent</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-portlets</artifactId> Modified: components/wci/trunk/test/servers/jboss51/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss51/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/test/servers/jboss51/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-server-parent</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-jboss51</artifactId> @@ -387,8 +387,8 @@ <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" /> <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" /> - <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}"/> - <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}"/> + <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}" /> + <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}" /> <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />  Modified: components/wci/trunk/test/servers/jboss6/pom.xml =================================================================== --- components/wci/trunk/test/servers/jboss6/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/test/servers/jboss6/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-server-parent</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-jboss6</artifactId> @@ -415,8 +415,8 @@ <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" /> <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" /> - <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}"/> - <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}"/> + <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}" /> + <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}" /> <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />  Modified: components/wci/trunk/test/servers/jetty6/pom.xml =================================================================== --- components/wci/trunk/test/servers/jetty6/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/test/servers/jetty6/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-server-parent</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-jetty6</artifactId> @@ -404,8 +404,8 @@ <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" /> <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" /> <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" /> - <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}"/> - <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}"/> + <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}" /> + <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}" /> <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />  Modified: components/wci/trunk/test/servers/pom.xml =================================================================== --- components/wci/trunk/test/servers/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/test/servers/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-parent</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</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 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/test/servers/tomcat6/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-server-parent</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-tomcat6</artifactId> @@ -399,8 +399,8 @@ <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" /> <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" /> - <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}"/> - <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}"/> + <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}" /> + <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}" /> <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />  Modified: components/wci/trunk/test/servers/tomcat7/pom.xml =================================================================== --- components/wci/trunk/test/servers/tomcat7/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/test/servers/tomcat7/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-test-server-parent</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-test-tomcat7</artifactId> @@ -393,8 +393,8 @@ <property name="test.generic.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-gatein-portlet.war.path}" /> <property name="test.native.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-portlet.war.path}" /> - <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}"/> - <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}"/> + <property name="test.native-skip.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-portlet.war.path}" /> + <property name="test.native-skip-with-gateinservlet.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-native-skipped-with-gateinservlet-portlet.war.path}" /> <property name="test.exo.portlet.war" value="${maven.dependency.org.gatein.wci.wci-test-exo-portlet.war.path}" />  Modified: components/wci/trunk/tomcat/pom.xml =================================================================== --- components/wci/trunk/tomcat/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/tomcat/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-tomcat</artifactId> Modified: components/wci/trunk/tomcat/tomcat6/pom.xml =================================================================== --- components/wci/trunk/tomcat/tomcat6/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/tomcat/tomcat6/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-tomcat</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-tomcat6</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> <packaging>jar</packaging> <name>GateIn - WCI Tomcat 6 compatibility component</name> Modified: components/wci/trunk/tomcat/tomcat7/pom.xml =================================================================== --- components/wci/trunk/tomcat/tomcat7/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/tomcat/tomcat7/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,11 +2,11 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-tomcat</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-tomcat7</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> <packaging>jar</packaging> <name>GateIn - WCI Tomcat 7 compatibility component</name> Modified: components/wci/trunk/wci/pom.xml =================================================================== --- components/wci/trunk/wci/pom.xml 2012-02-01 21:07:55 UTC (rev 8350) +++ components/wci/trunk/wci/pom.xml 2012-02-01 21:19:55 UTC (rev 8351) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.wci</groupId> <artifactId>wci-parent</artifactId> - <version>2.1.1-Beta01-SNAPSHOT</version> + <version>2.1.1-Beta01</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wci-wci</artifactId>

12 years, 11 months

1
0
0 / 0

gatein SVN: r8350 - in portal/trunk/wsrp-integration: extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf and 1 other directory.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2012-02-01 16:07:55 -0500 (Wed, 01 Feb 2012) New Revision: 8350 Removed: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/ConversationStateCredentialsAccessor.java Modified: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java portal/trunk/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml Log: - Reverted changes from GTNWSRP-268 until a new WSRP version is released. Deleted: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/ConversationStateCredentialsAccessor.java =================================================================== --- portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/ConversationStateCredentialsAccessor.java 2012-02-01 19:10:58 UTC (rev 8349) +++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/ConversationStateCredentialsAccessor.java 2012-02-01 21:07:55 UTC (rev 8350) @@ -1,55 +0,0 @@ -/* - * JBoss, a division of Red Hat - * Copyright 2012, Red Hat Middleware, LLC, and individual - * contributors as indicated by the @authors tag. See the - * copyright.txt in the distribution for a full listing of - * individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.gatein.integration.wsrp.wss; - -import org.exoplatform.services.security.ConversationState; -import org.gatein.common.logging.Logger; -import org.gatein.common.logging.LoggerFactory; -import org.gatein.wci.security.Credentials; -import org.gatein.wsrp.wss.credentials.CredentialsAccessor; - -/** - * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a> - */ -public class ConversationStateCredentialsAccessor implements CredentialsAccessor -{ - - private static final Logger log = LoggerFactory.getLogger(ConversationStateCredentialsAccessor.class); - - /** - * Reading credentials from @{link ConversationState} of current user. - * - * @return credentials - */ - @Override - public Credentials getCredentials() - { - if (ConversationState.getCurrent() == null) - { - log.warn("Cannot find Credentials because ConversationState not set."); - return null; - } - return (Credentials)ConversationState.getCurrent().getAttribute(Credentials.CREDENTIALS); - } -} Modified: portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java =================================================================== --- portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java 2012-02-01 19:10:58 UTC (rev 8349) +++ portal/trunk/wsrp-integration/extension-component/src/main/java/org/gatein/integration/wsrp/wss/JBoss5WSSServiceIntegration.java 2012-02-01 21:07:55 UTC (rev 8350) @@ -23,7 +23,6 @@ package org.gatein.integration.wsrp.wss; import org.gatein.wsrp.wss.WebServiceSecurityFactory; -import org.gatein.wsrp.wss.credentials.CredentialsAccessor; import org.picocontainer.Startable; import org.wsrp.wss.jboss5.handlers.consumer.JBWSSecurityHandlerWrapper; import org.wsrp.wss.jboss5.handlers.consumer.WSSecurityCredentialHandler; @@ -36,13 +35,12 @@ { private final WebServiceSecurityFactory wssFactory; - private final WSSecurityCredentialHandler WS_CREDENTIAL_HANDLER; + private final WSSecurityCredentialHandler WS_CREDENTIAL_HANDLER = new WSSecurityCredentialHandler(); private final JBWSSecurityHandlerWrapper JBWS_SECURITY_WRAPPER = new JBWSSecurityHandlerWrapper(); - public JBoss5WSSServiceIntegration(CredentialsAccessor credentialsAccessor) + public JBoss5WSSServiceIntegration() { wssFactory = WebServiceSecurityFactory.getInstance(); - WS_CREDENTIAL_HANDLER = new WSSecurityCredentialHandler(credentialsAccessor); } public void start() Modified: portal/trunk/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml =================================================================== --- portal/trunk/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml 2012-02-01 19:10:58 UTC (rev 8349) +++ portal/trunk/wsrp-integration/extension-ear-as5/src/main/application/lib/jboss5integration.jar/conf/configuration.xml 2012-02-01 21:07:55 UTC (rev 8350) @@ -28,16 +28,6 @@ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_2.xsd"> <component> - <key>org.gatein.wsrp.wss.credentials.CredentialsAccessor</key> - -  - <type>org.gatein.wsrp.wss.credentials.HTTPSessionCredentialsAccessor</type> - -  -  - </component> - - <component> <type>org.gatein.integration.wsrp.wss.JBoss5WSSServiceIntegration</type> </component>

12 years, 11 months

1
0
0 / 0

gatein SVN: r8349 - portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2012-02-01 14:10:58 -0500 (Wed, 01 Feb 2012) New Revision: 8349 Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/UserConfigurableValidator.java Log: - GTNPORTAL-1673: Added documentation. Modified: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/UserConfigurableValidator.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/UserConfigurableValidator.java 2012-02-01 18:56:16 UTC (rev 8348) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/UserConfigurableValidator.java 2012-02-01 19:10:58 UTC (rev 8349) @@ -38,7 +38,27 @@ import java.util.Properties; import java.util.regex.Pattern; -/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */ +/** + * A user-configurable validator. Several aspects of this validator can be configured via properties in the + * configuration.properties file found in the GateIn configuration directory (${gatein.conf.dir}. The validator + * supports several configurations that can be activated when a validator instance is created by passing it the name of + * the configuration to be activated. A configuration is created by adding an entry in configuration.properties using + * the {@link #KEY_PREFIX} prefix followed by the name of the configuration, a period '.' and the name of the + * validation aspect to modify. + * <p/> + * Currently supported validation aspects, where {configuration} is a configuration's name: + * <ul> + * <li>{@link #KEY_PREFIX}{configuration}.length.min: the minimal length of the validated field</li> + * <li>{@link #KEY_PREFIX}{configuration}.length.max: the maximal length of the validated field</li> + * <li>{@link #KEY_PREFIX}{configuration}.regexp: the regular expression to which the validated field must conform</li> + * <li>{@link #KEY_PREFIX}{configuration}.format.message: a message to display providing details about the format of + * values the regular expression allows in case the validated field doesn't conform to it</li> + * </ul> + * + * Currently used configurations in the code are defined by the {@link #USERNAME} and {@link #GROUPMEMBERSHIP} names. + * + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + */ @Serialized public class UserConfigurableValidator extends MultipleConditionsValidator { @@ -72,7 +92,7 @@ { // extract property key String propertyKey = key.substring(length, key.indexOf('.', length)); - if(!configurations.containsKey(propertyKey)) + if (!configurations.containsKey(propertyKey)) { configurations.put(propertyKey, new ValidatorConfiguration(propertyKey, properties)); } @@ -96,17 +116,17 @@ this(USERNAME, DEFAULT_LOCALIZATION_KEY); } - public UserConfigurableValidator(String validatorName, String messageLocalizationKey) + public UserConfigurableValidator(String configurationName, String messageLocalizationKey) { this.exceptionOnMissingMandatory = true; this.trimValue = true; localizationKey = messageLocalizationKey != null ? messageLocalizationKey : DEFAULT_LOCALIZATION_KEY; - this.validatorName = validatorName != null ? validatorName : USERNAME; + this.validatorName = configurationName != null ? configurationName : USERNAME; } - public UserConfigurableValidator(String validatorName) + public UserConfigurableValidator(String configurationName) { - this(validatorName, DEFAULT_LOCALIZATION_KEY); + this(configurationName, DEFAULT_LOCALIZATION_KEY); } @Override @@ -161,10 +181,10 @@ boolean isUser = USERNAME.equals(propertyKey); String prefixedKey = KEY_PREFIX + propertyKey; - String property = properties.getProperty(prefixedKey + ".min.length"); + String property = properties.getProperty(prefixedKey + ".length.min"); minLength = property != null ? Integer.valueOf(property) : (isUser ? UsernameValidator.DEFAULT_MIN_LENGTH : 0); - property = properties.getProperty(prefixedKey + ".max.length"); + property = properties.getProperty(prefixedKey + ".length.max"); maxLength = property != null ? Integer.valueOf(property) : (isUser ? UsernameValidator.DEFAULT_MAX_LENGTH : Integer.MAX_VALUE); pattern = properties.getProperty(prefixedKey + ".regexp", Utils.USER_NAME_VALIDATOR_REGEX);

12 years, 11 months

1
0
0 / 0

gatein SVN: r8348 - in portal/trunk/webui/core/src: test/java/org/exoplatform/webui/test/validator and 1 other directory.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2012-02-01 13:56:16 -0500 (Wed, 01 Feb 2012) New Revision: 8348 Added: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/UserConfigurableValidator.java Removed: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/UserConfigurableUsernameValidator.java Modified: portal/trunk/webui/core/src/test/java/org/exoplatform/webui/test/validator/TestWebuiValidator.java Log: - GTNPORTAL-1673: Renamed UserConfigurableUsernameValidator to UserConfigurableValidator since it makes more sense. Deleted: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/UserConfigurableUsernameValidator.java =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/UserConfigurableUsernameValidator.java 2012-02-01 18:54:13 UTC (rev 8347) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/UserConfigurableUsernameValidator.java 2012-02-01 18:56:16 UTC (rev 8348) @@ -1,175 +0,0 @@ -/* - * JBoss, a division of Red Hat - * Copyright 2012, Red Hat Middleware, LLC, and individual - * contributors as indicated by the @authors tag. See the - * copyright.txt in the distribution for a full listing of - * individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.exoplatform.webui.form.validator; - -import org.exoplatform.commons.serialization.api.annotations.Serialized; -import org.exoplatform.portal.pom.config.Utils; -import org.exoplatform.services.log.ExoLogger; -import org.exoplatform.services.log.Log; -import org.exoplatform.web.application.CompoundApplicationMessage; -import org.exoplatform.webui.form.UIFormInput; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; -import java.util.regex.Pattern; - -/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */ -@Serialized -public class UserConfigurableUsernameValidator extends MultipleConditionsValidator -{ - protected static Log log = ExoLogger.getLogger(UserConfigurableUsernameValidator.class); - - public static final String USERNAME = "username"; - public static final String GROUPMEMBERSHIP = "groupmembership"; - public static final String DEFAULT_LOCALIZATION_KEY = "ExpressionValidator.msg.value-invalid"; - public static final String GROUP_MEMBERSHIP_VALIDATION_REGEX = "^\\p{L}[\\p{L}\\d._\\-\\s*,\\s*]+$"; - public static final String GROUP_MEMBERSHIP_LOCALIZATION_KEY = "UIGroupMembershipForm.msg.Invalid-char"; - - private static Map<String, ValidatorConfiguration> configurations = new HashMap<String, ValidatorConfiguration>(3); - - public static final String KEY_PREFIX = "gatein.validators."; - - static - { - String gateinConfDir = System.getProperty("gatein.conf.dir"); - File conf = new File(gateinConfDir, "configuration.properties"); - if (conf.exists()) - { - try - { - Properties properties = new Properties(); - properties.load(new FileInputStream(conf)); - int length = KEY_PREFIX.length(); - for (Object objectKey : properties.keySet()) - { - String key = (String)objectKey; - if (key.startsWith(KEY_PREFIX)) - { - // extract property key - String propertyKey = key.substring(length, key.indexOf('.', length)); - if(!configurations.containsKey(propertyKey)) - { - configurations.put(propertyKey, new ValidatorConfiguration(propertyKey, properties)); - } - } - } - } - catch (IOException e) - { - log.info(e.getLocalizedMessage()); - log.debug(e); - } - } - } - - private final String validatorName; - private final String localizationKey; - - // needed by @Serialized - public UserConfigurableUsernameValidator() - { - this(USERNAME, DEFAULT_LOCALIZATION_KEY); - } - - public UserConfigurableUsernameValidator(String validatorName, String messageLocalizationKey) - { - this.exceptionOnMissingMandatory = true; - this.trimValue = true; - localizationKey = messageLocalizationKey != null ? messageLocalizationKey : DEFAULT_LOCALIZATION_KEY; - this.validatorName = validatorName != null ? validatorName : USERNAME; - } - - public UserConfigurableUsernameValidator(String validatorName) - { - this(validatorName, DEFAULT_LOCALIZATION_KEY); - } - - @Override - protected void validate(String value, String label, CompoundApplicationMessage messages, UIFormInput uiInput) - { - ValidatorConfiguration configuration = configurations.get(validatorName); - - if (configuration == null) - { - // we don't have a user-configured validator for this validator name - - if (USERNAME.equals(validatorName)) - { - // if the validator name is USERNAME constant, we have a username to validate with the original, non-configured behavior - UsernameValidator.validate(value, label, messages, UsernameValidator.DEFAULT_MIN_LENGTH, UsernameValidator.DEFAULT_MAX_LENGTH); - } - else - { - // else, we assume that we need to validate a group membership, replicating original behavior - if (!Pattern.matches(GROUP_MEMBERSHIP_VALIDATION_REGEX, value)) - { - messages.addMessage(localizationKey, new Object[]{label}); - } - } - } - else - { - // otherwise, use the user-provided configuration - - if (value.length() < configuration.minLength || value.length() > configuration.maxLength) - { - messages.addMessage("StringLengthValidator.msg.length-invalid", new Object[]{label, configuration.minLength.toString(), configuration.maxLength.toString()}); - } - - if (!Pattern.matches(configuration.pattern, value)) - { - messages.addMessage(localizationKey, new Object[]{label, configuration.formatMessage}); - } - } - } - - private static class ValidatorConfiguration - { - private Integer minLength; - private Integer maxLength; - private String pattern; - private String formatMessage; - - private ValidatorConfiguration(String propertyKey, Properties properties) - { - // used to assign backward compatible default values - boolean isUser = USERNAME.equals(propertyKey); - String prefixedKey = KEY_PREFIX + propertyKey; - - String property = properties.getProperty(prefixedKey + ".min.length"); - minLength = property != null ? Integer.valueOf(property) : (isUser ? UsernameValidator.DEFAULT_MIN_LENGTH : 0); - - property = properties.getProperty(prefixedKey + ".max.length"); - maxLength = property != null ? Integer.valueOf(property) : (isUser ? UsernameValidator.DEFAULT_MAX_LENGTH : Integer.MAX_VALUE); - - pattern = properties.getProperty(prefixedKey + ".regexp", Utils.USER_NAME_VALIDATOR_REGEX); - formatMessage = properties.getProperty(prefixedKey + ".format.message", pattern); - } - - } -} Copied: portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/UserConfigurableValidator.java (from rev 8347, portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/UserConfigurableUsernameValidator.java) =================================================================== --- portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/UserConfigurableValidator.java (rev 0) +++ portal/trunk/webui/core/src/main/java/org/exoplatform/webui/form/validator/UserConfigurableValidator.java 2012-02-01 18:56:16 UTC (rev 8348) @@ -0,0 +1,175 @@ +/* + * JBoss, a division of Red Hat + * Copyright 2012, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.webui.form.validator; + +import org.exoplatform.commons.serialization.api.annotations.Serialized; +import org.exoplatform.portal.pom.config.Utils; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; +import org.exoplatform.web.application.CompoundApplicationMessage; +import org.exoplatform.webui.form.UIFormInput; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import java.util.regex.Pattern; + +/** @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> */ +@Serialized +public class UserConfigurableValidator extends MultipleConditionsValidator +{ + protected static Log log = ExoLogger.getLogger(UserConfigurableValidator.class); + + public static final String USERNAME = "username"; + public static final String GROUPMEMBERSHIP = "groupmembership"; + public static final String DEFAULT_LOCALIZATION_KEY = "ExpressionValidator.msg.value-invalid"; + public static final String GROUP_MEMBERSHIP_VALIDATION_REGEX = "^\\p{L}[\\p{L}\\d._\\-\\s*,\\s*]+$"; + public static final String GROUP_MEMBERSHIP_LOCALIZATION_KEY = "UIGroupMembershipForm.msg.Invalid-char"; + + private static Map<String, ValidatorConfiguration> configurations = new HashMap<String, ValidatorConfiguration>(3); + + public static final String KEY_PREFIX = "gatein.validators."; + + static + { + String gateinConfDir = System.getProperty("gatein.conf.dir"); + File conf = new File(gateinConfDir, "configuration.properties"); + if (conf.exists()) + { + try + { + Properties properties = new Properties(); + properties.load(new FileInputStream(conf)); + int length = KEY_PREFIX.length(); + for (Object objectKey : properties.keySet()) + { + String key = (String)objectKey; + if (key.startsWith(KEY_PREFIX)) + { + // extract property key + String propertyKey = key.substring(length, key.indexOf('.', length)); + if(!configurations.containsKey(propertyKey)) + { + configurations.put(propertyKey, new ValidatorConfiguration(propertyKey, properties)); + } + } + } + } + catch (IOException e) + { + log.info(e.getLocalizedMessage()); + log.debug(e); + } + } + } + + private final String validatorName; + private final String localizationKey; + + // needed by @Serialized + public UserConfigurableValidator() + { + this(USERNAME, DEFAULT_LOCALIZATION_KEY); + } + + public UserConfigurableValidator(String validatorName, String messageLocalizationKey) + { + this.exceptionOnMissingMandatory = true; + this.trimValue = true; + localizationKey = messageLocalizationKey != null ? messageLocalizationKey : DEFAULT_LOCALIZATION_KEY; + this.validatorName = validatorName != null ? validatorName : USERNAME; + } + + public UserConfigurableValidator(String validatorName) + { + this(validatorName, DEFAULT_LOCALIZATION_KEY); + } + + @Override + protected void validate(String value, String label, CompoundApplicationMessage messages, UIFormInput uiInput) + { + ValidatorConfiguration configuration = configurations.get(validatorName); + + if (configuration == null) + { + // we don't have a user-configured validator for this validator name + + if (USERNAME.equals(validatorName)) + { + // if the validator name is USERNAME constant, we have a username to validate with the original, non-configured behavior + UsernameValidator.validate(value, label, messages, UsernameValidator.DEFAULT_MIN_LENGTH, UsernameValidator.DEFAULT_MAX_LENGTH); + } + else + { + // else, we assume that we need to validate a group membership, replicating original behavior + if (!Pattern.matches(GROUP_MEMBERSHIP_VALIDATION_REGEX, value)) + { + messages.addMessage(localizationKey, new Object[]{label}); + } + } + } + else + { + // otherwise, use the user-provided configuration + + if (value.length() < configuration.minLength || value.length() > configuration.maxLength) + { + messages.addMessage("StringLengthValidator.msg.length-invalid", new Object[]{label, configuration.minLength.toString(), configuration.maxLength.toString()}); + } + + if (!Pattern.matches(configuration.pattern, value)) + { + messages.addMessage(localizationKey, new Object[]{label, configuration.formatMessage}); + } + } + } + + private static class ValidatorConfiguration + { + private Integer minLength; + private Integer maxLength; + private String pattern; + private String formatMessage; + + private ValidatorConfiguration(String propertyKey, Properties properties) + { + // used to assign backward compatible default values + boolean isUser = USERNAME.equals(propertyKey); + String prefixedKey = KEY_PREFIX + propertyKey; + + String property = properties.getProperty(prefixedKey + ".min.length"); + minLength = property != null ? Integer.valueOf(property) : (isUser ? UsernameValidator.DEFAULT_MIN_LENGTH : 0); + + property = properties.getProperty(prefixedKey + ".max.length"); + maxLength = property != null ? Integer.valueOf(property) : (isUser ? UsernameValidator.DEFAULT_MAX_LENGTH : Integer.MAX_VALUE); + + pattern = properties.getProperty(prefixedKey + ".regexp", Utils.USER_NAME_VALIDATOR_REGEX); + formatMessage = properties.getProperty(prefixedKey + ".format.message", pattern); + } + + } +} Modified: portal/trunk/webui/core/src/test/java/org/exoplatform/webui/test/validator/TestWebuiValidator.java =================================================================== --- portal/trunk/webui/core/src/test/java/org/exoplatform/webui/test/validator/TestWebuiValidator.java 2012-02-01 18:54:13 UTC (rev 8347) +++ portal/trunk/webui/core/src/test/java/org/exoplatform/webui/test/validator/TestWebuiValidator.java 2012-02-01 18:56:16 UTC (rev 8348) @@ -31,7 +31,7 @@ import org.exoplatform.webui.form.validator.ResourceValidator; import org.exoplatform.webui.form.validator.SpecialCharacterValidator; import org.exoplatform.webui.form.validator.URLValidator; -import org.exoplatform.webui.form.validator.UserConfigurableUsernameValidator; +import org.exoplatform.webui.form.validator.UserConfigurableValidator; import org.exoplatform.webui.form.validator.UsernameValidator; import org.exoplatform.webui.form.validator.Validator; @@ -96,7 +96,7 @@ Validator validator = new UsernameValidator(3, 30); validateUsernames(validator); - validator = new UserConfigurableUsernameValidator(UserConfigurableUsernameValidator.USERNAME); + validator = new UserConfigurableValidator(UserConfigurableValidator.USERNAME); validateUsernames(validator); }

12 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits February 2012