gatein SVN: r6267 - epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-04-18 10:33:22 -0400 (Mon, 18 Apr 2011)
New Revision: 6267
Added:
epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/gatein_objects_1_1_1.xsd
Log:
JBEPP-786 Error in Xml definition in gatein_objects_1_0 / visibility options do not include the default : VISIBLE value
Copied: epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/gatein_objects_1_1_1.xsd (from rev 6205, portal/trunk/component/portal/src/main/java/gatein_objects_1_1_1.xsd)
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/gatein_objects_1_1_1.xsd (rev 0)
+++ epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/gatein_objects_1_1_1.xsd 2011-04-18 14:33:22 UTC (rev 6267)
@@ -0,0 +1,192 @@
+<?xml version="1.0"?>
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<xs:schema
+ targetNamespace="http://www.gatein.org/xml/ns/gatein_objects_1_1_1"
+ xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_1_1"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.0">
+
+ <!-- A top page element -->
+ <xs:element name="page" type="pageType"/>
+
+ <!-- A top page-set element -->
+ <xs:element name="page-set" type="pageSetType"/>
+
+ <!-- A top portal-config element -->
+ <xs:element name="portal-config" type="portalConfigType"/>
+
+ <!-- A top container element -->
+ <xs:element name="container" type="containerType"/>
+
+ <!-- A top node-navigation element -->
+ <xs:element name="node-navigation" type="nodeNavigationType"/>
+
+ <!-- The type of a top navigation node -->
+ <xs:complexType name="nodeNavigationType">
+ <xs:sequence>
+ <xs:element name="priority" type="xs:positiveInteger"/>
+ <xs:element name="page-nodes" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="node" type="nodeType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <!-- The type of a navigation node -->
+ <xs:complexType name="nodeType">
+ <xs:sequence>
+ <xs:element name="uri" type="xs:string"/>
+ <xs:element name="name" type="xs:string"/>
+ <xs:element name="label" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="icon" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="start-publication-date" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="end-publication-date" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="visibility" type="visibility" default="DISPLAYED" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="page-reference" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="node" type="nodeType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:simpleType name="visibility">
+ <xs:restriction base='xs:string'>
+ <xs:enumeration value="DISPLAYED"/>
+ <xs:enumeration value="HIDDEN"/>
+ <xs:enumeration value="TEMPORAL"/>
+ <xs:enumeration value="SYSTEM"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="pageSetType">
+ <xs:sequence>
+ <xs:element name="page" type="pageType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portalConfigType">
+ <xs:sequence>
+ <xs:element name="portal-name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="locale" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="edit-permission" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="skin" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="properties" type="propertiesType" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="portal-layout" minOccurs="1" maxOccurs="1">
+ <xs:complexType>
+ <xs:group ref="containerChildrenGroup"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="propertiesType">
+ <xs:sequence minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="entry" type="propertiesEntryType" minOccurs="1" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="propertiesEntryType">
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="key" type="xs:string"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:group name="containerChildrenGroup">
+ <xs:sequence>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="portlet-application" type="portletApplicationType" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="container" type="containerType" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="page-body" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="site-body" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ </xs:choice>
+ </xs:sequence>
+ </xs:group>
+
+ <xs:complexType name="pageType">
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="factory-id" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="edit-permission" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="show-max-window" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+ <xs:group ref="containerChildrenGroup"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="containerType">
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="icon" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="factory-id" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="width" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="height" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:group ref="containerChildrenGroup"/>
+ </xs:sequence>
+ <xs:attribute name="id" type="xs:string"/>
+ <xs:attribute name="template" type="xs:string"/>
+ <xs:attribute name="attribute" type="xs:string"/>
+ </xs:complexType>
+
+ <xs:complexType name="portletApplicationType">
+ <xs:sequence>
+ <xs:element name="portlet" type="portletType" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="title" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="access-permissions" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="show-info-bar" type="xs:boolean" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="show-application-state" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="show-application-mode" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="width" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="height" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portletType">
+ <xs:sequence>
+ <xs:element name="application-ref" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="portlet-ref" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="preferences" type="portletPreferencesType" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portletPreferencesType">
+ <xs:sequence>
+ <xs:element name="preference" type="portletPreferenceType" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="portletPreferenceType">
+ <xs:sequence>
+ <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1"/>
+ <xs:element name="value" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ <xs:element name="read-only" type="xs:string" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
13 years, 8 months
gatein SVN: r6266 - epp/portal/branches/EPP_5_1_Branch.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-04-18 10:29:33 -0400 (Mon, 18 Apr 2011)
New Revision: 6266
Modified:
epp/portal/branches/EPP_5_1_Branch/pom.xml
Log:
JBEPP-858 Upgrade to PicketLink 1.1.8.GA
Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-04-18 12:41:49 UTC (rev 6265)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-04-18 14:29:33 UTC (rev 6266)
@@ -47,7 +47,7 @@
<org.gatein.common.version>2.0.3-GA</org.gatein.common.version>
<org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.2.0-GA</org.gatein.pc.version>
- <org.picketlink.idm>1.1.8.CR01</org.picketlink.idm>
+ <org.picketlink.idm>1.1.8.GA</org.picketlink.idm>
<org.gatein.wsrp.version>2.0.1-Beta02</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
13 years, 8 months
gatein SVN: r6265 - in components/wsrp/trunk: admin-gui and 6 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-04-18 08:41:49 -0400 (Mon, 18 Apr 2011)
New Revision: 6265
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml
Log:
- GTNWSRP-222: Replaced Google collections by Guava.
- Removed now useless code from GTNWSRP-218.
- Changed version properties to be more in line with GateIn.
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2011-04-18 12:38:56 UTC (rev 6264)
+++ components/wsrp/trunk/admin-gui/pom.xml 2011-04-18 12:41:49 UTC (rev 6265)
@@ -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">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
@@ -81,13 +82,6 @@
<version>1.1.15</version>
</dependency>
- <!-- To make JSF works on AS 6 -->
- <!--<dependency>
- <groupId>org.jboss.el</groupId>
- <artifactId>jboss-el</artifactId>
- <version>1.0_02.CR5</version>
- </dependency>-->
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml 2011-04-18 12:38:56 UTC (rev 6264)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml 2011-04-18 12:41:49 UTC (rev 6265)
@@ -43,12 +43,6 @@
<param-value>Mojarra-1.2</param-value>
</context-param>
- <!-- Tell JBoss AS 6 to use JBoss EL engine instead of default -->
- <!--<context-param>
- <param-name>com.sun.faces.expressionFactory</param-name>
- <param-value>org.jboss.el.ExpressionFactoryImpl</param-value>
- </context-param>-->
-
<!-- Facelet configuration -->
<context-param>
<param-name>facelets.DEVELOPMENT</param-name>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2011-04-18 12:38:56 UTC (rev 6264)
+++ components/wsrp/trunk/common/pom.xml 2011-04-18 12:41:49 UTC (rev 6265)
@@ -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">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
@@ -75,8 +76,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<!-- tests -->
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2011-04-18 12:38:56 UTC (rev 6264)
+++ components/wsrp/trunk/consumer/pom.xml 2011-04-18 12:41:49 UTC (rev 6265)
@@ -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">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
@@ -117,7 +118,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>${version.mockito}</version>
+ <version>${org.mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2011-04-18 12:38:56 UTC (rev 6264)
+++ components/wsrp/trunk/pom.xml 2011-04-18 12:41:49 UTC (rev 6265)
@@ -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>
@@ -46,20 +47,20 @@
</scm>
<properties>
- <version.gatein.pc>2.3.0-Beta02</version.gatein.pc>
- <version.gatein.common>2.0.4-Beta02</version.gatein.common>
- <version.gatein.wci>2.1.0-Beta01</version.gatein.wci>
+ <org.gatein.pc.version>2.3.0-Beta02</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>
- <version.jsf>1.2_12</version.jsf>
- <version.servlet>2.5</version.servlet>
- <version.apache.commons-fileupload>1.2.1</version.apache.commons-fileupload>
- <version.javax.mail>1.4.1</version.javax.mail>
- <version.javax.xml.ws>2.1</version.javax.xml.ws>
- <version.javax.xml.soap.saaj>1.3</version.javax.xml.soap.saaj>
- <version.google-collections>1.0</version.google-collections>
- <version.chromattic>1.1.0-beta2</version.chromattic>
- <version.arquillian>1.0.0.Alpha2</version.arquillian>
- <version.mockito>1.8.5</version.mockito>
+ <jsf.version>1.2_12</jsf.version>
+ <servlet.version>2.5</servlet.version>
+ <apache.commons-fileupload.version>1.2.1</apache.commons-fileupload.version>
+ <javax.mail.version>1.4.1</javax.mail.version>
+ <javax.xml.ws.version>2.1</javax.xml.ws.version>
+ <javax.xml.soap.saaj.version>1.3</javax.xml.soap.saaj.version>
+ <org.chromattic.version>1.1.0-beta2</org.chromattic.version>
+ <org.jboss.arquillian.version>1.0.0.Alpha2</org.jboss.arquillian.version>
+ <org.mockito.version>1.8.5</org.mockito.version>
+ <com.google.guava.version>r09</com.google.guava.version>
</properties>
<dependencyManagement>
@@ -113,79 +114,78 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-common</artifactId>
- <version>${version.gatein.common}</version>
+ <version>${org.gatein.common.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-api</artifactId>
- <version>${version.gatein.pc}</version>
+ <version>${org.gatein.pc.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-portlet</artifactId>
- <version>${version.gatein.pc}</version>
+ <version>${org.gatein.pc.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-federation</artifactId>
- <version>${version.gatein.pc}</version>
+ <version>${org.gatein.pc.version}</version>
</dependency>
<!-- external dependencies -->
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>${version.jsf}</version>
+ <version>${jsf.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>${version.servlet}</version>
+ <version>${servlet.version}</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>${version.apache.commons-fileupload}</version>
+ <version>${apache.commons-fileupload.version}</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>${version.javax.mail}</version>
+ <version>${javax.mail.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
- <version>${version.javax.xml.ws}</version>
+ <version>${javax.xml.ws.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
<artifactId>saaj-api</artifactId>
- <version>${version.javax.xml.soap.saaj}</version>
+ <version>${javax.xml.soap.saaj.version}</version>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>${version.google-collections}</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${com.google.guava.version}</version>
</dependency>
-
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.api</artifactId>
- <version>${version.chromattic}</version>
+ <version>${org.chromattic.version}</version>
</dependency>
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.apt</artifactId>
- <version>${version.chromattic}</version>
+ <version>${org.chromattic.version}</version>
<scope>compile</scope>
</dependency>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2011-04-18 12:38:56 UTC (rev 6264)
+++ components/wsrp/trunk/producer/pom.xml 2011-04-18 12:41:49 UTC (rev 6265)
@@ -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">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
@@ -98,7 +99,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>${version.mockito}</version>
+ <version>${org.mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-04-18 12:38:56 UTC (rev 6264)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-04-18 12:41:49 UTC (rev 6265)
@@ -22,7 +22,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/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>
@@ -314,7 +315,7 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat6</artifactId>
<scope>test</scope>
- <version>${version.gatein.wci}</version>
+ <version>${org.gatein.wci.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.wsrp</groupId>
@@ -326,13 +327,13 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-controller</artifactId>
<scope>test</scope>
- <version>${version.gatein.pc}</version>
+ <version>${org.gatein.pc.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-mc</artifactId>
<scope>test</scope>
- <version>${version.gatein.pc}</version>
+ <version>${org.gatein.pc.version}</version>
</dependency>
<dependency>
@@ -344,19 +345,19 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-api</artifactId>
- <version>${version.arquillian}</version>
+ <version>${org.jboss.arquillian.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-junit</artifactId>
- <version>${version.arquillian}</version>
+ <version>${org.jboss.arquillian.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-jbossas-remote-51</artifactId>
- <version>${version.arquillian}</version>
+ <version>${org.jboss.arquillian.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -429,7 +430,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.8.5</version>
+ <version>${org.mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml 2011-04-18 12:38:56 UTC (rev 6264)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml 2011-04-18 12:41:49 UTC (rev 6265)
@@ -62,7 +62,7 @@
<include>junit:junit</include>
<include>commons-fileupload:commons-fileupload</include>
- <include>com.google.collections:google-collections</include>
+ <include>com.google.guava:guava</include>
<!-- mockito and related dependencies -->
<include>org.mockito:mockito-core</include>
13 years, 8 months
gatein SVN: r6264 - in components/wsrp/branches/2.0.x: common and 1 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-04-18 08:38:56 -0400 (Mon, 18 Apr 2011)
New Revision: 6264
Modified:
components/wsrp/branches/2.0.x/common/pom.xml
components/wsrp/branches/2.0.x/pom.xml
components/wsrp/branches/2.0.x/wsrp-producer-war/src/test/assembly/test-producer.xml
Log:
- GTNWSRP-222: Replaced Google collections by Guava.
Modified: components/wsrp/branches/2.0.x/common/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/common/pom.xml 2011-04-18 10:53:41 UTC (rev 6263)
+++ components/wsrp/branches/2.0.x/common/pom.xml 2011-04-18 12:38:56 UTC (rev 6264)
@@ -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">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
@@ -66,8 +67,8 @@
<artifactId>saaj-api</artifactId>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<!-- tests -->
Modified: components/wsrp/branches/2.0.x/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/pom.xml 2011-04-18 10:53:41 UTC (rev 6263)
+++ components/wsrp/branches/2.0.x/pom.xml 2011-04-18 12:38:56 UTC (rev 6264)
@@ -56,7 +56,7 @@
<version.javax.mail>1.4.1</version.javax.mail>
<version.javax.xml.ws>2.1</version.javax.xml.ws>
<version.javax.xml.soap.saaj>1.3</version.javax.xml.soap.saaj>
- <version.google-collections>1.0</version.google-collections>
+ <com.google.guava.version>r09</com.google.guava.version>
</properties>
<dependencyManagement>
@@ -156,9 +156,9 @@
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>${version.google-collections}</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${com.google.guava.version}</version>
</dependency>
<!--
Modified: components/wsrp/branches/2.0.x/wsrp-producer-war/src/test/assembly/test-producer.xml
===================================================================
--- components/wsrp/branches/2.0.x/wsrp-producer-war/src/test/assembly/test-producer.xml 2011-04-18 10:53:41 UTC (rev 6263)
+++ components/wsrp/branches/2.0.x/wsrp-producer-war/src/test/assembly/test-producer.xml 2011-04-18 12:38:56 UTC (rev 6264)
@@ -62,7 +62,7 @@
<include>junit:junit</include>
<include>commons-fileupload:commons-fileupload</include>
- <include>com.google.collections:google-collections</include>
+ <include>com.google.guava:guava</include>
</includes>
</dependencySet>
13 years, 8 months
gatein SVN: r6263 - portal/trunk.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-04-18 06:53:41 -0400 (Mon, 18 Apr 2011)
New Revision: 6263
Modified:
portal/trunk/pom.xml
Log:
- Reverted to WSRP 2.1.0-Beta01 until changes needed to use Chromattic 1.1.0-beta2 are done.
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-04-17 19:44:37 UTC (rev 6262)
+++ portal/trunk/pom.xml 2011-04-18 10:53:41 UTC (rev 6263)
@@ -48,7 +48,7 @@
<org.gatein.wci.version>2.1.0-Beta02</org.gatein.wci.version>
<org.gatein.pc.version>2.3.0-Beta02</org.gatein.pc.version>
<org.picketlink.idm>1.1.8.GA</org.picketlink.idm>
- <org.gatein.wsrp.version>2.1.0-Beta02</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>2.1.0-Beta01</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.6-Beta01</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
13 years, 8 months
gatein SVN: r6262 - in components/shindig/trunk: java/common and 4 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-04-17 15:44:37 -0400 (Sun, 17 Apr 2011)
New Revision: 6262
Modified:
components/shindig/trunk/java/common/pom.xml
components/shindig/trunk/java/gadgets/pom.xml
components/shindig/trunk/java/samples/pom.xml
components/shindig/trunk/java/server/pom.xml
components/shindig/trunk/java/social-api/pom.xml
components/shindig/trunk/pom.xml
Log:
GTNPORTAL-1865 : Replace google collection by google guava
Modified: components/shindig/trunk/java/common/pom.xml
===================================================================
--- components/shindig/trunk/java/common/pom.xml 2011-04-17 19:18:00 UTC (rev 6261)
+++ components/shindig/trunk/java/common/pom.xml 2011-04-17 19:44:37 UTC (rev 6262)
@@ -89,8 +89,8 @@
<artifactId>aopalliance</artifactId>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Modified: components/shindig/trunk/java/gadgets/pom.xml
===================================================================
--- components/shindig/trunk/java/gadgets/pom.xml 2011-04-17 19:18:00 UTC (rev 6261)
+++ components/shindig/trunk/java/gadgets/pom.xml 2011-04-17 19:44:37 UTC (rev 6262)
@@ -150,8 +150,8 @@
<artifactId>oauth-httpclient3</artifactId>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.guice</groupId>
Modified: components/shindig/trunk/java/samples/pom.xml
===================================================================
--- components/shindig/trunk/java/samples/pom.xml 2011-04-17 19:18:00 UTC (rev 6261)
+++ components/shindig/trunk/java/samples/pom.xml 2011-04-17 19:44:37 UTC (rev 6262)
@@ -132,8 +132,8 @@
<artifactId>annotations</artifactId>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>net.oauth.core</groupId>
Modified: components/shindig/trunk/java/server/pom.xml
===================================================================
--- components/shindig/trunk/java/server/pom.xml 2011-04-17 19:18:00 UTC (rev 6261)
+++ components/shindig/trunk/java/server/pom.xml 2011-04-17 19:44:37 UTC (rev 6262)
@@ -140,8 +140,8 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.guice</groupId>
Modified: components/shindig/trunk/java/social-api/pom.xml
===================================================================
--- components/shindig/trunk/java/social-api/pom.xml 2011-04-17 19:18:00 UTC (rev 6261)
+++ components/shindig/trunk/java/social-api/pom.xml 2011-04-17 19:44:37 UTC (rev 6262)
@@ -95,8 +95,8 @@
<artifactId>aopalliance</artifactId>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<artifactId>commons-lang</artifactId>
Modified: components/shindig/trunk/pom.xml
===================================================================
--- components/shindig/trunk/pom.xml 2011-04-17 19:18:00 UTC (rev 6261)
+++ components/shindig/trunk/pom.xml 2011-04-17 19:44:37 UTC (rev 6262)
@@ -1286,9 +1286,9 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>1.0-rc2</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>r09</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
13 years, 8 months
gatein SVN: r6261 - in portal/trunk: webui/portal/src/main/java/org/exoplatform/portal/webui/application and 1 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-04-17 15:18:00 -0400 (Sun, 17 Apr 2011)
New Revision: 6261
Modified:
portal/trunk/pom.xml
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java
portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java
Log:
- Updated to use WSRP 2.1.0-Beta02 and PC 2.3.0-Beta02 so that tests can be performed.
- Use proper PortletContext methods in ModelAdapter to avoid exposing internals of the portlet container.
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-04-17 18:06:47 UTC (rev 6260)
+++ portal/trunk/pom.xml 2011-04-17 19:18:00 UTC (rev 6261)
@@ -46,9 +46,9 @@
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.4-Beta02</org.gatein.common.version>
<org.gatein.wci.version>2.1.0-Beta02</org.gatein.wci.version>
- <org.gatein.pc.version>2.3.0-Beta01</org.gatein.pc.version>
+ <org.gatein.pc.version>2.3.0-Beta02</org.gatein.pc.version>
<org.picketlink.idm>1.1.8.GA</org.picketlink.idm>
- <org.gatein.wsrp.version>2.1.0-Beta01</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>2.1.0-Beta02</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.6-Beta01</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2011-04-17 18:06:47 UTC (rev 6260)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ModelAdapter.java 2011-04-17 19:18:00 UTC (rev 6261)
@@ -49,6 +49,7 @@
*/
public abstract class ModelAdapter<S, C extends Serializable>
{
+ private static final String LOCAL_STATE_ID = PortletContext.LOCAL_CONSUMER_CLONE.getId();
public static <S, C extends Serializable, I> ModelAdapter<S, C> getAdapter(ApplicationType<S> type)
{
@@ -82,7 +83,7 @@
@Override
public StatefulPortletContext<ExoPortletState> getPortletContext(ExoContainer container, String applicationId,
- ApplicationState<Portlet> applicationState) throws Exception
+ ApplicationState<Portlet> applicationState) throws Exception
{
DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class);
Portlet preferences = dataStorage.load(applicationState, ApplicationType.PORTLET);
@@ -95,12 +96,12 @@
map.getState().put(pref.getName(), pref.getValues());
}
}
- return StatefulPortletContext.create("local._dumbvalue", ExoPortletStateType.getInstance(), map);
+ return StatefulPortletContext.create(LOCAL_STATE_ID, ExoPortletStateType.getInstance(), map);
}
@Override
public ApplicationState<Portlet> update(ExoContainer container, ExoPortletState updateState,
- ApplicationState<Portlet> applicationState) throws Exception
+ ApplicationState<Portlet> applicationState) throws Exception
{
// Compute new preferences
PortletBuilder builder = new PortletBuilder();
@@ -128,8 +129,7 @@
String[] chunks = Utils.split("/", applicationState);
String appName = chunks[0];
String portletName = chunks[1];
- return PortletContext.createPortletContext(PortletInvoker.LOCAL_PORTLET_INVOKER_ID + "./" + appName + "."
- + portletName);
+ return PortletContext.reference(PortletInvoker.LOCAL_PORTLET_INVOKER_ID, PortletContext.createPortletContext(appName, portletName));
}
@Override
@@ -140,7 +140,9 @@
TransientApplicationState<Portlet> transientState = (TransientApplicationState<Portlet>)applicationState;
Portlet pref = transientState.getContentState();
if (pref == null)
+ {
pref = new Portlet();
+ }
return pref;
}
else
@@ -148,18 +150,20 @@
DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class);
Portlet pref = dataStorage.load(applicationState, ApplicationType.PORTLET);
if (pref == null)
+ {
pref = new Portlet();
+ }
return pref;
}
}
@Override
public ExoPortletState getStateFromModifiedContext(PortletContext originalPortletContext,
- PortletContext modifiedPortletContext)
+ PortletContext modifiedPortletContext)
{
if (modifiedPortletContext != null && modifiedPortletContext instanceof StatefulPortletContext)
{
- StatefulPortletContext statefulContext = (StatefulPortletContext) modifiedPortletContext;
+ StatefulPortletContext statefulContext = (StatefulPortletContext)modifiedPortletContext;
if (statefulContext.getState() instanceof ExoPortletState)
{
return (ExoPortletState)statefulContext.getState();
@@ -170,11 +174,11 @@
@Override
public ExoPortletState getstateFromClonedContext(PortletContext originalPortletContext,
- PortletContext clonedPortletContext)
+ PortletContext clonedPortletContext)
{
if (clonedPortletContext != null && clonedPortletContext instanceof StatefulPortletContext)
{
- StatefulPortletContext statefulContext = (StatefulPortletContext) clonedPortletContext;
+ StatefulPortletContext statefulContext = (StatefulPortletContext)clonedPortletContext;
if (statefulContext.getState() instanceof ExoPortletState)
{
return (ExoPortletState)statefulContext.getState();
@@ -184,18 +188,15 @@
}
};
+ private static final String DASHBOARD = "dashboard";
+ private static final String GADGET_PORTLET = "GadgetPortlet";
+ private static final PortletContext WRAPPER_CONTEXT = PortletContext.reference(PortletInvoker.LOCAL_PORTLET_INVOKER_ID, PortletContext.createPortletContext(DASHBOARD, GADGET_PORTLET));
+ private static final String WRAPPER_ID = WRAPPER_CONTEXT.getId();
private static final ModelAdapter<Gadget, ExoPortletState> GADGET = new ModelAdapter<Gadget, ExoPortletState>()
{
-
- /** . */
- private final String WRAPPER_ID = "local./" + "dashboard" + "." + "GadgetPortlet";
-
- /** . */
- private final PortletContext WRAPPER_CONTEXT = PortletContext.createPortletContext(WRAPPER_ID);
-
@Override
public StatefulPortletContext<ExoPortletState> getPortletContext(ExoContainer container, String applicationId,
- ApplicationState<Gadget> applicationState) throws Exception
+ ApplicationState<Gadget> applicationState) throws Exception
{
GadgetRegistryService gadgetService =
(GadgetRegistryService)container.getComponentInstanceOfType(GadgetRegistryService.class);
@@ -203,12 +204,12 @@
String url = GadgetUtil.reproduceUrl(model.getUrl(), model.isLocal());
ExoPortletState prefs = new ExoPortletState(WRAPPER_ID);
prefs.getState().put("url", Arrays.asList(url));
- return StatefulPortletContext.create("local._dumbvalue", ExoPortletStateType.getInstance(), prefs);
+ return StatefulPortletContext.create(LOCAL_STATE_ID, ExoPortletStateType.getInstance(), prefs);
}
@Override
public ApplicationState<Gadget> update(ExoContainer container, ExoPortletState updateState,
- ApplicationState<Gadget> gadgetApplicationState) throws Exception
+ ApplicationState<Gadget> gadgetApplicationState) throws Exception
{
throw new UnsupportedOperationException("Cannot edit gadget preferences");
}
@@ -228,11 +229,11 @@
@Override
public ExoPortletState getStateFromModifiedContext(PortletContext originalPortletContext,
- PortletContext modifiedPortletContext)
+ PortletContext modifiedPortletContext)
{
if (modifiedPortletContext != null && modifiedPortletContext instanceof StatefulPortletContext)
{
- StatefulPortletContext statefulContext = (StatefulPortletContext) modifiedPortletContext;
+ StatefulPortletContext statefulContext = (StatefulPortletContext)modifiedPortletContext;
if (statefulContext.getState() instanceof ExoPortletState)
{
return (ExoPortletState)statefulContext.getState();
@@ -243,11 +244,11 @@
@Override
public ExoPortletState getstateFromClonedContext(PortletContext originalPortletContext,
- PortletContext clonedPortletContext)
+ PortletContext clonedPortletContext)
{
if (clonedPortletContext != null && clonedPortletContext instanceof StatefulPortletContext)
{
- StatefulPortletContext statefulContext = (StatefulPortletContext) clonedPortletContext;
+ StatefulPortletContext statefulContext = (StatefulPortletContext)clonedPortletContext;
if (statefulContext.getState() instanceof ExoPortletState)
{
return (ExoPortletState)statefulContext.getState();
@@ -259,10 +260,9 @@
/**
* todo: this ModelAdapter is not quite good, what is really needed is a ModelAdapter<WSRP, byte[]> so that the
- * StatefulPortletContext returned by getPortletContext is actually of type PortletStateType.OPAQUE so that it
- * can be properly handled in WSRP...
- * This model needs to be revisited if we want to properly support consumer-side state management.
- * See GTNPORTAL-736.
+ * StatefulPortletContext returned by getPortletContext is actually of type PortletStateType.OPAQUE so that it can be
+ * properly handled in WSRP... This model needs to be revisited if we want to properly support consumer-side state
+ * management. See GTNPORTAL-736.
*/
private static final ModelAdapter<WSRP, WSRP> WSRP = new ModelAdapter<WSRP, WSRP>()
{
@@ -280,7 +280,7 @@
@Override
public StatefulPortletContext<WSRP> getPortletContext(ExoContainer container, String applicationId,
- ApplicationState<WSRP> state) throws Exception
+ ApplicationState<WSRP> state) throws Exception
{
DataStorage dataStorage = (DataStorage)container.getComponentInstanceOfType(DataStorage.class);
WSRP wsrp = dataStorage.load(state, ApplicationType.WSRP_PORTLET);
@@ -319,11 +319,11 @@
@Override
public WSRP getStateFromModifiedContext(PortletContext originalPortletContext,
- PortletContext modifiedPortletContext)
+ PortletContext modifiedPortletContext)
{
WSRP wsrp = new WSRP();
wsrp.setPortletId(modifiedPortletContext.getId());
-
+
// from the originalPortletContext see if we are dealing with a cloned context or not.
if (originalPortletContext instanceof StatefulPortletContext)
{
@@ -333,7 +333,7 @@
wsrp.setCloned(((WSRP)originalState).isCloned());
}
}
-
+
if (modifiedPortletContext instanceof StatefulPortletContext)
{
Object modifiedState = ((StatefulPortletContext)modifiedPortletContext).getState();
@@ -342,7 +342,7 @@
wsrp.setState((byte[])modifiedState);
}
}
-
+
return wsrp;
}
@@ -352,14 +352,14 @@
WSRP wsrp = new WSRP();
wsrp.setPortletId(clonedPortletContext.getId());
wsrp.setCloned(true);
-
+
// if we have an associated state, record it as well...
if (clonedPortletContext instanceof StatefulPortletContext)
{
StatefulPortletContext statefulPortletContext = (StatefulPortletContext)clonedPortletContext;
wsrp.setState((byte[])statefulPortletContext.getState());
}
-
+
return wsrp;
}
};
@@ -367,10 +367,10 @@
public abstract PortletContext getProducerOfferedPortletContext(String applicationId);
public abstract StatefulPortletContext<C> getPortletContext(ExoContainer container, String applicationId,
- ApplicationState<S> applicationState) throws Exception;
+ ApplicationState<S> applicationState) throws Exception;
public abstract ApplicationState<S> update(ExoContainer container, C updateState,
- ApplicationState<S> applicationState) throws Exception;
+ ApplicationState<S> applicationState) throws Exception;
/**
* Returns the state of the gadget as preferences or null if the preferences cannot be edited as such.
@@ -381,21 +381,21 @@
* @throws Exception any exception
*/
public abstract Portlet getState(ExoContainer container, ApplicationState<S> applicationState) throws Exception;
-
+
/**
* Extracts the state based on what the current PortletContext is and the new modified PortletContext.
- *
+ *
* @param originalPortletContext The current PortletContext for the Portlet
* @param modifiedPortletContext The new modified PortletContext
* @return
*/
public abstract C getStateFromModifiedContext(PortletContext originalPortletContext, PortletContext modifiedPortletContext);
-
+
/**
* Extracts the state based on what the current PortletContext is and the new cloned PortletContext
- *
+ *
* @param originalPortletContext The current PortletContext for the Portlet
- * @param clonedPortletContext The new cloned PortletContext
+ * @param clonedPortletContext The new cloned PortletContext
* @return
*/
public abstract C getstateFromClonedContext(PortletContext originalPortletContext, PortletContext clonedPortletContext);
Modified: portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java
===================================================================
--- portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java 2011-04-17 18:06:47 UTC (rev 6260)
+++ portal/trunk/wsrp-integration/extension-component/src/test/java/org/gatein/integration/wsrp/structure/MOPConsumerStructureProviderTestCase.java 2011-04-17 19:18:00 UTC (rev 6261)
@@ -88,7 +88,7 @@
public void testAssignPortletToWindow()
{
- String newCustomizationId = "new";
+ String newCustomizationId = "/app.new";
String newWindowName = "portlet";
provider.assignPortletToWindow(PortletContext.createPortletContext(newCustomizationId), "window11", "page1", newWindowName);
verify(structureAccess).getWindowFrom(getIdFor("window11"));
13 years, 8 months
gatein SVN: r6260 - in components/wsrp/trunk: admin-gui and 13 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-04-17 14:06:47 -0400 (Sun, 17 Apr 2011)
New Revision: 6260
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/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:
[maven-release-plugin] prepare for next development iteration
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2011-04-17 18:06:19 UTC (rev 6259)
+++ components/wsrp/trunk/admin-gui/pom.xml 2011-04-17 18:06:47 UTC (rev 6260)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-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-04-17 18:06:19 UTC (rev 6259)
+++ components/wsrp/trunk/api/pom.xml 2011-04-17 18:06:47 UTC (rev 6260)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-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-04-17 18:06:19 UTC (rev 6259)
+++ components/wsrp/trunk/common/pom.xml 2011-04-17 18:06:47 UTC (rev 6260)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-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-04-17 18:06:19 UTC (rev 6259)
+++ components/wsrp/trunk/consumer/pom.xml 2011-04-17 18:06:47 UTC (rev 6260)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-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-04-17 18:06:19 UTC (rev 6259)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2011-04-17 18:06:47 UTC (rev 6260)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-SNAPSHOT</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/jcr-impl/pom.xml
===================================================================
--- components/wsrp/trunk/jcr-impl/pom.xml 2011-04-17 18:06:19 UTC (rev 6259)
+++ components/wsrp/trunk/jcr-impl/pom.xml 2011-04-17 18:06:47 UTC (rev 6260)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2011-04-17 18:06:19 UTC (rev 6259)
+++ components/wsrp/trunk/pom.xml 2011-04-17 18:06:47 UTC (rev 6260)
@@ -29,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -40,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.1.0-...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.1.0-Beta02</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.1.0-Beta02</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2011-04-17 18:06:19 UTC (rev 6259)
+++ components/wsrp/trunk/producer/pom.xml 2011-04-17 18:06:47 UTC (rev 6260)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-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-04-17 18:06:19 UTC (rev 6259)
+++ components/wsrp/trunk/test/pom.xml 2011-04-17 18:06:47 UTC (rev 6260)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-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-04-17 18:06:19 UTC (rev 6259)
+++ components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-04-17 18:06:47 UTC (rev 6260)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-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-04-17 18:06:19 UTC (rev 6259)
+++ components/wsrp/trunk/ws-security/pom.xml 2011-04-17 18:06:47 UTC (rev 6260)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-SNAPSHOT</version>
</parent>
<artifactId>wsrp-wss-parent</artifactId>
Modified: components/wsrp/trunk/ws-security/wss/pom.xml
===================================================================
--- components/wsrp/trunk/ws-security/wss/pom.xml 2011-04-17 18:06:19 UTC (rev 6259)
+++ components/wsrp/trunk/ws-security/wss/pom.xml 2011-04-17 18:06:47 UTC (rev 6260)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-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-04-17 18:06:19 UTC (rev 6259)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-04-17 18:06:47 UTC (rev 6260)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2011-04-17 18:06:19 UTC (rev 6259)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2011-04-17 18:06:47 UTC (rev 6260)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-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-04-17 18:06:19 UTC (rev 6259)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2011-04-17 18:06:47 UTC (rev 6260)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.0-Beta02</version>
+ <version>2.1.0-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
13 years, 8 months
gatein SVN: r6259 - components/wsrp/tags.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-04-17 14:06:19 -0400 (Sun, 17 Apr 2011)
New Revision: 6259
Added:
components/wsrp/tags/2.1.0-Beta02/
Log:
[maven-scm] copy for tag 2.1.0-Beta02
13 years, 8 months
gatein SVN: r6258 - in components/wsrp/trunk: admin-gui and 13 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-04-17 14:05:53 -0400 (Sun, 17 Apr 2011)
New Revision: 6258
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/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:
[maven-release-plugin] prepare release 2.1.0-Beta02
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2011-04-17 17:46:24 UTC (rev 6257)
+++ components/wsrp/trunk/admin-gui/pom.xml 2011-04-17 18:05:53 UTC (rev 6258)
@@ -21,12 +21,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/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-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</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-04-17 17:46:24 UTC (rev 6257)
+++ components/wsrp/trunk/api/pom.xml 2011-04-17 18:05:53 UTC (rev 6258)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</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-04-17 17:46:24 UTC (rev 6257)
+++ components/wsrp/trunk/common/pom.xml 2011-04-17 18:05:53 UTC (rev 6258)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</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-04-17 17:46:24 UTC (rev 6257)
+++ components/wsrp/trunk/consumer/pom.xml 2011-04-17 18:05:53 UTC (rev 6258)
@@ -21,12 +21,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/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-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</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-04-17 17:46:24 UTC (rev 6257)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2011-04-17 18:05:53 UTC (rev 6258)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/jcr-impl/pom.xml
===================================================================
--- components/wsrp/trunk/jcr-impl/pom.xml 2011-04-17 17:46:24 UTC (rev 6257)
+++ components/wsrp/trunk/jcr-impl/pom.xml 2011-04-17 18:05:53 UTC (rev 6258)
@@ -22,12 +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>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2011-04-17 17:46:24 UTC (rev 6257)
+++ components/wsrp/trunk/pom.xml 2011-04-17 18:05:53 UTC (rev 6258)
@@ -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>
@@ -30,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</version>
<packaging>pom</packaging>
@@ -41,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.1.0-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.1.0-Beta02</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.1.0-Beta02</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2011-04-17 17:46:24 UTC (rev 6257)
+++ components/wsrp/trunk/producer/pom.xml 2011-04-17 18:05:53 UTC (rev 6258)
@@ -21,12 +21,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/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-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</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-04-17 17:46:24 UTC (rev 6257)
+++ components/wsrp/trunk/test/pom.xml 2011-04-17 18:05:53 UTC (rev 6258)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</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-04-17 17:46:24 UTC (rev 6257)
+++ components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-04-17 18:05:53 UTC (rev 6258)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</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-04-17 17:46:24 UTC (rev 6257)
+++ components/wsrp/trunk/ws-security/pom.xml 2011-04-17 18:05:53 UTC (rev 6258)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</version>
</parent>
<artifactId>wsrp-wss-parent</artifactId>
Modified: components/wsrp/trunk/ws-security/wss/pom.xml
===================================================================
--- components/wsrp/trunk/ws-security/wss/pom.xml 2011-04-17 17:46:24 UTC (rev 6257)
+++ components/wsrp/trunk/ws-security/wss/pom.xml 2011-04-17 18:05:53 UTC (rev 6258)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</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-04-17 17:46:24 UTC (rev 6257)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-04-17 18:05:53 UTC (rev 6258)
@@ -22,12 +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>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2011-04-17 17:46:24 UTC (rev 6257)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2011-04-17 18:05:53 UTC (rev 6258)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</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-04-17 17:46:24 UTC (rev 6257)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2011-04-17 18:05:53 UTC (rev 6258)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.0-Beta02-SNAPSHOT</version>
+ <version>2.1.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
13 years, 8 months