gatein SVN: r4564 - portal/branches.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-06 19:24:30 -0400 (Wed, 06 Oct 2010)
New Revision: 4564
Removed:
portal/branches/wsrp2-integration/
Log:
- Deleted wsrp2-integration feature branch. Will re-create if needed.
13 years, 9 months
gatein SVN: r4563 - in portal/trunk: component/wsrp and 8 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-06 18:59:10 -0400 (Wed, 06 Oct 2010)
New Revision: 4563
Added:
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/mapping/BaseMapping.java
Modified:
portal/trunk/component/wsrp/pom.xml
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/SessionEventListenerAndBroadcaster.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfoMapping.java
portal/trunk/pom.xml
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoWindowContext.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
Log:
- Merged from wsrp2-integration, ignoring temporary fix (rev. 4466) for issue with commit 4242 (svn merge -r4466:4562 https://svn.jboss.org/repos/gatein/portal/branches/wsrp2-integration)
+ Udated to use PC 2.2.0-Beta05 and WSRP 2.0.0-Beta01
+ Use AbstractWindowContext instead of ExoWindowContext since there wasn't any discernible advantage to using a custom implementation at this point.
+ Adapted for API changes
+ GTNPORTAL-1529: Fixed inconsitent parameters in JCRPersister.delete method
+ Introduced BaseMapping to gather common behavior and possibly extends JCRPersister with more generic methods down the road
Modified: portal/trunk/component/wsrp/pom.xml
===================================================================
--- portal/trunk/component/wsrp/pom.xml 2010-10-06 21:35:50 UTC (rev 4562)
+++ portal/trunk/component/wsrp/pom.xml 2010-10-06 22:59:10 UTC (rev 4563)
@@ -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.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
@@ -125,6 +126,17 @@
<build>
<plugins>
+ <!--<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/gatein/portal/wsrp/SessionEventListenerAndBroadcaster.java</exclude>
+ <exclude>org/gatein/portal/wsrp/MOPPortalStructureProvider.java</exclude>
+ <exclude>org/gatein/portal/wsrp/state/migration/**/*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java 2010-10-06 21:35:50 UTC (rev 4562)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java 2010-10-06 22:59:10 UTC (rev 4563)
@@ -41,7 +41,7 @@
import org.gatein.pc.api.PortletContext;
import org.gatein.pc.api.PortletStateType;
import org.gatein.pc.api.StatefulPortletContext;
-import org.gatein.wsrp.api.PortalStructureProvider;
+import org.gatein.wsrp.api.context.ConsumerStructureProvider;
import java.util.Collection;
import java.util.Collections;
@@ -54,7 +54,7 @@
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-public class MOPPortalStructureProvider implements PortalStructureProvider
+public class MOPPortalStructureProvider implements ConsumerStructureProvider
{
private final POMSessionManager pomManager;
private Map<String, PageInfo> pageInfos;
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/SessionEventListenerAndBroadcaster.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/SessionEventListenerAndBroadcaster.java 2010-10-06 21:35:50 UTC (rev 4562)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/SessionEventListenerAndBroadcaster.java 2010-10-06 22:59:10 UTC (rev 4563)
@@ -26,9 +26,9 @@
import org.exoplatform.container.PortalContainer;
import org.exoplatform.services.listener.Event;
import org.exoplatform.services.listener.Listener;
-import org.gatein.wsrp.api.SessionEvent;
-import org.gatein.wsrp.api.SessionEventBroadcaster;
-import org.gatein.wsrp.api.SessionEventListener;
+import org.gatein.wsrp.api.session.SessionEvent;
+import org.gatein.wsrp.api.session.SessionEventBroadcaster;
+import org.gatein.wsrp.api.session.SessionEventListener;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java 2010-10-06 21:35:50 UTC (rev 4562)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java 2010-10-06 22:59:10 UTC (rev 4563)
@@ -22,6 +22,7 @@
package org.gatein.portal.wsrp.state;
+import EDU.oswego.cs.dl.util.concurrent.FJTask;
import org.chromattic.api.Chromattic;
import org.chromattic.api.ChromatticBuilder;
import org.chromattic.api.ChromatticSession;
@@ -33,11 +34,17 @@
import org.exoplatform.services.jcr.RepositoryService;
import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.ext.common.SessionProvider;
+import org.gatein.common.util.ParameterValidation;
+import org.gatein.portal.wsrp.state.mapping.BaseMapping;
import javax.jcr.Credentials;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -50,6 +57,7 @@
public static final String PORTLET_STATES_WORKSPACE_NAME = "pc-system";
private static final String REPOSITORY_NAME = "repository";
private String workspaceName;
+ private Map<Class, Class<? extends BaseMapping>> modelToMapping;
public JCRPersister(ExoContainer container, String workspaceName)
{
@@ -73,8 +81,18 @@
throw new IllegalArgumentException("Unknown workspace name: '" + workspaceName + "'");
}
+ modelToMapping = new HashMap<Class, Class<? extends BaseMapping>>(mappingClasses.size());
for (Class mappingClass : mappingClasses)
{
+ if (BaseMapping.class.isAssignableFrom(mappingClass))
+ {
+ Type[] interfaces = mappingClass.getGenericInterfaces();
+ if(ParameterValidation.existsAndIsNotEmpty(interfaces))
+ {
+ Class type = (Class)((ParameterizedType)interfaces[0]).getActualTypeArguments()[0];
+ modelToMapping.put(type, mappingClass);
+ }
+ }
builder.add(mappingClass);
}
@@ -102,9 +120,16 @@
public <T> boolean delete(T toDelete, StoresByPathManager<T> manager)
{
+ Class<? extends Object> modelClass = toDelete.getClass();
+ Class<? extends BaseMapping> baseMappingClass = modelToMapping.get(modelClass);
+ if(baseMappingClass == null)
+ {
+ throw new IllegalArgumentException("Cannot find a mapping class for " + modelClass.getName());
+ }
+
ChromatticSession session = getSession();
- Object old = session.findByPath(toDelete.getClass(), manager.getChildPath(toDelete));
+ Object old = session.findByPath(baseMappingClass, manager.getChildPath(toDelete));
if (old != null)
{
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java 2010-10-06 21:35:50 UTC (rev 4562)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java 2010-10-06 22:59:10 UTC (rev 4563)
@@ -205,7 +205,7 @@
public ProducerInfo next()
{
- return mappings.next().toProducerInfo();
+ return mappings.next().toModel(null);
}
public void remove()
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java 2010-10-06 21:35:50 UTC (rev 4562)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java 2010-10-06 22:59:10 UTC (rev 4563)
@@ -24,6 +24,7 @@
package org.gatein.portal.wsrp.state.consumer.mapping;
import org.chromattic.api.annotations.*;
+import org.gatein.portal.wsrp.state.mapping.BaseMapping;
import org.gatein.wsrp.consumer.EndpointConfigurationInfo;
import org.gatein.wsrp.consumer.ProducerInfo;
import org.gatein.wsrp.consumer.RegistrationInfo;
@@ -33,7 +34,7 @@
* @version $Revision$
*/
@PrimaryType(name = ProducerInfoMapping.NODE_NAME)
-public abstract class ProducerInfoMapping
+public abstract class ProducerInfoMapping implements BaseMapping<ProducerInfo>
{
public static final String NODE_NAME = "wsrp:producerinfo";
@@ -84,7 +85,7 @@
rim.initFrom(regInfo);
}
- public ProducerInfo toProducerInfo()
+ public ProducerInfo toModel(ProducerInfo initial)
{
// todo: should probably use a ProducerInfo implementation backed by mapping at some point
ProducerInfo info = new ProducerInfo();
Copied: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/mapping/BaseMapping.java (from rev 4562, portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/mapping/BaseMapping.java)
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/mapping/BaseMapping.java (rev 0)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/mapping/BaseMapping.java 2010-10-06 22:59:10 UTC (rev 4563)
@@ -0,0 +1,34 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.gatein.portal.wsrp.state.mapping;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public interface BaseMapping<T>
+{
+ void initFrom(T model);
+
+ T toModel(T initial);
+}
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java 2010-10-06 21:35:50 UTC (rev 4562)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/JCRMigrationService.java 2010-10-06 22:59:10 UTC (rev 4563)
@@ -32,7 +32,7 @@
import org.gatein.portal.wsrp.state.migration.mapping.ExportInfoMapping;
import org.gatein.portal.wsrp.state.migration.mapping.ExportInfosMapping;
import org.gatein.portal.wsrp.state.migration.mapping.ExportedStateMapping;
-import org.gatein.wsrp.api.PortalStructureProvider;
+import org.gatein.wsrp.api.context.ConsumerStructureProvider;
import org.gatein.wsrp.consumer.migration.ExportInfo;
import org.gatein.wsrp.consumer.migration.MigrationService;
@@ -46,7 +46,7 @@
*/
public class JCRMigrationService implements MigrationService, StoresByPathManager<ExportInfo>
{
- private PortalStructureProvider structureProvider;
+ private ConsumerStructureProvider structureProvider;
private JCRPersister persister;
private static final String EXPORT_INFOS_PATH = ExportInfosMapping.NODE_NAME;
private int exportInfosCount = -1;
@@ -61,12 +61,12 @@
persister.initializeBuilderFor(mappingClasses);
}
- public PortalStructureProvider getStructureProvider()
+ public ConsumerStructureProvider getStructureProvider()
{
return structureProvider;
}
- public void setStructureProvider(PortalStructureProvider structureProvider)
+ public void setStructureProvider(ConsumerStructureProvider structureProvider)
{
ParameterValidation.throwIllegalArgExceptionIfNull(structureProvider, "PortalStructureProvider");
this.structureProvider = structureProvider;
@@ -82,7 +82,7 @@
List<ExportInfo> exportInfos = new ArrayList<ExportInfo>(exportInfoMappings.size());
for (ExportInfoMapping eim : exportInfoMappings)
{
- exportInfos.add(eim.toExportInfo());
+ exportInfos.add(eim.toModel(null));
}
persister.closeSession(session, false);
@@ -112,7 +112,7 @@
if(eim != null)
{
- return eim.toExportInfo();
+ return eim.toModel(null);
}
else
{
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfoMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfoMapping.java 2010-10-06 21:35:50 UTC (rev 4562)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/migration/mapping/ExportInfoMapping.java 2010-10-06 22:59:10 UTC (rev 4563)
@@ -29,6 +29,7 @@
import org.chromattic.api.annotations.Property;
import org.exoplatform.commons.utils.Safe;
import org.gatein.portal.wsrp.state.JCRPersister;
+import org.gatein.portal.wsrp.state.mapping.BaseMapping;
import org.gatein.wsrp.consumer.migration.ExportInfo;
import javax.xml.namespace.QName;
@@ -44,7 +45,7 @@
* @version $Revision$
*/
@PrimaryType(name = ExportInfoMapping.NODE_NAME)
-public abstract class ExportInfoMapping
+public abstract class ExportInfoMapping implements BaseMapping<ExportInfo>
{
public static final String NODE_NAME = "wsrp:exportinfo";
@@ -118,7 +119,7 @@
}
}
- public ExportInfo toExportInfo()
+ public ExportInfo toModel(ExportInfo initial)
{
List<ExportedStateMapping> exportedStates = getExportedStates();
SortedMap<String, byte[]> states = new TreeMap<String,byte[]>();
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-10-06 21:35:50 UTC (rev 4562)
+++ portal/trunk/pom.xml 2010-10-06 22:59:10 UTC (rev 4563)
@@ -46,9 +46,9 @@
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<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-Beta04</org.gatein.pc.version>
+ <org.gatein.pc.version>2.2.0-Beta05</org.gatein.pc.version>
<org.picketlink.idm>1.1.6.GA</org.picketlink.idm>
- <org.gatein.wsrp.version>2.0.0-Alpha03</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>2.0.0-Beta01</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>
<rhino.version>1.6R5</rhino.version>
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoWindowContext.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoWindowContext.java 2010-10-06 21:35:50 UTC (rev 4562)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoWindowContext.java 2010-10-06 22:59:10 UTC (rev 4563)
@@ -1,16 +1,16 @@
/**
* 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
@@ -19,18 +19,15 @@
package org.exoplatform.portal.webui.application;
-import org.gatein.pc.api.spi.WindowContext;
+import org.gatein.pc.portlet.impl.spi.AbstractWindowContext;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class ExoWindowContext implements WindowContext
+public class ExoWindowContext extends AbstractWindowContext
{
- /** . */
- private final String windowId;
-
/**
* Create a new window context.
*
@@ -39,15 +36,6 @@
*/
public ExoWindowContext(String windowId) throws NullPointerException
{
- if (windowId == null)
- {
- throw new NullPointerException();
- }
- this.windowId = windowId;
+ super(windowId);
}
-
- public String getId()
- {
- return windowId;
- }
}
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2010-10-06 21:35:50 UTC (rev 4562)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2010-10-06 22:59:10 UTC (rev 4563)
@@ -76,6 +76,7 @@
import org.gatein.pc.portlet.impl.spi.AbstractRequestContext;
import org.gatein.pc.portlet.impl.spi.AbstractSecurityContext;
import org.gatein.pc.portlet.impl.spi.AbstractServerContext;
+import org.gatein.pc.portlet.impl.spi.AbstractWindowContext;
import java.io.Serializable;
import java.util.ArrayList;
@@ -812,7 +813,7 @@
invocation.setServerContext(new AbstractServerContext(servletRequest, prc.getResponse()));
//TODO: ExoUserContext impl not tested
invocation.setUserContext(new ExoUserContext(servletRequest, userProfile));
- invocation.setWindowContext(new ExoWindowContext(storageName));
+ invocation.setWindowContext(new AbstractWindowContext(storageName));
invocation.setPortalContext(new AbstractPortalContext(Collections.singletonMap(
"javax.portlet.markup.head.element.support", "true")));
invocation.setSecurityContext(new AbstractSecurityContext(servletRequest));
13 years, 9 months
gatein SVN: r4562 - in components/wsrp/trunk/common/src: main/java/org/gatein/wsrp/spec/v1 and 1 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-10-06 17:35:50 -0400 (Wed, 06 Oct 2010)
New Revision: 4562
Modified:
components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java
components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/spec/v1/V2ToV1Converter.java
components/wsrp/trunk/common/src/test/java/org/gatein/wsrp/spec/v1/V2ToV1ConverterTestCase.java
Log:
GTNWSRP-92: Fix remaining issues with potential compatibilities between the V1 and V2 schemas. The V2ToV1Converter should now make sure to return required values in v1 which became optional in v2.
Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java
===================================================================
--- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java 2010-10-06 21:09:46 UTC (rev 4561)
+++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java 2010-10-06 21:35:50 UTC (rev 4562)
@@ -664,8 +664,6 @@
*/
public static SessionContext createSessionContext(String sessionID, int expires)
{
- //TODO: a sessionID is minOccurs 0, it shouldn't be required, expires also is minOccurs 0
- ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(sessionID, "session Id", "SessionContext");
if (expires < 0)
{
throw new IllegalArgumentException("SessionContext requires a positive expiration time.");
Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/spec/v1/V2ToV1Converter.java
===================================================================
--- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/spec/v1/V2ToV1Converter.java 2010-10-06 21:09:46 UTC (rev 4561)
+++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/spec/v1/V2ToV1Converter.java 2010-10-06 21:35:50 UTC (rev 4562)
@@ -753,7 +753,7 @@
public static V1SessionContext toV1SessionContext(SessionContext sessionContext)
{
- if (sessionContext != null)
+ if (sessionContext != null && !ParameterValidation.isNullOrEmpty(sessionContext.getSessionID()))
{
V1SessionContext v1SessionContext = WSRP1TypeFactory.createSessionContext(sessionContext.getSessionID(), sessionContext.getExpires());
v1SessionContext.getExtensions().addAll(Lists.transform(sessionContext.getExtensions(), EXTENSION));
@@ -781,7 +781,19 @@
{
QName errorCode = failedPortlets.getErrorCode();
V1LocalizedString reason = toV1LocalizedString(failedPortlets.getReason());
- String v1Reason = errorCode.toString() + ": " + reason.getValue();
+
+ String v1Reason;
+ //failedPortlets.getReason is optional in V2, but errorCode is required.
+ //for V2DestroyFailed the reason is required
+ if (reason != null && reason.getValue() != null)
+ {
+ v1Reason = errorCode.toString() + ": " + reason.getValue();
+ }
+ else
+ {
+ v1Reason = errorCode.toString();
+ }
+
for (String handle : failedPortlets.getPortletHandles())
{
V1DestroyFailed destroyFailed = WSRP1TypeFactory.createDestroyFailed(handle, v1Reason);
@@ -1180,7 +1192,18 @@
{
V1ItemDescription result = new V1ItemDescription();
result.setItemName(from.getItemName());
- result.setDescription(LOCALIZEDSTRING.apply(from.getDescription()));
+ if (from.getDescription() != null)
+ {
+ result.setDescription(LOCALIZEDSTRING.apply(from.getDescription()));
+ }
+ else if (from.getDisplayName() != null)
+ {
+ result.setDescription(LOCALIZEDSTRING.apply(from.getDisplayName()));
+ }
+ else
+ {
+ result.setDescription(WSRP1TypeFactory.createLocalizedString("No Description Available"));
+ }
List<V1Extension> extensions = WSRPUtils.transform(from.getExtensions(), EXTENSION);
if (extensions != null)
{
@@ -1204,7 +1227,16 @@
{
V1NamedString result = new V1NamedString();
result.setName(namedString.getName());
- result.setValue(namedString.getValue());
+ //GetValue is required for V1, but optional for V2. If we receive a null
+ //value from V2, then just set the value to be equal to the name.
+ if (namedString.getValue() == null)
+ {
+ result.setValue(namedString.getName());
+ }
+ else
+ {
+ result.setValue(namedString.getValue());
+ }
return result;
}
else
Modified: components/wsrp/trunk/common/src/test/java/org/gatein/wsrp/spec/v1/V2ToV1ConverterTestCase.java
===================================================================
--- components/wsrp/trunk/common/src/test/java/org/gatein/wsrp/spec/v1/V2ToV1ConverterTestCase.java 2010-10-06 21:09:46 UTC (rev 4561)
+++ components/wsrp/trunk/common/src/test/java/org/gatein/wsrp/spec/v1/V2ToV1ConverterTestCase.java 2010-10-06 21:35:50 UTC (rev 4562)
@@ -23,14 +23,29 @@
package org.gatein.wsrp.spec.v1;
+import java.util.ArrayList;
+import java.util.List;
+
import junit.framework.TestCase;
import org.gatein.wsrp.WSRPTypeFactory;
+import org.gatein.wsrp.spec.v2.ErrorCodes;
+import org.gatein.wsrp.spec.v2.ErrorCodes.Codes;
+import org.oasis.wsrp.v1.V1DestroyFailed;
import org.oasis.wsrp.v1.V1InvalidSession;
+import org.oasis.wsrp.v1.V1ItemDescription;
+import org.oasis.wsrp.v1.V1NamedString;
import org.oasis.wsrp.v1.V1OperationFailed;
+import org.oasis.wsrp.v1.V1SessionContext;
+import org.oasis.wsrp.v2.FailedPortlets;
+import org.oasis.wsrp.v2.ItemDescription;
+import org.oasis.wsrp.v2.LocalizedString;
+import org.oasis.wsrp.v2.NamedString;
import org.oasis.wsrp.v2.OperationFailed;
-import org.oasis.wsrp.v2.OperationFailedFault;
+import org.oasis.wsrp.v2.SessionContext;
+import com.google.common.collect.Lists;
+
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
@@ -91,5 +106,126 @@
// expected
}
}
+
+ public void testNamedString()
+ {
+ NamedString namedString = WSRPTypeFactory.createNamedString("name1", "value1");
+ V1NamedString v1NamedString = convertNamedStringToV1NamedString(namedString);
+ assertEquals("name1", v1NamedString.getName());
+ assertEquals("value1", v1NamedString.getValue());
+
+ //value is optional in v2, but not in v1, if a null value is passed the V1NamedString should use the name instead of the value
+ namedString = WSRPTypeFactory.createNamedString("name2", null);
+ v1NamedString = convertNamedStringToV1NamedString(namedString);
+ assertEquals("name2", v1NamedString.getName());
+ assertEquals("name2", v1NamedString.getValue());
+
+ //TODO; should an empty value be valid?
+ namedString = WSRPTypeFactory.createNamedString("name3", "");
+ v1NamedString = convertNamedStringToV1NamedString(namedString);
+ assertEquals("name3", v1NamedString.getName());
+ assertEquals("", v1NamedString.getValue());
+ }
+
+ private V1NamedString convertNamedStringToV1NamedString(NamedString namedString)
+ {
+ List<NamedString> namedStringList = new ArrayList<NamedString>();
+ namedStringList.add(namedString);
+
+ List<V1NamedString> v1NamedStringList = Lists.transform(namedStringList, V2ToV1Converter.NAMEDSTRING);
+
+ assertEquals(1, v1NamedStringList.size());
+
+ return v1NamedStringList.iterator().next();
+ }
+
+ public void testSessionContext()
+ {
+ SessionContext sessionContext = WSRPTypeFactory.createSessionContext("session1234", 0);
+ V1SessionContext v1SessionContext = V2ToV1Converter.toV1SessionContext(sessionContext);
+ assertEquals("session1234", v1SessionContext.getSessionID());
+ assertEquals(0, v1SessionContext.getExpires());
+
+ sessionContext = WSRPTypeFactory.createSessionContext(null, 0);
+ v1SessionContext = V2ToV1Converter.toV1SessionContext(sessionContext);
+ assertNull(v1SessionContext);
+
+ sessionContext = WSRPTypeFactory.createSessionContext("", 0);
+ v1SessionContext = V2ToV1Converter.toV1SessionContext(sessionContext);
+ assertNull(v1SessionContext);
+ }
+
+ public void testItemDescription()
+ {
+ V1ItemDescription v1ItemDescription = convertItemDescriptionToV1ItemDescription("desc1", "dn1", "item1");
+ assertEquals("desc1", v1ItemDescription.getDescription().getValue());
+ assertEquals("item1", v1ItemDescription.getItemName());
+
+ v1ItemDescription = convertItemDescriptionToV1ItemDescription(null, "dn1", "item1");
+ assertEquals("dn1", v1ItemDescription.getDescription().getValue());
+ assertEquals("item1", v1ItemDescription.getItemName());
+ v1ItemDescription = convertItemDescriptionToV1ItemDescription("", "dn1", "item1");
+ assertEquals("", v1ItemDescription.getDescription().getValue());
+ assertEquals("item1", v1ItemDescription.getItemName());
+
+ v1ItemDescription = convertItemDescriptionToV1ItemDescription(null, null, "item1");
+ assertNotNull(v1ItemDescription.getDescription().getValue());
+ assertEquals("item1", v1ItemDescription.getItemName());
+ }
+
+ private V1ItemDescription convertItemDescriptionToV1ItemDescription (String description, String displayName, String itemName)
+ {
+ LocalizedString descriptionLS = null;
+ if (description != null)
+ {
+ descriptionLS = WSRPTypeFactory.createLocalizedString(description);
+ }
+
+ LocalizedString displayNameLS = null;
+ if (displayName != null)
+ {
+ displayNameLS = WSRPTypeFactory.createLocalizedString(displayName);
+ }
+
+ ItemDescription itemDescription = WSRPTypeFactory.createItemDescription(descriptionLS, displayNameLS, itemName);
+
+ List<ItemDescription> itemDescriptionList = new ArrayList<ItemDescription>();
+ itemDescriptionList.add(itemDescription);
+
+ List<V1ItemDescription> v1ItemDesciptionList = Lists.transform(itemDescriptionList, V2ToV1Converter.ITEMDESCRIPTION);
+
+ assertEquals(1, v1ItemDesciptionList.size());
+
+ return v1ItemDesciptionList.iterator().next();
+ }
+
+ public void testDestroyedFailed()
+ {
+ V1DestroyFailed destroyFailed = convertFailedPortletsToDestroyFailed("handle1", Codes.OPERATIONFAILED, "this failed for some reason");
+ assertEquals("handle1", destroyFailed.getPortletHandle());
+ assertTrue(destroyFailed.getReason().contains(ErrorCodes.getQname(Codes.OPERATIONFAILED).toString()));
+ assertTrue(destroyFailed.getReason().contains("this failed for some reason"));
+
+ destroyFailed = convertFailedPortletsToDestroyFailed("handle1", Codes.OPERATIONFAILED, null);
+ assertEquals("handle1", destroyFailed.getPortletHandle());
+ assertEquals(ErrorCodes.getQname(Codes.OPERATIONFAILED).toString(), destroyFailed.getReason());
+ }
+
+ private V1DestroyFailed convertFailedPortletsToDestroyFailed(String portletHandle, Codes errorCode, String reason)
+ {
+ List<String> portletHandles = new ArrayList<String>();
+ portletHandles.add(portletHandle);
+
+ FailedPortlets failedPortlets = WSRPTypeFactory.createFailedPortlets(portletHandles, errorCode, reason);
+ List<FailedPortlets> failedPortletsList = new ArrayList<FailedPortlets>();
+ failedPortletsList.add(failedPortlets);
+
+ List<V1DestroyFailed> destroyFailedList = V2ToV1Converter.toV1DestroyFailed(failedPortletsList);
+
+ assertEquals(1, destroyFailedList.size());
+
+ return destroyFailedList.iterator().next();
+ }
+
}
13 years, 9 months
gatein SVN: r4561 - in portal/branches/wsrp2-integration: webui/portal/src/main/java/org/exoplatform/portal/webui/application and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-06 17:09:46 -0400 (Wed, 06 Oct 2010)
New Revision: 4561
Modified:
portal/branches/wsrp2-integration/pom.xml
portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoWindowContext.java
portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
Log:
- Updated to use PC 2.2.0-Beta05 and WSRP 2.0.0-Beta01.
- Use AbstractWindowContext instead of ExoWindowContext since there wasn't any discernible advantage to using a custom implementation at this point.
Modified: portal/branches/wsrp2-integration/pom.xml
===================================================================
--- portal/branches/wsrp2-integration/pom.xml 2010-10-06 20:57:32 UTC (rev 4560)
+++ portal/branches/wsrp2-integration/pom.xml 2010-10-06 21:09:46 UTC (rev 4561)
@@ -46,9 +46,9 @@
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<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-Beta04</org.gatein.pc.version>
+ <org.gatein.pc.version>2.2.0-Beta05</org.gatein.pc.version>
<org.picketlink.idm>1.1.5.GA</org.picketlink.idm>
- <org.gatein.wsrp.version>2.0.0-Beta01-SNAPSHOT</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>2.0.0-Beta01</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>
<rhino.version>1.6R5</rhino.version>
Modified: portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoWindowContext.java
===================================================================
--- portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoWindowContext.java 2010-10-06 20:57:32 UTC (rev 4560)
+++ portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoWindowContext.java 2010-10-06 21:09:46 UTC (rev 4561)
@@ -1,16 +1,16 @@
/**
* 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
@@ -19,18 +19,15 @@
package org.exoplatform.portal.webui.application;
-import org.gatein.pc.api.spi.WindowContext;
+import org.gatein.pc.portlet.impl.spi.AbstractWindowContext;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class ExoWindowContext implements WindowContext
+public class ExoWindowContext extends AbstractWindowContext
{
- /** . */
- private final String windowId;
-
/**
* Create a new window context.
*
@@ -39,15 +36,6 @@
*/
public ExoWindowContext(String windowId) throws NullPointerException
{
- if (windowId == null)
- {
- throw new NullPointerException();
- }
- this.windowId = windowId;
+ super(windowId);
}
-
- public String getId()
- {
- return windowId;
- }
}
Modified: portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
===================================================================
--- portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2010-10-06 20:57:32 UTC (rev 4560)
+++ portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2010-10-06 21:09:46 UTC (rev 4561)
@@ -76,6 +76,7 @@
import org.gatein.pc.portlet.impl.spi.AbstractRequestContext;
import org.gatein.pc.portlet.impl.spi.AbstractSecurityContext;
import org.gatein.pc.portlet.impl.spi.AbstractServerContext;
+import org.gatein.pc.portlet.impl.spi.AbstractWindowContext;
import java.io.Serializable;
import java.util.ArrayList;
@@ -765,7 +766,7 @@
invocation.setServerContext(new AbstractServerContext(servletRequest, prc.getResponse()));
//TODO: ExoUserContext impl not tested
invocation.setUserContext(new ExoUserContext(servletRequest, userProfile));
- invocation.setWindowContext(new ExoWindowContext(storageName));
+ invocation.setWindowContext(new AbstractWindowContext(storageName));
invocation.setPortalContext(new AbstractPortalContext(Collections.singletonMap(
"javax.portlet.markup.head.element.support", "true")));
invocation.setSecurityContext(new AbstractSecurityContext(servletRequest));
13 years, 9 months
gatein SVN: r4560 - epp/portal/branches/EPP_5_1_Branch.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-10-06 16:57:32 -0400 (Wed, 06 Oct 2010)
New Revision: 4560
Modified:
epp/portal/branches/EPP_5_1_Branch/pom.xml
Log:
JBEPP-504: Update dependencies for WCI, PC and WSRP
Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/pom.xml 2010-10-06 20:35:32 UTC (rev 4559)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2010-10-06 20:57:32 UTC (rev 4560)
@@ -46,9 +46,9 @@
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<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-Beta04</org.gatein.pc.version>
+ <org.gatein.pc.version>2.2.0-Beta05</org.gatein.pc.version>
<org.picketlink.idm>1.1.6.GA</org.picketlink.idm>
- <org.gatein.wsrp.version>2.0.0-Alpha02</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>2.0.0-Beta01</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>
<rhino.version>1.6R5</rhino.version>
13 years, 9 months
gatein SVN: r4559 - in components/wsrp/trunk: admin-gui and 9 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-06 16:35:32 -0400 (Wed, 06 Oct 2010)
New Revision: 4559
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/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/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 2010-10-06 20:35:12 UTC (rev 4558)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-10-06 20:35:32 UTC (rev 4559)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta01</version>
+ <version>2.0.0-Beta02-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 2010-10-06 20:35:12 UTC (rev 4558)
+++ components/wsrp/trunk/api/pom.xml 2010-10-06 20:35:32 UTC (rev 4559)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta01</version>
+ <version>2.0.0-Beta02-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 2010-10-06 20:35:12 UTC (rev 4558)
+++ components/wsrp/trunk/common/pom.xml 2010-10-06 20:35:32 UTC (rev 4559)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta01</version>
+ <version>2.0.0-Beta02-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 2010-10-06 20:35:12 UTC (rev 4558)
+++ components/wsrp/trunk/consumer/pom.xml 2010-10-06 20:35:32 UTC (rev 4559)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta01</version>
+ <version>2.0.0-Beta02-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 2010-10-06 20:35:12 UTC (rev 4558)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-10-06 20:35:32 UTC (rev 4559)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta01</version>
+ <version>2.0.0-Beta02-SNAPSHOT</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-10-06 20:35:12 UTC (rev 4558)
+++ components/wsrp/trunk/pom.xml 2010-10-06 20:35:32 UTC (rev 4559)
@@ -29,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta01</version>
+ <version>2.0.0-Beta02-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -40,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-Beta01</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.0.0-Beta01</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 2010-10-06 20:35:12 UTC (rev 4558)
+++ components/wsrp/trunk/producer/pom.xml 2010-10-06 20:35:32 UTC (rev 4559)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta01</version>
+ <version>2.0.0-Beta02-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 2010-10-06 20:35:12 UTC (rev 4558)
+++ components/wsrp/trunk/test/pom.xml 2010-10-06 20:35:32 UTC (rev 4559)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta01</version>
+ <version>2.0.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-10-06 20:35:12 UTC (rev 4558)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-10-06 20:35:32 UTC (rev 4559)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta01</version>
+ <version>2.0.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-10-06 20:35:12 UTC (rev 4558)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-10-06 20:35:32 UTC (rev 4559)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta01</version>
+ <version>2.0.0-Beta02-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 2010-10-06 20:35:12 UTC (rev 4558)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2010-10-06 20:35:32 UTC (rev 4559)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.0.0-Beta01</version>
+ <version>2.0.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
13 years, 9 months
gatein SVN: r4558 - components/wsrp/tags.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-06 16:35:12 -0400 (Wed, 06 Oct 2010)
New Revision: 4558
Added:
components/wsrp/tags/2.0.0-Beta01/
Log:
[maven-scm] copy for tag 2.0.0-Beta01
Copied: components/wsrp/tags/2.0.0-Beta01 (from rev 4557, components/wsrp/trunk)
13 years, 9 months
gatein SVN: r4557 - in components/wsrp/trunk: admin-gui and 9 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-06 16:34:52 -0400 (Wed, 06 Oct 2010)
New Revision: 4557
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/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/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.0.0-Beta01
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-10-06 20:32:04 UTC (rev 4556)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-10-06 20:34:52 UTC (rev 4557)
@@ -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.0.0-Beta01-SNAPSHOT</version>
+ <version>2.0.0-Beta01</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 2010-10-06 20:32:04 UTC (rev 4556)
+++ components/wsrp/trunk/api/pom.xml 2010-10-06 20:34:52 UTC (rev 4557)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta01-SNAPSHOT</version>
+ <version>2.0.0-Beta01</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 2010-10-06 20:32:04 UTC (rev 4556)
+++ components/wsrp/trunk/common/pom.xml 2010-10-06 20:34:52 UTC (rev 4557)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta01-SNAPSHOT</version>
+ <version>2.0.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2010-10-06 20:32:04 UTC (rev 4556)
+++ components/wsrp/trunk/consumer/pom.xml 2010-10-06 20:34:52 UTC (rev 4557)
@@ -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.0.0-Beta01-SNAPSHOT</version>
+ <version>2.0.0-Beta01</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 2010-10-06 20:32:04 UTC (rev 4556)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-10-06 20:34:52 UTC (rev 4557)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta01-SNAPSHOT</version>
+ <version>2.0.0-Beta01</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-10-06 20:32:04 UTC (rev 4556)
+++ components/wsrp/trunk/pom.xml 2010-10-06 20:34:52 UTC (rev 4557)
@@ -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.0.0-Beta01-SNAPSHOT</version>
+ <version>2.0.0-Beta01</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.0.0-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.0.0-Beta01</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.0.0-Beta01</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-10-06 20:32:04 UTC (rev 4556)
+++ components/wsrp/trunk/producer/pom.xml 2010-10-06 20:34:52 UTC (rev 4557)
@@ -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.0.0-Beta01-SNAPSHOT</version>
+ <version>2.0.0-Beta01</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 2010-10-06 20:32:04 UTC (rev 4556)
+++ components/wsrp/trunk/test/pom.xml 2010-10-06 20:34:52 UTC (rev 4557)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta01-SNAPSHOT</version>
+ <version>2.0.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-10-06 20:32:04 UTC (rev 4556)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-10-06 20:34:52 UTC (rev 4557)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta01-SNAPSHOT</version>
+ <version>2.0.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-10-06 20:32:04 UTC (rev 4556)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-10-06 20:34:52 UTC (rev 4557)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta01-SNAPSHOT</version>
+ <version>2.0.0-Beta01</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 2010-10-06 20:32:04 UTC (rev 4556)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2010-10-06 20:34:52 UTC (rev 4557)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.0.0-Beta01-SNAPSHOT</version>
+ <version>2.0.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
13 years, 9 months
gatein SVN: r4556 - components/wsrp/tags.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-06 16:32:04 -0400 (Wed, 06 Oct 2010)
New Revision: 4556
Removed:
components/wsrp/tags/2.2.0-Beta01/
Log:
Removed improper tag version. :(
13 years, 9 months
gatein SVN: r4555 - in components/wsrp/trunk: admin-gui and 9 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-10-06 16:29:43 -0400 (Wed, 06 Oct 2010)
New Revision: 4555
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/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/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] rollback the release of 2.2.0-Beta01
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2010-10-06 20:14:04 UTC (rev 4554)
+++ components/wsrp/trunk/admin-gui/pom.xml 2010-10-06 20:29:43 UTC (rev 4555)
@@ -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.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta01-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 2010-10-06 20:14:04 UTC (rev 4554)
+++ components/wsrp/trunk/api/pom.xml 2010-10-06 20:29:43 UTC (rev 4555)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta01-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 2010-10-06 20:14:04 UTC (rev 4554)
+++ components/wsrp/trunk/common/pom.xml 2010-10-06 20:29:43 UTC (rev 4555)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta01-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 2010-10-06 20:14:04 UTC (rev 4554)
+++ components/wsrp/trunk/consumer/pom.xml 2010-10-06 20:29:43 UTC (rev 4555)
@@ -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.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta01-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 2010-10-06 20:14:04 UTC (rev 4554)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2010-10-06 20:29:43 UTC (rev 4555)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2010-10-06 20:14:04 UTC (rev 4554)
+++ components/wsrp/trunk/pom.xml 2010-10-06 20:29:43 UTC (rev 4555)
@@ -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.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2010-10-06 20:14:04 UTC (rev 4554)
+++ components/wsrp/trunk/producer/pom.xml 2010-10-06 20:29:43 UTC (rev 4555)
@@ -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.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta01-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 2010-10-06 20:14:04 UTC (rev 4554)
+++ components/wsrp/trunk/test/pom.xml 2010-10-06 20:29:43 UTC (rev 4555)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-10-06 20:14:04 UTC (rev 4554)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-10-06 20:29:43 UTC (rev 4555)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2010-10-06 20:14:04 UTC (rev 4554)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2010-10-06 20:29:43 UTC (rev 4555)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta01-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 2010-10-06 20:14:04 UTC (rev 4554)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2010-10-06 20:29:43 UTC (rev 4555)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.0.0-Beta02-SNAPSHOT</version>
+ <version>2.0.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
13 years, 9 months