August 2011 - gatein-commits - Jboss List Archives

gatein SVN: r7228 - in components/wsrp/trunk: admin-gui and 14 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-08-25 06:01:14 -0400 (Thu, 25 Aug 2011) New Revision: 7228 Modified: components/wsrp/trunk/admin-gui/pom.xml components/wsrp/trunk/api/pom.xml components/wsrp/trunk/common/pom.xml components/wsrp/trunk/consumer/pom.xml components/wsrp/trunk/hibernate-impl/pom.xml components/wsrp/trunk/jcr-impl/pom.xml components/wsrp/trunk/pom.xml components/wsrp/trunk/producer/pom.xml components/wsrp/trunk/test/pom.xml components/wsrp/trunk/ws-security/jboss5/pom.xml components/wsrp/trunk/ws-security/pom.xml components/wsrp/trunk/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml components/wsrp/trunk/ws-security/wss/pom.xml components/wsrp/trunk/wsrp-producer-war/pom.xml components/wsrp/trunk/wsrp1-ws/pom.xml components/wsrp/trunk/wsrp2-ws/pom.xml Log: - Updated to version 2.1.0-Beta05-SNAPSHOT. Modified: components/wsrp/trunk/admin-gui/pom.xml =================================================================== --- components/wsrp/trunk/admin-gui/pom.xml 2011-08-25 09:36:31 UTC (rev 7227) +++ components/wsrp/trunk/admin-gui/pom.xml 2011-08-25 10:01:14 UTC (rev 7228) @@ -21,11 +21,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.1.0-CR01-SNAPSHOT</version> + <version>2.1.0-Beta05-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-admin-gui</artifactId> Modified: components/wsrp/trunk/api/pom.xml =================================================================== --- components/wsrp/trunk/api/pom.xml 2011-08-25 09:36:31 UTC (rev 7227) +++ components/wsrp/trunk/api/pom.xml 2011-08-25 10:01:14 UTC (rev 7228) @@ -21,11 +21,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.1.0-CR01-SNAPSHOT</version> + <version>2.1.0-Beta05-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-integration-api</artifactId> Modified: components/wsrp/trunk/common/pom.xml =================================================================== --- components/wsrp/trunk/common/pom.xml 2011-08-25 09:36:31 UTC (rev 7227) +++ components/wsrp/trunk/common/pom.xml 2011-08-25 10:01:14 UTC (rev 7228) @@ -21,11 +21,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.1.0-CR01-SNAPSHOT</version> + <version>2.1.0-Beta05-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-common</artifactId> Modified: components/wsrp/trunk/consumer/pom.xml =================================================================== --- components/wsrp/trunk/consumer/pom.xml 2011-08-25 09:36:31 UTC (rev 7227) +++ components/wsrp/trunk/consumer/pom.xml 2011-08-25 10:01:14 UTC (rev 7228) @@ -21,11 +21,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.1.0-CR01-SNAPSHOT</version> + <version>2.1.0-Beta05-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-consumer</artifactId> Modified: components/wsrp/trunk/hibernate-impl/pom.xml =================================================================== --- components/wsrp/trunk/hibernate-impl/pom.xml 2011-08-25 09:36:31 UTC (rev 7227) +++ components/wsrp/trunk/hibernate-impl/pom.xml 2011-08-25 10:01:14 UTC (rev 7228) @@ -22,13 +22,14 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.1.0-CR01-SNAPSHOT</version> + <version>2.1.0-Beta05-SNAPSHOT</version> </parent> <groupId>org.gatein.wsrp</groupId> Modified: components/wsrp/trunk/jcr-impl/pom.xml =================================================================== --- components/wsrp/trunk/jcr-impl/pom.xml 2011-08-25 09:36:31 UTC (rev 7227) +++ components/wsrp/trunk/jcr-impl/pom.xml 2011-08-25 10:01:14 UTC (rev 7228) @@ -22,11 +22,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>wsrp-parent</artifactId> <groupId>org.gatein.wsrp</groupId> - <version>2.1.0-CR01-SNAPSHOT</version> + <version>2.1.0-Beta05-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2011-08-25 09:36:31 UTC (rev 7227) +++ components/wsrp/trunk/pom.xml 2011-08-25 10:01:14 UTC (rev 7228) @@ -21,7 +21,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -29,7 +30,7 @@ <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.1.0-CR01-SNAPSHOT</version> + <version>2.1.0-Beta05-SNAPSHOT</version> <packaging>pom</packaging> Modified: components/wsrp/trunk/producer/pom.xml =================================================================== --- components/wsrp/trunk/producer/pom.xml 2011-08-25 09:36:31 UTC (rev 7227) +++ components/wsrp/trunk/producer/pom.xml 2011-08-25 10:01:14 UTC (rev 7228) @@ -21,11 +21,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.1.0-CR01-SNAPSHOT</version> + <version>2.1.0-Beta05-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-producer-lib</artifactId> Modified: components/wsrp/trunk/test/pom.xml =================================================================== --- components/wsrp/trunk/test/pom.xml 2011-08-25 09:36:31 UTC (rev 7227) +++ components/wsrp/trunk/test/pom.xml 2011-08-25 10:01:14 UTC (rev 7228) @@ -22,11 +22,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.1.0-CR01-SNAPSHOT</version> + <version>2.1.0-Beta05-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/wsrp/trunk/ws-security/jboss5/pom.xml =================================================================== --- components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-08-25 09:36:31 UTC (rev 7227) +++ components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-08-25 10:01:14 UTC (rev 7228) @@ -21,11 +21,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-wss-parent</artifactId> - <version>2.1.0-CR01-SNAPSHOT</version> + <version>2.1.0-Beta05-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-wss-jboss5</artifactId> Modified: components/wsrp/trunk/ws-security/pom.xml =================================================================== --- components/wsrp/trunk/ws-security/pom.xml 2011-08-25 09:36:31 UTC (rev 7227) +++ components/wsrp/trunk/ws-security/pom.xml 2011-08-25 10:01:14 UTC (rev 7228) @@ -21,13 +21,14 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.1.0-CR01-SNAPSHOT</version> + <version>2.1.0-Beta05-SNAPSHOT</version> </parent> <artifactId>wsrp-wss-parent</artifactId> Modified: components/wsrp/trunk/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml =================================================================== --- components/wsrp/trunk/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2011-08-25 09:36:31 UTC (rev 7227) +++ components/wsrp/trunk/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2011-08-25 10:01:14 UTC (rev 7228) @@ -21,11 +21,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-wss-parent</artifactId> - <version>2.1.0-CR01-SNAPSHOT</version> + <version>2.1.0-Beta05-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-producer-jb5wss</artifactId> @@ -59,12 +60,12 @@ <artifactId>maven-war-plugin</artifactId> <version>2.1.1</version> <configuration> - <overlays> - <overlay> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer</artifactId> - </overlay> - </overlays> + <overlays> + <overlay> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer</artifactId> + </overlay> + </overlays> </configuration> </plugin> </plugins> Modified: components/wsrp/trunk/ws-security/wss/pom.xml =================================================================== --- components/wsrp/trunk/ws-security/wss/pom.xml 2011-08-25 09:36:31 UTC (rev 7227) +++ components/wsrp/trunk/ws-security/wss/pom.xml 2011-08-25 10:01:14 UTC (rev 7228) @@ -21,11 +21,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-wss-parent</artifactId> - <version>2.1.0-CR01-SNAPSHOT</version> + <version>2.1.0-Beta05-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-wss</artifactId> Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-08-25 09:36:31 UTC (rev 7227) +++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-08-25 10:01:14 UTC (rev 7228) @@ -22,11 +22,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.1.0-CR01-SNAPSHOT</version> + <version>2.1.0-Beta05-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/wsrp/trunk/wsrp1-ws/pom.xml =================================================================== --- components/wsrp/trunk/wsrp1-ws/pom.xml 2011-08-25 09:36:31 UTC (rev 7227) +++ components/wsrp/trunk/wsrp1-ws/pom.xml 2011-08-25 10:01:14 UTC (rev 7228) @@ -21,11 +21,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> - <version>2.1.0-CR01-SNAPSHOT</version> + <version>2.1.0-Beta05-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-wsrp1-ws</artifactId> Modified: components/wsrp/trunk/wsrp2-ws/pom.xml =================================================================== --- components/wsrp/trunk/wsrp2-ws/pom.xml 2011-08-25 09:36:31 UTC (rev 7227) +++ components/wsrp/trunk/wsrp2-ws/pom.xml 2011-08-25 10:01:14 UTC (rev 7228) @@ -22,11 +22,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>wsrp-parent</artifactId> <groupId>org.gatein.wsrp</groupId> - <version>2.1.0-CR01-SNAPSHOT</version> + <version>2.1.0-Beta05-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-wsrp2-ws</artifactId>

12 years, 10 months

1
0
0 / 0

gatein SVN: r7227 - portal/branches.

by do-not-reply＠jboss.org

Author: trong.tran Date: 2011-08-25 05:36:31 -0400 (Thu, 25 Aug 2011) New Revision: 7227 Removed: portal/branches/branch-showinfobar/ Log: Remove a feature branch which was merged into trunk

12 years, 10 months

1
0
0 / 0

