gatein SVN: r3396 - components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-06-20 15:50:09 -0400 (Sun, 20 Jun 2010)
New Revision: 3396
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ActionHandler.java
Log:
- Properly report an error if both redirect URL and update response are null.
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ActionHandler.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ActionHandler.java 2010-06-20 19:48:45 UTC (rev 3395)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ActionHandler.java 2010-06-20 19:50:09 UTC (rev 3396)
@@ -224,9 +224,14 @@
UpdateResponse updateResponse = blockingInteractionResponse.getUpdateResponse();
if (redirectURL != null && updateResponse != null)
{
- return new ErrorResponse(new IllegalArgumentException("Response cannot both redirect and update state."));
+ return new ErrorResponse(new IllegalArgumentException("Producer error: response cannot both redirect and update state."));
}
+ if (redirectURL == null && updateResponse == null)
+ {
+ return new ErrorResponse(new IllegalArgumentException("Producer error: response must redirect or update state."));
+ }
+
if (redirectURL != null)
{
return new HTTPRedirectionResponse(redirectURL); // do we need to process URLs?
14 years
- 1
- 0
gatein SVN: r3395 - in components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp: protocol/v1 and 1 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-06-20 15:48:45 -0400 (Sun, 20 Jun 2010)
New Revision: 3395
Modified:
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/WSRPConsumerBaseTest.java
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java
Log:
- Make it possible for BehaviorBackedServiceFactory to know which MarkupBehavior is requested.
- Make WSRPConsumerBaseTest use BehaviorBackedServiceFactory.
- Make sure that MarkupTestCase properly request a MarkupBehavior.
- MarkupTestCase now uses a specific MockUserContext instead of AbstractUserContext as new code doesn't allow for empty locales.
Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/WSRPConsumerBaseTest.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/WSRPConsumerBaseTest.java 2010-06-20 12:18:14 UTC (rev 3394)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/WSRPConsumerBaseTest.java 2010-06-20 19:48:45 UTC (rev 3395)
@@ -24,8 +24,8 @@
package org.gatein.wsrp.consumer;
import junit.framework.TestCase;
-import org.gatein.wsrp.WSRPConsumer;
import org.gatein.wsrp.test.ExtendedAssert;
+import org.gatein.wsrp.test.protocol.v1.BehaviorBackedServiceFactory;
import org.gatein.wsrp.test.protocol.v1.BehaviorRegistry;
import org.gatein.wsrp.test.protocol.v1.MarkupBehavior;
import org.gatein.wsrp.test.protocol.v1.PortletManagementBehavior;
@@ -65,13 +65,14 @@
protected TestWSRPProducer producer = new TestWSRPProducerImpl();
/** . */
- protected WSRPConsumer consumer = new WSRPConsumerImpl();
+ protected WSRPConsumerImpl consumer = new WSRPConsumerImpl();
private boolean strict = true;
private String sdClassName;
private String mClassName;
private String pmClassName;
private String rClassName;
+ protected static String requestedMarkupBehavior;
public void setUp() throws Exception
@@ -80,7 +81,8 @@
producer.reset();
// set the test producer identifier
- consumer.getProducerInfo().setId(TEST_PRODUCER_ID);
+ ProducerInfo producerInfo = consumer.getProducerInfo();
+ producerInfo.setId(TEST_PRODUCER_ID);
// reset the behaviors
BehaviorRegistry registry = producer.getBehaviorRegistry();
@@ -91,13 +93,16 @@
registerAdditionalMarkupBehaviors(registry);
// use a fresh ConsumerRegistry
- consumer.getProducerInfo().setRegistry(new MockConsumerRegistry());
+ producerInfo.setRegistry(new MockConsumerRegistry());
+ // use
+ producerInfo.setEndpointConfigurationInfo(new EndpointConfigurationInfo(new BehaviorBackedServiceFactory(registry)));
+
// make sure we use clean producer info for each test
consumer.refreshProducerInfo();
// use cache to avoid un-necessary calls
- consumer.getProducerInfo().setExpirationCacheSeconds(120);
+ producerInfo.setExpirationCacheSeconds(120);
}
protected void setRegistrationBehavior(RegistrationBehavior behavior)
@@ -129,26 +134,6 @@
registry.setPortletManagementBehavior(behavior);
}
- public TestWSRPProducer getProducer()
- {
- return producer;
- }
-
- public void setProducer(TestWSRPProducer producer)
- {
- this.producer = producer;
- }
-
- public WSRPConsumer getConsumer()
- {
- return consumer;
- }
-
- public void setConsumer(WSRPConsumer consumer)
- {
- this.consumer = consumer;
- }
-
public void testProducerId()
{
ExtendedAssert.assertEquals(TEST_PRODUCER_ID, consumer.getProducerId());
@@ -246,4 +231,22 @@
{
return producer.getBehaviorRegistry().getServiceDescriptionBehavior().getPortletNumber();
}
+
+ /**
+ * So that BehaviorBackedServiceFactory can retrieve the proper behavior when retrieving the markup service for
+ * invocation.
+ *
+ * @return
+ */
+ public static String getRequestedMarkupBehavior()
+ {
+ return requestedMarkupBehavior;
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ // reset the requested markup behavior
+ requestedMarkupBehavior = null;
+ }
}
Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java 2010-06-20 12:18:14 UTC (rev 3394)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java 2010-06-20 19:48:45 UTC (rev 3395)
@@ -66,7 +66,9 @@
import javax.servlet.http.HttpSession;
import javax.xml.ws.Holder;
+import java.util.Collections;
import java.util.List;
+import java.util.Locale;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -75,6 +77,7 @@
*/
public class MarkupTestCase extends V1ConsumerBaseTest
{
+
public MarkupTestCase() throws Exception
{
super();
@@ -282,9 +285,12 @@
render.setInstanceContext(new AbstractInstanceContext(portletHandle));
render.setSecurityContext(new AbstractSecurityContext(MockHttpServletRequest.createMockRequest(null)));
- render.setUserContext(new AbstractUserContext());
+ render.setUserContext(new MockUserContext());
render.setWindowContext(new AbstractWindowContext("windowcontext"));
render.setPortalContext(new AbstractPortalContext());
+
+ requestedMarkupBehavior = portletHandle;
+
return render;
}
@@ -294,8 +300,20 @@
ActionInvocation action = new ActionInvocation(ac);
action.setInstanceContext(new AbstractInstanceContext(portletHandle));
action.setSecurityContext(new AbstractSecurityContext(MockHttpServletRequest.createMockRequest(null)));
- action.setUserContext(new AbstractUserContext());
+ action.setUserContext(new MockUserContext());
action.setTarget(PortletContext.createPortletContext(portletHandle));
+
+ requestedMarkupBehavior = portletHandle;
+
return action;
}
+
+ static class MockUserContext extends AbstractUserContext
+ {
+ @Override
+ public List<Locale> getLocales()
+ {
+ return Collections.singletonList(Locale.ENGLISH);
+ }
+ }
}
Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java 2010-06-20 12:18:14 UTC (rev 3394)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v1/BehaviorBackedServiceFactory.java 2010-06-20 19:48:45 UTC (rev 3395)
@@ -26,6 +26,7 @@
import org.gatein.common.NotYetImplemented;
import org.gatein.pc.api.Mode;
import org.gatein.pc.api.WindowState;
+import org.gatein.wsrp.consumer.WSRPConsumerBaseTest;
import org.gatein.wsrp.services.MarkupService;
import org.gatein.wsrp.services.PortletManagementService;
import org.gatein.wsrp.services.RegistrationService;
@@ -75,7 +76,12 @@
public BehaviorBackedServiceFactory()
{
- registry = new BehaviorRegistry();
+ this(new BehaviorRegistry());
+ }
+
+ public BehaviorBackedServiceFactory(BehaviorRegistry registry)
+ {
+ this.registry = registry;
registry.registerMarkupBehavior(new SimpleMarkupBehavior());
}
@@ -92,7 +98,13 @@
}
if (WSRPV1MarkupPortType.class.isAssignableFrom(serviceClass))
{
- return (T)registry.getMarkupBehaviorFor(MARKUP);
+ String requestedMarkupBehavior = WSRPConsumerBaseTest.getRequestedMarkupBehavior();
+ if (requestedMarkupBehavior == null)
+ {
+ requestedMarkupBehavior = MARKUP;
+ }
+
+ return (T)registry.getMarkupBehaviorFor(requestedMarkupBehavior);
}
if (WSRPV1PortletManagementPortType.class.isAssignableFrom(serviceClass))
{
14 years
- 1
- 0
gatein SVN: r3394 - in components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer: portlet/info and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-06-20 08:18:14 -0400 (Sun, 20 Jun 2010)
New Revision: 3394
Added:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPEventInfo.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPNavigationInfo.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPParameterInfo.java
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPPortletInfo.java
Log:
- Started adding events and PRP metadata on the consumer side.
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java 2010-06-20 12:15:10 UTC (rev 3393)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java 2010-06-20 12:18:14 UTC (rev 3394)
@@ -23,16 +23,20 @@
package org.gatein.wsrp.consumer;
+import org.gatein.common.NotYetImplemented;
import org.gatein.common.util.ParameterValidation;
import org.gatein.pc.api.InvokerUnavailableException;
import org.gatein.pc.api.NoSuchPortletException;
import org.gatein.pc.api.Portlet;
import org.gatein.pc.api.PortletContext;
import org.gatein.pc.api.PortletInvokerException;
+import org.gatein.pc.api.info.EventInfo;
+import org.gatein.pc.api.info.TypeInfo;
import org.gatein.wsrp.WSRPConstants;
import org.gatein.wsrp.WSRPTypeFactory;
import org.gatein.wsrp.WSRPUtils;
import org.gatein.wsrp.consumer.portlet.WSRPPortlet;
+import org.gatein.wsrp.consumer.portlet.info.WSRPEventInfo;
import org.gatein.wsrp.consumer.portlet.info.WSRPPortletInfo;
import org.gatein.wsrp.consumer.registry.ConsumerRegistry;
import org.gatein.wsrp.servlet.UserAccess;
@@ -58,6 +62,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.namespace.QName;
import javax.xml.ws.Holder;
import java.util.Collections;
import java.util.HashMap;
@@ -123,6 +129,9 @@
private Map<String, ItemDescription> customModes;
private Map<String, ItemDescription> customWindowStates;
+ /** Events */
+ private Map<QName, EventInfo> eventDescriptions;
+
/*protected org.oasis.wsrp.v1.ItemDescription[] userCategoryDescriptions;
protected org.oasis.wsrp.v1.ItemDescription[] customUserProfileItemDescriptions;
@@ -479,6 +488,37 @@
// custom window state descriptions
customWindowStates = toMap(serviceDescription.getCustomWindowStateDescriptions());
+ // event descriptions
+ List<EventDescription> eventDescriptions = serviceDescription.getEventDescriptions();
+ if (!eventDescriptions.isEmpty())
+ {
+ this.eventDescriptions = new HashMap<QName, EventInfo>(eventDescriptions.size());
+
+ for (final EventDescription event : eventDescriptions)
+ {
+ QName name = event.getName();
+ EventInfo eventInfo = new WSRPEventInfo(
+ name,
+ WSRPUtils.convertToCommonLocalizedStringOrNull(event.getLabel()),
+ WSRPUtils.convertToCommonLocalizedStringOrNull(event.getDescription()),
+ new TypeInfo()
+ {
+ public String getName()
+ {
+ return event.getType().toString();
+ }
+
+ public XmlRootElement getXMLBinding()
+ {
+ throw new NotYetImplemented(); // todo
+ }
+ },
+ event.getAliases());
+
+ this.eventDescriptions.put(name, eventInfo);
+ }
+ }
+
// do we need to register?
if (serviceDescription.isRequiresRegistration())
{
@@ -1168,4 +1208,9 @@
log.warn(ERASED_LOCAL_REGISTRATION_INFORMATION);
}
+
+ public EventInfo getInfoForEvent(QName name)
+ {
+ return eventDescriptions.get(name);
+ }
}
Added: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPEventInfo.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPEventInfo.java (rev 0)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPEventInfo.java 2010-06-20 12:18:14 UTC (rev 3394)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2010, Red Hat Middleware, LLC, and individual
+ * contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.gatein.wsrp.consumer.portlet.info;
+
+import org.gatein.common.i18n.LocalizedString;
+import org.gatein.pc.api.info.EventInfo;
+import org.gatein.pc.api.info.TypeInfo;
+
+import javax.xml.namespace.QName;
+import java.util.Collection;
+import java.util.Collections;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class WSRPEventInfo implements EventInfo
+{
+ private final QName name;
+ private final LocalizedString displayName;
+ private final LocalizedString description;
+ private final TypeInfo type;
+ private final Collection<QName> aliases;
+
+ public WSRPEventInfo(QName name, LocalizedString displayName, LocalizedString description, TypeInfo type, Collection<QName> aliases)
+ {
+ this.name = name;
+ this.displayName = displayName;
+ this.description = description;
+ this.type = type;
+ this.aliases = Collections.unmodifiableCollection(aliases);
+ }
+
+ public QName getName()
+ {
+ return name;
+ }
+
+ public LocalizedString getDisplayName()
+ {
+ return displayName;
+ }
+
+ public LocalizedString getDescription()
+ {
+ return description;
+ }
+
+ public TypeInfo getType()
+ {
+ return type;
+ }
+
+ public Collection<QName> getAliases()
+ {
+ return aliases;
+ }
+}
Added: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPNavigationInfo.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPNavigationInfo.java (rev 0)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPNavigationInfo.java 2010-06-20 12:18:14 UTC (rev 3394)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2010, Red Hat Middleware, LLC, and individual
+ * contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.gatein.wsrp.consumer.portlet.info;
+
+import org.gatein.common.util.ParameterValidation;
+import org.gatein.pc.api.info.NavigationInfo;
+import org.gatein.pc.api.info.ParameterInfo;
+
+import javax.xml.namespace.QName;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class WSRPNavigationInfo implements NavigationInfo
+{
+ private final Map<String, ParameterInfo> byId;
+ private final Map<QName, ParameterInfo> byName;
+
+ public WSRPNavigationInfo(Collection<ParameterInfo> params)
+ {
+ if (ParameterValidation.existsAndIsNotEmpty(params))
+ {
+ byId = new HashMap<String, ParameterInfo>(params.size());
+ byName = new HashMap<QName, ParameterInfo>(params.size());
+
+ for (ParameterInfo param : params)
+ {
+ byId.put(param.getId(), param);
+ byName.put(param.getName(), param);
+ }
+ }
+ else
+ {
+ byId = Collections.emptyMap();
+ byName = Collections.emptyMap();
+ }
+ }
+
+ public ParameterInfo getPublicParameter(String id)
+ {
+ return byId.get(id);
+ }
+
+ public ParameterInfo getPublicParameter(QName name)
+ {
+ return byName.get(name);
+ }
+
+ public Collection<? extends ParameterInfo> getPublicParameters()
+ {
+ return Collections.unmodifiableCollection(byId.values());
+ }
+}
Added: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPParameterInfo.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPParameterInfo.java (rev 0)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPParameterInfo.java 2010-06-20 12:18:14 UTC (rev 3394)
@@ -0,0 +1,70 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2010, Red Hat Middleware, LLC, and individual
+ * contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.gatein.wsrp.consumer.portlet.info;
+
+import org.gatein.common.i18n.LocalizedString;
+import org.gatein.pc.api.info.ParameterInfo;
+
+import javax.xml.namespace.QName;
+import java.util.Collection;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ */
+public class WSRPParameterInfo implements ParameterInfo
+{
+ private final String id;
+ private final QName name;
+ private final Collection<QName> aliases;
+ private final LocalizedString description;
+
+ public WSRPParameterInfo(String id, QName name, Collection<QName> aliases, LocalizedString description)
+ {
+ this.id = id;
+ this.name = name;
+ this.aliases = aliases;
+ this.description = description;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public QName getName()
+ {
+ return name;
+ }
+
+ public Collection<QName> getAliases()
+ {
+ return aliases;
+ }
+
+ public LocalizedString getDescription()
+ {
+ return description;
+ }
+}
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPPortletInfo.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPPortletInfo.java 2010-06-20 12:15:10 UTC (rev 3393)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/portlet/info/WSRPPortletInfo.java 2010-06-20 12:18:14 UTC (rev 3394)
@@ -46,11 +46,13 @@
import org.oasis.wsrp.v2.LocalizedString;
import org.oasis.wsrp.v2.MarkupType;
import org.oasis.wsrp.v2.ModelDescription;
+import org.oasis.wsrp.v2.ParameterDescription;
import org.oasis.wsrp.v2.PortletDescription;
import org.oasis.wsrp.v2.PortletPropertyDescriptionResponse;
import org.oasis.wsrp.v2.PropertyDescription;
import javax.xml.namespace.QName;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -84,25 +86,104 @@
private PreferencesInfo prefInfo;
private ProducerInfo originatingProducer;
private String portletHandle;
+ private final EventingInfo eventingInfo;
+ private final NavigationInfo navigationInfo;
public WSRPPortletInfo(final PortletDescription portletDescription, ProducerInfo originatingProducerInfo)
{
ParameterValidation.throwIllegalArgExceptionIfNull(portletDescription, "PortletDescription");
ParameterValidation.throwIllegalArgExceptionIfNull(originatingProducerInfo, "ProducerInfo");
+ this.originatingProducer = originatingProducerInfo;
+ this.portletHandle = portletDescription.getPortletHandle();
+
createCapabilitiesInfo(portletDescription);
createMetaInfo(portletDescription, originatingProducerInfo.getId());
createWSRPInfo(portletDescription, originatingProducerInfo.getId());
- this.originatingProducer = originatingProducerInfo;
- this.portletHandle = portletDescription.getPortletHandle();
+ this.eventingInfo = createEventingInfo(portletDescription);
+ this.navigationInfo = createNavigationInfo(portletDescription);
}
+ private NavigationInfo createNavigationInfo(PortletDescription portletDescription)
+ {
+ List<ParameterDescription> parameterDescriptions = portletDescription.getNavigationalPublicValueDescriptions();
+ if (!parameterDescriptions.isEmpty())
+ {
+ Collection<ParameterInfo> params = new ArrayList<ParameterInfo>(parameterDescriptions.size());
+ for (ParameterDescription parameterDescription : parameterDescriptions)
+ {
+ // WSRP doesn't distinguish between name and aliases as JSR-286 does so assume that first name is the name,
+ // rest are considered aliases...
+ List<QName> names = parameterDescription.getNames();
+ int nameNb = names.size();
+ QName name;
+ Collection<QName> aliases;
+ switch (nameNb)
+ {
+ case 0:
+ throw new IllegalArgumentException("Parameter must at least have one name");
+ case 1:
+ name = names.get(0);
+ aliases = Collections.emptyList();
+ break;
+ default:
+ name = names.get(0);
+ aliases = names.subList(1, nameNb);
+ }
- public WSRPPortletInfo(WSRPPortletInfo other, String newHandle)
+ // create new ParameterInfo and add it
+ params.add(
+ new WSRPParameterInfo(
+ parameterDescription.getIdentifier(),
+ name,
+ aliases,
+ WSRPUtils.convertToCommonLocalizedStringOrNull(parameterDescription.getDescription())));
+ }
+
+ return new WSRPNavigationInfo(params);
+ }
+ else
+ {
+ return new WSRPNavigationInfo(Collections.<ParameterInfo>emptyList());
+ }
+ }
+
+ private EventingInfo createEventingInfo(PortletDescription portletDescription)
{
+ Map<QName, EventInfo> produced = null;
+ Map<QName, EventInfo> consumed = null;
+
+ List<QName> events = portletDescription.getPublishedEvents();
+ if (!events.isEmpty())
+ {
+ produced = new HashMap<QName, EventInfo>(events.size());
+ for (QName event : events)
+ {
+ EventInfo desc = originatingProducer.getInfoForEvent(event);
+ produced.put(event, desc);
+ }
+ }
+
+ events = portletDescription.getHandledEvents();
+ if (!events.isEmpty())
+ {
+ consumed = new HashMap<QName, EventInfo>(events.size());
+ for (QName event : events)
+ {
+ EventInfo desc = originatingProducer.getInfoForEvent(event);
+ consumed.put(event, desc);
+ }
+ }
+
+ return new WSRPEventingInfo(produced, consumed);
+ }
+
+
+ public WSRPPortletInfo(final WSRPPortletInfo other, String newHandle)
+ {
ParameterValidation.throwIllegalArgExceptionIfNull(other, "WSRPPortletInfo");
ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(newHandle, "new portlet handle", "WSRPPortletInfo");
@@ -126,6 +207,9 @@
WSRPPreferencesInfo otherPref = (WSRPPreferencesInfo)other.getPreferences();
prefInfo = new WSRPPreferencesInfo(new HashMap<String, PreferenceInfo>(otherPref.preferences));
+ eventingInfo = other.eventingInfo;
+ navigationInfo = other.navigationInfo;
+
originatingProducer = other.originatingProducer;
portletHandle = newHandle;
}
@@ -166,8 +250,8 @@
for (PropertyDescription desc : descs)
{
String keyAsString = desc.getName().toString();
- prefInfos.put(keyAsString, new WSRPPreferenceInfo(keyAsString, getPortalLocalizedStringOrNullFrom(desc.getLabel()),
- getPortalLocalizedStringOrNullFrom(desc.getHint())));
+ prefInfos.put(keyAsString, new WSRPPreferenceInfo(keyAsString, WSRPUtils.convertToCommonLocalizedStringOrNull(desc.getLabel()),
+ WSRPUtils.convertToCommonLocalizedStringOrNull(desc.getHint())));
}
}
else
@@ -229,41 +313,12 @@
public EventingInfo getEventing()
{
- //todo: revisit when implementing WSRP 2
- return new EventingInfo()
- {
- public Map<QName, ? extends EventInfo> getProducedEvents()
- {
- return Collections.emptyMap();
- }
-
- public Map<QName, ? extends EventInfo> getConsumedEvents()
- {
- return Collections.emptyMap();
- }
- };
+ return eventingInfo;
}
public NavigationInfo getNavigation()
{
- //todo: revisit when implementing WSRP 2
- return new NavigationInfo()
- {
- public ParameterInfo getPublicParameter(String s)
- {
- return null;
- }
-
- public ParameterInfo getPublicParameter(QName qName)
- {
- return null;
- }
-
- public Collection<? extends ParameterInfo> getPublicParameters()
- {
- return Collections.emptyList();
- }
- };
+ return navigationInfo;
}
public <T> T getAttachment(Class<T> tClass) throws IllegalArgumentException
@@ -366,10 +421,10 @@
private void createMetaInfo(PortletDescription portletDescription, String producerId)
{
final Map<String, org.gatein.common.i18n.LocalizedString> metaInfos = new HashMap<String, org.gatein.common.i18n.LocalizedString>();
- metaInfos.put(MetaInfo.DESCRIPTION, getPortalLocalizedStringOrNullFrom(portletDescription.getDescription()));
- metaInfos.put(MetaInfo.DISPLAY_NAME, getPortalLocalizedStringOrNullFrom(portletDescription.getDisplayName()));
- metaInfos.put(MetaInfo.SHORT_TITLE, getPortalLocalizedStringOrNullFrom(portletDescription.getShortTitle()));
- metaInfos.put(MetaInfo.TITLE, getPortalLocalizedStringOrNullFrom(portletDescription.getTitle()));
+ metaInfos.put(MetaInfo.DESCRIPTION, WSRPUtils.convertToCommonLocalizedStringOrNull(portletDescription.getDescription()));
+ metaInfos.put(MetaInfo.DISPLAY_NAME, WSRPUtils.convertToCommonLocalizedStringOrNull(portletDescription.getDisplayName()));
+ metaInfos.put(MetaInfo.SHORT_TITLE, WSRPUtils.convertToCommonLocalizedStringOrNull(portletDescription.getShortTitle()));
+ metaInfos.put(MetaInfo.TITLE, WSRPUtils.convertToCommonLocalizedStringOrNull(portletDescription.getTitle()));
// keywords need to be concatenated
List<LocalizedString> keywords = portletDescription.getKeywords();
@@ -403,17 +458,6 @@
metaInfo = new WSRPMetaInfo(metaInfos);
}
- private org.gatein.common.i18n.LocalizedString getPortalLocalizedStringOrNullFrom(LocalizedString wsrpLocalizedString)
- {
- if (wsrpLocalizedString != null)
- {
- return new org.gatein.common.i18n.LocalizedString(wsrpLocalizedString.getValue(),
- WSRPUtils.getLocale(wsrpLocalizedString.getLang()));
- }
-
- return null;
- }
-
class MediaTypeInfo
{
public MediaTypeInfo(MarkupType markupType)
@@ -725,4 +769,40 @@
return null;
}
}
+
+ private static class WSRPEventingInfo implements EventingInfo
+ {
+ private final Map<QName, ? extends EventInfo> produced;
+ private final Map<QName, ? extends EventInfo> consumed;
+
+ public WSRPEventingInfo(Map<QName, ? extends EventInfo> produced, Map<QName, ? extends EventInfo> consumed)
+ {
+ if (produced != null)
+ {
+ this.produced = Collections.unmodifiableMap(produced);
+ }
+ else
+ {
+ this.produced = Collections.emptyMap();
+ }
+ if (consumed != null)
+ {
+ this.consumed = Collections.unmodifiableMap(consumed);
+ }
+ else
+ {
+ this.consumed = Collections.emptyMap();
+ }
+ }
+
+ public Map<QName, ? extends EventInfo> getProducedEvents()
+ {
+ return produced;
+ }
+
+ public Map<QName, ? extends EventInfo> getConsumedEvents()
+ {
+ return consumed;
+ }
+ }
}
14 years
- 1
- 0
gatein SVN: r3393 - components/wsrp/trunk/test/src/main/java/org/gatein/wsrp/test/support.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-06-20 08:15:10 -0400 (Sun, 20 Jun 2010)
New Revision: 3393
Modified:
components/wsrp/trunk/test/src/main/java/org/gatein/wsrp/test/support/MockHttpServletRequest.java
Log:
- Added some missing methods.
Modified: components/wsrp/trunk/test/src/main/java/org/gatein/wsrp/test/support/MockHttpServletRequest.java
===================================================================
--- components/wsrp/trunk/test/src/main/java/org/gatein/wsrp/test/support/MockHttpServletRequest.java 2010-06-20 12:14:13 UTC (rev 3392)
+++ components/wsrp/trunk/test/src/main/java/org/gatein/wsrp/test/support/MockHttpServletRequest.java 2010-06-20 12:15:10 UTC (rev 3393)
@@ -1,25 +1,25 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2010, Red Hat Middleware, LLC, and individual
+ * contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.gatein.wsrp.test.support;
@@ -134,48 +134,60 @@
public boolean hasMoreElements()
{
- return false;
- }
-
+ return false;
+ }
+
public String nextElement()
{
- return null;
- }
- };
+ return null;
+ }
+ };
}
if ("getCookies".equals(methodName))
{
- return new Cookie[0];
+ return new Cookie[0];
}
if ("getMethod".equals(methodName))
{
- return "GET";
+ return "GET";
}
if ("getContextPath".equals(methodName))
{
- return "/";
+ return "/";
}
if ("getPathInfo".equals(methodName))
{
- return "/";
- }
+ return "/";
+ }
if ("getQueryString".equals(methodName))
{
- return "";
+ return "";
}
if ("getQueryURI".equals(methodName))
{
- return "";
+ return "";
}
if ("getRequestURI".equals(methodName))
{
- return "";
+ return "";
}
if ("getServletPath".equals(methodName))
{
- return "/";
+ return "/";
}
-
+ if ("getAuthType".equals(methodName))
+ {
+ return null;
+ }
+ if ("isSecure".equals(methodName))
+ {
+ return false;
+ }
+ if ("getUserPrincipal".equals(methodName))
+ {
+ return null;
+ }
+
throw new UnsupportedOperationException("MockHttpServletRequest does not support: " + method);
}
}
14 years
- 1
- 0
gatein SVN: r3392 - in components/wsrp/trunk: common/src/main/java/org/gatein/wsrp/spec/v1 and 1 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-06-20 08:14:13 -0400 (Sun, 20 Jun 2010)
New Revision: 3392
Modified:
components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPUtils.java
components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/spec/v1/V2ToV1Converter.java
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v2/MarkupBehavior.java
Log:
- Added WSRPUtils.convertToCommonLocalizedStringOrNull method.
- Renamed WSRPUtils.convertToLocalizedString to convertToRegistrationLocalizedString.
- Fixed NPEs that could occur due to navigationalContext being possibly null.
Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPUtils.java
===================================================================
--- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPUtils.java 2010-06-20 12:09:52 UTC (rev 3391)
+++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPUtils.java 2010-06-20 12:14:13 UTC (rev 3392)
@@ -43,6 +43,7 @@
import org.oasis.wsrp.v2.InteractionParams;
import org.oasis.wsrp.v2.MarkupParams;
import org.oasis.wsrp.v2.NamedString;
+import org.oasis.wsrp.v2.NavigationalContext;
import org.oasis.wsrp.v2.PropertyDescription;
import org.oasis.wsrp.v2.StateChange;
import org.slf4j.Logger;
@@ -369,9 +370,13 @@
{
sb.append("(secure)");
}
- sb.append("[M=").append(params.getMode()).append("][WS=").append(params.getWindowState()).append("]")
- .append("[private NS=").append(params.getNavigationalContext().getOpaqueValue()).append("]")
- .append("[public NS=").append(params.getNavigationalContext().getPublicValues()).append("]");
+ NavigationalContext navigationalContext = params.getNavigationalContext();
+ sb.append("[M=").append(params.getMode()).append("][WS=").append(params.getWindowState()).append("]");
+ if (navigationalContext != null)
+ {
+ sb.append("[private NS=").append(navigationalContext.getOpaqueValue()).append("]")
+ .append("[public NS=").append(navigationalContext.getPublicValues()).append("]");
+ }
return sb.toString();
}
return null;
@@ -456,7 +461,7 @@
}
else
{
- return convertToLocalizedString(wsrpLocalizedString);
+ return convertToRegistrationLocalizedString(wsrpLocalizedString);
}
}
@@ -465,7 +470,7 @@
* @return
* @since 2.6
*/
- public static LocalizedString convertToLocalizedString(org.oasis.wsrp.v2.LocalizedString wsrpLocalizedString)
+ public static LocalizedString convertToRegistrationLocalizedString(org.oasis.wsrp.v2.LocalizedString wsrpLocalizedString)
{
ParameterValidation.throwIllegalArgExceptionIfNull(wsrpLocalizedString, "WSRP LocalizedString");
String lang = wsrpLocalizedString.getLang();
@@ -523,6 +528,17 @@
}
}
+ public static org.gatein.common.i18n.LocalizedString convertToCommonLocalizedStringOrNull(org.oasis.wsrp.v2.LocalizedString wsrpLocalizedString)
+ {
+ if (wsrpLocalizedString != null)
+ {
+ return new org.gatein.common.i18n.LocalizedString(wsrpLocalizedString.getValue(),
+ getLocale(wsrpLocalizedString.getLang()));
+ }
+
+ return null;
+ }
+
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
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-06-20 12:09:52 UTC (rev 3391)
+++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/spec/v1/V2ToV1Converter.java 2010-06-20 12:14:13 UTC (rev 3392)
@@ -94,6 +94,7 @@
import org.oasis.wsrp.v2.ModelDescription;
import org.oasis.wsrp.v2.ModelTypes;
import org.oasis.wsrp.v2.NamedString;
+import org.oasis.wsrp.v2.NavigationalContext;
import org.oasis.wsrp.v2.Online;
import org.oasis.wsrp.v2.PersonName;
import org.oasis.wsrp.v2.PortletContext;
@@ -125,8 +126,6 @@
import org.oasis.wsrp.v2.UserContext;
import org.oasis.wsrp.v2.UserProfile;
-import sun.reflect.generics.visitor.Reifier;
-
import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.List;
@@ -181,7 +180,11 @@
markupParams.getMimeTypes(), markupParams.getMode(), markupParams.getWindowState());
v1MarkupParams.setClientData(toV1ClientData(markupParams.getClientData()));
- v1MarkupParams.setNavigationalState(markupParams.getNavigationalContext().getOpaqueValue());
+ NavigationalContext navigationalContext = markupParams.getNavigationalContext();
+ if (navigationalContext != null)
+ {
+ v1MarkupParams.setNavigationalState(navigationalContext.getOpaqueValue());
+ }
v1MarkupParams.setValidateTag(markupParams.getValidateTag());
List<String> charSets = markupParams.getMarkupCharacterSets();
@@ -992,7 +995,7 @@
{
result = WSRP1TypeFactory.createBlockingInteractionResponse(updateResponse);
}
-
+
List<V1Extension> extensions = WSRPUtils.transform(blockingInteractionResponse.getExtensions(), EXTENSION);
if (extensions != null)
{
@@ -1058,7 +1061,7 @@
{
V1PortletDescriptionResponse result = WSRP1TypeFactory.createPortletDescriptionResponse(toV1PortletDescription(portletDescriptionResponse.getPortletDescription()));
result.setResourceList(toV1ResourceList(portletDescriptionResponse.getResourceList()));
-
+
List<V1Extension> extensions = WSRPUtils.transform(portletDescriptionResponse.getExtensions(), EXTENSION);
if (extensions != null)
{
@@ -1072,7 +1075,7 @@
return null;
}
}
-
+
public static V1PropertyDescription toV1PropertyDescription(PropertyDescription propertyDescription)
{
if (propertyDescription != null)
@@ -1093,7 +1096,7 @@
return null;
}
}
-
+
private static class V2ToV1Extension implements Function<Extension, V1Extension>
{
public V1Extension apply(Extension from)
Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v2/MarkupBehavior.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v2/MarkupBehavior.java 2010-06-20 12:09:52 UTC (rev 3391)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/protocol/v2/MarkupBehavior.java 2010-06-20 12:14:13 UTC (rev 3392)
@@ -46,6 +46,7 @@
import org.oasis.wsrp.v2.MarkupResponse;
import org.oasis.wsrp.v2.MissingParameters;
import org.oasis.wsrp.v2.ModifyRegistrationRequired;
+import org.oasis.wsrp.v2.NavigationalContext;
import org.oasis.wsrp.v2.OperationFailed;
import org.oasis.wsrp.v2.OperationNotSupported;
import org.oasis.wsrp.v2.PortletContext;
@@ -168,9 +169,11 @@
gm.setRuntimeContext(runtimeContext);
gm.setUserContext(userContext);
+ NavigationalContext navigationalContext = markupParams.getNavigationalContext();
String markupString = getMarkupString(WSRPUtils.getJSR168PortletModeFromWSRPName(markupParams.getMode()),
WSRPUtils.getJSR168WindowStateFromWSRPName(markupParams.getWindowState()),
- markupParams.getNavigationalContext().getOpaqueValue(), gm);
+ navigationalContext != null ? navigationalContext.getOpaqueValue() : null,
+ gm);
markupContext.value = WSRPTypeFactory.createMarkupContext(MediaType.TEXT_HTML.getValue(), markupString);
markupContext.value.setRequiresRewriting(Boolean.TRUE);
14 years
- 1
- 0
gatein SVN: r3391 - in components/wsrp/trunk/wsrp-producer-war/src/test: test-portlets/test-basic-portlet-war/WEB-INF and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-06-20 08:09:52 -0400 (Sun, 20 Jun 2010)
New Revision: 3391
Modified:
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java
components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml
Log:
- Added tests for parameter descriptions.
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java 2010-06-19 09:44:10 UTC (rev 3390)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java 2010-06-20 12:09:52 UTC (rev 3391)
@@ -26,7 +26,6 @@
import org.gatein.common.util.ParameterValidation;
import org.gatein.wsrp.producer.WSRPProducerBaseTest;
import org.gatein.wsrp.protocol.v1.NeedPortletHandleTest;
-import org.gatein.wsrp.protocol.v1.V1ProducerBaseTest;
import org.gatein.wsrp.servlet.ServletAccess;
import org.gatein.wsrp.spec.v2.WSRP2Constants;
import org.gatein.wsrp.test.ExtendedAssert;
@@ -43,6 +42,7 @@
import org.oasis.wsrp.v2.EventDescription;
import org.oasis.wsrp.v2.InvalidRegistration;
import org.oasis.wsrp.v2.OperationFailed;
+import org.oasis.wsrp.v2.ParameterDescription;
import org.oasis.wsrp.v2.PortletDescription;
import org.oasis.wsrp.v2.ServiceDescription;
@@ -195,21 +195,52 @@
}
- /*@Test
+ @Test
public void testParameterDescriptions() throws Exception
{
try
{
- deploy("google-portlet.war");
+ deploy("test-basic-portlet.war");
ServiceDescription description = producer.getServiceDescription(getNoRegistrationServiceDescriptionRequest());
- description.get
+ List<PortletDescription> portlets = description.getOfferedPortlets();
+ ExtendedAssert.assertEquals(1, portlets.size());
+ PortletDescription portlet = portlets.get(0);
+ QName fooparam = new QName("urn:jboss:gatein", "fooparam");
+ QName zipcode = new QName("urn:jboss:portal:simple:google", "zipcode");
+
+ List<ParameterDescription> publicValueDescriptions = portlet.getNavigationalPublicValueDescriptions();
+ ExtendedAssert.assertNotNull(publicValueDescriptions);
+ ExtendedAssert.assertEquals(2, publicValueDescriptions.size());
+ for (ParameterDescription param : publicValueDescriptions)
+ {
+ String identifier = param.getIdentifier();
+ if ("foo".equals(identifier))
+ {
+ List<QName> names = param.getNames();
+ ExtendedAssert.assertTrue(names.contains(fooparam));
+ ExtendedAssert.assertTrue(names.contains(new QName("urn:jboss:gatein", "barparam")));
+ ExtendedAssert.assertTrue(names.contains(new QName("urn:jboss:gatein", "bazparam")));
+ ExtendedAssert.assertEquals(identifier, param.getLabel().getValue());
+ ExtendedAssert.assertEquals("Foo param", param.getDescription().getValue());
+ }
+ else if ("zipcode".equals(identifier))
+ {
+ List<QName> names = param.getNames();
+ ExtendedAssert.assertEquals(1, names.size());
+ ExtendedAssert.assertTrue(names.contains(zipcode));
+ }
+ else
+ {
+ ExtendedAssert.fail("Unexpected parameter description: " + identifier);
+ }
+ }
}
finally
{
- undeploy("google-portlet.war");
+ undeploy("test-basic-portlet.war");
}
- }*/
+ }
}
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml 2010-06-19 09:44:10 UTC (rev 3390)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-basic-portlet-war/WEB-INF/portlet.xml 2010-06-20 12:09:52 UTC (rev 3391)
@@ -60,6 +60,7 @@
<qname xmlns:jbp='urn:jboss:portal:samples:event'>jbp:ZipEvent</qname>
</supported-processing-event>
<supported-public-render-parameter>zipcode</supported-public-render-parameter>
+ <supported-public-render-parameter>foo</supported-public-render-parameter>
</portlet>
<event-definition>
@@ -79,7 +80,10 @@
</public-render-parameter>
<public-render-parameter>
<identifier>foo</identifier>
- <qname xmlns:gtn='urn:jboss:gatein'>gtn:foo</qname>
+ <qname xmlns:gtn='urn:jboss:gatein'>gtn:fooparam</qname>
+ <description>Foo param</description>
+ <alias xmlns:gtn='urn:jboss:gatein'>gtn:barparam</alias>
+ <alias xmlns:gtn='urn:jboss:gatein'>gtn:bazparam</alias>
</public-render-parameter>
<container-runtime-option>
14 years
- 1
- 0
gatein SVN: r3390 - in portal/trunk: component and 69 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-06-19 05:44:10 -0400 (Sat, 19 Jun 2010)
New Revision: 3390
Modified:
portal/trunk/component/application-registry/pom.xml
portal/trunk/component/common/pom.xml
portal/trunk/component/dashboard/pom.xml
portal/trunk/component/identity/pom.xml
portal/trunk/component/management/pom.xml
portal/trunk/component/pc/pom.xml
portal/trunk/component/pom.xml
portal/trunk/component/portal/pom.xml
portal/trunk/component/resources/pom.xml
portal/trunk/component/scripting/pom.xml
portal/trunk/component/test/core/pom.xml
portal/trunk/component/test/jcr/pom.xml
portal/trunk/component/test/organization/pom.xml
portal/trunk/component/test/pom.xml
portal/trunk/component/web/pom.xml
portal/trunk/component/wsrp/pom.xml
portal/trunk/component/xml-parser/pom.xml
portal/trunk/examples/extension/config/pom.xml
portal/trunk/examples/extension/ear/pom.xml
portal/trunk/examples/extension/jar/pom.xml
portal/trunk/examples/extension/pom.xml
portal/trunk/examples/extension/war/pom.xml
portal/trunk/examples/pom.xml
portal/trunk/examples/portal/config/pom.xml
portal/trunk/examples/portal/ear/pom.xml
portal/trunk/examples/portal/jar/pom.xml
portal/trunk/examples/portal/pom.xml
portal/trunk/examples/portal/rest-war/pom.xml
portal/trunk/examples/portal/war/pom.xml
portal/trunk/examples/portlets/jsfhellouser/pom.xml
portal/trunk/examples/portlets/jsphellouser/pom.xml
portal/trunk/examples/portlets/pom.xml
portal/trunk/examples/portlets/simplesthelloworld/pom.xml
portal/trunk/examples/portlets/struts-jpetstore/pom.xml
portal/trunk/examples/skins/pom.xml
portal/trunk/examples/skins/simpleskin/pom.xml
portal/trunk/gadgets/core/pom.xml
portal/trunk/gadgets/eXoGadgets/pom.xml
portal/trunk/gadgets/pom.xml
portal/trunk/gadgets/server/pom.xml
portal/trunk/packaging/module/pom.xml
portal/trunk/packaging/pkg/pom.xml
portal/trunk/packaging/pom.xml
portal/trunk/packaging/product/pom.xml
portal/trunk/packaging/reports/pom.xml
portal/trunk/pom.xml
portal/trunk/portlet/dashboard/pom.xml
portal/trunk/portlet/exoadmin/pom.xml
portal/trunk/portlet/pom.xml
portal/trunk/portlet/web/pom.xml
portal/trunk/server/jboss/patch-ear/pom.xml
portal/trunk/server/jboss/plugin/pom.xml
portal/trunk/server/jboss/pom.xml
portal/trunk/server/pom.xml
portal/trunk/server/tomcat/patch/pom.xml
portal/trunk/server/tomcat/plugin/pom.xml
portal/trunk/server/tomcat/pom.xml
portal/trunk/starter/ear/pom.xml
portal/trunk/starter/pom.xml
portal/trunk/starter/war/pom.xml
portal/trunk/testsuite/pom.xml
portal/trunk/testsuite/selenium-snifftests/pom.xml
portal/trunk/testsuite/webuibasedsamples/pom.xml
portal/trunk/web/eXoResources/pom.xml
portal/trunk/web/pom.xml
portal/trunk/web/portal/pom.xml
portal/trunk/web/rest/pom.xml
portal/trunk/webui/core/pom.xml
portal/trunk/webui/eXo/pom.xml
portal/trunk/webui/pom.xml
portal/trunk/webui/portal/pom.xml
Log:
Should have been a SNAPSHOT
Modified: portal/trunk/component/application-registry/pom.xml
===================================================================
--- portal/trunk/component/application-registry/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/component/application-registry/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/component/common/pom.xml
===================================================================
--- portal/trunk/component/common/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/component/common/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.portal.component.common</artifactId>
Modified: portal/trunk/component/dashboard/pom.xml
===================================================================
--- portal/trunk/component/dashboard/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/component/dashboard/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/component/identity/pom.xml
===================================================================
--- portal/trunk/component/identity/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/component/identity/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/component/management/pom.xml
===================================================================
--- portal/trunk/component/management/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/component/management/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/component/pc/pom.xml
===================================================================
--- portal/trunk/component/pc/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/component/pc/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/component/pom.xml
===================================================================
--- portal/trunk/component/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/component/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.component</artifactId>
Modified: portal/trunk/component/portal/pom.xml
===================================================================
--- portal/trunk/component/portal/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/component/portal/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/component/resources/pom.xml
===================================================================
--- portal/trunk/component/resources/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/component/resources/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/component/scripting/pom.xml
===================================================================
--- portal/trunk/component/scripting/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/component/scripting/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/component/test/core/pom.xml
===================================================================
--- portal/trunk/component/test/core/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/component/test/core/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/component/test/jcr/pom.xml
===================================================================
--- portal/trunk/component/test/jcr/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/component/test/jcr/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/component/test/organization/pom.xml
===================================================================
--- portal/trunk/component/test/organization/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/component/test/organization/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/component/test/pom.xml
===================================================================
--- portal/trunk/component/test/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/component/test/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/component/web/pom.xml
===================================================================
--- portal/trunk/component/web/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/component/web/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/component/wsrp/pom.xml
===================================================================
--- portal/trunk/component/wsrp/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/component/wsrp/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/component/xml-parser/pom.xml
===================================================================
--- portal/trunk/component/xml-parser/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/component/xml-parser/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/examples/extension/config/pom.xml
===================================================================
--- portal/trunk/examples/extension/config/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/examples/extension/config/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/examples/extension/ear/pom.xml
===================================================================
--- portal/trunk/examples/extension/ear/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/examples/extension/ear/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,23 +37,23 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.config</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.jar</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.war</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: portal/trunk/examples/extension/jar/pom.xml
===================================================================
--- portal/trunk/examples/extension/jar/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/examples/extension/jar/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/examples/extension/pom.xml
===================================================================
--- portal/trunk/examples/extension/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/examples/extension/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample.extension.root</artifactId>
Modified: portal/trunk/examples/extension/war/pom.xml
===================================================================
--- portal/trunk/examples/extension/war/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/examples/extension/war/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/examples/pom.xml
===================================================================
--- portal/trunk/examples/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/examples/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample</artifactId>
Modified: portal/trunk/examples/portal/config/pom.xml
===================================================================
--- portal/trunk/examples/portal/config/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/examples/portal/config/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/examples/portal/ear/pom.xml
===================================================================
--- portal/trunk/examples/portal/ear/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/examples/portal/ear/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,29 +37,29 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.config</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.jar</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.war</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.rest-war</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: portal/trunk/examples/portal/jar/pom.xml
===================================================================
--- portal/trunk/examples/portal/jar/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/examples/portal/jar/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/examples/portal/pom.xml
===================================================================
--- portal/trunk/examples/portal/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/examples/portal/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample.portal.root</artifactId>
Modified: portal/trunk/examples/portal/rest-war/pom.xml
===================================================================
--- portal/trunk/examples/portal/rest-war/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/examples/portal/rest-war/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/examples/portal/war/pom.xml
===================================================================
--- portal/trunk/examples/portal/war/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/examples/portal/war/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/examples/portlets/jsfhellouser/pom.xml
===================================================================
--- portal/trunk/examples/portlets/jsfhellouser/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/examples/portlets/jsfhellouser/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsf-hellouser</artifactId>
Modified: portal/trunk/examples/portlets/jsphellouser/pom.xml
===================================================================
--- portal/trunk/examples/portlets/jsphellouser/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/examples/portlets/jsphellouser/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsp-hellouser</artifactId>
Modified: portal/trunk/examples/portlets/pom.xml
===================================================================
--- portal/trunk/examples/portlets/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/examples/portlets/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
Modified: portal/trunk/examples/portlets/simplesthelloworld/pom.xml
===================================================================
--- portal/trunk/examples/portlets/simplesthelloworld/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/examples/portlets/simplesthelloworld/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>gatein-simplest-helloworld</artifactId>
Modified: portal/trunk/examples/portlets/struts-jpetstore/pom.xml
===================================================================
--- portal/trunk/examples/portlets/struts-jpetstore/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/examples/portlets/struts-jpetstore/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>struts-jpetstore</artifactId>
Modified: portal/trunk/examples/skins/pom.xml
===================================================================
--- portal/trunk/examples/skins/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/examples/skins/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<groupId>org.gatein.portal.examples.skins</groupId>
Modified: portal/trunk/examples/skins/simpleskin/pom.xml
===================================================================
--- portal/trunk/examples/skins/simpleskin/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/examples/skins/simpleskin/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.portal.examples.skins</groupId>
<artifactId>parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>gatein-sample-skin</artifactId>
Modified: portal/trunk/gadgets/core/pom.xml
===================================================================
--- portal/trunk/gadgets/core/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/gadgets/core/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -14,7 +14,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-core</artifactId>
Modified: portal/trunk/gadgets/eXoGadgets/pom.xml
===================================================================
--- portal/trunk/gadgets/eXoGadgets/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/gadgets/eXoGadgets/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/gadgets/pom.xml
===================================================================
--- portal/trunk/gadgets/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/gadgets/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets</artifactId>
Modified: portal/trunk/gadgets/server/pom.xml
===================================================================
--- portal/trunk/gadgets/server/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/gadgets/server/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-server</artifactId>
Modified: portal/trunk/packaging/module/pom.xml
===================================================================
--- portal/trunk/packaging/module/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/packaging/module/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/packaging/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/pkg/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/packaging/pkg/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -67,13 +67,13 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>portal.packaging.module</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
<type>js</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>portal.packaging.product</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
<type>js</type>
</dependency>
</dependencies>
Modified: portal/trunk/packaging/pom.xml
===================================================================
--- portal/trunk/packaging/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/packaging/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/packaging/product/pom.xml
===================================================================
--- portal/trunk/packaging/product/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/packaging/product/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/packaging/reports/pom.xml
===================================================================
--- portal/trunk/packaging/reports/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/packaging/reports/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -31,7 +31,7 @@
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GateIn - Portal</name>
@@ -307,110 +307,110 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.pc</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.application-registry</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.xml-parser</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.scripting</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.dashboard</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.core</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-core</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
Modified: portal/trunk/portlet/dashboard/pom.xml
===================================================================
--- portal/trunk/portlet/dashboard/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/portlet/dashboard/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/portlet/exoadmin/pom.xml
===================================================================
--- portal/trunk/portlet/exoadmin/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/portlet/exoadmin/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/portlet/pom.xml
===================================================================
--- portal/trunk/portlet/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/portlet/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.portlet</artifactId>
Modified: portal/trunk/portlet/web/pom.xml
===================================================================
--- portal/trunk/portlet/web/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/portlet/web/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/server/jboss/patch-ear/pom.xml
===================================================================
--- portal/trunk/server/jboss/patch-ear/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/server/jboss/patch-ear/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/server/jboss/plugin/pom.xml
===================================================================
--- portal/trunk/server/jboss/plugin/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/server/jboss/plugin/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/server/jboss/pom.xml
===================================================================
--- portal/trunk/server/jboss/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/server/jboss/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server.jboss</artifactId>
Modified: portal/trunk/server/pom.xml
===================================================================
--- portal/trunk/server/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/server/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server</artifactId>
Modified: portal/trunk/server/tomcat/patch/pom.xml
===================================================================
--- portal/trunk/server/tomcat/patch/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/server/tomcat/patch/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.tomcat</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/server/tomcat/plugin/pom.xml
===================================================================
--- portal/trunk/server/tomcat/plugin/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/server/tomcat/plugin/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.tomcat</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/server/tomcat/pom.xml
===================================================================
--- portal/trunk/server/tomcat/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/server/tomcat/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server.tomcat</artifactId>
Modified: portal/trunk/starter/ear/pom.xml
===================================================================
--- portal/trunk/starter/ear/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/starter/ear/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.starter.war</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: portal/trunk/starter/pom.xml
===================================================================
--- portal/trunk/starter/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/starter/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.starter.root</artifactId>
Modified: portal/trunk/starter/war/pom.xml
===================================================================
--- portal/trunk/starter/war/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/starter/war/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/testsuite/pom.xml
===================================================================
--- portal/trunk/testsuite/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/testsuite/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.testsuite</artifactId>
Modified: portal/trunk/testsuite/selenium-snifftests/pom.xml
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/testsuite/selenium-snifftests/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.selenium.snifftests</artifactId>
Modified: portal/trunk/testsuite/webuibasedsamples/pom.xml
===================================================================
--- portal/trunk/testsuite/webuibasedsamples/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/testsuite/webuibasedsamples/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.webui.based.samples</artifactId>
Modified: portal/trunk/web/eXoResources/pom.xml
===================================================================
--- portal/trunk/web/eXoResources/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/web/eXoResources/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/web/pom.xml
===================================================================
--- portal/trunk/web/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/web/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.web</artifactId>
Modified: portal/trunk/web/portal/pom.xml
===================================================================
--- portal/trunk/web/portal/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/web/portal/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/web/rest/pom.xml
===================================================================
--- portal/trunk/web/rest/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/web/rest/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/webui/core/pom.xml
===================================================================
--- portal/trunk/webui/core/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/webui/core/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/webui/eXo/pom.xml
===================================================================
--- portal/trunk/webui/eXo/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/webui/eXo/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portal/trunk/webui/pom.xml
===================================================================
--- portal/trunk/webui/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/webui/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.webui</artifactId>
Modified: portal/trunk/webui/portal/pom.xml
===================================================================
--- portal/trunk/webui/portal/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
+++ portal/trunk/webui/portal/pom.xml 2010-06-19 09:44:10 UTC (rev 3390)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>3.2.0-Beta01</version>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
14 years
- 1
- 0
gatein SVN: r3389 - in components/wsrp/trunk: wsrp-producer-war and 4 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-06-18 18:36:00 -0400 (Fri, 18 Jun 2010)
New Revision: 3389
Modified:
components/wsrp/trunk/hibernate-impl/
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-applicationscope-portlet.xml
components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-basic-portlet.xml
components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-dispatcher-portlet.xml
components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-encodeurl-portlet.xml
components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-getlocales-portlet.xml
components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-implicitcloning-portlet.xml
components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-markup-portlet.xml
components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-multivalued-portlet.xml
components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml
components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-renderparam-portlet.xml
components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resource-portlet.xml
components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resourcenoencodeurl-portlet.xml
components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-session-portlet.xml
components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-usercontext-portlet.xml
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/PortletManagementTestCase.java
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/RegistrationTestCase.java
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ReleaseSessionTestCase.java
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ServiceDescriptionTestCase.java
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java
components/wsrp/trunk/wsrp2-ws/
Log:
GTNWSRP-46: properly separating out the tests to be more independent. A few steps closer to being able to run the tests independently through a ide.
Added a few target dirs to svn:ignore (ie wsrp-wsrp2-ws and hibernate-impl).
Property changes on: components/wsrp/trunk/hibernate-impl
___________________________________________________________________
Name: svn:ignore
+ target
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-18 22:36:00 UTC (rev 3389)
@@ -106,6 +106,64 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>start-test-server</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>1.0.1</version>
+ <configuration>
+<!-- <container>-->
+ <!--<containerId>jboss51x</containerId>
+ <home>${JBOSS_HOME}</home>
+ <log>${basedir}/target/jboss51x/container.log</log>
+ <systemProperties>-->
+ <!-- Since the tests run on the server, we need to pass system properties to the
+ server so that the tests can use them. -->
+ <!-- The tests need to deploy and undeploy artifacts during the test so we need to pass
+ properties to enable this behaviour. -->
+<!-- <jboss.deploy.dir>${jboss.server.home.dir}/conf</jboss.deploy.dir>
+ <test.deployables.dir>${basedir}/target/test-archives</test.deployables.dir>
+ <jboss.deploy.url.prefix>http://localhost:8080/jmx-console/HtmlAdaptor?action=invokeOpByName&n...</jboss.deploy.url.prefix>
+ <jboss.undeploy.url.prefix>http://localhost:8080//jmx-console/HtmlAdaptor?action=invokeOpByName&...</jboss.undeploy.url.prefix>
+ </systemProperties>
+ </container>-->
+ <wait>true</wait>
+<!-- <configuration>
+ <home>${basedir}/target/cargo/standalone</home>
+ <properties>
+ <cargo.logging>low</cargo.logging>
+ <cargo.jvmargs>${cargo.jvmargs}</cargo.jvmargs>
+ </properties>
+ <deployables>
+ <deployable>
+ <location>${basedir}/target/test-archives/test-producer.sar</location>
+ <type>sar</type>
+ </deployable>
+ </deployables>
+ <configfiles>
+ <configfile>
+ <file>${JBOSS_HOME}/server/default/conf/jboss-log4j.xml</file>
+ <tofile>/conf/jboss-log4j.xml</tofile>
+ </configfile>
+ </configfiles>
+ </configuration>-->
+ </configuration>
+<!-- <executions>
+ <execution>
+ <id>pre-integration-test</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ </execution>
+ </executions> -->
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<dependencies>
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-applicationscope-portlet.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-applicationscope-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-applicationscope-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389)
@@ -7,12 +7,11 @@
<fileSets>
<!-- Test Classes -->
- <!-- TODO: we probably shouldn't be using all of these classes here -->
<fileSet>
<directory>target/test-classes</directory>
- <outputDirectory></outputDirectory>
+ <outputDirectory>WEB-INF/classes</outputDirectory>
<includes>
- <include>org/**MarkupPortlet.java</include>
+ <include>org/gatein/wsrp/portlet/**</include>
</includes>
</fileSet>
<!-- Fileset for the sar strucuture -->
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-basic-portlet.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-basic-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-basic-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389)
@@ -7,12 +7,11 @@
<fileSets>
<!-- Test Classes -->
- <!-- TODO: we probably shouldn't be using all of these classes here -->
<fileSet>
<directory>target/test-classes</directory>
- <outputDirectory></outputDirectory>
+ <outputDirectory>WEB-INF/classes</outputDirectory>
<includes>
- <include>org/**MarkupPortlet.java</include>
+ <include>org/gatein/wsrp/portlet/BasicPortlet.class</include>
</includes>
</fileSet>
<!-- Fileset for the sar strucuture -->
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-dispatcher-portlet.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-dispatcher-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-dispatcher-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389)
@@ -7,12 +7,11 @@
<fileSets>
<!-- Test Classes -->
- <!-- TODO: we probably shouldn't be using all of these classes here -->
<fileSet>
<directory>target/test-classes</directory>
- <outputDirectory></outputDirectory>
+ <outputDirectory>WEB-INF/classes</outputDirectory>
<includes>
- <include>org/**MarkupPortlet.java</include>
+ <include>org/gatein/wsrp/portlet/DispatcherPortlet.class</include>
</includes>
</fileSet>
<!-- Fileset for the sar strucuture -->
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-encodeurl-portlet.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-encodeurl-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-encodeurl-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389)
@@ -7,12 +7,11 @@
<fileSets>
<!-- Test Classes -->
- <!-- TODO: we probably shouldn't be using all of these classes here -->
<fileSet>
<directory>target/test-classes</directory>
- <outputDirectory></outputDirectory>
+ <outputDirectory>WEB-INF/classes</outputDirectory>
<includes>
- <include>org/**MarkupPortlet.java</include>
+ <include>org/gatein/wsrp/portlet/EncodeURLPortlet.class</include>
</includes>
</fileSet>
<!-- Fileset for the sar strucuture -->
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-getlocales-portlet.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-getlocales-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-getlocales-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389)
@@ -7,12 +7,11 @@
<fileSets>
<!-- Test Classes -->
- <!-- TODO: we probably shouldn't be using all of these classes here -->
<fileSet>
<directory>target/test-classes</directory>
- <outputDirectory></outputDirectory>
+ <outputDirectory>WEB-INF/classes</outputDirectory>
<includes>
- <include>org/**MarkupPortlet.java</include>
+ <include>org/gatein/wsrp/portlet/GetLocalesPortlet.class</include>
</includes>
</fileSet>
<!-- Fileset for the sar strucuture -->
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-implicitcloning-portlet.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-implicitcloning-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-implicitcloning-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389)
@@ -7,12 +7,11 @@
<fileSets>
<!-- Test Classes -->
- <!-- TODO: we probably shouldn't be using all of these classes here -->
<fileSet>
<directory>target/test-classes</directory>
- <outputDirectory></outputDirectory>
+ <outputDirectory>WEB-INF/classes</outputDirectory>
<includes>
- <include>org/**MarkupPortlet.java</include>
+ <include>org/gatein/wsrp/portlet/ImplicitCloningPortlet.class</include>
</includes>
</fileSet>
<!-- Fileset for the sar strucuture -->
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-markup-portlet.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-markup-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-markup-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389)
@@ -7,12 +7,11 @@
<fileSets>
<!-- Test Classes -->
- <!-- TODO: we probably shouldn't be using all of these classes here -->
<fileSet>
<directory>target/test-classes</directory>
- <outputDirectory></outputDirectory>
+ <outputDirectory>WEB-INF/classes</outputDirectory>
<includes>
- <include>org/**MarkupPortlet.java</include>
+ <include>org/gatein/wsrp/portlet/MarkupPortlet.class</include>
</includes>
</fileSet>
<!-- Fileset for the sar strucuture -->
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-multivalued-portlet.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-multivalued-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-multivalued-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389)
@@ -7,12 +7,11 @@
<fileSets>
<!-- Test Classes -->
- <!-- TODO: we probably shouldn't be using all of these classes here -->
<fileSet>
<directory>target/test-classes</directory>
- <outputDirectory></outputDirectory>
+ <outputDirectory>WEB-INF/classes</outputDirectory>
<includes>
- <include>org/**MarkupPortlet.java</include>
+ <include>org/gatein/wsrp/portlet/MultiValuedPortlet.class</include>
</includes>
</fileSet>
<!-- Fileset for the sar strucuture -->
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 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml 2010-06-18 22:36:00 UTC (rev 3389)
@@ -7,12 +7,11 @@
<fileSets>
<!-- Test Classes -->
- <!-- TODO: we probably shouldn't be using all of these classes here -->
<fileSet>
<directory>target/test-classes</directory>
<outputDirectory></outputDirectory>
<includes>
- <include>org/**</include>
+ <include>org/gatein/wsrp/config/**</include>
</includes>
</fileSet>
<!-- Fileset for the sar strucuture -->
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-renderparam-portlet.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-renderparam-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-renderparam-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389)
@@ -7,12 +7,11 @@
<fileSets>
<!-- Test Classes -->
- <!-- TODO: we probably shouldn't be using all of these classes here -->
<fileSet>
<directory>target/test-classes</directory>
- <outputDirectory></outputDirectory>
+ <outputDirectory>WEB-INF/classes</outputDirectory>
<includes>
- <include>org/**MarkupPortlet.java</include>
+ <include>org/gatein/wsrp/portlet/RenderParamPortlet.class</include>
</includes>
</fileSet>
<!-- Fileset for the sar strucuture -->
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resource-portlet.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resource-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resource-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389)
@@ -7,12 +7,11 @@
<fileSets>
<!-- Test Classes -->
- <!-- TODO: we probably shouldn't be using all of these classes here -->
<fileSet>
<directory>target/test-classes</directory>
- <outputDirectory></outputDirectory>
+ <outputDirectory>WEB-INF/classes</outputDirectory>
<includes>
- <include>org/**MarkupPortlet.java</include>
+ <include>org/gatein/wsrp/portlet/ResourcePortlet.class</include>
</includes>
</fileSet>
<!-- Fileset for the sar strucuture -->
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resourcenoencodeurl-portlet.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resourcenoencodeurl-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-resourcenoencodeurl-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389)
@@ -7,12 +7,11 @@
<fileSets>
<!-- Test Classes -->
- <!-- TODO: we probably shouldn't be using all of these classes here -->
<fileSet>
<directory>target/test-classes</directory>
- <outputDirectory></outputDirectory>
+ <outputDirectory>WEB-INF/classes</outputDirectory>
<includes>
- <include>org/**MarkupPortlet.java</include>
+ <include>org/gatein/wsrp/portlet/ResourceNoEncodeURLPortlet.class</include>
</includes>
</fileSet>
<!-- Fileset for the sar strucuture -->
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-session-portlet.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-session-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-session-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389)
@@ -7,12 +7,11 @@
<fileSets>
<!-- Test Classes -->
- <!-- TODO: we probably shouldn't be using all of these classes here -->
<fileSet>
<directory>target/test-classes</directory>
- <outputDirectory></outputDirectory>
+ <outputDirectory>WEB-INF/classes</outputDirectory>
<includes>
- <include>org/**MarkupPortlet.java</include>
+ <include>org/gatein/wsrp/portlet/SessionPortlet.class</include>
</includes>
</fileSet>
<!-- Fileset for the sar strucuture -->
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-usercontext-portlet.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-usercontext-portlet.xml 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-usercontext-portlet.xml 2010-06-18 22:36:00 UTC (rev 3389)
@@ -7,12 +7,11 @@
<fileSets>
<!-- Test Classes -->
- <!-- TODO: we probably shouldn't be using all of these classes here -->
<fileSet>
<directory>target/test-classes</directory>
- <outputDirectory></outputDirectory>
+ <outputDirectory>WEB-INF/classes</outputDirectory>
<includes>
- <include>org/**MarkupPortlet.java</include>
+ <include>org/gatein/wsrp/portlet/UserContextPortlet.class</include>
</includes>
</fileSet>
<!-- Fileset for the sar strucuture -->
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java 2010-06-18 22:36:00 UTC (rev 3389)
@@ -27,6 +27,7 @@
import org.gatein.wsrp.WSRPConstants;
import org.gatein.wsrp.WSRPPortletURL;
import org.gatein.wsrp.WSRPRenderURL;
+import org.gatein.wsrp.producer.WSRPProducerBaseTest;
import org.gatein.wsrp.spec.v1.WSRP1TypeFactory;
import org.gatein.wsrp.servlet.ServletAccess;
import org.gatein.wsrp.test.ExtendedAssert;
@@ -83,7 +84,11 @@
@Deployment
public static JavaArchive createDeployment()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class);
+ JavaArchive jar = ShrinkWrap.create("test.jar", JavaArchive.class);
+ jar.addClass(NeedPortletHandleTest.class);
+ jar.addClass(V1ProducerBaseTest.class);
+ jar.addClass(WSRPProducerBaseTest.class);
+ return jar;
}
@Before
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/PortletManagementTestCase.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/PortletManagementTestCase.java 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/PortletManagementTestCase.java 2010-06-18 22:36:00 UTC (rev 3389)
@@ -24,6 +24,7 @@
package org.gatein.wsrp.protocol.v1;
import org.gatein.wsrp.WSRPConstants;
+import org.gatein.wsrp.producer.WSRPProducerBaseTest;
import org.gatein.wsrp.servlet.ServletAccess;
import org.gatein.wsrp.spec.v1.WSRP1TypeFactory;
import org.gatein.wsrp.test.ExtendedAssert;
@@ -83,7 +84,11 @@
@Deployment
public static JavaArchive createDeployment()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class);
+ JavaArchive jar = ShrinkWrap.create("test.jar", JavaArchive.class);
+ jar.addClass(NeedPortletHandleTest.class);
+ jar.addClass(V1ProducerBaseTest.class);
+ jar.addClass(WSRPProducerBaseTest.class);
+ return jar;
}
@Before
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/RegistrationTestCase.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/RegistrationTestCase.java 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/RegistrationTestCase.java 2010-06-18 22:36:00 UTC (rev 3389)
@@ -28,6 +28,7 @@
import org.gatein.registration.RegistrationManager;
import org.gatein.wsrp.WSRPConstants;
import org.gatein.wsrp.WSRPUtils;
+import org.gatein.wsrp.producer.WSRPProducerBaseTest;
import org.gatein.wsrp.registration.RegistrationPropertyDescription;
import org.gatein.wsrp.servlet.ServletAccess;
import org.gatein.wsrp.spec.v1.WSRP1TypeFactory;
@@ -71,7 +72,11 @@
@Deployment
public static JavaArchive createDeployment()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class);
+ JavaArchive jar = ShrinkWrap.create("test.jar", JavaArchive.class);
+ jar.addClass(NeedPortletHandleTest.class);
+ jar.addClass(V1ProducerBaseTest.class);
+ jar.addClass(WSRPProducerBaseTest.class);
+ return jar;
}
@Before
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ReleaseSessionTestCase.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ReleaseSessionTestCase.java 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ReleaseSessionTestCase.java 2010-06-18 22:36:00 UTC (rev 3389)
@@ -23,6 +23,7 @@
package org.gatein.wsrp.protocol.v1;
+import org.gatein.wsrp.producer.WSRPProducerBaseTest;
import org.gatein.wsrp.servlet.ServletAccess;
import org.gatein.wsrp.spec.v1.WSRP1TypeFactory;
import org.gatein.wsrp.test.ExtendedAssert;
@@ -73,7 +74,11 @@
@Deployment
public static JavaArchive createDeployment()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class);
+ JavaArchive jar = ShrinkWrap.create("test.jar", JavaArchive.class);
+ jar.addClass(NeedPortletHandleTest.class);
+ jar.addClass(V1ProducerBaseTest.class);
+ jar.addClass(WSRPProducerBaseTest.class);
+ return jar;
}
@Before
@@ -142,6 +147,7 @@
// so we need to wait for the proper case to init the registration context... Hackish! :(
if (index == 0)
{
+ System.out.println("REGISTRATIONCONTEXT : " + releaseSessions.getRegistrationContext());
releaseSessions.setRegistrationContext(registerConsumer());
}
}
@@ -152,9 +158,14 @@
catch (V1OperationFailed operationFailedFault)
{
// expected fault.
+ operationFailedFault.printStackTrace();
}
finally
{
+ if (index == 0 && useRegistration)
+ {
+ releaseSessions.setRegistrationContext(null);
+ }
tearDown();
}
}
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ServiceDescriptionTestCase.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ServiceDescriptionTestCase.java 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/ServiceDescriptionTestCase.java 2010-06-18 22:36:00 UTC (rev 3389)
@@ -30,6 +30,7 @@
package org.gatein.wsrp.protocol.v1;
import org.gatein.wsrp.WSRPUtils;
+import org.gatein.wsrp.producer.WSRPProducerBaseTest;
import org.gatein.wsrp.protocol.v1.V1ProducerBaseTest;
import org.gatein.wsrp.registration.RegistrationPropertyDescription;
import org.gatein.wsrp.servlet.ServletAccess;
@@ -71,7 +72,11 @@
@Deployment
public static JavaArchive createDeployment()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class);
+ JavaArchive jar = ShrinkWrap.create("test.jar", JavaArchive.class);
+ jar.addClass(NeedPortletHandleTest.class);
+ jar.addClass(V1ProducerBaseTest.class);
+ jar.addClass(WSRPProducerBaseTest.class);
+ return jar;
}
@Before
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java 2010-06-18 19:00:26 UTC (rev 3388)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java 2010-06-18 22:36:00 UTC (rev 3389)
@@ -24,6 +24,9 @@
package org.gatein.wsrp.protocol.v2;
import org.gatein.common.util.ParameterValidation;
+import org.gatein.wsrp.producer.WSRPProducerBaseTest;
+import org.gatein.wsrp.protocol.v1.NeedPortletHandleTest;
+import org.gatein.wsrp.protocol.v1.V1ProducerBaseTest;
import org.gatein.wsrp.servlet.ServletAccess;
import org.gatein.wsrp.spec.v2.WSRP2Constants;
import org.gatein.wsrp.test.ExtendedAssert;
@@ -61,7 +64,11 @@
@Deployment
public static JavaArchive createDeployment()
{
- return ShrinkWrap.create("test.jar", JavaArchive.class);
+ JavaArchive jar = ShrinkWrap.create("test.jar", JavaArchive.class);
+ jar.addClass(NeedPortletHandleTest.class);
+ jar.addClass(V2ProducerBaseTest.class);
+ jar.addClass(WSRPProducerBaseTest.class);
+ return jar;
}
@Before
Property changes on: components/wsrp/trunk/wsrp2-ws
___________________________________________________________________
Name: svn:ignore
+ target
14 years
- 1
- 0
gatein SVN: r3388 - components/wsrp/trunk/wsrp-producer-war.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-06-18 15:00:26 -0400 (Fri, 18 Jun 2010)
New Revision: 3388
Modified:
components/wsrp/trunk/wsrp-producer-war/pom.xml
Log:
GTNWSRP-46: test to see if this will get around a hudson bug.
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-18 18:48:31 UTC (rev 3387)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-06-18 19:00:26 UTC (rev 3388)
@@ -69,6 +69,7 @@
</property>
</activation>
<properties>
+ <jboss.systemPath>${jboss.zip.url}</jboss.systemPath>
<JBOSS_HOME>${project.build.directory}/cargo/servers/jboss-5.1.0.GA</JBOSS_HOME>
</properties>
<dependencies>
@@ -78,7 +79,7 @@
<version>5.1.0.GA</version>
<scope>system</scope>
<type>zip</type>
- <systemPath>${jboss.zip.url}</systemPath>
+ <systemPath>${jboss.systemPath}</systemPath>
</dependency>
</dependencies>
<build>
14 years
- 1
- 0
gatein SVN: r3387 - in components/wsrp/trunk: producer/src/test/java/org/gatein/wsrp/protocol and 2 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-06-18 14:48:31 -0400 (Fri, 18 Jun 2010)
New Revision: 3387
Removed:
components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/WSRPProducerBaseTest.java
components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/protocol/v1/
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/registration/
Modified:
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/RegistrationTestCase.java
Log:
GTNWSRP-46: Clean up duplicate tests.
Deleted: components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/WSRPProducerBaseTest.java
===================================================================
--- components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/WSRPProducerBaseTest.java 2010-06-18 17:36:40 UTC (rev 3386)
+++ components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/WSRPProducerBaseTest.java 2010-06-18 18:48:31 UTC (rev 3387)
@@ -1,130 +0,0 @@
-/*
- * JBoss, a division of Red Hat
- * Copyright 2010, Red Hat Middleware, LLC, and individual
- * contributors as indicated by the @authors tag. See the
- * copyright.txt in the distribution for a full listing of
- * individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.gatein.wsrp.producer;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.nio.channels.FileChannel;
-
-import junit.framework.TestCase;
-import org.gatein.common.NotYetImplemented;
-
-/**
- * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a>
- * @version $Revision: 8808 $
- */
-public abstract class WSRPProducerBaseTest extends TestCase
-{
- protected WSRPProducerImpl producer = WSRPProducerImpl.getInstance();
-
- protected WSRPProducerBaseTest(String name) throws Exception
- {
- super(name);
- }
-
- public void deploy(String warFileName) throws Exception
- {
- File archiveDirectory = getDirectory("test.deployables.dir");
- File deployDirectory = getDirectory("jboss.server.home.dir", "deploy");
- File archiveFile = getArchive(warFileName, archiveDirectory, true);
- File deployArchive = getArchive(warFileName, deployDirectory, false);
-
- FileChannel inputChannel = new FileInputStream(archiveFile).getChannel();
- FileChannel outputChannel = new FileOutputStream(deployArchive).getChannel();
-
- inputChannel.transferTo(0, inputChannel.size(), outputChannel);
-
- Thread.currentThread().sleep(10000);
- }
-
- public void undeploy(String warFileName) throws Exception
- {
- File deployDirectory = getDirectory("jboss.server.home.dir", "deploy");
- File archive = getArchive(warFileName, deployDirectory, true);
-
- archive.delete();
-
- Thread.currentThread().sleep(10000);
- }
-
- private File getDirectory (String property) throws Exception
- {
- return getDirectory(property, null);
- }
-
- private File getDirectory (String property, String subDirectory) throws Exception
- {
- String deployableProperty = System.getProperty(property);
- if (deployableProperty != null)
- {
- if (subDirectory != null)
- {
- deployableProperty += File.separator + subDirectory;
- }
-
- File deployableDir = new File(deployableProperty);
- if (deployableDir.exists() && deployableDir.isDirectory())
- {
- return deployableDir;
- }
- else
- {
- throw new Error("Found a system property for \'" + property + "\' [" + deployableProperty + "] but value does not correspond to a directory.");
- }
- }
- else
- {
- throw new Error ("Could not find the system property \'" + property + "\' cannot deploy test archives.");
- }
-}
-
-
- private File getArchive(String fileName, File deployDirectory, boolean shouldExist) throws Exception
- {
- if (fileName != null && deployDirectory != null && deployDirectory.exists() && deployDirectory.isDirectory())
- {
- File archiveFile = new File(deployDirectory.getAbsoluteFile() + File.separator + fileName);
- return archiveFile;
-// if (archiveFile.exists() && shouldExist)
-// {
-// return archiveFile;
-// }
-// else if (!archiveFile.exists() && !shouldExist)
-// {
-// return archiveFile;
-// }
-// else
-// {
-// //since its not what we are expecting we need to throw the opposite error message
-// String existsString = shouldExist ? "does not exist" : "exists";
-// throw new Exception("Archive " + fileName + " in directory " + deployDirectory + " " + existsString + " which is not expected.");
-// }
- }
- else
- {
- throw new Exception("Cannot find archive to deploy. Archive name [" + fileName + "] is null or the deploy directory + [" + deployDirectory + "] is not a directory");
- }
- }
-}
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/RegistrationTestCase.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/RegistrationTestCase.java 2010-06-18 17:36:40 UTC (rev 3386)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v1/RegistrationTestCase.java 2010-06-18 18:48:31 UTC (rev 3387)
@@ -29,8 +29,19 @@
import org.gatein.wsrp.WSRPConstants;
import org.gatein.wsrp.WSRPUtils;
import org.gatein.wsrp.registration.RegistrationPropertyDescription;
+import org.gatein.wsrp.servlet.ServletAccess;
import org.gatein.wsrp.spec.v1.WSRP1TypeFactory;
import org.gatein.wsrp.test.ExtendedAssert;
+import org.gatein.wsrp.test.support.MockHttpServletRequest;
+import org.gatein.wsrp.test.support.MockHttpServletResponse;
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
import org.oasis.wsrp.v1.V1GetMarkup;
import org.oasis.wsrp.v1.V1GetServiceDescription;
import org.oasis.wsrp.v1.V1InvalidRegistration;
@@ -49,6 +60,7 @@
* @version $Revision: 12309 $
* @since 2.4
*/
+(a)RunWith(Arquillian.class)
public class RegistrationTestCase extends V1ProducerBaseTest
{
public RegistrationTestCase() throws Exception
@@ -56,11 +68,40 @@
super("RegistrationTestCase");
}
+ @Deployment
+ public static JavaArchive createDeployment()
+ {
+ return ShrinkWrap.create("test.jar", JavaArchive.class);
+ }
+
+ @Before
+ public void setUp() throws Exception
+ {
+ if (System.getProperty("test.deployables.dir") != null)
+ {
+ super.setUp();
+ //hack to get around having to have a httpservletrequest when accessing the producer services
+ //I don't know why its really needed, seems to be a dependency where wsrp connects with the pc module
+ ServletAccess.setRequestAndResponse(MockHttpServletRequest.createMockRequest(null), MockHttpServletResponse.createMockResponse());
+ }
+ }
+
+
+ @After
+ public void tearDown() throws Exception
+ {
+ if (System.getProperty("test.deployables.dir") != null)
+ {
+ super.tearDown();
+ }
+ }
+
/**
* R355: The portal MUST pass a name for itself that uniquely identifies it.
*
* @throws Exception
*/
+ @Test
public void testUniqueNameRegistration() throws Exception
{
// not sure how to test this...
@@ -76,6 +117,7 @@
*
* @throws Exception
*/
+ @Test
public void testConsumerAgent() throws Exception
{
configureRegistrationSettings(true, false);
@@ -97,6 +139,7 @@
producer.register(regData);
}
+ @Test
public void testRegistrationHandle() throws V1OperationFailed, V1MissingParameters, RegistrationException
{
// check that a registration handle was created
@@ -118,6 +161,7 @@
assertEquals(expectedHandle, registrationHandle);
}
+ @Test
public void testDeregister() throws Exception
{
// initiate registration
@@ -161,6 +205,7 @@
ExtendedAssert.assertNotNull(producer.getServiceDescription(gs));
}
+ @Test
public void testModifyRegistration() throws Exception
{
// initiate registration
@@ -237,6 +282,7 @@
checkServiceDescriptionWithOnlyBasicPortlet(gs);
}
+ @Test
public void testModifyRegistrationIncorrectData() throws Exception
{
// initiate registration
@@ -264,6 +310,7 @@
}
}
+ @Test
public void testRegister() throws Exception
{
configureRegistrationSettings(true, false);
@@ -280,6 +327,7 @@
checkServiceDescriptionWithOnlyBasicPortlet(gs);
}
+ @Test
public void testRegisterWhenRegistrationNotRequired() throws Exception
{
configureRegistrationSettings(false, false);
@@ -295,6 +343,7 @@
}
}
+ @Test
public void testDeregisterWhenRegistrationNotRequired() throws Exception
{
configureRegistrationSettings(false, false);
@@ -310,6 +359,7 @@
}
}
+ @Test
public void testModifyRegistrationWhenRegistrationNotRequired() throws Exception
{
configureRegistrationSettings(false, false);
@@ -325,6 +375,7 @@
}
}
+ @Test
public void testModifyRegistrationNoRegistrationWhenRegistrationRequired() throws Exception
{
configureRegistrationSettings(true, false);
@@ -344,6 +395,7 @@
}
}
+ @Test
public void testDeregisterNoRegistrationWhenRegistrationRequired() throws Exception
{
configureRegistrationSettings(true, false);
14 years
- 1
- 0