Author: chris.laprun(a)jboss.com Date: 2011-09-01 13:20:20 -0400 (Thu, 01 Sep 2011) New Revision: 7283 Modified: components/wsrp/branches/clustering/ components/wsrp/branches/clustering/admin-gui/pom.xml components/wsrp/branches/clustering/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java components/wsrp/branches/clustering/api/pom.xml components/wsrp/branches/clustering/common/pom.xml components/wsrp/branches/clustering/consumer/pom.xml components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java components/wsrp/branches/clustering/hibernate-impl/pom.xml components/wsrp/branches/clustering/jcr-impl/pom.xml components/wsrp/branches/clustering/pom.xml components/wsrp/branches/clustering/producer/pom.xml components/wsrp/branches/clustering/test/pom.xml components/wsrp/branches/clustering/ws-security/jboss5/pom.xml components/wsrp/branches/clustering/ws-security/pom.xml components/wsrp/branches/clustering/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml components/wsrp/branches/clustering/ws-security/wss/pom.xml components/wsrp/branches/clustering/wsrp-producer-war/pom.xml components/wsrp/branches/clustering/wsrp-producer-war/src/test/assembly/test-producer.xml components/wsrp/branches/clustering/wsrp-producer-war/src/test/producer-sar/portlet-container.war/WEB-INF/jboss-beans.xml components/wsrp/branches/clustering/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml components/wsrp/branches/clustering/wsrp1-ws/pom.xml components/wsrp/branches/clustering/wsrp2-ws/pom.xml Log: - Merged changes from trunk (r7210 through r7282) Property changes on: components/wsrp/branches/clustering ___________________________________________________________________ Added: svn:mergeinfo + /components/wsrp/trunk:7210-7282 Modified: components/wsrp/branches/clustering/admin-gui/pom.xml =================================================================== --- components/wsrp/branches/clustering/admin-gui/pom.xml 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/admin-gui/pom.xml 2011-09-01 17:20:20 UTC (rev 7283) @@ -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. @@ -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-Beta06-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-admin-gui</artifactId> Modified: components/wsrp/branches/clustering/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java =================================================================== --- components/wsrp/branches/clustering/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerManagerBean.java 2011-09-01 17:20:20 UTC (rev 7283) @@ -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. @@ -24,7 +24,6 @@ package org.gatein.wsrp.admin.ui; import org.gatein.common.util.ParameterValidation; -import org.gatein.pc.api.PortletInvokerException; import org.gatein.wsrp.WSRPConsumer; import org.gatein.wsrp.consumer.ProducerInfo; import org.gatein.wsrp.consumer.RefreshResult; @@ -311,7 +310,7 @@ } return result; } - catch (PortletInvokerException e) + catch (Exception e) { beanContext.createErrorMessageFrom(e); return null; Modified: components/wsrp/branches/clustering/api/pom.xml =================================================================== --- components/wsrp/branches/clustering/api/pom.xml 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/api/pom.xml 2011-09-01 17:20:20 UTC (rev 7283) @@ -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. @@ -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-Beta06-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-integration-api</artifactId> Modified: components/wsrp/branches/clustering/common/pom.xml =================================================================== --- components/wsrp/branches/clustering/common/pom.xml 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/common/pom.xml 2011-09-01 17:20:20 UTC (rev 7283) @@ -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. @@ -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-Beta06-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-common</artifactId> Modified: components/wsrp/branches/clustering/consumer/pom.xml =================================================================== --- components/wsrp/branches/clustering/consumer/pom.xml 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/consumer/pom.xml 2011-09-01 17:20:20 UTC (rev 7283) @@ -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. @@ -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-Beta06-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-consumer</artifactId> 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-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/consumer/src/main/java/org/gatein/wsrp/consumer/RegistrationInfo.java 2011-09-01 17:20:20 UTC (rev 7283) @@ -622,6 +622,7 @@ { log.debug("Using default registration data for producer '" + producerId + "'"); registrationData = WSRPTypeFactory.createDefaultRegistrationData(); + registrationData.setConsumerName(getConsumerName()); result.setStatus(RefreshResult.Status.SUCCESS); } } Modified: components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java =================================================================== --- components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java 2011-09-01 17:20:20 UTC (rev 7283) @@ -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. @@ -248,7 +248,6 @@ return false; } - @Override public boolean isWSSAvailable() { return false; Modified: components/wsrp/branches/clustering/hibernate-impl/pom.xml =================================================================== --- components/wsrp/branches/clustering/hibernate-impl/pom.xml 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/hibernate-impl/pom.xml 2011-09-01 17:20:20 UTC (rev 7283) @@ -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-Beta06-SNAPSHOT</version> </parent> <groupId>org.gatein.wsrp</groupId> Modified: components/wsrp/branches/clustering/jcr-impl/pom.xml =================================================================== --- components/wsrp/branches/clustering/jcr-impl/pom.xml 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/jcr-impl/pom.xml 2011-09-01 17:20:20 UTC (rev 7283) @@ -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-Beta06-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/wsrp/branches/clustering/pom.xml =================================================================== --- components/wsrp/branches/clustering/pom.xml 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/pom.xml 2011-09-01 17:20:20 UTC (rev 7283) @@ -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-Beta06-SNAPSHOT</version> <packaging>pom</packaging> @@ -46,7 +47,7 @@ </scm> <properties> - <org.gatein.pc.version>2.3.0-Beta03</org.gatein.pc.version> + <org.gatein.pc.version>2.3.0-Beta05</org.gatein.pc.version> <org.gatein.common.version>2.0.4-Beta02</org.gatein.common.version> <org.gatein.wci.version>2.1.0-Beta01</org.gatein.wci.version> Modified: components/wsrp/branches/clustering/producer/pom.xml =================================================================== --- components/wsrp/branches/clustering/producer/pom.xml 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/producer/pom.xml 2011-09-01 17:20:20 UTC (rev 7283) @@ -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. @@ -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-Beta06-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-producer-lib</artifactId> Modified: components/wsrp/branches/clustering/test/pom.xml =================================================================== --- components/wsrp/branches/clustering/test/pom.xml 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/test/pom.xml 2011-09-01 17:20:20 UTC (rev 7283) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ~ 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. @@ -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-Beta06-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: components/wsrp/branches/clustering/ws-security/jboss5/pom.xml =================================================================== --- components/wsrp/branches/clustering/ws-security/jboss5/pom.xml 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/ws-security/jboss5/pom.xml 2011-09-01 17:20:20 UTC (rev 7283) @@ -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. @@ -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-Beta06-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-wss-jboss5</artifactId> Modified: components/wsrp/branches/clustering/ws-security/pom.xml =================================================================== --- components/wsrp/branches/clustering/ws-security/pom.xml 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/ws-security/pom.xml 2011-09-01 17:20:20 UTC (rev 7283) @@ -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-Beta06-SNAPSHOT</version> </parent> <artifactId>wsrp-wss-parent</artifactId> Modified: components/wsrp/branches/clustering/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml =================================================================== --- components/wsrp/branches/clustering/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2011-09-01 17:20:20 UTC (rev 7283) @@ -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. @@ -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-Beta06-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/branches/clustering/ws-security/wss/pom.xml =================================================================== --- components/wsrp/branches/clustering/ws-security/wss/pom.xml 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/ws-security/wss/pom.xml 2011-09-01 17:20:20 UTC (rev 7283) @@ -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. @@ -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-Beta06-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-wss</artifactId> Modified: components/wsrp/branches/clustering/wsrp-producer-war/pom.xml =================================================================== --- components/wsrp/branches/clustering/wsrp-producer-war/pom.xml 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/wsrp-producer-war/pom.xml 2011-09-01 17:20:20 UTC (rev 7283) @@ -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-Beta06-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -328,11 +329,12 @@ <scope>test</scope> <version>${org.gatein.pc.version}</version> </dependency> + <!-- Staxnav needed for PC --> <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-mc</artifactId> + <groupId>org.staxnav</groupId> + <artifactId>staxnav.core</artifactId> + <version>0.9.4</version> <scope>test</scope> - <version>${org.gatein.pc.version}</version> </dependency> <dependency> Modified: components/wsrp/branches/clustering/wsrp-producer-war/src/test/assembly/test-producer.xml =================================================================== --- components/wsrp/branches/clustering/wsrp-producer-war/src/test/assembly/test-producer.xml 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/wsrp-producer-war/src/test/assembly/test-producer.xml 2011-09-01 17:20:20 UTC (rev 7283) @@ -1,3 +1,26 @@ +<!-- + ~ 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. + --> + <assembly> <id>producer</id> <formats> @@ -46,7 +69,7 @@ <include>javax.portlet:portlet-api</include> <include>org.gatein.pc:pc-controller</include> - <include>org.gatein.pc:pc-mc</include> + <include>org.staxnav:staxnav.core</include> <include>org.gatein.common:common-common</include> <include>org.gatein.common:common-logging</include> Modified: components/wsrp/branches/clustering/wsrp-producer-war/src/test/producer-sar/portlet-container.war/WEB-INF/jboss-beans.xml =================================================================== --- components/wsrp/branches/clustering/wsrp-producer-war/src/test/producer-sar/portlet-container.war/WEB-INF/jboss-beans.xml 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/wsrp-producer-war/src/test/producer-sar/portlet-container.war/WEB-INF/jboss-beans.xml 2011-09-01 17:20:20 UTC (rev 7283) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ~ 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,7 +23,7 @@ --> <deployment xmlns="urn:jboss:bean-deployer:2.0"> - <bean name="PortletApplicationDeployer" class="org.gatein.pc.mc.PortletApplicationDeployer"> + <bean name="PortletApplicationDeployer" class="org.gatein.pc.portlet.impl.deployment.PortletApplicationDeployer"> <alias>PortletApplicationRegistry</alias> <property name="servletContainerFactory"> <inject bean="ServletContainerFactory"/> Modified: components/wsrp/branches/clustering/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml =================================================================== --- components/wsrp/branches/clustering/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml 2011-09-01 17:20:20 UTC (rev 7283) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ~ 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. @@ -50,15 +50,15 @@ <value>prefValue2</value> </preference> </portlet-preferences> + <supported-processing-event> + <qname xmlns:jbp='urn:jboss:portal:samples:event'>jbp:ZipEvent</qname> + </supported-processing-event> <supported-publishing-event> <qname xmlns:jbp='urn:jboss:portal:samples:event'>jbp:ZipEvent</qname> </supported-publishing-event> <supported-publishing-event> <qname xmlns:gtn='urn:jboss:gatein'>gtn:foo</qname> </supported-publishing-event> - <supported-processing-event> - <qname xmlns:jbp='urn:jboss:portal:samples:event'>jbp:ZipEvent</qname> - </supported-processing-event> <supported-public-render-parameter>zipcode</supported-public-render-parameter> <supported-public-render-parameter>foo</supported-public-render-parameter> </portlet> @@ -69,9 +69,9 @@ </event-definition> <event-definition> <qname xmlns:gtn='urn:jboss:gatein'>gtn:foo</qname> - <value-type>java.lang.String</value-type> <alias xmlns:gtn='urn:jboss:gatein'>gtn:bar</alias> <alias xmlns:gtn='urn:jboss:gatein'>gtn:baz</alias> + <value-type>java.lang.String</value-type> </event-definition> <public-render-parameter> @@ -79,9 +79,9 @@ <qname xmlns:g='urn:jboss:portal:simple:google'>g:zipcode</qname> </public-render-parameter> <public-render-parameter> + <description>Foo param</description> <identifier>foo</identifier> <qname xmlns:gtn='urn:jboss:gatein'>gtn:fooparam</qname> - <description>Foo param</description> <alias xmlns:gtn='urn:jboss:gatein'>gtn:barparam</alias> <alias xmlns:gtn='urn:jboss:gatein'>gtn:bazparam</alias> </public-render-parameter> Modified: components/wsrp/branches/clustering/wsrp1-ws/pom.xml =================================================================== --- components/wsrp/branches/clustering/wsrp1-ws/pom.xml 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/wsrp1-ws/pom.xml 2011-09-01 17:20:20 UTC (rev 7283) @@ -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. @@ -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-Beta06-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-wsrp1-ws</artifactId> Modified: components/wsrp/branches/clustering/wsrp2-ws/pom.xml =================================================================== --- components/wsrp/branches/clustering/wsrp2-ws/pom.xml 2011-09-01 16:44:04 UTC (rev 7282) +++ components/wsrp/branches/clustering/wsrp2-ws/pom.xml 2011-09-01 17:20:20 UTC (rev 7283) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ~ 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. @@ -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-Beta06-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>wsrp-wsrp2-ws</artifactId>