gatein SVN: r7226 - in components/wsrp/branches/clustering: consumer/src/main/java/org/gatein/wsrp/consumer/registry and 9 other directories.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-08-25 04:35:46 -0400 (Thu, 25 Aug 2011) New Revision: 7226 Modified: components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/ConsumerRegistry.java components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/InMemoryConsumerRegistry.java components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/xml/XMLConsumerRegistry.java components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java components/wsrp/branches/clustering/hibernate-impl/src/main/java/org/gatein/wsrp/consumer/registry/hibernate/HibernateConsumerRegistry.java components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistry.java components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java components/wsrp/branches/clustering/jcr-impl/src/test/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistryTestCase.java Log: - Initial commit of work on properly clustering WSRP: basically removing a lot of local state in ConsumerRegistry, hitting persistence instead. Not very well tested, just wanted to get the code out of my machine. Modified: components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java 2011-08-25 07:49:56 UTC (rev 7225) +++ components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java 2011-08-25 08:35:46 UTC (rev 7226) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual + * Copyright 2011, 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. @@ -55,6 +55,30 @@ serviceFactory = new SOAPServiceFactory(); } + @Override + public boolean equals(Object o) + { + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } + + EndpointConfigurationInfo that = (EndpointConfigurationInfo)o; + + return serviceFactory.equals(that.serviceFactory); + + } + + @Override + public int hashCode() + { + return serviceFactory.hashCode(); + } + public EndpointConfigurationInfo(ServiceFactory serviceFactory) { ParameterValidation.throwIllegalArgExceptionIfNull(serviceFactory, "ServiceFactory"); @@ -237,17 +261,17 @@ { return serviceFactory.getWSRPVersion(); } - + public boolean getWSSEnabled() { return serviceFactory.isWSSEnabled(); } - + public void setWSSEnabled(boolean enable) { serviceFactory.enableWSS(enable); } - + public boolean isWSSAvailable() { return serviceFactory.isWSSAvailable(); Modified: components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java 2011-08-25 07:49:56 UTC (rev 7225) +++ components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java 2011-08-25 08:35:46 UTC (rev 7226) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual + * Copyright 2011, 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. @@ -41,6 +41,7 @@ import javax.xml.namespace.QName; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -77,6 +78,50 @@ */ private static final String UNDETERMINED_REGISTRATION = "__JBP__UNDETERMINED__REGISTRATION__"; + @Override + public boolean equals(Object o) + { + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } + + RegistrationInfo that = (RegistrationInfo)o; + + if (persistentConsumerName != null ? !persistentConsumerName.equals(that.persistentConsumerName) : that.persistentConsumerName != null) + { + return false; + } + if (persistentRegistrationHandle != null ? !persistentRegistrationHandle.equals(that.persistentRegistrationHandle) : that.persistentRegistrationHandle != null) + { + return false; + } + if (persistentRegistrationProperties != null ? !persistentRegistrationProperties.equals(that.persistentRegistrationProperties) : that.persistentRegistrationProperties != null) + { + return false; + } + if (!Arrays.equals(persistentRegistrationState, that.persistentRegistrationState)) + { + return false; + } + + return true; + } + + @Override + public int hashCode() + { + int result = persistentConsumerName != null ? persistentConsumerName.hashCode() : 0; + result = 31 * result + (persistentRegistrationHandle != null ? persistentRegistrationHandle.hashCode() : 0); + result = 31 * result + (persistentRegistrationState != null ? Arrays.hashCode(persistentRegistrationState) : 0); + result = 31 * result + (persistentRegistrationProperties != null ? persistentRegistrationProperties.hashCode() : 0); + return result; + } + public RegistrationInfo(ProducerInfo producerInfo) { this(); Modified: components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java 2011-08-25 07:49:56 UTC (rev 7225) +++ components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java 2011-08-25 08:35:46 UTC (rev 7226) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual + * Copyright 2011, 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. @@ -38,14 +38,8 @@ import org.slf4j.LoggerFactory; import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Map; -import java.util.SortedMap; -import java.util.TreeMap; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> @@ -57,9 +51,6 @@ /** Gives access to the Portal's portlet invokers */ private FederatingPortletInvoker federatingPortletInvoker; - private SortedMap<String, WSRPConsumer> consumers; - private Map<String, String> keysToIds; - private SessionEventBroadcaster sessionEventBroadcaster = SessionEventBroadcaster.NO_OP_BROADCASTER; private MigrationService migrationService; @@ -68,11 +59,6 @@ private static final Logger log = LoggerFactory.getLogger(AbstractConsumerRegistry.class); - protected AbstractConsumerRegistry() - { - initConsumers(null); - } - public FederatingPortletInvoker getFederatingPortletInvoker() { return federatingPortletInvoker; @@ -105,7 +91,6 @@ ProducerInfo info = new ProducerInfo(); info.setId(id); - info.setRegistry(this); info.setExpirationCacheSeconds(expirationCacheSeconds); info.getEndpointConfigurationInfo().setWsdlDefinitionURL(wsdlURL); @@ -140,8 +125,6 @@ } deactivateConsumer(consumer); - remove(consumer); - delete(info); } else @@ -168,9 +151,9 @@ this.federatingPortletInvoker = federatingPortletInvoker; } - public ProducerInfo getProducerInfoByKey(String key) + /*protected ProducerInfo getProducerInfoByKey(String key) { - String id = keysToIds.get(key); + String id = getIdForKey(key); if (id != null) { return getConsumer(id).getProducerInfo(); @@ -179,24 +162,30 @@ { return null; } - } + }*/ - private WSRPConsumer createConsumerFrom(ProducerInfo producerInfo) + /*protected String getIdForKey(String key) { - WSRPConsumer consumer = newConsumer(producerInfo); - add(consumer); + // try local cache first + String id = keysToIds.get(key); - return consumer; - } + // if it's not in the local cache, reload from persistence and check again + if(id == null) + { + reloadConsumers(); + return keysToIds.get(key); + } + else + { + return id; + } + }*/ - /** - * Extracted for testing purposes... - * - * @param producerInfo - * @return - */ - protected WSRPConsumer newConsumer(ProducerInfo producerInfo) + protected WSRPConsumer createConsumerFrom(ProducerInfo producerInfo) { + // make sure we set the registry after loading from DB since registry is not persisted. + producerInfo.setRegistry(this); + return new WSRPConsumerImpl(producerInfo, migrationService); } @@ -253,7 +242,7 @@ } } - public void updateProducerInfo(ProducerInfo producerInfo) + public String updateProducerInfo(ProducerInfo producerInfo) { ParameterValidation.throwIllegalArgExceptionIfNull(producerInfo, "ProducerInfo"); @@ -262,7 +251,6 @@ // if we updated and oldId is not null, we need to update the local information if (oldId != null) { - remove(getConsumer(oldId)); WSRPConsumer consumer = createConsumerFrom(producerInfo); // update the federating portlet invoker: @@ -273,6 +261,8 @@ federatingPortletInvoker.registerInvoker(producerInfo.getId(), consumer); } } + + return oldId; } public void start() throws Exception @@ -282,9 +272,6 @@ public void reloadConsumers() { - // load the configured consumers - initConsumers(null); - Iterator<ProducerInfo> producerInfos = getProducerInfosFromStorage(); // load the configured producers @@ -293,9 +280,6 @@ { producerInfo = producerInfos.next(); - // need to set the registry after loading from DB since registry is not persisted. - producerInfo.setRegistry(this); - createConsumerFrom(producerInfo); } } @@ -322,19 +306,26 @@ // ignore and continue } } - - clearConsumers(); } public List<WSRPConsumer> getConfiguredConsumers() { - return new ArrayList<WSRPConsumer>(getConsumers()); + return getConsumers(true); } public WSRPConsumer getConsumer(String id) { ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(id, "consumer id", null); - return consumers.get(id); + + ProducerInfo info = loadProducerInfo(id); + if (info != null) + { + return createConsumerFrom(info); + } + else + { + return null; + } } public void registerOrDeregisterConsumerWith(String id, boolean register) @@ -432,36 +423,20 @@ protected abstract Iterator<ProducerInfo> getProducerInfosFromStorage(); - // internal management methods + protected abstract ProducerInfo loadProducerInfo(String id); - protected void add(WSRPConsumer consumer) + protected List<WSRPConsumer> getConsumers(boolean startConsumers) { - String id = consumer.getProducerId(); - consumers.put(id, consumer); - ProducerInfo info = consumer.getProducerInfo(); - keysToIds.put(info.getKey(), id); - } - - protected WSRPConsumer remove(WSRPConsumer consumer) - { - String id = keysToIds.remove(consumer.getProducerInfo().getKey()); - return consumers.remove(id); - } - - protected Collection<WSRPConsumer> getConsumers() - { - return getConsumers(true); - } - - protected Collection<WSRPConsumer> getConsumers(boolean startConsumers) - { - Collection<WSRPConsumer> consumerz = consumers.values(); - - if (startConsumers) + Iterator<ProducerInfo> infos = getProducerInfosFromStorage(); + List<WSRPConsumer> consumers = new ArrayList<WSRPConsumer>(); + while (infos.hasNext()) { - for (WSRPConsumer consumer : consumerz) + ProducerInfo info = infos.next(); + WSRPConsumer consumer = createConsumerFrom(info); + consumers.add(consumer); + if (startConsumers) { - if (consumer.getProducerInfo().isActive() && !consumer.isActive()) + if (info.isActive() && !consumer.isActive()) { try { @@ -470,38 +445,15 @@ catch (Exception e) { log.info("Couldn't activate consumer " + consumer.getProducerId()); - consumer.getProducerInfo().setActiveAndSave(false); + info.setActiveAndSave(false); } } } } - return consumerz; - } - protected Map<String, String> getKeyMappings() - { - return Collections.unmodifiableMap(keysToIds); + return consumers; } - protected void initConsumers(SortedMap<String, WSRPConsumer> consumers) - { - if (!ParameterValidation.existsAndIsNotEmpty(consumers)) - { - consumers = new TreeMap<String, WSRPConsumer>(); - } - this.consumers = consumers; - int size = consumers.size(); - keysToIds = size == 0 ? new HashMap<String, String>() : new HashMap<String, String>(size); - } - - private void clearConsumers() - { - consumers.clear(); - keysToIds.clear(); - consumers = null; - keysToIds = null; - } - protected class ProducerInfoIterator implements Iterator<ProducerInfo> { private Iterator<WSRPConsumer> consumers; Modified: components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/ConsumerRegistry.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/ConsumerRegistry.java 2011-08-25 07:49:56 UTC (rev 7225) +++ components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/ConsumerRegistry.java 2011-08-25 08:35:46 UTC (rev 7226) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual + * Copyright 2011, 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. @@ -58,7 +58,13 @@ */ void activateConsumerWith(String id) throws ConsumerException; - void updateProducerInfo(ProducerInfo producerInfo) throws ConsumerException; + /** + * Persists the changes made to ProducerInfo. + * + * @param producerInfo the ProducerInfo to persist + * @return the previous value of the ProducerInfo's id if it has changed, <code>null</code> otherwise + */ + String updateProducerInfo(ProducerInfo producerInfo) throws ConsumerException; void deactivateConsumerWith(String id) throws ConsumerException; @@ -76,9 +82,7 @@ void setFederatingPortletInvoker(FederatingPortletInvoker federatingPortletInvoker); - ProducerInfo getProducerInfoByKey(String key); - MigrationService getMigrationService(); void setMigrationService(MigrationService migrationService); -} \ No newline at end of file +} Modified: components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/InMemoryConsumerRegistry.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/InMemoryConsumerRegistry.java 2011-08-25 07:49:56 UTC (rev 7225) +++ components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/InMemoryConsumerRegistry.java 2011-08-25 08:35:46 UTC (rev 7226) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual + * Copyright 2011, 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. @@ -23,11 +23,17 @@ package org.gatein.wsrp.consumer.registry; +import org.gatein.common.util.ParameterValidation; import org.gatein.pc.federation.impl.FederatingPortletInvokerService; +import org.gatein.wsrp.WSRPConsumer; import org.gatein.wsrp.consumer.ProducerInfo; import org.gatein.wsrp.consumer.migration.InMemoryMigrationService; +import java.util.HashMap; import java.util.Iterator; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; import java.util.UUID; /** @@ -36,13 +42,42 @@ */ public class InMemoryConsumerRegistry extends AbstractConsumerRegistry { + private SortedMap<String, WSRPConsumer> consumers; + private Map<String, String> keysToIds; + public InMemoryConsumerRegistry() { + initConsumers(null); setFederatingPortletInvoker(new FederatingPortletInvokerService()); setMigrationService(new InMemoryMigrationService()); } @Override + protected WSRPConsumer createConsumerFrom(ProducerInfo producerInfo) + { + WSRPConsumer consumer = super.createConsumerFrom(producerInfo); + + String id = consumer.getProducerId(); + consumers.put(id, consumer); + ProducerInfo info = consumer.getProducerInfo(); + keysToIds.put(info.getKey(), id); + + return consumer; + } + + @Override + public String updateProducerInfo(ProducerInfo producerInfo) + { + String oldId = super.updateProducerInfo(producerInfo); + if (oldId != null) + { + keysToIds.put(producerInfo.getKey(), producerInfo.getId()); + consumers.remove(oldId); + } + return oldId; + } + + @Override protected void save(ProducerInfo info, String messageOnError) { // generate a UUID for ProducerInfo @@ -52,19 +87,72 @@ @Override protected void delete(ProducerInfo info) { - // nothing to do here + String key = info.getKey(); + String removed = keysToIds.remove(key); + if (removed != null) + { + consumers.remove(removed); + } } @Override protected String update(ProducerInfo producerInfo) { String key = producerInfo.getKey(); - return getKeyMappings().get(key); + String oldId = keysToIds.get(key); + if (oldId.equals(producerInfo.getId())) + { + return null; + } + else + { + return oldId; + } } @Override + public void reloadConsumers() + { + // do nothing + } + + @Override protected Iterator<ProducerInfo> getProducerInfosFromStorage() { - return new ProducerInfoIterator(getConsumers().iterator()); + return new ProducerInfoIterator(consumers.values().iterator()); } + + @Override + protected ProducerInfo loadProducerInfo(String id) + { + if (keysToIds.containsValue(id)) + { + return consumers.get(id).getProducerInfo(); + } + else + { + return null; + } + } + + @Override + public void stop() throws Exception + { + super.stop(); + consumers.clear(); + keysToIds.clear(); + consumers = null; + keysToIds = null; + } + + protected void initConsumers(SortedMap<String, WSRPConsumer> consumers) + { + if (!ParameterValidation.existsAndIsNotEmpty(consumers)) + { + consumers = new TreeMap<String, WSRPConsumer>(); + } + this.consumers = consumers; + int size = consumers.size(); + keysToIds = size == 0 ? new HashMap<String, String>() : new HashMap<String, String>(size); + } } Modified: components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/xml/XMLConsumerRegistry.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/xml/XMLConsumerRegistry.java 2011-08-25 07:49:56 UTC (rev 7225) +++ components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/registry/xml/XMLConsumerRegistry.java 2011-08-25 08:35:46 UTC (rev 7226) @@ -1,31 +1,31 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ +/* + * JBoss, a division of Red Hat + * Copyright 2011, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.gatein.wsrp.consumer.registry.xml; import org.gatein.common.xml.NullEntityResolver; import org.gatein.wsrp.WSRPConsumer; import org.gatein.wsrp.consumer.ProducerInfo; -import org.gatein.wsrp.consumer.registry.AbstractConsumerRegistry; +import org.gatein.wsrp.consumer.registry.InMemoryConsumerRegistry; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; @@ -37,14 +37,13 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; -import java.util.Iterator; import java.util.SortedMap; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision: 9360 $ */ -public class XMLConsumerRegistry extends AbstractConsumerRegistry +public class XMLConsumerRegistry extends InMemoryConsumerRegistry { private final static Logger log = LoggerFactory.getLogger(XMLConsumerRegistry.class); @@ -101,34 +100,9 @@ { throw new RuntimeException("Couldn't set unmarshall WSRP Consumers configuration", e); } - - for (WSRPConsumer consumer : getConsumers()) - { - - ProducerInfo producerInfo = consumer.getProducerInfo(); - try - { - // try to activate the consumer - activateConsumer(consumer); - } - catch (Exception e) - { - producerInfo.setActive(false); - updateProducerInfo(producerInfo); - } - } } @Override - public void stop() throws Exception - { - for (WSRPConsumer consumer : getConsumers()) - { - consumer.stop(); - } - } - - @Override protected void save(ProducerInfo info, String messageOnError) { // do nothing @@ -145,10 +119,4 @@ { return null; } - - @Override - protected Iterator<ProducerInfo> getProducerInfosFromStorage() - { - return new ProducerInfoIterator(getConsumers().iterator()); - } } Modified: components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2011-08-25 07:49:56 UTC (rev 7225) +++ components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2011-08-25 08:35:46 UTC (rev 7226) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual + * Copyright 2011, 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. @@ -58,7 +58,6 @@ import javax.xml.ws.handler.Handler; import javax.xml.ws.handler.soap.SOAPHandler; import javax.xml.ws.handler.soap.SOAPMessageContext; - import java.net.MalformedURLException; import java.net.URI; import java.net.URL; @@ -100,9 +99,48 @@ private boolean failed; private boolean available; private int msBeforeTimeOut = DEFAULT_TIMEOUT_MS; - + private boolean wssEnabled; + @Override + public boolean equals(Object o) + { + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } + + SOAPServiceFactory that = (SOAPServiceFactory)o; + + if (msBeforeTimeOut != that.msBeforeTimeOut) + { + return false; + } + if (wssEnabled != that.wssEnabled) + { + return false; + } + if (wsdlDefinitionURL != null ? !wsdlDefinitionURL.equals(that.wsdlDefinitionURL) : that.wsdlDefinitionURL != null) + { + return false; + } + + return true; + } + + @Override + public int hashCode() + { + int result = wsdlDefinitionURL != null ? wsdlDefinitionURL.hashCode() : 0; + result = 31 * result + msBeforeTimeOut; + result = 31 * result + (wssEnabled ? 1 : 0); + return result; + } + private void setTimeout(Map<String, Object> requestContext) { int timeout = getWSOperationTimeOut(); @@ -138,7 +176,7 @@ { handlerChain.add(REQUEST_HEADER_CLIENT_HANDLER); } - + addWSSHandlers(handlerChain); } else @@ -146,7 +184,7 @@ // otherwise, create a handler chain and add our handler to it handlerChain = new ArrayList<Handler>(1); handlerChain.add(REQUEST_HEADER_CLIENT_HANDLER); - + addWSSHandlers(handlerChain); } binding.setHandlerChain(handlerChain); @@ -518,7 +556,7 @@ { return this.wssEnabled; } - + public boolean isWSSAvailable() { WebServiceSecurityFactory wssFactory = WebServiceSecurityFactory.getInstance(); @@ -531,7 +569,7 @@ return false; } } - + protected void addWSSHandlers(List<Handler> handlerChain) { if (wssEnabled) Modified: components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java 2011-08-25 07:49:56 UTC (rev 7225) +++ components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java 2011-08-25 08:35:46 UTC (rev 7226) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual + * Copyright 2011, 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. @@ -41,7 +41,7 @@ */ public class ConsumerRegistryTestCase extends TestCase { - protected ConsumerRegistry registry; + protected AbstractConsumerRegistry registry; @Override protected void setUp() throws Exception @@ -57,11 +57,13 @@ assertEquals(id, consumer.getProducerId()); ProducerInfo info = consumer.getProducerInfo(); assertNotNull(info); + assertNotNull(info.getKey()); assertEquals(consumer.getProducerId(), info.getId()); EndpointConfigurationInfo endpoint = info.getEndpointConfigurationInfo(); assertNotNull(endpoint); RegistrationInfo regInfo = info.getRegistrationInfo(); assertTrue(regInfo.isUndetermined()); + assertEquals(registry, info.getRegistry()); WSRPConsumer fromRegistry = registry.getConsumer(id); assertNotNull(fromRegistry); @@ -71,6 +73,7 @@ assertEquals(fromRegistry.getProducerId(), fromRegistryInfo.getId()); assertNotNull(fromRegistryInfo.getEndpointConfigurationInfo()); assertTrue(fromRegistryInfo.getRegistrationInfo().isUndetermined()); + assertEquals(registry, fromRegistryInfo.getRegistry()); assertEquals(info.getId(), fromRegistryInfo.getId()); assertEquals(info.getEndpointConfigurationInfo(), fromRegistryInfo.getEndpointConfigurationInfo()); @@ -87,17 +90,6 @@ assertNull(registry.getConsumer("inexistent")); } - public void testGetProducerInfoByKey() - { - WSRPConsumer consumer = registry.createConsumer("id", null, null); - ProducerInfo info = consumer.getProducerInfo(); - - String key = info.getKey(); - assertNotNull(key); - - assertEquals(info, registry.getProducerInfoByKey(key)); - } - public void testDoubleRegistrationOfConsumerWithSameId() { String id = "foo"; @@ -121,12 +113,9 @@ WSRPConsumer consumer = registry.createConsumer(id, null, null); assertEquals(consumer, registry.getConsumer(id)); - String key = consumer.getProducerInfo().getKey(); - registry.destroyConsumer(id); assertNull(registry.getConsumer(id)); - assertNull(registry.getProducerInfoByKey(key)); } public void testUpdateProducerInfo() @@ -135,7 +124,6 @@ String id = "foo"; WSRPConsumer consumer = registry.createConsumer(id, null, null); ProducerInfo info = consumer.getProducerInfo(); - String key = info.getKey(); // change the id on the consumer's producer info and save it info.setId("bar"); @@ -143,7 +131,6 @@ assertNull(registry.getConsumer(id)); assertEquals(info, consumer.getProducerInfo()); - assertEquals(info, registry.getProducerInfoByKey(key)); assertEquals(consumer, registry.getConsumer("bar")); } @@ -158,14 +145,13 @@ Mockito.stub(info.getEndpointConfigurationInfo()).toReturn(endpoint); // create a consumer to spy from - WSRPConsumer original = ((AbstractConsumerRegistry)registry).newConsumer(info); + WSRPConsumer original = registry.createConsumerFrom(info); WSRPConsumer consumer = Mockito.spy(original); // force re-init of registry from "persistence" to ensure that the spy registry actually uses our spy consumer ConsumerRegistry registrySpy = Mockito.spy(registry); - Mockito.doReturn(Collections.singletonList(info).iterator()).when((AbstractConsumerRegistry)registrySpy).getProducerInfosFromStorage(); - Mockito.doReturn(consumer).when((AbstractConsumerRegistry)registrySpy).newConsumer(info); - registrySpy.reloadConsumers(); + Mockito.doReturn(consumer).when(registrySpy).getConsumer("foo"); + Mockito.doReturn(Collections.singletonList(consumer)).when((AbstractConsumerRegistry)registrySpy).getConsumers(false); WSRPConsumer foo = registrySpy.getConsumer("foo"); assertTrue(foo.getProducerInfo().isActive()); Modified: components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java 2011-08-25 07:49:56 UTC (rev 7225) +++ components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java 2011-08-25 08:35:46 UTC (rev 7226) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual + * Copyright 2011, 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. @@ -53,7 +53,8 @@ /** * Creates a ConsumerRegistry containing 2 consumers with id '{@link #CONSUMER1}' and '{@link #CONSUMER2}' - * respectively. CONSUMER2 is active and has a service description URL set to {@link #MOCK_SERVICE_DESCRIPTION} and a + * respectively. CONSUMER2 is active and has a service description URL set to {@link #MOCK_SERVICE_DESCRIPTION} and + * a * markup URL set to {@link #MOCK_MARKUP} */ public MockConsumerRegistry() @@ -97,9 +98,9 @@ // do nothing } - public void updateProducerInfo(ProducerInfo producerInfo) + public String updateProducerInfo(ProducerInfo producerInfo) { - // do nothing + return null; } public void deactivateConsumerWith(String id) throws ConsumerException Modified: components/wsrp/branches/clustering/hibernate-impl/src/main/java/org/gatein/wsrp/consumer/registry/hibernate/HibernateConsumerRegistry.java =================================================================== --- components/wsrp/branches/clustering/hibernate-impl/src/main/java/org/gatein/wsrp/consumer/registry/hibernate/HibernateConsumerRegistry.java 2011-08-25 07:49:56 UTC (rev 7225) +++ components/wsrp/branches/clustering/hibernate-impl/src/main/java/org/gatein/wsrp/consumer/registry/hibernate/HibernateConsumerRegistry.java 2011-08-25 08:35:46 UTC (rev 7226) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual + * Copyright 2011, 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. @@ -113,6 +113,14 @@ } @Override + protected ProducerInfo loadProducerInfo(String id) + { + Session session = sessionFactory.getCurrentSession(); + return (ProducerInfo)session.createQuery("from ProducerInfo pi where pi.persistentId = :id") + .setParameter("id", id).uniqueResult(); + } + + @Override public void start() throws Exception { InitialContext initialContext = new InitialContext(); Modified: components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistry.java =================================================================== --- components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistry.java 2011-08-25 07:49:56 UTC (rev 7225) +++ components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistry.java 2011-08-25 08:35:46 UTC (rev 7226) @@ -169,6 +169,22 @@ return new MappingToProducerInfoIterator(mappings.iterator()); } + @Override + protected ProducerInfo loadProducerInfo(String id) + { + ChromatticSession session = persister.getSession(); + ProducerInfoMapping pim = session.findByPath(ProducerInfoMapping.class, getPathFor(id)); + + if (pim != null) + { + return pim.toModel(null); + } + else + { + return null; + } + } + private ProducerInfosMapping getProducerInfosMapping(ChromatticSession session) { ProducerInfosMapping producerInfosMapping = session.findByPath(ProducerInfosMapping.class, PRODUCER_INFOS_PATH); @@ -212,9 +228,14 @@ private static String getPathFor(ProducerInfo info) { - return PRODUCER_INFOS_PATH + "/" + info.getId(); + return getPathFor(info.getId()); } + private static String getPathFor(final String producerInfoId) + { + return PRODUCER_INFOS_PATH + "/" + producerInfoId; + } + private static ProducerInfoMapping toProducerInfoMapping(ProducerInfo producerInfo, ChromatticSession session) { ProducerInfoMapping pim = session.findById(ProducerInfoMapping.class, producerInfo.getKey()); Modified: components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java =================================================================== --- components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java 2011-08-25 07:49:56 UTC (rev 7225) +++ components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/consumer/registry/mapping/ProducerInfoMapping.java 2011-08-25 08:35:46 UTC (rev 7226) @@ -95,7 +95,11 @@ public ProducerInfo toModel(ProducerInfo initial) { // todo: should probably use a ProducerInfo implementation backed by mapping at some point - ProducerInfo info = new ProducerInfo(); + ProducerInfo info = initial; + if (initial == null) + { + info = new ProducerInfo(); + } // basic properties info.setKey(getKey()); Modified: components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java =================================================================== --- components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java 2011-08-25 07:49:56 UTC (rev 7225) +++ components/wsrp/branches/clustering/jcr-impl/src/main/java/org/gatein/wsrp/registration/JCRRegistrationPersistenceManager.java 2011-08-25 08:35:46 UTC (rev 7226) @@ -42,6 +42,7 @@ import org.gatein.wsrp.registration.mapping.RegistrationPropertiesMapping; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; @@ -53,7 +54,6 @@ public class JCRRegistrationPersistenceManager extends RegistrationPersistenceManagerImpl { private ChromatticPersister persister; - private ConsumersAndGroupsMapping mappings; public static final List<Class> mappingClasses = new ArrayList<Class>(6); @@ -70,33 +70,142 @@ this.persister = persister; ChromatticSession session = persister.getSession(); - mappings = session.findByPath(ConsumersAndGroupsMapping.class, ConsumersAndGroupsMapping.NODE_NAME); + ConsumersAndGroupsMapping mappings = session.findByPath(ConsumersAndGroupsMapping.class, ConsumersAndGroupsMapping.NODE_NAME); if (mappings == null) { mappings = session.insert(ConsumersAndGroupsMapping.class, ConsumersAndGroupsMapping.NODE_NAME); } persister.save(); // needed right now as the session must still be open to iterate over nodes - for (ConsumerGroupMapping cgm : mappings.getConsumerGroups()) + initLocalCaches(mappings); + + persister.closeSession(false); + } + + public Collection<ConsumerSPI> getConsumers() throws RegistrationException + { + initLocalConsumerCache(); + + return super.getConsumers(); + } + + public Collection<RegistrationSPI> getRegistrations() throws RegistrationException + { + initLocalConsumerCache(); + + return super.getRegistrations(); + } + + public Collection<ConsumerGroupSPI> getConsumerGroups() throws RegistrationException + { + initLocalConsumerGroupCache(); + + return super.getConsumerGroups(); + } + + public Registration getRegistration(String registrationId) throws RegistrationException + { + Registration registration = super.getRegistration(registrationId); + // if we didn't find it in local cache, reload from JCR and check again; + if (registration == null) { - internalAddConsumerGroup(cgm.toConsumerGroup(this)); + initLocalConsumerCache(); + return super.getRegistration(registrationId); } + else + { + return registration; + } + } - for (ConsumerMapping cm : mappings.getConsumers()) + public ConsumerGroup getConsumerGroup(String name) throws RegistrationException + { + ConsumerGroup consumerGroup = super.getConsumerGroup(name); + // if we didn't find it in local cache, reload from JCR and check again; + if (consumerGroup == null) { - ConsumerSPI consumer = cm.toConsumer(this); - internalAddConsumer(consumer); + initLocalConsumerGroupCache(); + return super.getConsumerGroup(name); + } + else + { + return consumerGroup; + } + } - // get the registrations and add them to local map. - for (Registration registration : consumer.getRegistrations()) + public Consumer getConsumerById(String consumerId) throws RegistrationException + { + Consumer consumer = super.getConsumerById(consumerId); + // if we didn't find it in local cache, reload from JCR and check again; + if (consumer == null) + { + initLocalConsumerCache(); + return super.getConsumerById(consumerId); + } + else + { + return consumer; + } + } + + private void initLocalCaches(ConsumersAndGroupsMapping mappings) throws RegistrationException + { + initLocalCache(mappings, false); + + initLocalCache(mappings, true); + } + + private void initLocalCache(ConsumersAndGroupsMapping mappings, final boolean loadConsumers) throws RegistrationException + { + // if we already have mappings, no need to get them from JCR + ChromatticSession session = null; + if (mappings == null) + { + session = persister.getSession(); + mappings = session.findByPath(ConsumersAndGroupsMapping.class, ConsumersAndGroupsMapping.NODE_NAME); + } + + if (loadConsumers) + { + // load consumers and registrations + for (ConsumerMapping cm : mappings.getConsumers()) { - internalAddRegistration((RegistrationSPI)registration); + ConsumerSPI consumer = cm.toConsumer(this); + internalAddConsumer(consumer); + + // get the registrations and add them to local map. + for (Registration registration : consumer.getRegistrations()) + { + internalAddRegistration((RegistrationSPI)registration); + } } } + else + { + // load consumer groups + for (ConsumerGroupMapping cgm : mappings.getConsumerGroups()) + { + internalAddConsumerGroup(cgm.toConsumerGroup(this)); + } + } - persister.closeSession(false); + // if session is not null, we need to close it + if (session != null) + { + persister.closeSession(false); + } } + private void initLocalConsumerCache() throws RegistrationException + { + initLocalCache(null, true); + } + + private void initLocalConsumerGroupCache() throws RegistrationException + { + initLocalCache(null, false); + } + @Override protected RegistrationSPI internalRemoveRegistration(String registrationId) throws RegistrationException { @@ -110,7 +219,7 @@ protected RegistrationSPI internalCreateRegistration(ConsumerSPI consumer, Map registrationProperties) throws RegistrationException { ChromatticSession session = persister.getSession(); - RegistrationSPI registration = null; + RegistrationSPI registration; try { ConsumerMapping cm = session.findById(ConsumerMapping.class, consumer.getPersistentKey()); @@ -149,7 +258,7 @@ ConsumerSPI consumer = super.internalCreateConsumer(consumerId, consumerName); ChromatticSession session = persister.getSession(); - mappings = session.findByPath(ConsumersAndGroupsMapping.class, ConsumersAndGroupsMapping.NODE_NAME); + ConsumersAndGroupsMapping mappings = session.findByPath(ConsumersAndGroupsMapping.class, ConsumersAndGroupsMapping.NODE_NAME); try { ConsumerMapping cm = mappings.createConsumer(consumerId); @@ -237,7 +346,7 @@ ConsumerGroupSPI group = super.internalCreateConsumerGroup(name); ChromatticSession session = persister.getSession(); - mappings = session.findByPath(ConsumersAndGroupsMapping.class, ConsumersAndGroupsMapping.NODE_NAME); + ConsumersAndGroupsMapping mappings = session.findByPath(ConsumersAndGroupsMapping.class, ConsumersAndGroupsMapping.NODE_NAME); try { ConsumerGroupMapping cgm = mappings.createConsumerGroup(name); Modified: components/wsrp/branches/clustering/jcr-impl/src/test/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistryTestCase.java =================================================================== --- components/wsrp/branches/clustering/jcr-impl/src/test/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistryTestCase.java 2011-08-25 07:49:56 UTC (rev 7225) +++ components/wsrp/branches/clustering/jcr-impl/src/test/java/org/gatein/wsrp/consumer/registry/JCRConsumerRegistryTestCase.java 2011-08-25 08:35:46 UTC (rev 7226) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual + * Copyright 2011, 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. @@ -29,8 +29,7 @@ /** * This is essentially the same class as org.gatein.wsrp.state.consumer.ConsumerRegistryTestCase in WSRP consumer - * module - * tests. + * module tests. * * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$

12 years, 10 months

1
0
0 / 0

gatein SVN: r7225 - epp/portal/tags.

by do-not-reply＠jboss.org

Author: theute Date: 2011-08-25 03:49:56 -0400 (Thu, 25 Aug 2011) New Revision: 7225 Added: epp/portal/tags/EPP_5_2_0_Dev03/ Removed: epp/portal/tags/5.2.0-epp-DEV03/ Log: Renamed tag

12 years, 10 months

1
0
0 / 0

gatein SVN: r7224 - in epp/portal/branches/EPP_5_2_Branch: component and 74 other directories.

by do-not-reply＠jboss.org

Author: theute Date: 2011-08-25 03:40:37 -0400 (Thu, 25 Aug 2011) New Revision: 7224 Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml epp/portal/branches/EPP_5_2_Branch/component/pom.xml epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml epp/portal/branches/EPP_5_2_Branch/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml epp/portal/branches/EPP_5_2_Branch/server/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml epp/portal/branches/EPP_5_2_Branch/web/pom.xml epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>exo.portal.component.common</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>exo.portal.component</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>distribution.parent</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -38,23 +38,23 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.config</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.jar</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.war</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>exo.portal.sample</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -38,29 +38,29 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.config</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.jar</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.war</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.rest-war</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>gatein-api</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>gatein-jsf-hellouser</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>gatein-jsp-hellouser</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>gatein-simplest-helloworld</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -5,7 +5,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>struts-jpetstore</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.portal.examples.skins</groupId> <artifactId>skins-parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>gatein-sample-skin</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -14,7 +14,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>exo.portal.gadgets-core</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>exo.portal.gadgets</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>exo.portal.gadgets-server</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -31,7 +31,7 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <packaging>pom</packaging> <name>EPP GateIn - Portal - ${project.version}</name> @@ -71,9 +71,9 @@ </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/epp/portal/tags/5.2.0-epp-D...</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/epp/portal/tags/5.2.0-epp-DEV03</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/epp/portal/tags/5.2.0-epp-DEV03</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/epp/portal/branches/EPP_5_2...</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/epp/portal/branches/EPP_5_2_Branch</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/epp/portal/branches/EPP_5_2_Branch</url> </scm> <modules> @@ -469,74 +469,74 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.common</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.controller</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.security</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.server</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.resources</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.pc</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.identity</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.identity</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.resources</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.application-registry</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> @@ -546,68 +546,68 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.scripting</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.management</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.framework</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portlet</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portal</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.eXo</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.core</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.dashboard</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets-core</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> @@ -624,7 +624,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss.plugin</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency>  Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>exo.portal.portlet</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>exo.portal.server.jboss</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>exo.portal.server</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -38,7 +38,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.starter.war</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/starter/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>exo.portal.starter.root</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -51,7 +51,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.starter.jar</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </dependency> </dependencies> </project> Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>exo.portal.testsuite</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>exo.portal.selenium.snifftests</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>exo.webui.based.samples</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>exo.portal.web</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>exo.portal.webui</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -26,7 +26,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -26,7 +26,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>extension-config</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -27,7 +27,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>extension-ear</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -27,7 +27,7 @@ <parent> <groupId>org.gatein.integration</groupId> <artifactId>gatein-wsrp-integration-parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>extension-ear-as5</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -27,7 +27,7 @@ <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <artifactId>extension-war</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2011-08-25 07:38:30 UTC (rev 7223) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2011-08-25 07:40:37 UTC (rev 7224) @@ -34,7 +34,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03</version> + <version>5.2.0-epp-DEV04-SNAPSHOT</version> </parent> <description>GateIn WSRP Integration extension parent</description>

12 years, 10 months

1
0
0 / 0

gatein SVN: r7223 - epp/portal/tags.

by do-not-reply＠jboss.org

Author: theute Date: 2011-08-25 03:38:30 -0400 (Thu, 25 Aug 2011) New Revision: 7223 Added: epp/portal/tags/5.2.0-epp-DEV03/ Log: [maven-scm] copy for tag 5.2.0-epp-DEV03

12 years, 10 months

1
0
0 / 0

gatein SVN: r7222 - in epp/portal/branches/EPP_5_2_Branch: component and 74 other directories.

by do-not-reply＠jboss.org

Author: theute Date: 2011-08-25 03:30:07 -0400 (Thu, 25 Aug 2011) New Revision: 7222 Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml epp/portal/branches/EPP_5_2_Branch/component/pom.xml epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml epp/portal/branches/EPP_5_2_Branch/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml epp/portal/branches/EPP_5_2_Branch/server/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/pom.xml epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml epp/portal/branches/EPP_5_2_Branch/web/pom.xml epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml Log: [maven-release-plugin] prepare release 5.2.0-epp-DEV03 Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>exo.portal.component.common</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>exo.portal.component</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -1,13 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>distribution.parent</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -38,23 +38,23 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.config</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.jar</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.war</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>exo.portal.sample</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -38,29 +38,29 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.config</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.jar</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.war</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.rest-war</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>gatein-api</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>gatein-jsf-hellouser</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>gatein-jsp-hellouser</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>gatein-simplest-helloworld</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -5,7 +5,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>portlets-parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>struts-jpetstore</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.portal.examples.skins</groupId> <artifactId>skins-parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>gatein-sample-skin</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -14,7 +14,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>exo.portal.gadgets-core</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>exo.portal.gadgets</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>exo.portal.gadgets-server</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -31,7 +31,7 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <packaging>pom</packaging> <name>EPP GateIn - Portal - ${project.version}</name> @@ -71,9 +71,9 @@ </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/epp/portal/branches/EPP_5_2...</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/epp/portal/branches/EPP_5_2_Branch</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/epp/portal/branches/EPP_5_2_Branch</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/epp/portal/tags/5.2.0-epp-D...</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/epp/portal/tags/5.2.0-epp-DEV03</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/epp/portal/tags/5.2.0-epp-DEV03</url> </scm> <modules> @@ -469,74 +469,74 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.common</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.controller</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.security</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.server</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.api</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web.resources</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.pc</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.identity</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.identity</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.resources</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.application-registry</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> @@ -546,68 +546,68 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.scripting</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.management</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.framework</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portlet</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portal</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.eXo</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.core</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.dashboard</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets-core</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <type>test-jar</type> </dependency> <dependency> @@ -624,7 +624,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss.plugin</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency>  Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>exo.portal.portlet</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>exo.portal.server.jboss</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/server/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>exo.portal.server</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -38,7 +38,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.starter.war</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <type>war</type> </dependency> </dependencies> Modified: epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: epp/portal/branches/EPP_5_2_Branch/starter/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>exo.portal.starter.root</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -51,7 +51,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.starter.jar</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </dependency> </dependencies> </project> Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>exo.portal.testsuite</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>exo.portal.selenium.snifftests</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>exo.webui.based.samples</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/web/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>exo.portal.web</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>exo.portal.webui</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -22,13 +22,11 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -21,13 +21,12 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>gatein-wsrp-integration-parent</artifactId> <groupId>org.gatein.integration</groupId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>extension-config</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -1,193 +1,192 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>gatein-wsrp-integration-parent</artifactId> - <groupId>org.gatein.integration</groupId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> - </parent> - - <artifactId>extension-ear</artifactId> - <packaging>ear</packaging> - - <name>GateIn WSRP Integration extension EAR</name> - - <dependencies> - <dependency> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-config</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-war</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-component</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-admin-gui</artifactId> - <version>${org.gatein.wsrp.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer</artifactId> - <version>${org.gatein.wsrp.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-lib</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-consumer</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-jcr-impl</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-common</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp1-ws</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp2-ws</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-integration-api</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss-jboss5</artifactId> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ear-plugin</artifactId> - <configuration> - <displayName>gatein-wsrp-integration</displayName> - <defaultLibBundleDir>lib</defaultLibBundleDir> - <modules> - <webModule> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-war</artifactId> - <contextRoot>gatein-wsrp-integration</contextRoot> - </webModule> - <webModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer</artifactId> - <contextRoot>wsrp-producer</contextRoot> - </webModule> - <webModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-admin-gui</artifactId> - <contextRoot>wsrp-admin-gui</contextRoot> - </webModule> - <jarModule> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-config</artifactId> - <includeInApplicationXml>true</includeInApplicationXml> - <bundleDir>/</bundleDir> - </jarModule> - <jarModule> - <groupId>org.gatein.integration</groupId> - <artifactId>extension-component</artifactId> - <includeInApplicationXml>true</includeInApplicationXml> - <bundleDir>/</bundleDir> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-lib</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-consumer</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-jcr-impl</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-common</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp1-ws</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wsrp2-ws</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-integration-api</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss-jboss5</artifactId> - </jarModule> - <jarModule> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-wss</artifactId> - </jarModule> - </modules> - </configuration> - </plugin> - </plugins> - <finalName>gatein-wsrp-integration</finalName> - </build> - -</project> +<?xml version="1.0" encoding="UTF-8"?> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>gatein-wsrp-integration-parent</artifactId> + <groupId>org.gatein.integration</groupId> + <version>5.2.0-epp-DEV03</version> + </parent> + + <artifactId>extension-ear</artifactId> + <packaging>ear</packaging> + + <name>GateIn WSRP Integration extension EAR</name> + + <dependencies> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-config</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-war</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-component</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-admin-gui</artifactId> + <version>${org.gatein.wsrp.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer</artifactId> + <version>${org.gatein.wsrp.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-jcr-impl</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-common</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp1-ws</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp2-ws</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</artifactId> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <displayName>gatein-wsrp-integration</displayName> + <defaultLibBundleDir>lib</defaultLibBundleDir> + <modules> + <webModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-war</artifactId> + <contextRoot>gatein-wsrp-integration</contextRoot> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer</artifactId> + <contextRoot>wsrp-producer</contextRoot> + </webModule> + <webModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-admin-gui</artifactId> + <contextRoot>wsrp-admin-gui</contextRoot> + </webModule> + <jarModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-config</artifactId> + <includeInApplicationXml>true</includeInApplicationXml> + <bundleDir>/</bundleDir> + </jarModule> + <jarModule> + <groupId>org.gatein.integration</groupId> + <artifactId>extension-component</artifactId> + <includeInApplicationXml>true</includeInApplicationXml> + <bundleDir>/</bundleDir> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-jcr-impl</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-common</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp1-ws</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wsrp2-ws</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss-jboss5</artifactId> + </jarModule> + <jarModule> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-wss</artifactId> + </jarModule> + </modules> + </configuration> + </plugin> + </plugins> + <finalName>gatein-wsrp-integration</finalName> + </build> + +</project> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -27,7 +27,7 @@ <parent> <groupId>org.gatein.integration</groupId> <artifactId>gatein-wsrp-integration-parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <artifactId>extension-ear-as5</artifactId> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -1,43 +1,42 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>gatein-wsrp-integration-parent</artifactId> - <groupId>org.gatein.integration</groupId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> - </parent> - - <artifactId>extension-war</artifactId> - <packaging>war</packaging> - - <name>GateIn WSRP Integration extension WAR</name> - - <build> - <finalName>gatein-wsrp-integration</finalName> - </build> - -</project> +<?xml version="1.0" encoding="UTF-8"?> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>gatein-wsrp-integration-parent</artifactId> + <groupId>org.gatein.integration</groupId> + <version>5.2.0-epp-DEV03</version> + </parent> + + <artifactId>extension-war</artifactId> + <packaging>war</packaging> + + <name>GateIn WSRP Integration extension WAR</name> + + <build> + <finalName>gatein-wsrp-integration</finalName> + </build> + +</project> Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) +++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2011-08-25 07:30:07 UTC (rev 7222) @@ -21,8 +21,7 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>GateIn WSRP Integration</name> @@ -35,7 +34,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>5.2.0-epp-DEV03-SNAPSHOT</version> + <version>5.2.0-epp-DEV03</version> </parent> <description>GateIn WSRP Integration extension parent</description>

12 years, 10 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: theute Date: 2011-08-25 03:17:32 -0400 (Thu, 25 Aug 2011) New Revision: 7221 Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml Log: JBEPP-1123 Update gatein management version to beta02. Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-08-25 06:44:08 UTC (rev 7220) +++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-08-25 07:17:32 UTC (rev 7221) @@ -50,7 +50,7 @@ <org.picketlink.idm>1.3.0.Alpha03</org.picketlink.idm> <org.gatein.wsrp.version>2.1.0-Beta04</org.gatein.wsrp.version> <org.gatein.mop.version>1.1.0-Beta05</org.gatein.mop.version> - <org.gatein.mgmt.version>1.0.0-Beta01</org.gatein.mgmt.version> + <org.gatein.mgmt.version>1.0.0-Beta02</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> @@ -877,13 +877,6 @@ <artifactId>log4j</artifactId> <version>1.2.16</version> </dependency> -  - <dependency> - <groupId>org.staxnav</groupId> - <artifactId>staxnav.core</artifactId> - <version>${org.staxnav.version}</version> - </dependency> -  <dependency> <groupId>com.google.javascript</groupId> @@ -917,6 +910,25 @@ <version>${nl.captcha.simplecaptcha.version}</version> </dependency> +  + <dependency> + <groupId>org.staxnav</groupId> + <artifactId>staxnav.core</artifactId> + <version>${org.staxnav.version}</version> + </dependency> + + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>${commons-dbcp.version}</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> + </dependency> +  <dependency> <groupId>net.jcip</groupId>

12 years, 10 months

1
0
0 / 0

gatein SVN: r7220 - in epp/portal/branches/EPP_5_2_Branch: component and 3 other directories.

by do-not-reply＠jboss.org

Author: theute Date: 2011-08-25 02:44:08 -0400 (Thu, 25 Aug 2011) New Revision: 7220 Modified: epp/portal/branches/EPP_5_2_Branch/ epp/portal/branches/EPP_5_2_Branch/component/ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/PageImportTask.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/SiteLayoutImportTask.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/page/PageUtils.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/management/exportimport/PageImportTaskTest.java Log: JBEPP-1122: Stale storage id's result in error during rollback for pages and site layout. Property changes on: epp/portal/branches/EPP_5_2_Branch ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5622,5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1790:5871 /portal/branches/branch-GTNPORTAL-1822:5943,5952 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/branch-GTNPORTAL-1872:6400,6551 /portal/branches/branch-GTNPORTAL-1921:6603 /portal/branches/branch-GTNPORTAL-1963:6904,6915-6916 /portal/branches/decoupled-webos:6214-6243 /portal/branches/gatein-management:6920-6958 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/trunk:4891,5744,5822,5943,6168,6196,6201-6203,6205-6206,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7117,7125,7132,7134 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5622,5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1790:5871 /portal/branches/branch-GTNPORTAL-1822:5943,5952 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/branch-GTNPORTAL-1872:6400,6551 /portal/branches/branch-GTNPORTAL-1921:6603 /portal/branches/branch-GTNPORTAL-1963:6904,6915-6916 /portal/branches/decoupled-webos:6214-6243 /portal/branches/gatein-management:6920-6958 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/trunk:4891,5744,5822,5943,6168,6196,6201-6203,6205-6206,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7117,7125,7132-7134 Property changes on: epp/portal/branches/EPP_5_2_Branch/component ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5622,5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1790/component:5871 /portal/branches/branch-GTNPORTAL-1822/component:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component:6603 /portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916 /portal/trunk/component:4891,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6292,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7117,7125,7132,7134 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5622,5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1790/component:5871 /portal/branches/branch-GTNPORTAL-1822/component:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component:6603 /portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916 /portal/trunk/component:4891,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6292,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7117,7125,7132-7134 Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/PageImportTask.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/PageImportTask.java 2011-08-25 06:35:14 UTC (rev 7219) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/PageImportTask.java 2011-08-25 06:44:08 UTC (rev 7220) @@ -27,6 +27,7 @@ import org.exoplatform.portal.config.Query; import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.mop.SiteKey; +import org.exoplatform.portal.mop.management.operations.page.PageUtils; import java.util.ArrayList; import java.util.List; @@ -109,7 +110,7 @@ } else { - rollbackSaves.getPages().add(found); + rollbackSaves.getPages().add(PageUtils.copy(found)); } } } @@ -129,9 +130,10 @@ rollbackDeletes.setPages(new ArrayList<Page>()); for (Page page : existingPages) { + Page copy = PageUtils.copy(page); dataStorage.remove(page); dataStorage.save(); - rollbackSaves.getPages().add(page); + rollbackSaves.getPages().add(copy); } for (Page src : data.getPages()) { Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/SiteLayoutImportTask.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/SiteLayoutImportTask.java 2011-08-25 06:35:14 UTC (rev 7219) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/SiteLayoutImportTask.java 2011-08-25 06:44:08 UTC (rev 7220) @@ -25,9 +25,7 @@ import org.exoplatform.portal.config.DataStorage; import org.exoplatform.portal.config.model.PortalConfig; import org.exoplatform.portal.mop.SiteKey; -import org.exoplatform.portal.pom.data.ModelDataStorage; -import org.exoplatform.portal.pom.data.PortalData; -import org.exoplatform.portal.pom.data.PortalKey; +import org.exoplatform.portal.mop.management.operations.page.PageUtils; /** * @author <a href="mailto:nscavell@redhat.com">Nick Scavelli</a> @@ -72,7 +70,7 @@ } else { - rollbackSave = dst; + rollbackSave = PageUtils.copy(dst); } dst = data; break; Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/page/PageUtils.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/page/PageUtils.java 2011-08-25 06:35:14 UTC (rev 7219) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/page/PageUtils.java 2011-08-25 06:44:08 UTC (rev 7220) @@ -1,8 +1,21 @@ package org.exoplatform.portal.mop.management.operations.page; +import org.exoplatform.container.ExoContainer; +import org.exoplatform.container.ExoContainerContext; +import org.exoplatform.container.PortalContainer; import org.exoplatform.portal.config.DataStorage; import org.exoplatform.portal.config.Query; +import org.exoplatform.portal.config.model.Application; +import org.exoplatform.portal.config.model.ApplicationState; +import org.exoplatform.portal.config.model.ApplicationType; +import org.exoplatform.portal.config.model.Container; +import org.exoplatform.portal.config.model.Dashboard; +import org.exoplatform.portal.config.model.ModelObject; import org.exoplatform.portal.config.model.Page; +import org.exoplatform.portal.config.model.PageBody; +import org.exoplatform.portal.config.model.PortalConfig; +import org.exoplatform.portal.config.model.Properties; +import org.exoplatform.portal.config.model.TransientApplicationState; import org.exoplatform.portal.mop.SiteKey; import org.gatein.management.api.exceptions.OperationException; @@ -29,7 +42,7 @@ } } - public static Page.PageSet getAllPages(DataStorage dataStorage, SiteKey siteKey, String operationName) + public static Page.PageSet getAllPages(DataStorage dataStorage, SiteKey siteKey, String operationName) { Query<Page> query = new Query<Page>(siteKey.getTypeName(), siteKey.getName(), Page.class); try @@ -45,4 +58,180 @@ throw new OperationException(operationName, "Could not retrieve pages for site " + siteKey); } } + + public static <S> Application<S> copy(Application<S> existing) + { + Application<S> application = new Application<S>(existing.getType()); + application.setAccessPermissions(copy(existing.getAccessPermissions())); + application.setDescription(existing.getDescription()); + application.setHeight(existing.getHeight()); + application.setIcon(existing.getIcon()); + application.setId(existing.getId()); + application.setModifiable(existing.isModifiable()); + application.setProperties(new Properties(existing.getProperties())); + application.setShowApplicationMode(existing.getShowApplicationMode()); + application.setShowApplicationState(existing.getShowApplicationState()); + application.setShowInfoBar(existing.getShowInfoBar()); + application.setState(copy(existing.getType(), existing.getState())); + application.setTheme(existing.getTheme()); + application.setTitle(existing.getTitle()); + application.setWidth(existing.getWidth()); + + return application; + } + + public static <S> ApplicationState<S> copy(ApplicationType<S> type, ApplicationState<S> existing) + { + if (existing instanceof TransientApplicationState) + { + TransientApplicationState<S> state = (TransientApplicationState<S>) existing; + return new TransientApplicationState<S>(state.getContentId(), state.getContentState(), state.getOwnerType(), state.getOwnerId(), state.getUniqueId()); + } + else + { + // Hate doing this, but it's the only way to deal with persistent application state... + ExoContainer container = ExoContainerContext.getCurrentContainer(); + if (container instanceof PortalContainer) + { + DataStorage ds = (DataStorage) container.getComponentInstanceOfType(DataStorage.class); + try + { + S s = ds.load(existing, type); + String contentId = ds.getId(existing); + + return new TransientApplicationState<S>(contentId, s); + } + catch (Exception e) + { + throw new RuntimeException("Exception copying persistent application state.", e); + } + } + else + { + throw new RuntimeException("Unable to copy persistent application state with kernel container " + container); + } + } + } + + public static Container copy(Container existing) + { + Container container = new Container(); + copyFields(existing, container); + + return container; + } + + public static Dashboard copy(Dashboard existing) + { + Dashboard dashboard = new Dashboard(); + copyFields(existing, dashboard); + + return dashboard; + } + + public static Page copy(Page existing) + { + Page page = new Page(); + + // Copy page specific data + page.setEditPermission(existing.getEditPermission()); + page.setModifiable(existing.isModifiable()); + page.setOwnerId(existing.getOwnerId()); + page.setOwnerType(existing.getOwnerType()); + page.setPageId(existing.getPageId()); + page.setShowMaxWindow(existing.isShowMaxWindow()); + + // Copy container specific data. + copyFields(existing, page); + + return page; + } + + public static Page.PageSet copy(Page.PageSet existingPageSet) + { + Page.PageSet pageSet = new Page.PageSet(); + ArrayList<Page> pages = new ArrayList<Page>(existingPageSet.getPages().size()); + pageSet.setPages(pages); + + for (Page existingPage : existingPageSet.getPages()) + { + pages.add(copy(existingPage)); + } + + return pageSet; + } + + @SuppressWarnings("unused") + public static PageBody copy(PageBody existing) + { + return new PageBody(); + } + + public static PortalConfig copy(PortalConfig existing) + { + PortalConfig portalConfig = new PortalConfig(existing.getType(), existing.getName()); + portalConfig.setAccessPermissions(copy(existing.getAccessPermissions())); + portalConfig.setDescription(existing.getDescription()); + portalConfig.setEditPermission(existing.getEditPermission()); + portalConfig.setLabel(existing.getLabel()); + portalConfig.setLocale(existing.getLocale()); + portalConfig.setModifiable(existing.isModifiable()); + portalConfig.setPortalLayout(copy(existing.getPortalLayout())); + portalConfig.setProperties(new Properties(existing.getProperties())); + + return portalConfig; + } + + private static void copyFields(Container existing, Container container) + { + container.setAccessPermissions(copy(existing.getAccessPermissions())); + container.setChildren(copyChildren(existing.getChildren())); + container.setDecorator(existing.getDecorator()); + container.setDescription(existing.getDescription()); + container.setFactoryId(existing.getFactoryId()); + container.setHeight(existing.getHeight()); + container.setIcon(existing.getIcon()); + container.setId(existing.getId()); + container.setName(existing.getName()); + container.setTemplate(existing.getTemplate()); + container.setTitle(existing.getTitle()); + container.setWidth(existing.getWidth()); + } + + private static ArrayList<ModelObject> copyChildren(ArrayList<ModelObject> existing) + { + if (existing == null) return null; + ArrayList<ModelObject> children = new ArrayList<ModelObject>(existing.size()); + + for (ModelObject object : existing) + { + if (object instanceof Application) + { + @SuppressWarnings("unchecked") + Application app = copy((Application) object); + + children.add(app); + } + if (object instanceof Dashboard) + { + children.add(copy((Dashboard) object)); + } + if (object instanceof Container) + { + children.add(copy((Container) object)); + } + } + + return children; + } + + private static String[] copy(String[] existing) + { + if (existing == null) return null; + + String[] array = new String[existing.length]; + System.arraycopy(existing, 0, array, 0, existing.length); + + return array; + } } Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/management/exportimport/PageImportTaskTest.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/management/exportimport/PageImportTaskTest.java 2011-08-25 06:35:14 UTC (rev 7219) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/mop/management/exportimport/PageImportTaskTest.java 2011-08-25 06:44:08 UTC (rev 7220) @@ -220,7 +220,7 @@ assertNullOrEmpty(task.getRollbackDeletes()); Assert.assertNotNull(task.getRollbackSaves()); Assert.assertEquals(3, task.getRollbackSaves().getPages().size()); - Assert.assertEquals(existing.getPages(), task.getRollbackSaves().getPages()); + comparePages(existing.getPages(), task.getRollbackSaves().getPages()); } public void testMerge_NewPages() throws Exception @@ -283,8 +283,8 @@ Assert.assertNotNull(task.getRollbackSaves()); Assert.assertEquals(2, task.getRollbackSaves().getPages().size()); - Assert.assertEquals(existing.getPages().get(0), task.getRollbackSaves().getPages().get(0)); - Assert.assertEquals(existing.getPages().get(2), task.getRollbackSaves().getPages().get(1)); + comparePage(existing.getPages().get(0), task.getRollbackSaves().getPages().get(0)); + comparePage(existing.getPages().get(2), task.getRollbackSaves().getPages().get(1)); } public void testOverwrite_NoPages() throws Exception @@ -347,7 +347,7 @@ assertNullOrEmpty(task.getRollbackDeletes()); Assert.assertNotNull(task.getRollbackSaves()); Assert.assertEquals(3, task.getRollbackSaves().getPages().size()); - Assert.assertEquals(existing.getPages(), task.getRollbackSaves().getPages()); + comparePages(existing.getPages(), task.getRollbackSaves().getPages()); } public void testOverwrite_NewPages() throws Exception @@ -384,7 +384,7 @@ Assert.assertEquals(importing.getPages(), task.getRollbackDeletes().getPages()); Assert.assertNotNull(task.getRollbackSaves()); - Assert.assertEquals(existing.getPages(), task.getRollbackSaves().getPages()); + comparePages(existing.getPages(), task.getRollbackSaves().getPages()); } public void testOverwrite_NewAndSamePages() throws Exception @@ -423,7 +423,7 @@ Assert.assertEquals(importing.getPages().get(3), task.getRollbackDeletes().getPages().get(1)); Assert.assertNotNull(task.getRollbackSaves()); - Assert.assertEquals(existing.getPages(), task.getRollbackSaves().getPages()); + comparePages(existing.getPages(), task.getRollbackSaves().getPages()); } private void assertNullOrEmpty(Page.PageSet pages) @@ -434,6 +434,27 @@ } } + private void comparePages(ArrayList<Page> expected, ArrayList<Page> actual) + { + if (expected == null) + { + assertNull(actual); + return; + } + + assertEquals(expected.size(), actual.size()); + + for (int i=0; i<expected.size(); i++) + { + comparePage(expected.get(i), actual.get(i)); + } + } + + private void comparePage(Page expected, Page actual) + { + assertEquals(expected.getName(), actual.getName()); + } + private Query<Page> query(String ownerType, String ownerId) { return argThat(new QueryMatcher(new Query<Page>(ownerType, ownerId, Page.class)));

12 years, 10 months

1
0
0 / 0

gatein SVN: r7219 - in epp/portal/branches/EPP_5_2_Branch: component and 2 other directories.

by do-not-reply＠jboss.org

Author: theute Date: 2011-08-25 02:35:14 -0400 (Thu, 25 Aug 2011) New Revision: 7219 Modified: epp/portal/branches/EPP_5_2_Branch/ epp/portal/branches/EPP_5_2_Branch/component/ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/NavigationImportTask.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/MopImportResource.java Log: JBEPP-1121 Support navigation rollback during management operation import-resource. Property changes on: epp/portal/branches/EPP_5_2_Branch ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5622,5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1790:5871 /portal/branches/branch-GTNPORTAL-1822:5943,5952 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/branch-GTNPORTAL-1872:6400,6551 /portal/branches/branch-GTNPORTAL-1921:6603 /portal/branches/branch-GTNPORTAL-1963:6904,6915-6916 /portal/branches/decoupled-webos:6214-6243 /portal/branches/gatein-management:6920-6958 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/trunk:4891,5744,5822,5943,6168,6196,6201-6203,6205-6206,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7117,7125 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868 /portal/branches/branch-GTNPORTAL-1592:4894 /portal/branches/branch-GTNPORTAL-1643:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731:5622,5668 /portal/branches/branch-GTNPORTAL-1745:5765 /portal/branches/branch-GTNPORTAL-1790:5871 /portal/branches/branch-GTNPORTAL-1822:5943,5952 /portal/branches/branch-GTNPORTAL-1832:6030,6063 /portal/branches/branch-GTNPORTAL-1872:6400,6551 /portal/branches/branch-GTNPORTAL-1921:6603 /portal/branches/branch-GTNPORTAL-1963:6904,6915-6916 /portal/branches/decoupled-webos:6214-6243 /portal/branches/gatein-management:6920-6958 /portal/branches/global-portlet-metadata:6298-6384 /portal/branches/site-describability:6171-6235 /portal/trunk:4891,5744,5822,5943,6168,6196,6201-6203,6205-6206,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7117,7125,7132,7134 Property changes on: epp/portal/branches/EPP_5_2_Branch/component ___________________________________________________________________ Modified: svn:mergeinfo - /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5622,5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1790/component:5871 /portal/branches/branch-GTNPORTAL-1822/component:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component:6603 /portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916 /portal/trunk/component:4891,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6292,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7117,7125 + /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868 /portal/branches/branch-GTNPORTAL-1592/component:4894 /portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167 /portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445 /portal/branches/branch-GTNPORTAL-1731/component:5622,5668 /portal/branches/branch-GTNPORTAL-1745/component:5765 /portal/branches/branch-GTNPORTAL-1790/component:5871 /portal/branches/branch-GTNPORTAL-1822/component:5943,5952 /portal/branches/branch-GTNPORTAL-1832/component:6030,6063 /portal/branches/branch-GTNPORTAL-1872/component:6400,6551 /portal/branches/branch-GTNPORTAL-1921/component:6603 /portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916 /portal/trunk/component:4891,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6292,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7117,7125,7132,7134 Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/NavigationImportTask.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/NavigationImportTask.java 2011-08-25 04:34:28 UTC (rev 7218) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/exportimport/NavigationImportTask.java 2011-08-25 06:35:14 UTC (rev 7219) @@ -23,20 +23,25 @@ package org.exoplatform.portal.mop.management.exportimport; import org.exoplatform.portal.config.DataStorage; +import org.exoplatform.portal.config.model.NavigationFragment; import org.exoplatform.portal.config.model.PageNavigation; import org.exoplatform.portal.config.model.PortalConfig; import org.exoplatform.portal.mop.SiteKey; import org.exoplatform.portal.mop.description.DescriptionService; import org.exoplatform.portal.mop.importer.ImportMode; import org.exoplatform.portal.mop.importer.NavigationImporter; +import org.exoplatform.portal.mop.management.operations.navigation.NavigationUtils; import org.exoplatform.portal.mop.navigation.NavigationContext; import org.exoplatform.portal.mop.navigation.NavigationService; -import org.exoplatform.portal.pom.data.ModelDataStorage; -import org.exoplatform.portal.pom.data.PortalData; -import org.exoplatform.portal.pom.data.PortalKey; +import org.exoplatform.portal.mop.navigation.NodeChangeListener; +import org.exoplatform.portal.mop.navigation.NodeContext; +import org.exoplatform.portal.mop.navigation.NodeState; +import org.exoplatform.portal.mop.navigation.Scope; import org.gatein.common.logging.Logger; import org.gatein.common.logging.LoggerFactory; +import java.util.ArrayList; +import java.util.List; import java.util.Locale; /** @@ -91,25 +96,64 @@ rollbackTask = new RollbackTask() { @Override + public String getDescription() + { + return "Deleting navigation for site " + siteKey; + } + + @Override public void rollback() throws Exception { + log.debug("Rollback: " + getDescription()); navigationService.destroyNavigation(navContext); } }; } else { - //TODO: Rollback updates. + + final List<NodeContext<NodeContext<?>>> snapshots = new ArrayList<NodeContext<NodeContext<?>>>(data.getFragments().size()); + for (NavigationFragment fragment : data.getFragments()) + { + snapshots.add(NavigationUtils.loadNode(navigationService, navContext, fragment.getParentURI())); + } + rollbackTask = new RollbackTask() { @Override + public String getDescription() + { + return "Rolling back navigation changes..."; + } + + @Override public void rollback() throws Exception { - log.warn("Rollback for existing navigation not supported at the moment."); + log.debug(getDescription()); + + for (NodeContext<NodeContext<?>> snapshot : snapshots) + { + RollbackChangeListener listener = new RollbackChangeListener(); + navigationService.updateNode(snapshot, Scope.ALL, listener); + + // Rollback... + listener.rollback(); + + // If any errors, throw exception + if (listener.errors) + { + throw new Exception("Error rolling back navigation snapshot '" + snapshot.getName() + "'"); + } + + navigationService.saveNode(snapshot, null); + } + + log.debug("Successfully rolled back navigation changes."); } }; } + // Import navigation using gatein navigation importer. NavigationImporter importer = new NavigationImporter(locale, mode, data, navigationService, descriptionService); importer.perform(); } @@ -125,6 +169,183 @@ private static interface RollbackTask { + String getDescription(); + void rollback() throws Exception; } + + private static class RollbackChangeListener implements NodeChangeListener<NodeContext<NodeContext<?>>> + { + private List<RollbackTask> tasks = new ArrayList<RollbackTask>(); + private boolean errors; + + @Override + public void onAdd(final NodeContext<NodeContext<?>> target, final NodeContext<NodeContext<?>> parent, NodeContext<NodeContext<?>> previous) + { + tasks.add(new RollbackTask() + { + @Override + public String getDescription() + { + return "Removing node " + target.getName() + " from parent " + parent.getName(); + } + + @Override + public void rollback() throws Exception + { + parent.removeNode(target.getName()); + } + }); + } + + @Override + public void onCreate(final NodeContext<NodeContext<?>> target, final NodeContext<NodeContext<?>> parent, final NodeContext<NodeContext<?>> previous, final String name) + { + tasks.add(new RollbackTask() + { + @Override + public String getDescription() + { + return "Removing node " + name + " from parent " + parent.getName(); + } + + @Override + public void rollback() throws Exception + { + parent.removeNode(name); + } + }); + } + + @Override + public void onRemove(final NodeContext<NodeContext<?>> target, final NodeContext<NodeContext<?>> parent) + { + tasks.add(new RollbackTask() + { + // Copy all state for rollback + private String name = target.getName(); + private Integer index = target.getIndex(); + boolean hidden = target.isHidden(); + private NodeState state = target.getState(); + + @Override + public String getDescription() + { + return "Adding node " + target.getName() + " to parent " + parent.getName(); + } + + @Override + public void rollback() throws Exception + { + NodeContext node = parent.add(index, name); + node.setState(state); + node.setHidden(hidden); + } + }); + } + + @Override + public void onDestroy(final NodeContext<NodeContext<?>> target, final NodeContext<NodeContext<?>> parent) + { + tasks.add(new RollbackTask() + { + @Override + public String getDescription() + { + return "Adding node " + target.getName() + " from parent " + parent.getName(); + } + + @Override + public void rollback() throws Exception + { + parent.add(null, target); + } + }); + } + + @Override + public void onRename(final NodeContext<NodeContext<?>> target, final NodeContext<NodeContext<?>> parent, final String name) + { + tasks.add(new RollbackTask() + { + // Copy previous name for rollback + private String targetName = target.getName(); + + @Override + public String getDescription() + { + return "Renaming node " + name + " to " + targetName + " for parent " + parent.getName(); + } + + @Override + public void rollback() throws Exception + { + target.setName(targetName); + } + }); + } + + @Override + public void onUpdate(final NodeContext<NodeContext<?>> target, final NodeState state) + { + tasks.add(new RollbackTask() + { + // Copy state for rollback + private NodeState targetState = target.getState(); + + @Override + public String getDescription() + { + return "Setting node " + target.getName() + " back to previous state " + targetState; + } + + @Override + public void rollback() throws Exception + { + target.setState(targetState); + } + }); + } + + @Override + public void onMove(final NodeContext<NodeContext<?>> target, final NodeContext<NodeContext<?>> from, final NodeContext<NodeContext<?>> to, NodeContext<NodeContext<?>> previous) + { + tasks.add(new RollbackTask() + { + @Override + public String getDescription() + { + return "Moving node " + target.getName() + " from " + to.getName() + " to " + from.getName(); + } + + @Override + public void rollback() throws Exception + { + from.add(target.getIndex(), target); + to.removeNode(target.getName()); + } + }); + } + + public void rollback() + { + boolean debug = log.isDebugEnabled(); + for (RollbackTask task : tasks) + { + try + { + if (debug) + { + log.debug("Rollback: " + task.getDescription()); + } + task.rollback(); + } + catch (Exception e) + { + log.error("Exception during NodeChangeListener's rollback task: " + task.getDescription(), e); + errors = true; + } + } + } + } } Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/MopImportResource.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/MopImportResource.java 2011-08-25 04:34:28 UTC (rev 7218) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/management/operations/MopImportResource.java 2011-08-25 06:35:14 UTC (rev 7219) @@ -187,7 +187,7 @@ } // Perform import - Map<SiteKey, MopImport> completedImportMap = new HashMap<SiteKey, MopImport>(); + Map<SiteKey, MopImport> importsRan = new HashMap<SiteKey, MopImport>(); try { log.info("Performing import using strategy '" + strategy.getName() + "'"); @@ -195,13 +195,13 @@ { SiteKey siteKey = mopImportEntry.getKey(); MopImport mopImport = mopImportEntry.getValue(); - MopImport completed = new MopImport(); + MopImport ran = new MopImport(); - if (completedImportMap.containsKey(siteKey)) + if (importsRan.containsKey(siteKey)) { throw new IllegalStateException("Multiple site imports for same operation."); } - completedImportMap.put(siteKey, completed); + importsRan.put(siteKey, ran); log.debug("Importing data for site " + siteKey); @@ -209,24 +209,24 @@ if (mopImport.siteTask != null) { log.debug("Importing site layout data."); + ran.siteTask = mopImport.siteTask; mopImport.siteTask.importData(strategy); - completed.siteTask = mopImport.siteTask; } // Page import if (mopImport.pageTask != null) { log.debug("Importing page data."); + ran.pageTask = mopImport.pageTask; mopImport.pageTask.importData(strategy); - completed.pageTask = mopImport.pageTask; } // Navigation import if (mopImport.navigationTask != null) { log.debug("Importing navigation data."); + ran.navigationTask = mopImport.navigationTask; mopImport.navigationTask.importData(strategy); - completed.navigationTask = mopImport.navigationTask; } } log.info("Import successful !"); @@ -236,7 +236,7 @@ boolean rollbackSuccess = true; log.error("Exception importing data.", t); log.info("Attempting to rollback data modified by import."); - for (Map.Entry<SiteKey, MopImport> mopImportEntry : completedImportMap.entrySet()) + for (Map.Entry<SiteKey, MopImport> mopImportEntry : importsRan.entrySet()) { SiteKey siteKey = mopImportEntry.getKey(); MopImport mopImport = mopImportEntry.getValue(); @@ -292,7 +292,7 @@ finally { importMap.clear(); - completedImportMap.clear(); + importsRan.clear(); } }

12 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits August 2011