gatein SVN: r4311 - portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-09-22 11:19:57 -0400 (Wed, 22 Sep 2010)
New Revision: 4311
Modified:
portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java
Log:
- GTNWSRP-61: Fixed error where the Portal was not able to find the proper new customization due to caching.
Modified: portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java
===================================================================
--- portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java 2010-09-22 15:06:29 UTC (rev 4310)
+++ portal/branches/wsrp2-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPPortalStructureProvider.java 2010-09-22 15:19:57 UTC (rev 4311)
@@ -27,6 +27,7 @@
import org.exoplatform.portal.mop.Described;
import org.exoplatform.portal.pom.config.POMSession;
import org.exoplatform.portal.pom.config.POMSessionManager;
+import org.exoplatform.portal.pom.data.PageKey;
import org.exoplatform.portal.pom.spi.wsrp.WSRP;
import org.gatein.common.util.ParameterValidation;
import org.gatein.mop.api.content.Customization;
@@ -147,8 +148,11 @@
String uuid = windowIdToUUIDs.get(windowId);
ParameterValidation.throwIllegalArgExceptionIfNull(uuid, "UUID for " + windowId);
+ // get the window
POMSession session = pomManager.getSession();
UIWindow window = session.findObjectById(ObjectType.WINDOW, uuid);
+
+ // construct the new customization state
WSRP wsrp = new WSRP();
String portletId = portletContext.getId();
wsrp.setPortletId(portletId);
@@ -165,12 +169,19 @@
}
}
- // destroy existing customization
+ // destroy existing customization as otherwise re-customizing will fail
Customization<?> customization = window.getCustomization();
customization.destroy();
// and re-customize
window.customize(WSRP.CONTENT_TYPE, portletId, wsrp);
+
+ // mark page for cache invalidation otherwise DataCache will use the previous customization id when trying to set
+ // the portlet state in UIPortlet.setState and will not find it resulting in an error
+ Page page = window.getPage();
+ session.scheduleForEviction(new PageKey("portal", page.getSite().getName(), page.getName()));
+
+ // save
session.close(true);
}
15 years, 7 months
- 1
- 0
gatein SVN: r4310 - in components/wsrp/trunk: wsrp-producer-war/src/test/java/org/gatein/wsrp/support and 1 other directory.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-09-22 11:06:29 -0400 (Wed, 22 Sep 2010)
New Revision: 4310
Modified:
components/wsrp/trunk/producer/src/main/java/org/gatein/exports/ExportPersistenceManager.java
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/support/TestMockExportPersistenceManager.java
Log:
GTNWSRP-69: Update javadoc for ExportPersistenceManager. Change UpdateExportPortletData to include reference to the exportContextId which the portlet data is assigned to.
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/exports/ExportPersistenceManager.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/exports/ExportPersistenceManager.java 2010-09-22 15:04:28 UTC (rev 4309)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/exports/ExportPersistenceManager.java 2010-09-22 15:06:29 UTC (rev 4310)
@@ -45,27 +45,107 @@
*/
boolean supports(String type, double version);
+ /**
+ * Returns the reference ID of a particular export (if exported by reference).
+ * The type and version are used to determine how to deal with the byte array
+ * to retrieve this ID.
+ *
+ * @param type The type of export
+ * @param version The version of the export
+ * @param bytes The contents of the export
+ * @return The reference ID
+ * @throws UnsupportedEncodingException
+ */
String getExportReferenceId (String type, double version, byte[] bytes) throws UnsupportedEncodingException;
+ /**
+ * Stores the ExportContent and returns the reference ID used to store the content.
+ *
+ * @param exportContext The ExportContext to store
+ * @return The reference ID used to store the content
+ */
String storeExportContext(ExportContext exportContext);
+ /**
+ * Retrieves an ExportContext which corresponds to a particular reference ID
+ *
+ * @param refId The reference ID
+ * @return The ExportContext which corresponds to the reference ID
+ */
ExportContext getExportContext(String refId);
- //why are we returning an ExportContext here?
+ /**
+ * Updates an already stored ExportContext with an updated one.
+ *
+ * @param refId The reference ID of the stored ExportContext
+ * @param updatedExportContext The updated ExportContext
+ * @return The new ExportContext
+ */
ExportContext updateExportContext(String refId, ExportContext updatedExportContext);
+ /**
+ * Remove a stored ExportContext which corresponds to a reference ID.
+ *
+ * @param refId The reference ID of the ExportContext to remove
+ * @return True if the exportContext was removed, false otherwise
+ */
boolean removeExportContext(String refId);
+ /**
+ * Retrieves an ExportContext with the specified reference ID and returns
+ * the bytes which correspond to this reference
+ *
+ * @param refId The reference Id of the ExportContext
+ * @return The byte representation of the ExportContext
+ * @throws IOException If an error occurs when trying to encode the bytes
+ */
byte[] encodeExportContext(String refId) throws IOException;
+ /**
+ * Stores a ExportPortletData to a corresponding ExportContext
+ *
+ * @param exportContext The ExportContext
+ * @param exportPortletData The ExportPortletData
+ * @return the reference ID of the stored ExportPortletData
+ */
String storeExportPortletData (ExportContext exportContext, ExportPortletData exportPortletData);
+ /**
+ * Retrieves an ExportPortletData from an ExportContext
+ *
+ * @param exportContextId The id of the ExportContext
+ * @param portletDataId The id of the ExportPortletData
+ * @return The ExportPortletData object
+ */
ExportPortletData getExportPortletData (String exportContextId, String portletDataId);
- ExportPortletData updateExportPortletData(String refId, ExportPortletData updatedPortletData);
+ /**
+ * Updates a particular ExportPortletData corresponding to a ExportContext
+ *
+ * @param exportContextId The refId of the ExportContext
+ * @param exportPortletId The refId of the ExportPortletData
+ * @param updatedPortletData The new ExportPortletData to use
+ * @return The updated ExportPortletData
+ */
+ ExportPortletData updateExportPortletData(String exportContextId, String exportPortletId, ExportPortletData updatedPortletData);
+ /**
+ * Removes a ExportPortletData from a ExportContext
+ *
+ * @param exportContextId The reference Id of the ExportContext
+ * @param portletDataId The reference Id of the ExportPortletData to remove
+ * @return True if the ExportPortletData was removed
+ */
boolean removeExportPortletData(String exportContextId, String portletDataId);
+ /**
+ * Retrieves the ExportPortletData with the specified reference ID and returns
+ * the byte representation of this export.
+ *
+ * @param exportDataRefId The reference ID of the ExportPortletData
+ * @return The byte representation of the ExportPortletData
+ * @throws IOException
+ */
byte[] encodeExportPortletData(String exportDataRefId) throws IOException;
}
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/support/TestMockExportPersistenceManager.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/support/TestMockExportPersistenceManager.java 2010-09-22 15:04:28 UTC (rev 4309)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/support/TestMockExportPersistenceManager.java 2010-09-22 15:06:29 UTC (rev 4310)
@@ -148,11 +148,11 @@
}
}
- public ExportPortletData updateExportPortletData(String refId, ExportPortletData updatedPortletData)
+ public ExportPortletData updateExportPortletData(String exportContextId, String exportPortletId, ExportPortletData updatedPortletData)
{
- if (updatedPortletData != null && refId != null && exportContexts.containsKey(refId))
+ if (updatedPortletData != null && exportPortletId != null && exportContextId != null && exportContexts.containsKey(exportContextId))
{
- exportPortletDatas.put(refId, updatedPortletData);
+ exportPortletDatas.put(exportPortletId, updatedPortletData);
return updatedPortletData;
}
else
15 years, 7 months
- 1
- 0
gatein SVN: r4309 - in components/wsrp/trunk: producer/src/main/java/org/gatein/wsrp/producer/handlers and 2 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-09-22 11:04:28 -0400 (Wed, 22 Sep 2010)
New Revision: 4309
Added:
components/wsrp/trunk/wsrp-producer-war/src/main/webapp/WEB-INF/lib/
Modified:
components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/PortletManagementHandler.java
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/PortletManagementTestCase.java
Log:
GTNWSRP-71: Add copy portlet support.
Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java
===================================================================
--- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java 2010-09-22 15:01:36 UTC (rev 4308)
+++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPTypeFactory.java 2010-09-22 15:04:28 UTC (rev 4309)
@@ -45,6 +45,9 @@
import org.oasis.wsrp.v2.ClientData;
import org.oasis.wsrp.v2.ClonePortlet;
import org.oasis.wsrp.v2.Contact;
+import org.oasis.wsrp.v2.CopiedPortlet;
+import org.oasis.wsrp.v2.CopyPortlets;
+import org.oasis.wsrp.v2.CopyPortletsResponse;
import org.oasis.wsrp.v2.DestroyPortlets;
import org.oasis.wsrp.v2.DestroyPortletsResponse;
import org.oasis.wsrp.v2.EmployerInfo;
@@ -1754,4 +1757,44 @@
return userProfile;
}
+
+ public static CopyPortlets createCopyPortlets(RegistrationContext toRegistrationContext, UserContext toUserContext, RegistrationContext fromRegistrationContext, UserContext fromUserContext, List<PortletContext> fromPortletContexts)
+ {
+ if (!ParameterValidation.existsAndIsNotEmpty(fromPortletContexts))
+ {
+ throw new IllegalArgumentException("Must provide at least one PortletContext to CopyPortlets.");
+ }
+
+ CopyPortlets copyPortlets = new CopyPortlets();
+ copyPortlets.setToRegistrationContext(toRegistrationContext);
+ copyPortlets.setToUserContext(toUserContext);
+ copyPortlets.setFromRegistrationContext(fromRegistrationContext);
+ copyPortlets.setFromUserContext(fromUserContext);
+ copyPortlets.getFromPortletContexts().addAll(fromPortletContexts);
+
+ return copyPortlets;
+ }
+
+ public static CopyPortletsResponse createCopyPortletsResponse(List<CopiedPortlet> copiedPortlets, List<FailedPortlets> failedPortlets, ResourceList resourceList)
+ {
+ CopyPortletsResponse response = new CopyPortletsResponse();
+ response.getCopiedPortlets().addAll(copiedPortlets);
+ response.getFailedPortlets().addAll(failedPortlets);
+ response.setResourceList(resourceList);
+
+ return response;
+ }
+
+ public static CopiedPortlet createCopiedPortlet(PortletContext newPortletContext, String fromPortletHandle)
+ {
+ ParameterValidation.throwIllegalArgExceptionIfNull(newPortletContext, "newPortletContext");
+ ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(fromPortletHandle, "fromPortletHandle", "createCopiedPortlet");
+
+ CopiedPortlet copiedPortlet = new CopiedPortlet();
+
+ copiedPortlet.setNewPortletContext(newPortletContext);
+ copiedPortlet.setFromPortletHandle(fromPortletHandle);
+
+ return copiedPortlet;
+ }
}
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/PortletManagementHandler.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/PortletManagementHandler.java 2010-09-22 15:01:36 UTC (rev 4308)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/PortletManagementHandler.java 2010-09-22 15:04:28 UTC (rev 4309)
@@ -26,7 +26,6 @@
import com.google.common.base.Function;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
-import org.gatein.common.NotYetImplemented;
import org.gatein.common.i18n.LocalizedString;
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
@@ -57,6 +56,7 @@
import org.gatein.wsrp.spec.v2.WSRP2ExceptionFactory;
import org.oasis.wsrp.v2.AccessDenied;
import org.oasis.wsrp.v2.ClonePortlet;
+import org.oasis.wsrp.v2.CopiedPortlet;
import org.oasis.wsrp.v2.CopyPortlets;
import org.oasis.wsrp.v2.CopyPortletsResponse;
import org.oasis.wsrp.v2.DestroyPortlets;
@@ -93,6 +93,7 @@
import org.oasis.wsrp.v2.Property;
import org.oasis.wsrp.v2.PropertyDescription;
import org.oasis.wsrp.v2.PropertyList;
+import org.oasis.wsrp.v2.RegistrationContext;
import org.oasis.wsrp.v2.ReleaseExport;
import org.oasis.wsrp.v2.ResetProperty;
import org.oasis.wsrp.v2.ResourceList;
@@ -314,7 +315,113 @@
throws AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory,
MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended
{
- throw new NotYetImplemented();
+ WSRP2ExceptionFactory.throwOperationFailedIfValueIsMissing(copyPortlets, "copyPortlets");
+
+ List<PortletContext> portletContexts = copyPortlets.getFromPortletContexts();
+
+ if (!ParameterValidation.existsAndIsNotEmpty(portletContexts))
+ {
+ throw WSRP2ExceptionFactory.createWSException(MissingParameters.class, "Missing required portletContext in CopyPortlets.", null);
+ }
+
+ Registration fromRegistration = producer.getRegistrationOrFailIfInvalid(copyPortlets.getFromRegistrationContext());
+
+ RegistrationContext toRegistationContext = copyPortlets.getToRegistrationContext();
+
+ //if toRegistrationCotnext is null, then we use the fromRegistrationContext (from spec).
+ //NOTE: this means we can't move between a PortletContext on a registered consumer to a non-registered consumer
+ // between two non-registered consumers will still be ok.
+ if (toRegistationContext == null)
+ {
+ toRegistationContext = copyPortlets.getFromRegistrationContext();
+ }
+
+ Registration toRegistration = producer.getRegistrationOrFailIfInvalid(toRegistationContext);
+
+ UserContext fromUserContext = copyPortlets.getFromUserContext();
+ checkUserAuthorization(fromUserContext);
+ UserContext toUserContext = copyPortlets.getToUserContext();
+ checkUserAuthorization(toUserContext);
+
+ try
+ {
+ RegistrationLocal.setRegistration(fromRegistration);
+
+ Map<String, FailedPortlets> failedPortletsMap = new HashMap<String, FailedPortlets>(portletContexts.size());
+
+ List<CopiedPortlet> copiedPortlets = new ArrayList<CopiedPortlet>(portletContexts.size());
+
+ for (PortletContext portletContext : portletContexts)
+ {
+ try
+ {
+ org.gatein.pc.api.PortletContext portalPC = WSRPUtils.convertToPortalPortletContext(portletContext);
+
+ //NOTE: There are two ways we can do a copy. We can export using one registration and import using another. This seems the most straight forward way to do this, just seems a little overkill.
+ // OR we can copy the portlet, then use the RegistrationManager and RegistrationPolicy to delete the PC from one registration and add it to another. But we don't actually
+ // create the copy under the toRegistration and we would need to add extra checks here to make sure the toRegistration has the proper permissions.
+ // Note sure why there is even a copy portlet operation since it can be replicated by an export and then an import operation.
+
+ org.gatein.pc.api.PortletContext exportedPortletContext = producer.getPortletInvoker().exportPortlet(PortletStateType.OPAQUE, portalPC);
+ //Change the registration to the new registration and try and do an import. This should force the new import to be under the new registration context
+ RegistrationLocal.setRegistration(toRegistration);
+ org.gatein.pc.api.PortletContext copiedPortletContext = producer.getPortletInvoker().importPortlet(PortletStateType.OPAQUE, exportedPortletContext);
+
+ PortletContext wsrpClonedPC = WSRPUtils.convertToWSRPPortletContext(copiedPortletContext);
+
+ CopiedPortlet copiedPortlet = WSRPTypeFactory.createCopiedPortlet(wsrpClonedPC, portletContext.getPortletHandle());
+ copiedPortlets.add(copiedPortlet);
+ }
+ catch (Exception e)
+ {
+ if (log.isWarnEnabled())
+ {
+ log.warn("Error occured while trying to export a portlet.", e);
+ }
+
+ ErrorCodes.Codes errorCode;
+ String reason;
+ if (e instanceof NoSuchPortletException || e instanceof InvalidHandle)
+ {
+ errorCode = ErrorCodes.Codes.INVALIDHANDLE;
+ reason = "The specified portlet handle is invalid";
+ }
+ else // default error message.
+ {
+ errorCode = ErrorCodes.Codes.OPERATIONFAILED;
+ reason = "Error preparing portlet for export";
+ }
+
+ if (!failedPortletsMap.containsKey(errorCode.name()))
+ {
+ List<String> portletHandles = new ArrayList<String>();
+ portletHandles.add(portletContext.getPortletHandle());
+
+ FailedPortlets failedPortlets = WSRPTypeFactory.createFailedPortlets(portletHandles, errorCode, reason);
+ failedPortletsMap.put(errorCode.name(), failedPortlets);
+ }
+ else
+ {
+ FailedPortlets failedPortlets = failedPortletsMap.get(errorCode.name());
+ failedPortlets.getPortletHandles().add(portletContext.getPortletHandle());
+ }
+ }
+ }
+
+ List<FailedPortlets> failedPortlets = new ArrayList<FailedPortlets>(failedPortletsMap.values());
+ //TODO: handle resources properly
+ ResourceList resourceList = null;
+ CopyPortletsResponse copyPortletsResponse = WSRPTypeFactory.createCopyPortletsResponse(copiedPortlets, failedPortlets, resourceList);
+ return copyPortletsResponse;
+ }
+ catch (Exception e)
+ {
+ throw WSRP2ExceptionFactory.throwWSException(OperationFailed.class, "Operation Failed while trying to CopyPortlets.", e);
+ }
+ finally
+ {
+ RegistrationLocal.setRegistration(null);
+ }
}
public PortletContext setPortletProperties(SetPortletProperties setPortletProperties)
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/PortletManagementTestCase.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/PortletManagementTestCase.java 2010-09-22 15:01:36 UTC (rev 4308)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/PortletManagementTestCase.java 2010-09-22 15:04:28 UTC (rev 4309)
@@ -29,7 +29,9 @@
import org.gatein.exports.impl.ExportManagerImpl;
import org.gatein.pc.api.PortletStateType;
import org.gatein.pc.api.state.PropertyMap;
+import org.gatein.pc.portlet.impl.state.StateConverterV0;
import org.gatein.pc.portlet.state.SimplePropertyMap;
+import org.gatein.pc.portlet.state.StateConverter;
import org.gatein.pc.portlet.state.producer.PortletState;
import org.gatein.pc.portlet.state.producer.ProducerPortletInvoker;
import org.gatein.wsrp.WSRPTypeFactory;
@@ -47,6 +49,8 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.oasis.wsrp.v2.BlockingInteractionResponse;
+import org.oasis.wsrp.v2.CopyPortlets;
+import org.oasis.wsrp.v2.CopyPortletsResponse;
import org.oasis.wsrp.v2.ExportPortlets;
import org.oasis.wsrp.v2.ExportPortletsResponse;
import org.oasis.wsrp.v2.ExportedPortlet;
@@ -658,6 +662,8 @@
@Test
public void testExportWithState() throws Exception
{
+ try
+ {
undeploy(TEST_BASIC_PORTLET_WAR);
String sessionPortletArchive = "test-portletstate-portlet.war";
deploy(sessionPortletArchive);
@@ -694,13 +700,20 @@
//quick check that the imported portlet has the right state
ImportPortletsResponse importResponse = createImportPortletsResponse("foo", portletContextFromExport);
+ assertEquals(1, importResponse.getImportedPortlets().size());
checkStatePortlet(importResponse.getImportedPortlets().get(0).getNewPortletContext().getPortletHandle(), "new value");
-
}
finally
{
undeploy(sessionPortletArchive);
}
+ }
+ catch (Exception e)
+ {
+ System.out.println("ERROR: an error occured " + this.getClass() + " testExportWithState");
+ e.printStackTrace();
+ throw e;
+ }
}
//Tests the situation in which we have a stateful export from one server and importing into another
@@ -760,7 +773,6 @@
protected byte[] createSessionByteValue(String portletHandle, String value) throws Exception
{
- ProducerPortletInvoker ppinvoker = (ProducerPortletInvoker)producer.getPortletInvoker();
Map<String, List<String>> properties = new HashMap<String, List<String>>();
List<String> values = new ArrayList<String>();
values.add(value);
@@ -768,7 +780,9 @@
PropertyMap property = new SimplePropertyMap(properties);
PortletState sstate = new PortletState(portletHandle, property);
- return ppinvoker.getStateConverter().marshall(PortletStateType.OPAQUE, sstate);
+
+ StateConverter stateConverter = new StateConverterV0();
+ return stateConverter.marshall(PortletStateType.OPAQUE, sstate);
}
@Test
@@ -1040,6 +1054,102 @@
return WSRPTypeFactory.createImportPortlets(registrationContext, importContext, importPortletsList, userContext, lifetime);
}
+
+ @Test
+ public void testSimpleCopyPortletNullRegistrations() throws Exception
+ {
+ String handle = getDefaultHandle();
+ List<PortletContext> portletContexts = createPortletContextList(handle);
+
+ CopyPortlets copyPortlets = createSimpleCopyPortlets(portletContexts);
+ CopyPortletsResponse response = producer.copyPortlets(copyPortlets);
+
+ checkSimpleCopyPortlets(response, handle);
+ }
+
+// Enable when we can have registered and non-registered consumer active at the same time.
+ @Test
+ public void testSimpleCopyPortletFromRegistrationNull() throws Exception
+ {
+ try
+ {
+ RegistrationData toRegistrationData = WSRPTypeFactory.createRegistrationData("CONSUMERB", "CONSUMERAGENTB.0.0", true);
+ RegistrationContext toregistrationContext = producer.register(toRegistrationData);
+
+ String handle = getDefaultHandle();
+ List<PortletContext> portletContexts = createPortletContextList(handle);
+
+ CopyPortlets copyPortlets = createSimpleCopyPortlets(portletContexts);
+ copyPortlets.setToRegistrationContext(toregistrationContext);
+
+ CopyPortletsResponse response = producer.copyPortlets(copyPortlets);
+
+ checkSimpleCopyPortlets(response, handle);
+ }
+ catch (Exception e)
+ {
+ System.out.println("ERROR: An exception occurred when running testSimpleCopyPortletFromRegistrationNull");
+ e.printStackTrace();
+ throw new Exception(e);
+ }
+ }
+
+ @Test
+ public void testSimpleCopyPortletToRegistrationNull() throws Exception
+ {
+ producer.getConfigurationService().getConfiguration().getRegistrationRequirements().setRegistrationRequired(true);
+
+ RegistrationData fromRegistrationData = WSRPTypeFactory.createRegistrationData("CONSUMERA", "CONSUMERAGENAT.0.0", true);
+ RegistrationContext fromRegistrationContext = producer.register(fromRegistrationData);
+
+ String handle = getDefaultHandle();
+ List<PortletContext> portletContexts = createPortletContextList(handle);
+
+ CopyPortlets copyPortlets = createSimpleCopyPortlets(portletContexts);
+ copyPortlets.setFromRegistrationContext(fromRegistrationContext);
+ CopyPortletsResponse response = producer.copyPortlets(copyPortlets);
+
+ checkSimpleCopyPortlets(response, handle);
+ }
+
+ @Test
+ public void testSimpleCopyPortletWithRegistrations() throws Exception
+ {
+ producer.getConfigurationService().getConfiguration().getRegistrationRequirements().setRegistrationRequired(true);
+
+ RegistrationData fromRegistrationData = WSRPTypeFactory.createRegistrationData("CONSUMERA", "CONSUMERAGENTA.0.0", true);
+ RegistrationContext fromRegistrationContext = producer.register(fromRegistrationData);
+ RegistrationData toRegistrationData = WSRPTypeFactory.createRegistrationData("CONSUMERB", "CONSUMERAGENTB.0.0", true);
+ RegistrationContext toregistrationContext = producer.register(toRegistrationData);
+
+ String handle = getDefaultHandle();
+ List<PortletContext> portletContexts = createPortletContextList(handle);
+
+ CopyPortlets copyPortlets = createSimpleCopyPortlets(portletContexts);
+ copyPortlets.setFromRegistrationContext(fromRegistrationContext);
+ copyPortlets.setToRegistrationContext(toregistrationContext);
+
+ CopyPortletsResponse response = producer.copyPortlets(copyPortlets);
+
+ checkSimpleCopyPortlets(response, handle);
+ }
+
+ protected CopyPortlets createSimpleCopyPortlets(List<PortletContext> portletContexts)
+ {
+ RegistrationContext toRegistrationContext = null;
+ UserContext toUserContext = null;
+ RegistrationContext fromRegistrationContext = null;
+ UserContext fromUserContext = null;
+ return WSRPTypeFactory.createCopyPortlets(toRegistrationContext, toUserContext, fromRegistrationContext, fromUserContext, portletContexts);
+ }
+
+ protected void checkSimpleCopyPortlets(CopyPortletsResponse response, String handle)
+ {
+ assertEquals(0, response.getFailedPortlets().size());
+ assertEquals(1, response.getCopiedPortlets().size());
+ assertEquals(handle, response.getCopiedPortlets().get(0).getFromPortletHandle());
+ }
+
protected String getMostUsedPortletWARFileName()
{
return TEST_BASIC_PORTLET_WAR;
15 years, 7 months
- 1
- 0
gatein SVN: r4308 - in components/wsrp/trunk: producer/src/main/java/org/gatein/registration/impl and 14 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2010-09-22 11:01:36 -0400 (Wed, 22 Sep 2010)
New Revision: 4308
Added:
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPPortletInvoker.java
components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-state-portlet.xml
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/StateCountingPortlet.java
components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-state-portlet-war/
components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-state-portlet-war/WEB-INF/
components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-state-portlet-war/WEB-INF/portlet.xml
components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-state-portlet-war/WEB-INF/web.xml
Modified:
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/AbstractRegistrationPersistenceManager.java
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/Registration.java
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPolicy.java
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationImpl.java
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/policies/DefaultRegistrationPolicy.java
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/policies/RegistrationPolicyWrapper.java
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/MarkupHandler.java
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/RegistrationHandler.java
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/WSRPInstanceContext.java
components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/config/TestRegistrationPolicy.java
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java
components/wsrp/trunk/wsrp-producer-war/src/test/producer-sar/META-INF/jboss-beans.xml
components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletstate-portlet-war/WEB-INF/portlet.xml
Log:
GTNWSRP-72: Add portlet context handling to registrations. Allows for registrations to have a filtered list of portlet contexts. RegistrationPolicy currently setup to handle filtering so that only cloned created from a particular registration has access.
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/AbstractRegistrationPersistenceManager.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/AbstractRegistrationPersistenceManager.java 2010-09-22 13:35:10 UTC (rev 4307)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/AbstractRegistrationPersistenceManager.java 2010-09-22 15:01:36 UTC (rev 4308)
@@ -59,6 +59,17 @@
internalSaveChangesTo(consumer);
}
+ public void saveChangesTo(Registration registration)
+ {
+ ParameterValidation.throwIllegalArgExceptionIfNull(registration, "Registration");
+
+ if (registration.getPersistentKey() == null)
+ {
+ throw new IllegalArgumentException("Registration " + registration + " hasn't yet been persisted and thus cannot be updated");
+ }
+ internalSaveChangesTo(registration);
+ }
+
public ConsumerGroup createConsumerGroup(String name) throws RegistrationException
{
ConsumerGroup group = getConsumerGroup(name);
@@ -165,6 +176,8 @@
protected abstract ConsumerSPI internalCreateConsumer(String consumerId, String consumerName);
protected abstract ConsumerSPI internalSaveChangesTo(Consumer consumer);
+
+ protected abstract RegistrationSPI internalSaveChangesTo(Registration registration);
protected abstract void internalAddConsumerGroup(ConsumerGroupSPI group);
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/Registration.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/Registration.java 2010-09-22 13:35:10 UTC (rev 4307)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/Registration.java 2010-09-22 15:01:36 UTC (rev 4308)
@@ -24,6 +24,8 @@
package org.gatein.registration;
import javax.xml.namespace.QName;
+
+import java.util.List;
import java.util.Map;
/**
@@ -106,4 +108,6 @@
Object getPropertyValueFor(QName propertyName);
Object getPropertyValueFor(String propertyName);
+
+ List<String> getPortletHandles();
}
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java 2010-09-22 13:35:10 UTC (rev 4307)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java 2010-09-22 15:01:36 UTC (rev 4308)
@@ -48,6 +48,13 @@
* @param consumer
*/
void saveChangesTo(Consumer consumer);
+
+ /**
+ * Saves changes made to the specified registration.
+ *
+ * @param registration
+ */
+ void saveChangesTo(Registration registration);
/**
* Retrieves the ConsumerGroup identified by the specified name.
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPolicy.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPolicy.java 2010-09-22 13:35:10 UTC (rev 4307)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/RegistrationPolicy.java 2010-09-22 15:01:36 UTC (rev 4308)
@@ -26,6 +26,8 @@
import org.gatein.wsrp.registration.PropertyDescription;
import javax.xml.namespace.QName;
+
+import java.util.List;
import java.util.Map;
/**
@@ -120,5 +122,10 @@
* @throws RegistrationException if an exception occurred in the Registration service
*/
void validateConsumerGroupName(String groupName, RegistrationManager manager) throws IllegalArgumentException, RegistrationException;
-
+
+ //TODO: add javadocs here
+ boolean checkPortletHandle(Registration registration, String portletHandle);
+ void addPortletHandle(Registration registration, String portletHandle);
+ void removePortletHandle(Registration registration, String portletHandle);
+ void updatePortletHandles(List<String> portlets);
}
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationImpl.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationImpl.java 2010-09-22 13:35:10 UTC (rev 4307)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationImpl.java 2010-09-22 15:01:36 UTC (rev 4308)
@@ -30,8 +30,10 @@
import org.gatein.registration.spi.RegistrationSPI;
import javax.xml.namespace.QName;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -47,6 +49,7 @@
private RegistrationStatus status;
private Map<QName, Object> properties;
private String registrationHandle;
+ private List<String> portletHandles;
RegistrationImpl(String key, ConsumerSPI consumer, RegistrationStatus status, Map<QName, Object> properties)
@@ -55,6 +58,7 @@
this.consumer = consumer;
this.status = status;
this.properties = new HashMap<QName, Object>(properties);
+ this.portletHandles = new ArrayList<String>();
}
public String getPersistentKey()
@@ -189,4 +193,8 @@
properties = new HashMap(registrationProperties);
}
+ public List<String> getPortletHandles()
+ {
+ return portletHandles;
+ }
}
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java 2010-09-22 13:35:10 UTC (rev 4307)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java 2010-09-22 15:01:36 UTC (rev 4308)
@@ -172,4 +172,10 @@
{
return (ConsumerSPI)consumer; // nothing to do here, left up to subclasses to implement update in persistent store
}
+
+ @Override
+ protected RegistrationSPI internalSaveChangesTo(Registration registration)
+ {
+ return (RegistrationSPI)registration; // nothing to do here, left up to subclasses to implement update in persistent store
+ }
}
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/policies/DefaultRegistrationPolicy.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/policies/DefaultRegistrationPolicy.java 2010-09-22 13:35:10 UTC (rev 4307)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/policies/DefaultRegistrationPolicy.java 2010-09-22 15:01:36 UTC (rev 4308)
@@ -37,8 +37,10 @@
import org.slf4j.LoggerFactory;
import javax.xml.namespace.QName;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -54,6 +56,9 @@
{
private RegistrationPropertyValidator validator;
private static final Logger log = LoggerFactory.getLogger(DefaultRegistrationPolicy.class);
+
+ //Stores a list of the default portlet handles which should be available to all registrations (ie not cloned handles)
+ List<String> defaultPortletHandleList = new ArrayList<String>();
@Override
public boolean equals(Object o)
@@ -217,4 +222,40 @@
{
return validator;
}
+
+ public void addPortletHandle(Registration registration, String portletHandle)
+ {
+ if (registration != null && !registration.getPortletHandles().contains(portletHandle))
+ {
+ registration.getPortletHandles().add(portletHandle);
+ }
+ }
+
+ public boolean checkPortletHandle(Registration registration, String portletHandle)
+ {
+ if (defaultPortletHandleList.contains(portletHandle))
+ {
+ return true;
+ }
+
+ if (registration != null && registration.getPortletHandles().contains(portletHandle))
+ {
+ return true;
+ }
+
+ return false;
+ }
+
+ public void removePortletHandle(Registration registration, String portletHandle)
+ {
+ if (registration != null)
+ {
+ registration.getPortletHandles().remove(portletHandle);
+ }
+ }
+
+ public void updatePortletHandles(List<String> portletHandles)
+ {
+ this.defaultPortletHandleList = portletHandles;
+ }
}
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/policies/RegistrationPolicyWrapper.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/policies/RegistrationPolicyWrapper.java 2010-09-22 13:35:10 UTC (rev 4307)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/policies/RegistrationPolicyWrapper.java 2010-09-22 15:01:36 UTC (rev 4308)
@@ -25,12 +25,15 @@
import org.gatein.common.util.ParameterValidation;
import org.gatein.registration.InvalidConsumerDataException;
+import org.gatein.registration.Registration;
import org.gatein.registration.RegistrationException;
import org.gatein.registration.RegistrationManager;
import org.gatein.registration.RegistrationPolicy;
import org.gatein.wsrp.registration.PropertyDescription;
import javax.xml.namespace.QName;
+
+import java.util.List;
import java.util.Map;
/**
@@ -98,4 +101,24 @@
return consumerName;
}
+
+ public void addPortletHandle(Registration registration, String portletHandle)
+ {
+ delegate.addPortletHandle(registration, portletHandle);
+ }
+
+ public boolean checkPortletHandle(Registration registration, String portletHandle)
+ {
+ return delegate.checkPortletHandle(registration, portletHandle);
+ }
+
+ public void removePortletHandle(Registration registration, String portletHandle)
+ {
+ delegate.removePortletHandle(registration, portletHandle);
+ }
+
+ public void updatePortletHandles(List<String> portletHandles)
+ {
+ delegate.updatePortletHandles(portletHandles);
+ }
}
Added: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPPortletInvoker.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPPortletInvoker.java (rev 0)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPPortletInvoker.java 2010-09-22 15:01:36 UTC (rev 4308)
@@ -0,0 +1,243 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.gatein.wsrp.producer;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+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.PortletStateType;
+import org.gatein.pc.api.StatefulPortletContext;
+import org.gatein.pc.api.invocation.PortletInvocation;
+import org.gatein.pc.api.invocation.response.PortletInvocationResponse;
+import org.gatein.pc.api.invocation.response.UpdateNavigationalStateResponse;
+import org.gatein.pc.api.state.DestroyCloneFailure;
+import org.gatein.pc.api.state.PropertyChange;
+import org.gatein.pc.api.state.PropertyMap;
+import org.gatein.pc.portlet.PortletInvokerInterceptor;
+import org.gatein.registration.Registration;
+import org.gatein.registration.RegistrationLocal;
+import org.gatein.registration.RegistrationManager;
+import org.gatein.wsrp.WSRPUtils;
+import org.gatein.wsrp.producer.handlers.processors.WSRPInstanceContext;
+import org.oasis.wsrp.v2.InvalidHandle;
+
+/**
+ * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a>
+ * @version $Revision$
+ */
+public class WSRPPortletInvoker extends PortletInvokerInterceptor
+{
+ /** Registration Manager */
+ private RegistrationManager registrationManager; //todo: make sure it's multi-thread safe
+
+ public RegistrationManager getRegistrationManager()
+ {
+ return registrationManager;
+ }
+
+ public void setRegistrationManager(RegistrationManager registrationManager)
+ {
+ this.registrationManager = registrationManager;
+ }
+
+ public Portlet getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
+ {
+ checkPortletContext(portletContext);
+ Portlet portlet = super.getPortlet(portletContext);
+
+ if (!portlet.getContext().getId().equals(portletContext.getId()))
+ {
+ addPortletContext(portlet.getContext());
+ }
+
+ return portlet;
+ }
+
+ public Set<Portlet> getPortlets() throws PortletInvokerException
+ {
+ /**
+ * Note: due to the way the ProducerPortletInvoker work, when calling super.getPortlets() it will
+ * return the portlets not for the ProducerPortletInvoker from its parent, which should only return
+ * non-cloned Portlets.
+ */
+
+ Registration registration = RegistrationLocal.getRegistration();
+ Set<Portlet> portlets = super.getPortlets();
+
+ //We first need to let the RegistrationPolicy know that there are potentially new portlets available
+ //from the PortletContainer (Note: this only included actual portlets, not clones).
+ List<String> portletHandleList = new ArrayList<String>();
+ for (Portlet portlet: portlets)
+ {
+ String portletHandle = WSRPUtils.convertToWSRPPortletContext(portlet.getContext()).getPortletHandle();
+ portletHandleList.add(portletHandle);
+ }
+ this.registrationManager.getPolicy().updatePortletHandles(portletHandleList);
+
+ //Now that the RegistrationPolicy knows about the new Portlets, we need to make
+ //sure that we only return portlets that the current registration has access to.
+ Set<Portlet> acceptedPortlets = new LinkedHashSet<Portlet>();
+ for (Portlet portlet : portlets)
+ {
+ String portletHandle = WSRPUtils.convertToWSRPPortletContext(portlet.getContext()).getPortletHandle();
+ if (this.registrationManager.getPolicy().checkPortletHandle(registration, portletHandle))
+ {
+ acceptedPortlets.add(portlet);
+ }
+ }
+
+ return acceptedPortlets;
+ }
+
+
+ public PortletInvocationResponse invoke(PortletInvocation invocation) throws IllegalArgumentException,
+ PortletInvokerException
+ {
+ checkPortletContext(invocation.getTarget());
+
+ PortletInvocationResponse response = super.invoke(invocation);
+
+ if (invocation.getInstanceContext() instanceof WSRPInstanceContext)
+ {
+ WSRPInstanceContext wsrpIC = (WSRPInstanceContext)invocation.getInstanceContext();
+ if (wsrpIC.wasModified() && !wsrpIC.getPortletContext().getId().equals(invocation.getTarget().getId()))
+ {
+ addPortletContext(wsrpIC.getPortletContext());
+ }
+ }
+
+ return response;
+ }
+
+ public PortletContext createClone(PortletStateType stateType, PortletContext portletContext)
+ throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ {
+ checkPortletContext(portletContext);
+
+ PortletContext clonedPortletContext = super.createClone(stateType, portletContext);
+
+ if (!portletContext.getId().equals(clonedPortletContext.getId()))
+ addPortletContext(clonedPortletContext);
+
+ return clonedPortletContext;
+ }
+
+ public List<DestroyCloneFailure> destroyClones(List<PortletContext> portletContexts)
+ throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ {
+ //TODO: fix this, we shouldn't remove the pc from the registration policy unless its actually removed from the invoker cleanly
+ for (PortletContext portletContext : portletContexts)
+ {
+ removePortletContext(portletContext);
+ }
+
+ return super.destroyClones(portletContexts);
+ }
+
+ public PropertyMap getProperties(PortletContext portletContext) throws IllegalArgumentException,
+ PortletInvokerException, UnsupportedOperationException
+ {
+ checkPortletContext(portletContext);
+ return super.getProperties(portletContext);
+ }
+
+ public PropertyMap getProperties(PortletContext portletContext, Set<String> keys) throws IllegalArgumentException,
+ PortletInvokerException, UnsupportedOperationException
+ {
+ checkPortletContext(portletContext);
+ return super.getProperties(portletContext, keys);
+ }
+
+ public PortletContext setProperties(PortletContext portletContext, PropertyChange[] changes)
+ throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ {
+ checkPortletContext(portletContext);
+ PortletContext updatedPortletContext = super.setProperties(portletContext, changes);
+
+ if (!portletContext.getId().equals(updatedPortletContext.getId()))
+ {
+ addPortletContext(updatedPortletContext);
+ }
+
+ return updatedPortletContext;
+ }
+
+ public PortletContext importPortlet(PortletStateType stateType, PortletContext originalPortletContext)
+ throws PortletInvokerException, IllegalArgumentException
+ {
+ //The original portletcontext is the non cloned version and should be one the PC available from the getPortlets operation
+ checkPortletContext(originalPortletContext);
+ PortletContext newPortletContext = super.importPortlet(stateType, originalPortletContext);
+
+ if (!newPortletContext.getId().equals(originalPortletContext.getId()))
+ addPortletContext(newPortletContext);
+
+ return newPortletContext;
+ }
+
+ public PortletContext exportPortlet(PortletStateType stateType, PortletContext portletContext)
+ throws PortletInvokerException, IllegalArgumentException
+ {
+ checkPortletContext(portletContext);
+ return super.exportPortlet(stateType, portletContext);
+ }
+
+ protected boolean checkPortletContext(PortletContext portletContext) throws PortletInvokerException
+ {
+ Registration registration = RegistrationLocal.getRegistration();
+ String portletHandle = WSRPUtils.convertToWSRPPortletContext(portletContext).getPortletHandle();
+ if (this.getRegistrationManager().getPolicy().checkPortletHandle(registration, portletHandle))
+ {
+ return true;
+ }
+ else
+ {
+ throw new NoSuchPortletException("The PortletContext " + portletContext.getId() + " does not exist or the application is lacking permission to access it.", portletContext.getId());
+ }
+ }
+
+ protected void addPortletContext(PortletContext portletContext)
+ {
+ Registration registration = RegistrationLocal.getRegistration();
+ String portletHandle = WSRPUtils.convertToWSRPPortletContext(portletContext).getPortletHandle();
+ this.getRegistrationManager().getPolicy().addPortletHandle(registration, portletHandle);
+ this.getRegistrationManager().getPersistenceManager().saveChangesTo(registration);
+ }
+
+ protected void removePortletContext(PortletContext portletContext)
+ {
+ Registration registration = RegistrationLocal.getRegistration();
+ String portletHandle = WSRPUtils.convertToWSRPPortletContext(portletContext).getPortletHandle();
+ this.getRegistrationManager().getPolicy().removePortletHandle(registration, portletHandle);
+ this.getRegistrationManager().getPersistenceManager().saveChangesTo(registration);
+ }
+}
+
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/MarkupHandler.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/MarkupHandler.java 2010-09-22 13:35:10 UTC (rev 4307)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/MarkupHandler.java 2010-09-22 15:01:36 UTC (rev 4308)
@@ -31,6 +31,8 @@
import org.gatein.pc.api.invocation.response.PortletInvocationResponse;
import org.gatein.pc.api.invocation.response.UpdateNavigationalStateResponse;
import org.gatein.pc.portlet.state.producer.PortletStateChangeRequiredException;
+import org.gatein.registration.Registration;
+import org.gatein.registration.RegistrationLocal;
import org.gatein.wsrp.producer.MarkupInterface;
import org.gatein.wsrp.producer.Utils;
import org.gatein.wsrp.producer.WSRPProducerImpl;
@@ -107,6 +109,8 @@
try
{
log.debug("RenderInvocation on portlet '" + handle + "'");
+ Registration registration = producer.getRegistrationOrFailIfInvalid(getMarkup.getRegistrationContext());
+ RegistrationLocal.setRegistration(registration);
response = producer.getPortletInvoker().invoke(requestProcessor.getInvocation());
log.debug("RenderInvocation done");
}
@@ -134,6 +138,8 @@
try
{
log.debug("ResourceInvocation on portlet '" + handle + "'");
+ Registration registration = producer.getRegistrationOrFailIfInvalid(getResource.getRegistrationContext());
+ RegistrationLocal.setRegistration(registration);
response = producer.getPortletInvoker().invoke(requestProcessor.getInvocation());
log.debug("ResourceInvocation done");
}
@@ -163,6 +169,8 @@
try
{
log.debug("ActionInvocation on portlet '" + handle + "'");
+ Registration registration = producer.getRegistrationOrFailIfInvalid(performBlockingInteraction.getRegistrationContext());
+ RegistrationLocal.setRegistration(registration);
response = producer.getPortletInvoker().invoke(requestProcessor.getInvocation());
log.debug("ActionInvocation done");
}
@@ -218,6 +226,8 @@
try
{
log.debug("EventInvocation on portlet '" + handle + "'");
+ Registration registration = producer.getRegistrationOrFailIfInvalid(handleEvents.getRegistrationContext());
+ RegistrationLocal.setRegistration(registration);
response = producer.getPortletInvoker().invoke(requestProcessor.getInvocation());
log.debug("EventInvocation done");
}
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/RegistrationHandler.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/RegistrationHandler.java 2010-09-22 13:35:10 UTC (rev 4307)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/RegistrationHandler.java 2010-09-22 15:01:36 UTC (rev 4308)
@@ -81,7 +81,7 @@
throws MissingParameters, OperationFailed, OperationNotSupported
{
ProducerRegistrationRequirements registrationRequirements = producer.getProducerRegistrationRequirements();
- if (registrationRequirements.isRegistrationRequired())
+ //if (registrationRequirements.isRegistrationRequired())
{
WSRP2ExceptionFactory.throwOperationFailedIfValueIsMissing(registrationData, "RegistrationData");
String consumerName = registrationData.getConsumerName();
@@ -113,7 +113,7 @@
return registrationContext;
}
- throw WSRP2ExceptionFactory.throwWSException(OperationFailed.class, "Registration shouldn't be attempted if registration is not required", null);
+ //throw WSRP2ExceptionFactory.throwWSException(OperationFailed.class, "Registration shouldn't be attempted if registration is not required", null);
}
private void updateRegistrationInformation(Registration registration, RegistrationData registrationData)
@@ -324,7 +324,10 @@
{
throwInvalidRegistrationFault("registration context is missing but registration is required");
}
+ }
+ if (registrationContext != null)
+ {
String regHandle = registrationContext.getRegistrationHandle();
if (regHandle == null)
{
@@ -348,11 +351,33 @@
}
else
{
- if (registrationContext != null)
+ try
{
- throwInvalidRegistrationFault("no registration necessary yet one was provided!");
+ //TODO: fix this giant hack,
+ String unregisteredConsumer = "UNREGISTEREDCONSUMER";
+ Consumer consumer = producer.getRegistrationManager().getConsumerByIdentity(unregisteredConsumer);
+ if (consumer == null)
+ {
+ consumer = producer.getRegistrationManager().createConsumer(unregisteredConsumer);
+ }
+
+ if (consumer.getRegistrations().isEmpty())
+ {
+ Registration registration = producer.getRegistrationManager().addRegistrationTo(unregisteredConsumer, new HashMap(), null, false);
+ registration.setStatus(RegistrationStatus.VALID);
+ return registration;
+ }
+ else
+ {
+ return consumer.getRegistrations().iterator().next();
+ }
}
- return null;
+ catch (RegistrationException e)
+ {
+ throwOperationFailedFault("Failed to create a virtual registration with a unregistered consumer", e);
+ return null;
+ }
+ // return null;
}
}
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/WSRPInstanceContext.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/WSRPInstanceContext.java 2010-09-22 13:35:10 UTC (rev 4307)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/processors/WSRPInstanceContext.java 2010-09-22 15:01:36 UTC (rev 4308)
@@ -36,7 +36,7 @@
* @version $Revision: 8784 $
* @since 2.6
*/
-class WSRPInstanceContext implements InstanceContext
+public class WSRPInstanceContext implements InstanceContext
{
private PortletContext context;
private String instanceId;
@@ -84,7 +84,7 @@
return wasModified;
}
- PortletContext getPortletContext()
+ public PortletContext getPortletContext()
{
return context;
}
Modified: components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/config/TestRegistrationPolicy.java
===================================================================
--- components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/config/TestRegistrationPolicy.java 2010-09-22 13:35:10 UTC (rev 4307)
+++ components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/config/TestRegistrationPolicy.java 2010-09-22 15:01:36 UTC (rev 4308)
@@ -24,12 +24,15 @@
package org.gatein.wsrp.producer.config;
import org.gatein.registration.InvalidConsumerDataException;
+import org.gatein.registration.Registration;
import org.gatein.registration.RegistrationException;
import org.gatein.registration.RegistrationManager;
import org.gatein.registration.RegistrationPolicy;
import org.gatein.wsrp.registration.PropertyDescription;
import javax.xml.namespace.QName;
+
+import java.util.List;
import java.util.Map;
/**
@@ -66,4 +69,21 @@
{
}
+ public void addPortletHandle(Registration registration, String portletHandle)
+ {
+ }
+
+ public boolean checkPortletHandle(Registration registration, String portletHandle)
+ {
+ return true;
+ }
+
+ public void removePortletHandle(Registration registration, String portletHandle)
+ {
+ }
+
+ public void updatePortletHandles(List<String> portletHandles)
+ {
+ }
+
}
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-09-22 15:01:36 UTC (rev 4308)
@@ -181,6 +181,7 @@
<descriptor>src/test/assembly/test-portletmodes-portlet.xml</descriptor>
<descriptor>src/test/assembly/test-prp-portlet.xml</descriptor>
<descriptor>src/test/assembly/test-testobject-jar.xml</descriptor>
+ <descriptor>src/test/assembly/test-state-portlet.xml</descriptor>
</descriptors>
</configuration>
<executions>
Added: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-state-portlet.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-state-portlet.xml (rev 0)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-state-portlet.xml 2010-09-22 15:01:36 UTC (rev 4308)
@@ -0,0 +1,25 @@
+<assembly>
+ <id>state-portlet</id>
+ <formats>
+ <format>war</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <!-- Test Classes -->
+ <fileSet>
+ <directory>target/test-classes</directory>
+ <outputDirectory>WEB-INF/classes</outputDirectory>
+ <includes>
+ <include>org/gatein/wsrp/portlet/StateCountingPortlet.class</include>
+ </includes>
+ </fileSet>
+ <!-- Fileset for the sar strucuture -->
+ <fileSet>
+ <directory>src/test/test-portlets/test-state-portlet-war</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
+
+</assembly>
+
Added: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/StateCountingPortlet.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/StateCountingPortlet.java (rev 0)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/StateCountingPortlet.java 2010-09-22 15:01:36 UTC (rev 4308)
@@ -0,0 +1,73 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.gatein.wsrp.portlet;
+
+import java.io.IOException;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletPreferences;
+import javax.portlet.PortletSecurityException;
+import javax.portlet.PortletURL;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+/**
+ * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a>
+ * @version $Revision$
+ */
+public class StateCountingPortlet extends GenericPortlet
+{
+
+ public void processAction(ActionRequest request, ActionResponse response) throws PortletException, PortletSecurityException, IOException
+ {
+ PortletPreferences pp = request.getPreferences();
+
+ String counter = pp.getValue("counter", "0");
+
+ int count = Integer.parseInt(counter);
+
+ count++;
+
+ pp.setValue("counter", "" + count);
+ pp.store();
+ }
+
+ protected void doView(RenderRequest request, RenderResponse response) throws PortletException, PortletSecurityException, IOException
+ {
+ response.setContentType("text/html");
+ PortletPreferences pp = request.getPreferences();
+
+ String count = pp.getValue("counter", "0");
+ response.getWriter().write("COUNT : " + count);
+
+ PortletURL actionURL = response.createActionURL();
+
+ response.getWriter().write(" <a href=\"" + actionURL +"\">count++</>");
+
+ }
+
+}
+
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java 2010-09-22 13:35:10 UTC (rev 4307)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java 2010-09-22 15:01:36 UTC (rev 4308)
@@ -123,11 +123,20 @@
@Test
public void testGetMarkupViewNoSession() throws Exception
{
- GetMarkup getMarkup = createMarkupRequest();
+ try
+ {
+ GetMarkup getMarkup = createMarkupRequest();
- MarkupResponse response = producer.getMarkup(getMarkup);
+ MarkupResponse response = producer.getMarkup(getMarkup);
- checkMarkupResponse(response, DEFAULT_VIEW_MARKUP);
+ checkMarkupResponse(response, DEFAULT_VIEW_MARKUP);
+ }
+ catch (Exception e)
+ {
+ System.out.println("ERROR running testGetMarkupViewNoSession");
+ e.printStackTrace();
+ throw e;
+ }
}
@Test
@@ -600,44 +609,53 @@
@Test
public void testImplicitCloning() throws Exception
{
- undeploy(DEFAULT_MARKUP_PORTLET_WAR);
- String archiveName = "test-implicitcloning-portlet.war";
- deploy(archiveName);
-
try
{
- // check the initial value
- GetMarkup gm = createMarkupRequestForCurrentlyDeployedPortlet();
- MarkupResponse res = producer.getMarkup(gm);
- String markupString = res.getMarkupContext().getItemString();
- ExtendedAssert.assertEquals("initial", markupString);
+ undeploy(DEFAULT_MARKUP_PORTLET_WAR);
+ String archiveName = "test-implicitcloning-portlet.war";
+ deploy(archiveName);
- // modify the preference value
- PerformBlockingInteraction pbi = createDefaultPerformBlockingInteraction(getHandleForCurrentlyDeployedArchive());
- pbi.getInteractionParams().setPortletStateChange(StateChange.CLONE_BEFORE_WRITE); // request cloning if needed
- String value = "new value";
- pbi.getInteractionParams().getFormParameters().add(createNamedString("value", value));
- BlockingInteractionResponse response = producer.performBlockingInteraction(pbi);
- ExtendedAssert.assertNotNull(response);
+ try
+ {
+ // check the initial value
+ GetMarkup gm = createMarkupRequestForCurrentlyDeployedPortlet();
+ MarkupResponse res = producer.getMarkup(gm);
+ String markupString = res.getMarkupContext().getItemString();
+ ExtendedAssert.assertEquals("initial", markupString);
- // check that we got a new portlet context
- PortletContext pc = response.getUpdateResponse().getPortletContext();
- ExtendedAssert.assertNotNull(pc);
+ // modify the preference value
+ PerformBlockingInteraction pbi = createDefaultPerformBlockingInteraction(getHandleForCurrentlyDeployedArchive());
+ pbi.getInteractionParams().setPortletStateChange(StateChange.CLONE_BEFORE_WRITE); // request cloning if needed
+ String value = "new value";
+ pbi.getInteractionParams().getFormParameters().add(createNamedString("value", value));
+ BlockingInteractionResponse response = producer.performBlockingInteraction(pbi);
+ ExtendedAssert.assertNotNull(response);
- // get the markup again and check that we still get the initial value with the initial portlet context
- res = producer.getMarkup(gm);
- markupString = res.getMarkupContext().getItemString();
- ExtendedAssert.assertEquals("initial", markupString);
+ // check that we got a new portlet context
+ PortletContext pc = response.getUpdateResponse().getPortletContext();
+ ExtendedAssert.assertNotNull(pc);
- // retrieving the markup with the new portlet context should return the new value
- gm.setPortletContext(pc);
- res = producer.getMarkup(gm);
- markupString = res.getMarkupContext().getItemString();
- ExtendedAssert.assertEquals(value, markupString);
+ // get the markup again and check that we still get the initial value with the initial portlet context
+ res = producer.getMarkup(gm);
+ markupString = res.getMarkupContext().getItemString();
+ ExtendedAssert.assertEquals("initial", markupString);
+
+ // retrieving the markup with the new portlet context should return the new value
+ gm.setPortletContext(pc);
+ res = producer.getMarkup(gm);
+ markupString = res.getMarkupContext().getItemString();
+ ExtendedAssert.assertEquals(value, markupString);
+ }
+ finally
+ {
+ undeploy(archiveName);
+ }
}
- finally
+ catch (Exception e)
{
- undeploy(archiveName);
+ System.out.println("ERROR during " + this.getClass() + " testImplicitCloning");
+ e.printStackTrace();
+ throw new Exception (e);
}
}
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/producer-sar/META-INF/jboss-beans.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/producer-sar/META-INF/jboss-beans.xml 2010-09-22 13:35:10 UTC (rev 4307)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/producer-sar/META-INF/jboss-beans.xml 2010-09-22 15:01:36 UTC (rev 4308)
@@ -39,7 +39,7 @@
<parameter>true</parameter>
</constructor>
<property name="portletInvoker">
- <inject bean="PortletInvoker"/>
+ <inject bean="WSRPPortletInvoker"/>
</property>
<property name="registrationManager">
<inject bean="RegistrationManagerService"/>
@@ -67,6 +67,15 @@
</property>
</bean>
+ <bean name="WSRPPortletInvoker" class="org.gatein.wsrp.producer.WSRPPortletInvoker">
+ <property name="next">
+ <inject bean="PortletInvoker"/>
+ </property>
+ <property name="registrationManager">
+ <inject bean="RegistrationManagerService"/>
+ </property>
+ </bean>
+
<!-- TODO: may need to write a new class for this -->
<bean name="ProducerPersistenceManagerService"
class="org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService"/>
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletstate-portlet-war/WEB-INF/portlet.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletstate-portlet-war/WEB-INF/portlet.xml 2010-09-22 13:35:10 UTC (rev 4307)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletstate-portlet-war/WEB-INF/portlet.xml 2010-09-22 15:01:36 UTC (rev 4308)
@@ -23,7 +23,7 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<portlet-app xmlns='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd' version='2.0'>
<portlet>
- <portlet-name>Implicit Cloning Test Portlet</portlet-name>
+ <portlet-name>State Test Portlet</portlet-name>
<portlet-class>org.gatein.wsrp.portlet.StatePortlet</portlet-class>
<supports>
Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-state-portlet-war/WEB-INF/portlet.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-state-portlet-war/WEB-INF/portlet.xml (rev 0)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-state-portlet-war/WEB-INF/portlet.xml 2010-09-22 15:01:36 UTC (rev 4308)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2008, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<portlet-app xmlns='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd' version='2.0'>
+ <portlet>
+ <portlet-name>State Test Portlet</portlet-name>
+ <portlet-class>org.gatein.wsrp.portlet.StateCountingPortlet</portlet-class>
+
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>view</portlet-mode>
+ </supports>
+
+ <supported-locale>en</supported-locale>
+
+ <portlet-info>
+ <title>State Counter Portlet</title>
+ </portlet-info>
+
+ <portlet-preferences>
+ <preference>
+ <name>counter</name>
+ <value>0</value>
+ </preference>
+ </portlet-preferences>
+ </portlet>
+
+ <container-runtime-option>
+ <name>org.gatein.pc.remotable</name>
+ <value>true</value>
+ </container-runtime-option>
+</portlet-app>
Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-state-portlet-war/WEB-INF/web.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-state-portlet-war/WEB-INF/web.xml (rev 0)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-state-portlet-war/WEB-INF/web.xml 2010-09-22 15:01:36 UTC (rev 4308)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2007, 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<web-app version="2.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+</web-app>
\ No newline at end of file
15 years, 7 months
- 1
- 0
gatein SVN: r4307 - in epp/portal/branches/EPP_5_0_Branch: component and 65 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-09-22 09:35:10 -0400 (Wed, 22 Sep 2010)
New Revision: 4307
Modified:
epp/portal/branches/EPP_5_0_Branch/component/application-registry/pom.xml
epp/portal/branches/EPP_5_0_Branch/component/common/pom.xml
epp/portal/branches/EPP_5_0_Branch/component/dashboard/pom.xml
epp/portal/branches/EPP_5_0_Branch/component/identity/pom.xml
epp/portal/branches/EPP_5_0_Branch/component/management/pom.xml
epp/portal/branches/EPP_5_0_Branch/component/pc/pom.xml
epp/portal/branches/EPP_5_0_Branch/component/pom.xml
epp/portal/branches/EPP_5_0_Branch/component/portal/pom.xml
epp/portal/branches/EPP_5_0_Branch/component/resources/pom.xml
epp/portal/branches/EPP_5_0_Branch/component/scripting/pom.xml
epp/portal/branches/EPP_5_0_Branch/component/test/core/pom.xml
epp/portal/branches/EPP_5_0_Branch/component/test/jcr/pom.xml
epp/portal/branches/EPP_5_0_Branch/component/test/organization/pom.xml
epp/portal/branches/EPP_5_0_Branch/component/test/pom.xml
epp/portal/branches/EPP_5_0_Branch/component/web/pom.xml
epp/portal/branches/EPP_5_0_Branch/component/wsrp/pom.xml
epp/portal/branches/EPP_5_0_Branch/component/xml-parser/pom.xml
epp/portal/branches/EPP_5_0_Branch/examples/extension/config/pom.xml
epp/portal/branches/EPP_5_0_Branch/examples/extension/ear/pom.xml
epp/portal/branches/EPP_5_0_Branch/examples/extension/jar/pom.xml
epp/portal/branches/EPP_5_0_Branch/examples/extension/pom.xml
epp/portal/branches/EPP_5_0_Branch/examples/extension/war/pom.xml
epp/portal/branches/EPP_5_0_Branch/examples/pom.xml
epp/portal/branches/EPP_5_0_Branch/examples/portal/config/pom.xml
epp/portal/branches/EPP_5_0_Branch/examples/portal/ear/pom.xml
epp/portal/branches/EPP_5_0_Branch/examples/portal/jar/pom.xml
epp/portal/branches/EPP_5_0_Branch/examples/portal/pom.xml
epp/portal/branches/EPP_5_0_Branch/examples/portal/rest-war/pom.xml
epp/portal/branches/EPP_5_0_Branch/examples/portal/war/pom.xml
epp/portal/branches/EPP_5_0_Branch/examples/portlets/jsfhellouser/pom.xml
epp/portal/branches/EPP_5_0_Branch/examples/portlets/jsphellouser/pom.xml
epp/portal/branches/EPP_5_0_Branch/examples/portlets/pom.xml
epp/portal/branches/EPP_5_0_Branch/examples/portlets/simplesthelloworld/pom.xml
epp/portal/branches/EPP_5_0_Branch/examples/skins/pom.xml
epp/portal/branches/EPP_5_0_Branch/examples/skins/simpleskin/pom.xml
epp/portal/branches/EPP_5_0_Branch/gadgets/core/pom.xml
epp/portal/branches/EPP_5_0_Branch/gadgets/eXoGadgets/pom.xml
epp/portal/branches/EPP_5_0_Branch/gadgets/pom.xml
epp/portal/branches/EPP_5_0_Branch/gadgets/server/pom.xml
epp/portal/branches/EPP_5_0_Branch/packaging/module/pom.xml
epp/portal/branches/EPP_5_0_Branch/packaging/pkg/pom.xml
epp/portal/branches/EPP_5_0_Branch/packaging/pom.xml
epp/portal/branches/EPP_5_0_Branch/packaging/product/pom.xml
epp/portal/branches/EPP_5_0_Branch/packaging/reports/pom.xml
epp/portal/branches/EPP_5_0_Branch/pom.xml
epp/portal/branches/EPP_5_0_Branch/portlet/dashboard/pom.xml
epp/portal/branches/EPP_5_0_Branch/portlet/exoadmin/pom.xml
epp/portal/branches/EPP_5_0_Branch/portlet/pom.xml
epp/portal/branches/EPP_5_0_Branch/portlet/web/pom.xml
epp/portal/branches/EPP_5_0_Branch/server/jboss/patch-ear/pom.xml
epp/portal/branches/EPP_5_0_Branch/server/jboss/plugin/pom.xml
epp/portal/branches/EPP_5_0_Branch/server/jboss/pom.xml
epp/portal/branches/EPP_5_0_Branch/server/pom.xml
epp/portal/branches/EPP_5_0_Branch/starter/ear/pom.xml
epp/portal/branches/EPP_5_0_Branch/starter/pom.xml
epp/portal/branches/EPP_5_0_Branch/starter/war/pom.xml
epp/portal/branches/EPP_5_0_Branch/testsuite/pom.xml
epp/portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/pom.xml
epp/portal/branches/EPP_5_0_Branch/testsuite/webuibasedsamples/pom.xml
epp/portal/branches/EPP_5_0_Branch/web/eXoResources/pom.xml
epp/portal/branches/EPP_5_0_Branch/web/pom.xml
epp/portal/branches/EPP_5_0_Branch/web/portal/pom.xml
epp/portal/branches/EPP_5_0_Branch/web/rest/pom.xml
epp/portal/branches/EPP_5_0_Branch/webui/core/pom.xml
epp/portal/branches/EPP_5_0_Branch/webui/eXo/pom.xml
epp/portal/branches/EPP_5_0_Branch/webui/pom.xml
epp/portal/branches/EPP_5_0_Branch/webui/portal/pom.xml
Log:
Preparing for a 5.0.2 (If any)
Modified: epp/portal/branches/EPP_5_0_Branch/component/application-registry/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/component/application-registry/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/component/application-registry/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/component/common/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/component/common/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/component/common/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.portal.component.common</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/component/dashboard/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/component/dashboard/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/component/dashboard/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/component/identity/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/component/identity/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/component/identity/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/component/management/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/component/management/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/component/management/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/component/pc/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/component/pc/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/component/pc/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/component/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/component/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/component/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.component</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/component/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/component/portal/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/component/portal/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/component/resources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/component/resources/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/component/resources/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/component/scripting/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/component/scripting/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/component/scripting/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/component/test/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/component/test/core/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/component/test/core/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/component/test/jcr/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/component/test/jcr/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/component/test/jcr/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/component/test/organization/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/component/test/organization/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/component/test/organization/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/component/test/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/component/test/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/component/test/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/component/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/component/web/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/component/web/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/component/wsrp/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/component/wsrp/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/component/wsrp/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/component/xml-parser/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/component/xml-parser/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/component/xml-parser/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/examples/extension/config/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/examples/extension/config/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/examples/extension/config/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/examples/extension/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/examples/extension/ear/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/examples/extension/ear/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-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>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.jar</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.war</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/branches/EPP_5_0_Branch/examples/extension/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/examples/extension/jar/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/examples/extension/jar/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/examples/extension/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/examples/extension/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/examples/extension/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample.extension.root</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/examples/extension/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/examples/extension/war/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/examples/extension/war/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/examples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/examples/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/examples/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/examples/portal/config/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/examples/portal/config/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/examples/portal/config/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/examples/portal/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/examples/portal/ear/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/examples/portal/ear/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-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>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.jar</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.war</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.rest-war</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/branches/EPP_5_0_Branch/examples/portal/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/examples/portal/jar/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/examples/portal/jar/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/examples/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/examples/portal/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/examples/portal/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample.portal.root</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/examples/portal/rest-war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/examples/portal/rest-war/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/examples/portal/rest-war/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/examples/portal/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/examples/portal/war/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/examples/portal/war/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/examples/portlets/jsfhellouser/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/examples/portlets/jsfhellouser/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/examples/portlets/jsfhellouser/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsf-hellouser</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/examples/portlets/jsphellouser/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/examples/portlets/jsphellouser/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/examples/portlets/jsphellouser/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsp-hellouser</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/examples/portlets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/examples/portlets/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/examples/portlets/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
Modified: epp/portal/branches/EPP_5_0_Branch/examples/portlets/simplesthelloworld/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/examples/portlets/simplesthelloworld/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/examples/portlets/simplesthelloworld/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>gatein-simplest-helloworld</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/examples/skins/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/examples/skins/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/examples/skins/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<groupId>org.gatein.portal.examples.skins</groupId>
Modified: epp/portal/branches/EPP_5_0_Branch/examples/skins/simpleskin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/examples/skins/simpleskin/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/examples/skins/simpleskin/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.portal.examples.skins</groupId>
<artifactId>examples.skins.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>gatein-sample-skin</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/gadgets/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/gadgets/core/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/gadgets/core/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -14,7 +14,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-core</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/gadgets/eXoGadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/gadgets/eXoGadgets/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/gadgets/eXoGadgets/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/gadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/gadgets/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/gadgets/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/gadgets/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/gadgets/server/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/gadgets/server/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-server</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/packaging/module/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/packaging/module/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/packaging/module/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/packaging/pkg/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/packaging/pkg/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/packaging/pkg/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -67,13 +67,13 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>portal.packaging.module</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
<type>js</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>portal.packaging.product</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
<type>js</type>
</dependency>
</dependencies>
Modified: epp/portal/branches/EPP_5_0_Branch/packaging/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/packaging/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/packaging/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/packaging/product/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/packaging/product/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/packaging/product/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/packaging/reports/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/packaging/reports/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/packaging/reports/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.packaging</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -37,7 +37,7 @@
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GateIn - Portal</name>
@@ -344,110 +344,110 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.pc</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.application-registry</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.xml-parser</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.scripting</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.dashboard</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.core</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-core</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
Modified: epp/portal/branches/EPP_5_0_Branch/portlet/dashboard/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/portlet/dashboard/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/portlet/dashboard/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/portlet/exoadmin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/portlet/exoadmin/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/portlet/exoadmin/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/portlet/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/portlet/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/portlet/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.portlet</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/portlet/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/portlet/web/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/portlet/web/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/server/jboss/patch-ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/server/jboss/patch-ear/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/server/jboss/patch-ear/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/server/jboss/plugin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/server/jboss/plugin/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/server/jboss/plugin/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/server/jboss/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/server/jboss/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/server/jboss/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server.jboss</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/server/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/server/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/starter/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/starter/ear/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/starter/ear/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-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>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/branches/EPP_5_0_Branch/starter/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/starter/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/starter/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.starter.root</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/starter/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/starter/war/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/starter/war/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/testsuite/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/testsuite/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/testsuite/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.testsuite</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.selenium.snifftests</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/testsuite/webuibasedsamples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/testsuite/webuibasedsamples/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/testsuite/webuibasedsamples/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>exo.webui.based.samples</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/web/eXoResources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/web/eXoResources/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/web/eXoResources/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/web/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/web/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.web</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/web/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/web/portal/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/web/portal/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/web/rest/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/web/rest/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/web/rest/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/webui/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/webui/core/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/webui/core/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/webui/eXo/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/webui/eXo/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/webui/eXo/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_0_Branch/webui/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/webui/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/webui/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.webui</artifactId>
Modified: epp/portal/branches/EPP_5_0_Branch/webui/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/webui/portal/pom.xml 2010-09-22 13:31:44 UTC (rev 4306)
+++ epp/portal/branches/EPP_5_0_Branch/webui/portal/pom.xml 2010-09-22 13:35:10 UTC (rev 4307)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.0.1-epp-GA</version>
+ <version>5.0.2-epp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
15 years, 7 months
- 1
- 0
gatein SVN: r4306 - epp/portal/tags.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-09-22 09:31:44 -0400 (Wed, 22 Sep 2010)
New Revision: 4306
Added:
epp/portal/tags/EPP_5_0_1_GA/
Log:
Tagging EPP 5.0.1
Copied: epp/portal/tags/EPP_5_0_1_GA (from rev 4305, epp/portal/branches/EPP_5_0_Branch)
15 years, 7 months
- 1
- 0
gatein SVN: r4305 - in components/wci/branches/adf/test: servers/jboss51/src/test/resources/config and 3 other directories.
by do-not-reply＠jboss.org
Author: alain_defrance
Date: 2010-09-22 09:26:26 -0400 (Wed, 22 Sep 2010)
New Revision: 4305
Modified:
components/wci/branches/adf/test/servers/jboss51/pom.xml
components/wci/branches/adf/test/servers/jboss51/src/test/resources/config/servers.xml
components/wci/branches/adf/test/servers/jetty6/pom.xml
components/wci/branches/adf/test/src/test/build.xml
components/wci/branches/adf/test/src/test/resources/config/servers.xml
Log:
Tomcat 7 native support & integration tests
Modified: components/wci/branches/adf/test/servers/jboss51/pom.xml
===================================================================
--- components/wci/branches/adf/test/servers/jboss51/pom.xml 2010-09-22 13:25:37 UTC (rev 4304)
+++ components/wci/branches/adf/test/servers/jboss51/pom.xml 2010-09-22 13:26:26 UTC (rev 4305)
@@ -188,6 +188,20 @@
<scope>test</scope>
</dependency>
+ <!-- JBoss Deployer -->
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-tools-jboss-deployer-5.1-and-onwards</artifactId>
+ <version>${version.cargo}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-profileservice-spi</artifactId>
+ <version>5.1.0.SP1</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
@@ -273,6 +287,7 @@
<artifactId>jaxen</artifactId>
<version>1.1.1</version>
</dependency>
+
</dependencies>
<version>1.3</version>
<executions>
Modified: components/wci/branches/adf/test/servers/jboss51/src/test/resources/config/servers.xml
===================================================================
--- components/wci/branches/adf/test/servers/jboss51/src/test/resources/config/servers.xml 2010-09-22 13:25:37 UTC (rev 4304)
+++ components/wci/branches/adf/test/servers/jboss51/src/test/resources/config/servers.xml 2010-09-22 13:26:26 UTC (rev 4305)
@@ -10,7 +10,7 @@
</service>
<deployer>
<remote>
- <name>jboss5x</name>
+ <name>jboss51x</name>
<host>localhost</host>
<port>8080</port>
</remote>
Modified: components/wci/branches/adf/test/servers/jetty6/pom.xml
===================================================================
--- components/wci/branches/adf/test/servers/jetty6/pom.xml 2010-09-22 13:25:37 UTC (rev 4304)
+++ components/wci/branches/adf/test/servers/jetty6/pom.xml 2010-09-22 13:26:26 UTC (rev 4305)
@@ -190,20 +190,20 @@
<groupId>org.jboss.remoting</groupId>
<artifactId>jboss-remoting</artifactId>
</dependency>
-
- <!-- Jetty Deployer -->
+
<dependency>
<groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-jetty-deployer</artifactId>
- <type>war</type>
+ <artifactId>cargo-core-uberjar</artifactId>
<version>${version.cargo}</version>
+ <scope>test</scope>
</dependency>
+ <!-- Jetty Deployer -->
<dependency>
<groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-uberjar</artifactId>
+ <artifactId>cargo-jetty-deployer</artifactId>
+ <type>war</type>
<version>${version.cargo}</version>
- <scope>test</scope>
</dependency>
</dependencies>
Modified: components/wci/branches/adf/test/src/test/build.xml
===================================================================
--- components/wci/branches/adf/test/src/test/build.xml 2010-09-22 13:25:37 UTC (rev 4304)
+++ components/wci/branches/adf/test/src/test/build.xml 2010-09-22 13:26:26 UTC (rev 4305)
@@ -27,6 +27,7 @@
<target name="tests.call.all" unless="tests">
<antcall target="tests.jboss5"/>
<antcall target="tests.jboss"/>
+ <antcall target="tests.tomcat7"/>
<antcall target="tests.tomcat"/>
<!-- <antcall target="tests.jetty"/> -->
</target>
Modified: components/wci/branches/adf/test/src/test/resources/config/servers.xml
===================================================================
--- components/wci/branches/adf/test/src/test/resources/config/servers.xml 2010-09-22 13:25:37 UTC (rev 4304)
+++ components/wci/branches/adf/test/src/test/resources/config/servers.xml 2010-09-22 13:26:26 UTC (rev 4305)
@@ -148,7 +148,7 @@
</service>
<deployer>
<remote>
- <name>jboss5x</name>
+ <name>jboss51x</name>
<host>localhost</host>
<port>8080</port>
</remote>
15 years, 7 months
- 1
- 0
gatein SVN: r4304 - epp/portal/branches/EPP_5_0_Branch.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-09-22 09:25:37 -0400 (Wed, 22 Sep 2010)
New Revision: 4304
Modified:
epp/portal/branches/EPP_5_0_Branch/pom.xml
Log:
JBEPP-473: Simple skin from examples folder doesn't appear at list
Upgrading eXo Kernel
Modified: epp/portal/branches/EPP_5_0_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_0_Branch/pom.xml 2010-09-22 07:16:28 UTC (rev 4303)
+++ epp/portal/branches/EPP_5_0_Branch/pom.xml 2010-09-22 13:25:37 UTC (rev 4304)
@@ -43,7 +43,7 @@
<name>GateIn - Portal</name>
<properties>
- <org.exoplatform.kernel.version>2.2.3-GA</org.exoplatform.kernel.version>
+ <org.exoplatform.kernel.version>2.2.3-CP01</org.exoplatform.kernel.version>
<org.exoplatform.core.version>2.3.3-GA</org.exoplatform.core.version>
<org.exoplatform.ws.version>2.1.3-GA</org.exoplatform.ws.version>
<org.exoplatform.jcr.version>1.12.3-GA</org.exoplatform.jcr.version>
15 years, 7 months
- 1
- 0
gatein SVN: r4303 - portal/trunk/component/scripting/src/test/java/org/exoplatform/groovyscript.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2010-09-22 03:16:28 -0400 (Wed, 22 Sep 2010)
New Revision: 4303
Modified:
portal/trunk/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java
Log:
Fix testcase failed
Modified: portal/trunk/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java
===================================================================
--- portal/trunk/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java 2010-09-22 04:52:10 UTC (rev 4302)
+++ portal/trunk/component/scripting/src/test/java/org/exoplatform/groovyscript/TestTemplateRendering.java 2010-09-22 07:16:28 UTC (rev 4303)
@@ -24,6 +24,8 @@
import java.awt.*;
import java.io.*;
+import java.text.DateFormat;
+import java.util.Date;
import java.util.EmptyStackException;
import java.util.HashMap;
import java.util.Locale;
@@ -36,6 +38,19 @@
public class TestTemplateRendering extends AbstractGateInTest
{
+ private DateFormat dateFormatFR;
+ private DateFormat dateFormatEN;
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ // TODO Auto-generated method stub
+ super.setUp();
+
+ dateFormatFR = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.FRANCE);
+ dateFormatEN = DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.ENGLISH);
+ }
+
public void testOutputStreamWriter() throws Exception
{
GroovyTemplate template = new GroovyTemplate("a<%='b'%>c<%out.print('d');%>e");
@@ -48,28 +63,31 @@
public void testDate1() throws Exception
{
+ Date dateToTest = new Date(0);
GroovyTemplate template = new GroovyTemplate("<% print(new Date(0)); %>");
- assertEquals("1 janv. 1970", template.render(Locale.FRENCH));
- assertEquals("Jan 1, 1970", template.render(Locale.ENGLISH));
- assertEquals("Thu Jan 01 07:00:00 ICT 1970", template.render());
+ assertEquals(dateFormatFR.format(dateToTest), template.render(Locale.FRENCH));
+ assertEquals(dateFormatEN.format(dateToTest), template.render(Locale.ENGLISH));
+ assertEquals(dateToTest.toString(), template.render());
}
public void testDate2() throws Exception
{
+ Date dateToTest = new Date(0);
GroovyTemplate template = new GroovyTemplate("<% def date = new Date(0) %>$date");
System.out.println("template.getGroovy() = " + template.getGroovy());
- assertEquals("1 janv. 1970", template.render(Locale.FRENCH));
- assertEquals("Jan 1, 1970", template.render(Locale.ENGLISH));
- assertEquals("Thu Jan 01 07:00:00 ICT 1970", template.render());
+ assertEquals(dateFormatFR.format(dateToTest), template.render(Locale.FRENCH));
+ assertEquals(dateFormatEN.format(dateToTest), template.render(Locale.ENGLISH));
+ assertEquals(dateToTest.toString(), template.render());
}
public void testDate3() throws Exception
{
+ Date dateToTest = new Date(0);
GroovyTemplate template = new GroovyTemplate("<%= new Date(0) %>");
System.out.println("template.getGroovy() = " + template.getGroovy());
- assertEquals("1 janv. 1970", template.render(Locale.FRENCH));
- assertEquals("Jan 1, 1970", template.render(Locale.ENGLISH));
- assertEquals("Thu Jan 01 07:00:00 ICT 1970", template.render());
+ assertEquals(dateFormatFR.format(dateToTest), template.render(Locale.FRENCH));
+ assertEquals(dateFormatEN.format(dateToTest), template.render(Locale.ENGLISH));
+ assertEquals(dateToTest.toString(), template.render());
}
public void testFoo() throws Exception
15 years, 7 months
- 1
- 0
gatein SVN: r4302 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-09-22 00:52:10 -0400 (Wed, 22 Sep 2010)
New Revision: 4302
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_05_RecoverUserNameOrPassword.html
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_38_EditPropertiesForGroup.html
Log:
TestVN-356:Clean and Improve existing Selenium for GateIn
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_05_RecoverUserNameOrPassword.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_05_RecoverUserNameOrPassword.html 2010-09-22 03:54:57 UTC (rev 4301)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_05_RecoverUserNameOrPassword.html 2010-09-22 04:52:10 UTC (rev 4302)
@@ -22,6 +22,11 @@
<td></td>
</tr>
<tr>
+ <td>windowMaximize</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>link=Sign in</td>
<td></td>
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_38_EditPropertiesForGroup.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_38_EditPropertiesForGroup.html 2010-09-22 03:54:57 UTC (rev 4301)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_38_EditPropertiesForGroup.html 2010-09-22 04:52:10 UTC (rev 4302)
@@ -17,6 +17,11 @@
<td></td>
</tr>
<tr>
+ <td>windowMaximize</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
<td>click</td>
<td>link=Sign in</td>
<td></td>
15 years, 7 months
- 1
- 0