Author: chris.laprun(a)jboss.com Date: 2011-04-08 16:59:33 -0400 (Fri, 08 Apr 2011) New Revision: 6186 Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/BeanContext.java components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPUtils.java components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerInfoTestCase.java components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/handlers/MimeResponseHandlerTestCase.java components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v1/PortletManagementTestCase.java components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v1/ServiceDescriptionTestCase.java components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v2/PortletManagementTestCase.java components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java components/wsrp/trunk/pom.xml components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/PortletManagementHandler.java components/wsrp/trunk/producer/src/test/java/org/gatein/registration/RegistrationTestCase.java components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/handlers/processors/MimeResponseProcessorTestCase.java components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/invoker/RegistrationCheckingPortletInvokerTestCase.java components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/PortletManagementTestCase.java Log: - GTNWSRP-220: Upgraded to snapshot of PC 2.3.0-Beta2 and updated code and tests as needed. - Removed dependency of BeanContext on Log4J that was masked by transititive dependencies. Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/BeanContext.java =================================================================== --- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/BeanContext.java 2011-04-08 20:24:23 UTC (rev 6185) +++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/BeanContext.java 2011-04-08 20:59:33 UTC (rev 6186) @@ -23,8 +23,9 @@ package org.gatein.wsrp.admin.ui; -import org.apache.log4j.Logger; import org.gatein.common.util.ParameterValidation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.text.MessageFormat; import java.util.Locale; @@ -39,7 +40,7 @@ */ public abstract class BeanContext { - protected final static Logger log = Logger.getLogger(BeanContext.class); + protected final static Logger log = LoggerFactory.getLogger(BeanContext.class); public static final String STATUS = "status"; private static final String DEFAULT_RESOURCE_NAME = "Resource"; Modified: components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPUtils.java =================================================================== --- components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPUtils.java 2011-04-08 20:24:23 UTC (rev 6185) +++ components/wsrp/trunk/common/src/main/java/org/gatein/wsrp/WSRPUtils.java 2011-04-08 20:59:33 UTC (rev 6186) @@ -251,7 +251,7 @@ PortletContext context; byte[] state = portletContext.getPortletState(); - context = PortletContext.createPortletContext(handle, state); + context = PortletContext.createPortletContext(handle, state, false); return context; } @@ -261,7 +261,7 @@ ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(portletHandle, "portlet handle", "PortletContext"); PortletContext context; - context = PortletContext.createPortletContext(portletHandle, state); + context = PortletContext.createPortletContext(portletHandle, state, false); return context; } Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java 2011-04-08 20:24:23 UTC (rev 6185) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java 2011-04-08 20:59:33 UTC (rev 6186) @@ -666,7 +666,7 @@ log.debug("Portlet '" + portletHandle + "' will store persistent state for each user."); } - wsrpPortlet = new WSRPPortlet(PortletContext.createPortletContext(portletHandle), info); + wsrpPortlet = new WSRPPortlet(PortletContext.createPortletContext(portletHandle, false), info); // add the portlet to the appropriate group if needed String portletGroupId = portletDescription.getGroupID(); Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java 2011-04-08 20:24:23 UTC (rev 6185) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java 2011-04-08 20:59:33 UTC (rev 6186) @@ -456,7 +456,7 @@ new Holder<Lifetime>(), new Holder<List<Extension>>() ); - PortletContext newPortletContext = PortletContext.createPortletContext(handle.value, portletState.value); + PortletContext newPortletContext = PortletContext.createPortletContext(handle.value, portletState.value, false); portlet.setPortletContext(newPortletContext); return newPortletContext; } @@ -933,7 +933,7 @@ for (ImportedPortlet importedPortlet : importedPortlets) { org.oasis.wsrp.v2.PortletContext portletContext = importedPortlet.getNewPortletContext(); - PortletContext apiPC = PortletContext.createPortletContext(portletContext.getPortletHandle(), portletContext.getPortletState()); + PortletContext apiPC = PortletContext.createPortletContext(portletContext.getPortletHandle(), portletContext.getPortletState(), false); // we need to reference the resulting PortletContext so that it can then be used properly importIdToPortletContext.put(importedPortlet.getImportID(), FederatingPortletInvokerService.reference(apiPC, getProducerId())); } Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerInfoTestCase.java =================================================================== --- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerInfoTestCase.java 2011-04-08 20:24:23 UTC (rev 6185) +++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerInfoTestCase.java 2011-04-08 20:59:33 UTC (rev 6186) @@ -263,14 +263,14 @@ // activate caching for this test so that we can simulate portlet deployment on the producer with a cached SD info.setExpirationCacheSeconds(1000); - org.gatein.pc.api.PortletContext portletContext = org.gatein.pc.api.PortletContext.createPortletContext("test"); + org.gatein.pc.api.PortletContext portletContext = org.gatein.pc.api.PortletContext.createPortletContext("test", false); Portlet portlet = info.getPortlet(portletContext); assertNotNull(portlet); assertEquals(portletContext, portlet.getContext()); assertEquals(1, behavior.getCallCount()); // test2 is not in the service description, so it should be looked up via Portlet Management... - portletContext = org.gatein.pc.api.PortletContext.createPortletContext("test2"); + portletContext = org.gatein.pc.api.PortletContext.createPortletContext(TestPortletManagementBehavior.HANDLE_FOR_GET_DESCRIPTION, false); // add portlet management behavior TestPortletManagementBehavior pmBehavior = new TestPortletManagementBehavior(); serviceFactory.getRegistry().setPortletManagementBehavior(pmBehavior); @@ -282,8 +282,9 @@ // try again, this time without a portlet management interface, the service description should be refreshed serviceFactory.getRegistry().setPortletManagementBehavior(null); // simulate a new portlet deployment since last time the SD was refreshed - behavior.addPortletDescription(behavior.createPortletDescription("test3", null)); - portletContext = org.gatein.pc.api.PortletContext.createPortletContext("test3"); + final String handle = "test3"; + behavior.addPortletDescription(behavior.createPortletDescription(handle, null)); + portletContext = org.gatein.pc.api.PortletContext.createPortletContext(handle, false); portlet = info.getPortlet(portletContext); assertEquals(2, behavior.getCallCount()); assertNotNull(portlet); @@ -462,11 +463,13 @@ private static class TestPortletManagementBehavior extends PortletManagementBehavior { + public static final String HANDLE_FOR_GET_DESCRIPTION = "test2"; + @Override public void getPortletDescription(@WebParam(name = "registrationContext", targetNamespace = "urn:oasis:names:tc:wsrp:v2:types") RegistrationContext registrationContext, @WebParam(name = "portletContext", targetNamespace = "urn:oasis:names:tc:wsrp:v2:types") PortletContext portletContext, @WebParam(name = "userContext", targetNamespace = "urn:oasis:names:tc:wsrp:v2:types") UserContext userContext, @WebParam(name = "desiredLocales", targetNamespace = "urn:oasis:names:tc:wsrp:v2:types") List<String> desiredLocales, @WebParam(name = "portletDescription", targetNamespace = "urn:oasis:names:tc:wsrp:v2:types", mode = WebParam.Mode.OUT) Holder<PortletDescription> portletDescription, @WebParam(name = "resourceList", targetNamespace = "urn:oasis:names:tc:wsrp:v2:types", mode = WebParam.Mode.OUT) Holder<ResourceList> resourceList, @WebParam(name = "extensions", targetNamespace = "urn:oasis:names:tc:wsrp:v2:types", mode = WebParam.Mode.OUT) Holder<List<Extension>> extensions) thr! ows AccessDenied, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended { super.getPortletDescription(registrationContext, portletContext, userContext, desiredLocales, portletDescription, resourceList, extensions); - portletDescription.value = createPortletDescription("test2", null); + portletDescription.value = createPortletDescription(HANDLE_FOR_GET_DESCRIPTION, null); } } Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/handlers/MimeResponseHandlerTestCase.java =================================================================== --- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/handlers/MimeResponseHandlerTestCase.java 2011-04-08 20:24:23 UTC (rev 6185) +++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/handlers/MimeResponseHandlerTestCase.java 2011-04-08 20:59:33 UTC (rev 6186) @@ -56,7 +56,7 @@ public static final String NAMESPACE = "NAMESPACE"; public static final String PORTLETID = "PORTLETID"; public static final MockWSRPConsumer CONSUMER = new MockWSRPConsumer("foo"); - public static final PortletContext PORTLET_CONTEXT = PortletContext.createPortletContext(PORTLETID); + public static final PortletContext PORTLET_CONTEXT = PortletContext.createPortletContext(PORTLETID, false); public static final TestPortletInvocationContext CONTEXT = new TestPortletInvocationContext(); public static final URLFormat FORMAT = new URLFormat(false, false, true, true); @@ -110,25 +110,25 @@ { String markup; String expected; - + String resourceID = WSRPResourceURL.encodeResource(null, new URL("http://localhost:8080/test-resource-portlet/gif/logo.gif"), false); - + //test with &amp; markup = "<img src='wsrp_rewrite?wsrp-urlType=resource&amp;wsrp-url=http%3A%2F%2Flocalhost%3A8080%2Ftest-resource-portlet%2Fgif%2Flogo.gif&amp;wsrp-requiresRewrite=true/wsrp_rewrite'/>"; - expected = "<img src='http://test/mock:type=resource?mock:ComponentID=foobar&amp;mock:resourceID=" + resourceID + "'/>"; + expected = "<img src='http://test/mock:type=resource?mock:ComponentID=foobar&amp;mock:resourceID=" + resourceID + "'/>"; processMarkupAndCheck(markup, expected); - + //test with & markup = "<img src='wsrp_rewrite?wsrp-urlType=resource&wsrp-url=http%3A%2F%2Flocalhost%3A8080%2Ftest-resource-portlet%2Fgif%2Flogo.gif&wsrp-requiresRewrite=true/wsrp_rewrite'/>"; - expected = "<img src='http://test/mock:type=resource?mock:ComponentID=foobar&mock:resourceID=" + resourceID + "'/>"; + expected = "<img src='http://test/mock:type=resource?mock:ComponentID=foobar&mock:resourceID=" + resourceID + "'/>"; processMarkupAndCheck(markup, expected); - + //test with /x26 markup = "<img src='wsrp_rewrite?wsrp-urlType=resource\\x26wsrp-url=http%3A%2F%2Flocalhost%3A8080%2Ftest-resource-portlet%2Fgif%2Flogo.gif\\x26wsrp-requiresRewrite=true/wsrp_rewrite'/>"; - expected = "<img src='http://test/mock:type=resource?mock:ComponentID=foobar\\x26mock:resourceID=" + resourceID + "'/>"; + expected = "<img src='http://test/mock:type=resource?mock:ComponentID=foobar\\x26mock:resourceID=" + resourceID + "'/>"; processMarkupAndCheck(markup, expected); } - + /*public void testResourceURLs() { String markup; Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java =================================================================== --- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java 2011-04-08 20:24:23 UTC (rev 6185) +++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v1/MarkupTestCase.java 2011-04-08 20:59:33 UTC (rev 6186) @@ -292,7 +292,7 @@ } RenderInvocation render = new RenderInvocation(invocationContext); - render.setTarget(PortletContext.createPortletContext(portletHandle)); + render.setTarget(PortletContext.createPortletContext(portletHandle, false)); render.setMode(mode); render.setWindowState(state); if (navigationalState != null) @@ -318,7 +318,7 @@ action.setInstanceContext(new AbstractInstanceContext(portletHandle)); action.setSecurityContext(new AbstractSecurityContext(MockHttpServletRequest.createMockRequest(null))); action.setUserContext(new MockUserContext()); - action.setTarget(PortletContext.createPortletContext(portletHandle)); + action.setTarget(PortletContext.createPortletContext(portletHandle, false)); RequestedMarkupBehavior.setRequestedMarkupBehavior(portletHandle); Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v1/PortletManagementTestCase.java =================================================================== --- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v1/PortletManagementTestCase.java 2011-04-08 20:24:23 UTC (rev 6185) +++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v1/PortletManagementTestCase.java 2011-04-08 20:59:33 UTC (rev 6186) @@ -53,7 +53,7 @@ public void testClone() throws Exception { - PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE); + PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE, false); PortletContext clone = consumer.createClone(PortletStateType.OPAQUE, original); ExtendedAssert.assertNotNull(clone); ExtendedAssert.assertFalse(original.equals(clone)); @@ -73,7 +73,7 @@ public void testGetSetProperties() throws Exception { - PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE); + PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE, false); PropertyMap props = consumer.getProperties(original); checkProperties(props, BasicPortletManagementBehavior.PROPERTY_VALUE); @@ -97,7 +97,7 @@ public void testSetResetSameProperty() throws PortletInvokerException { - PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE); + PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE, false); PortletContext clone = consumer.createClone(PortletStateType.OPAQUE, original); try @@ -130,7 +130,7 @@ BehaviorRegistry behaviorRegistry = producer.getBehaviorRegistry(); behaviorRegistry.setPortletManagementBehavior(new DestroyClonesPortletManagementBehavior(behaviorRegistry)); - PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE); + PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE, false); PortletContext clone = consumer.createClone(PortletStateType.OPAQUE, original); ExtendedAssert.assertNotNull(clone); Portlet portlet = consumer.getPortlet(clone); @@ -152,7 +152,7 @@ // re-create clone and try again with an added invalid portlet context clone = consumer.createClone(PortletStateType.OPAQUE, original); - PortletContext invalidContext = PortletContext.createPortletContext("invalid"); + PortletContext invalidContext = PortletContext.createPortletContext("invalid", false); clones.add(invalidContext); result = consumer.destroyClones(clones); ExtendedAssert.assertEquals(1, result.size()); @@ -170,7 +170,7 @@ public void testInvalidSetProperties() throws Exception { - PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE); + PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE, false); try { consumer.setProperties(original, null); Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v1/ServiceDescriptionTestCase.java =================================================================== --- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v1/ServiceDescriptionTestCase.java 2011-04-08 20:24:23 UTC (rev 6185) +++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v1/ServiceDescriptionTestCase.java 2011-04-08 20:59:33 UTC (rev 6186) @@ -60,10 +60,10 @@ public void testGetPortlet() throws Exception { //obtain one portlet - Portlet portlet = consumer.getPortlet(PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE)); + Portlet portlet = consumer.getPortlet(PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE, false)); checkPortlet(portlet, "", BasicMarkupBehavior.PORTLET_HANDLE); - portlet = consumer.getPortlet(PortletContext.createPortletContext(SessionMarkupBehavior.PORTLET_HANDLE)); + portlet = consumer.getPortlet(PortletContext.createPortletContext(SessionMarkupBehavior.PORTLET_HANDLE, false)); checkPortlet(portlet, "2", SessionMarkupBehavior.PORTLET_HANDLE); } } Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java =================================================================== --- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java 2011-04-08 20:24:23 UTC (rev 6185) +++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java 2011-04-08 20:59:33 UTC (rev 6186) @@ -225,7 +225,8 @@ PortletInvocationResponse response = consumer.invoke(render); String resourceID = WSRPResourceURL.encodeResource(null, new URL("http://localhost:8080/test-resource-portlet/gif/logo.gif"), false); - String expectedResult = "<img src='http://test/mock:type=resource?mock:ComponentID=foobar&amp;mock:resourceID=" + resourceID + "'/>";; + String expectedResult = "<img src='http://test/mock:type=resource?mock:ComponentID=foobar&amp;mock:resourceID=" + resourceID + "'/>"; + ; //NOTE: the value we get back is from the TestPortletInvocationContext, not what we would normally receive checkRenderResult(response, expectedResult); @@ -295,7 +296,7 @@ } RenderInvocation render = new RenderInvocation(invocationContext); - render.setTarget(PortletContext.createPortletContext(portletHandle)); + render.setTarget(PortletContext.createPortletContext(portletHandle, false)); render.setMode(mode); render.setWindowState(state); if (navigationalState != null) @@ -321,7 +322,7 @@ action.setInstanceContext(new AbstractInstanceContext(portletHandle)); action.setSecurityContext(new AbstractSecurityContext(MockHttpServletRequest.createMockRequest(null))); action.setUserContext(new MockUserContext()); - action.setTarget(PortletContext.createPortletContext(portletHandle)); + action.setTarget(PortletContext.createPortletContext(portletHandle, false)); RequestedMarkupBehavior.setRequestedMarkupBehavior(portletHandle); Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v2/PortletManagementTestCase.java =================================================================== --- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v2/PortletManagementTestCase.java 2011-04-08 20:24:23 UTC (rev 6185) +++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v2/PortletManagementTestCase.java 2011-04-08 20:59:33 UTC (rev 6186) @@ -55,7 +55,7 @@ public void testClone() throws Exception { - PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE); + PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE, false); PortletContext clone = consumer.createClone(PortletStateType.OPAQUE, original); ExtendedAssert.assertNotNull(clone); ExtendedAssert.assertFalse(original.equals(clone)); @@ -75,7 +75,7 @@ public void testGetSetProperties() throws Exception { - PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE); + PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE, false); PropertyMap props = consumer.getProperties(original); checkProperties(props, BasicPortletManagementBehavior.PROPERTY_VALUE); @@ -99,7 +99,7 @@ public void testSetResetSameProperty() throws PortletInvokerException { - PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE); + PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE, false); PortletContext clone = consumer.createClone(PortletStateType.OPAQUE, original); try @@ -131,7 +131,7 @@ BehaviorRegistry behaviorRegistry = producer.getBehaviorRegistry(); behaviorRegistry.setPortletManagementBehavior(new DestroyClonesPortletManagementBehavior(behaviorRegistry)); - PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE); + PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE, false); PortletContext clone = consumer.createClone(PortletStateType.OPAQUE, original); ExtendedAssert.assertNotNull(clone); Portlet portlet = consumer.getPortlet(clone); @@ -153,7 +153,7 @@ // re-create clone and try again with an added invalid portlet context clone = consumer.createClone(PortletStateType.OPAQUE, original); - PortletContext invalidContext = PortletContext.createPortletContext("invalid"); + PortletContext invalidContext = PortletContext.createPortletContext("invalid", false); clones.add(invalidContext); result = consumer.destroyClones(clones); ExtendedAssert.assertEquals(1, result.size()); @@ -171,7 +171,7 @@ public void testInvalidSetProperties() throws Exception { - PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE); + PortletContext original = PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE, false); try { consumer.setProperties(original, null); Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java =================================================================== --- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java 2011-04-08 20:24:23 UTC (rev 6185) +++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/protocol/v2/ServiceDescriptionTestCase.java 2011-04-08 20:59:33 UTC (rev 6186) @@ -82,10 +82,10 @@ public void testGetPortlet() throws Exception { //obtain one portlet - Portlet portlet = consumer.getPortlet(PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE)); + Portlet portlet = consumer.getPortlet(PortletContext.createPortletContext(BasicMarkupBehavior.PORTLET_HANDLE, false)); checkPortlet(portlet, "", BasicMarkupBehavior.PORTLET_HANDLE); - portlet = consumer.getPortlet(PortletContext.createPortletContext(SessionMarkupBehavior.PORTLET_HANDLE)); + portlet = consumer.getPortlet(PortletContext.createPortletContext(SessionMarkupBehavior.PORTLET_HANDLE, false)); checkPortlet(portlet, "2", SessionMarkupBehavior.PORTLET_HANDLE); } Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2011-04-08 20:24:23 UTC (rev 6185) +++ components/wsrp/trunk/pom.xml 2011-04-08 20:59:33 UTC (rev 6186) @@ -21,7 +21,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -46,7 +47,7 @@ </scm> <properties> - <version.gatein.pc>2.3.0-Beta01</version.gatein.pc> + <version.gatein.pc>2.3.0-Beta02-SNAPSHOT</version.gatein.pc> <version.gatein.common>2.0.4-Beta02</version.gatein.common> <version.gatein.wci>2.1.0-Beta01</version.gatein.wci> 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 2011-04-08 20:24:23 UTC (rev 6185) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/handlers/PortletManagementHandler.java 2011-04-08 20:59:33 UTC (rev 6186) @@ -26,6 +26,7 @@ import com.google.common.base.Function; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import com.sun.tools.corba.se.idl.InvalidArgument; import org.gatein.common.i18n.LocalizedString; import org.gatein.common.logging.Logger; import org.gatein.common.logging.LoggerFactory; @@ -389,7 +390,9 @@ ErrorCodes.Codes errorCode; String reason; - if (e instanceof NoSuchPortletException || e instanceof InvalidHandle) + final String message = e.getLocalizedMessage(); + if (e instanceof NoSuchPortletException || e instanceof InvalidHandle + || (e instanceof IllegalArgumentException && message != null && message.contains(org.gatein.pc.api.PortletContext.INVALID_PORTLET_CONTEXT))) { errorCode = ErrorCodes.Codes.INVALIDHANDLE; reason = "The specified portlet handle is invalid"; Modified: components/wsrp/trunk/producer/src/test/java/org/gatein/registration/RegistrationTestCase.java =================================================================== --- components/wsrp/trunk/producer/src/test/java/org/gatein/registration/RegistrationTestCase.java 2011-04-08 20:24:23 UTC (rev 6185) +++ components/wsrp/trunk/producer/src/test/java/org/gatein/registration/RegistrationTestCase.java 2011-04-08 20:59:33 UTC (rev 6186) @@ -160,18 +160,18 @@ public void testPortletContextOperations() throws RegistrationException { - PortletContext foo = PortletContext.createPortletContext("foo"); + PortletContext foo = PortletContext.createPortletContext("webapp", "foo"); registration.addPortletContext(foo); assertTrue(registration.knows(foo)); - assertTrue(registration.knows("foo")); + assertTrue(registration.knows(foo.getId())); Set<PortletContext> knownPortletContexts = registration.getKnownPortletContexts(); assertEquals(1, knownPortletContexts.size()); assertTrue(knownPortletContexts.contains(foo)); registration.removePortletContext(foo); assertFalse(registration.knows(foo)); - assertFalse(registration.knows("foo")); + assertFalse(registration.knows(foo.getId())); knownPortletContexts = registration.getKnownPortletContexts(); assertTrue(knownPortletContexts.isEmpty()); } Modified: components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/handlers/processors/MimeResponseProcessorTestCase.java =================================================================== --- components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/handlers/processors/MimeResponseProcessorTestCase.java 2011-04-08 20:24:23 UTC (rev 6185) +++ components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/handlers/processors/MimeResponseProcessorTestCase.java 2011-04-08 20:59:33 UTC (rev 6186) @@ -57,7 +57,7 @@ */ public class MimeResponseProcessorTestCase extends TestCase { - private static final String PORTLET_HANDLE = "portletHandle"; + private static final String PORTLET_HANDLE = "/app.portletHandle"; public void testShouldUseProvidedNamespace() throws OperationFailed, UnsupportedMode, InvalidHandle, MissingParameters, UnsupportedMimeType, UnsupportedWindowState, InvalidRegistration, ModifyRegistrationRequired { Modified: components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/invoker/RegistrationCheckingPortletInvokerTestCase.java =================================================================== --- components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/invoker/RegistrationCheckingPortletInvokerTestCase.java 2011-04-08 20:24:23 UTC (rev 6185) +++ components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/invoker/RegistrationCheckingPortletInvokerTestCase.java 2011-04-08 20:59:33 UTC (rev 6186) @@ -48,7 +48,7 @@ invoker.setRegistrationManager(registrationManager); PortletInvoker next = mock(PortletInvoker.class); - PortletContext portletContext = PortletContext.createPortletContext("foo"); + PortletContext portletContext = PortletContext.createPortletContext("app", "portlet"); Portlet portlet = mock(Portlet.class); when(next.getPortlet(portletContext)).thenReturn(portlet); 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 2011-04-08 20:24:23 UTC (rev 6185) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/PortletManagementTestCase.java 2011-04-08 20:59:33 UTC (rev 6186) @@ -1314,9 +1314,10 @@ assertEquals(0, response.getCopiedPortlets().size()); assertEquals(1, response.getFailedPortlets().size()); - assertTrue(response.getFailedPortlets().get(0).getPortletHandles().contains(fakePortletContext1)); - assertTrue(response.getFailedPortlets().get(0).getPortletHandles().contains(fakePortletContext2)); - assertTrue(response.getFailedPortlets().get(0).getErrorCode().getLocalPart().contains("InvalidHandle")); + final FailedPortlets failedPortlets = response.getFailedPortlets().get(0); + assertTrue(failedPortlets.getPortletHandles().contains(fakePortletContext1)); + assertTrue(failedPortlets.getPortletHandles().contains(fakePortletContext2)); + assertTrue(failedPortlets.getErrorCode().getLocalPart().contains("InvalidHandle")); } @Test