Author: chris.laprun(a)jboss.com Date: 2009-08-02 15:46:00 -0400 (Sun, 02 Aug 2009) New Revision: 13653 Added: jbossexo/modules/wsrp/trunk/producer/src/main/webapp/WEB-INF/conf/ jbossexo/modules/wsrp/trunk/producer/src/main/webapp/WEB-INF/conf/producer/ jbossexo/modules/wsrp/trunk/producer/src/main/webapp/WEB-INF/conf/producer/config.xml Modified: jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/UserContextConverter.java jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPActionURL.java jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPConstants.java jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPPortletURL.java jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPRenderURL.java jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPTypeFactory.java jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPUtils.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/ActionRequestProcessor.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/MarkupHandler.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/MarkupRequest.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/PortletManagementHandler.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/RequestProcessor.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPInstanceContext.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPPortletInvocationContext.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPRequestContext.java Log: - Adapted to change of package of many portlet module classes that are now in an api package. - Added configuration directory to resources. Modified: jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/UserContextConverter.java =================================================================== --- jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/UserContextConverter.java 2009-08-02 14:42:03 UTC (rev 13652) +++ jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/UserContextConverter.java 2009-08-02 19:46:00 UTC (rev 13653) @@ -25,7 +25,7 @@ import org.jboss.portal.common.NotYetImplemented; import static org.jboss.portal.common.p3p.P3PConstants.*; -import org.jboss.portal.portlet.spi.UserContext; +import org.jboss.portal.portlet.api.spi.UserContext; import org.jboss.portal.wsrp.core.Contact; import org.jboss.portal.wsrp.core.EmployerInfo; import org.jboss.portal.wsrp.core.Online; Modified: jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPActionURL.java =================================================================== --- jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPActionURL.java 2009-08-02 14:42:03 UTC (rev 13652) +++ jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPActionURL.java 2009-08-02 19:46:00 UTC (rev 13653) @@ -25,9 +25,9 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; -import org.jboss.portal.portlet.ActionURL; -import org.jboss.portal.portlet.OpaqueStateString; -import org.jboss.portal.portlet.StateString; +import org.jboss.portal.portlet.api.ActionURL; +import org.jboss.portal.portlet.api.OpaqueStateString; +import org.jboss.portal.portlet.api.StateString; import java.util.Map; Modified: jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPConstants.java =================================================================== --- jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPConstants.java 2009-08-02 14:42:03 UTC (rev 13652) +++ jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPConstants.java 2009-08-02 19:46:00 UTC (rev 13653) @@ -23,7 +23,7 @@ package org.jboss.portal.wsrp; -import org.jboss.portal.portlet.spi.PortalContext; +import org.jboss.portal.portlet.api.spi.PortalContext; import javax.xml.namespace.QName; import java.net.InetAddress; Modified: jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPPortletURL.java =================================================================== --- jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPPortletURL.java 2009-08-02 14:42:03 UTC (rev 13652) +++ jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPPortletURL.java 2009-08-02 19:46:00 UTC (rev 13653) @@ -28,12 +28,12 @@ import org.jboss.portal.common.NotYetImplemented; import org.jboss.portal.common.text.FastURLDecoder; import org.jboss.portal.common.util.Tools; -import org.jboss.portal.portlet.ActionURL; -import org.jboss.portal.portlet.ParametersStateString; -import org.jboss.portal.portlet.PortletURL; -import org.jboss.portal.portlet.RenderURL; -import org.jboss.portal.portlet.ResourceURL; -import org.jboss.portal.portlet.StateString; +import org.jboss.portal.portlet.api.ActionURL; +import org.jboss.portal.portlet.api.ParametersStateString; +import org.jboss.portal.portlet.api.PortletURL; +import org.jboss.portal.portlet.api.RenderURL; +import org.jboss.portal.portlet.api.ResourceURL; +import org.jboss.portal.portlet.api.StateString; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPRenderURL.java =================================================================== --- jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPRenderURL.java 2009-08-02 14:42:03 UTC (rev 13652) +++ jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPRenderURL.java 2009-08-02 19:46:00 UTC (rev 13653) @@ -25,9 +25,9 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; -import org.jboss.portal.portlet.OpaqueStateString; -import org.jboss.portal.portlet.RenderURL; -import org.jboss.portal.portlet.StateString; +import org.jboss.portal.portlet.api.OpaqueStateString; +import org.jboss.portal.portlet.api.RenderURL; +import org.jboss.portal.portlet.api.StateString; import java.util.Map; Modified: jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPTypeFactory.java =================================================================== --- jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPTypeFactory.java 2009-08-02 14:42:03 UTC (rev 13652) +++ jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPTypeFactory.java 2009-08-02 19:46:00 UTC (rev 13653) @@ -27,13 +27,13 @@ import org.jboss.portal.WindowState; import org.jboss.portal.common.util.ParameterValidation; import org.jboss.portal.common.util.Tools; -import org.jboss.portal.portlet.ActionURL; -import org.jboss.portal.portlet.OpaqueStateString; -import org.jboss.portal.portlet.PortletURL; -import org.jboss.portal.portlet.RenderURL; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.URLFormat; -import org.jboss.portal.portlet.spi.PortletInvocationContext; +import org.jboss.portal.portlet.api.ActionURL; +import org.jboss.portal.portlet.api.OpaqueStateString; +import org.jboss.portal.portlet.api.PortletURL; +import org.jboss.portal.portlet.api.RenderURL; +import org.jboss.portal.portlet.api.StateString; +import org.jboss.portal.portlet.api.URLFormat; +import org.jboss.portal.portlet.api.spi.PortletInvocationContext; import org.jboss.portal.wsrp.core.BlockingInteractionResponse; import org.jboss.portal.wsrp.core.CacheControl; import org.jboss.portal.wsrp.core.ClientData; @@ -195,7 +195,7 @@ * @since 2.6 */ public static GetPortletDescription createGetPortletDescription(RegistrationContext registrationContext, - org.jboss.portal.portlet.PortletContext portletContext) + org.jboss.portal.portlet.api.PortletContext portletContext) { ParameterValidation.throwIllegalArgExceptionIfNull(portletContext, "portlet context"); PortletContext wsrpPC = createPortletContext(portletContext.getId(), portletContext.getState()); Modified: jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPUtils.java =================================================================== --- jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPUtils.java 2009-08-02 14:42:03 UTC (rev 13652) +++ jbossexo/modules/wsrp/trunk/common/src/main/java/org/jboss/portal/wsrp/WSRPUtils.java 2009-08-02 19:46:00 UTC (rev 13653) @@ -28,11 +28,11 @@ import org.jboss.portal.common.i18n.LocaleFormat; import org.jboss.portal.common.util.ConversionException; import org.jboss.portal.common.util.ParameterValidation; -import org.jboss.portal.portlet.ActionURL; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.PortletURL; -import org.jboss.portal.portlet.RenderURL; -import org.jboss.portal.portlet.state.AccessMode; +import org.jboss.portal.portlet.api.ActionURL; +import org.jboss.portal.portlet.api.PortletContext; +import org.jboss.portal.portlet.api.PortletURL; +import org.jboss.portal.portlet.api.RenderURL; +import org.jboss.portal.portlet.api.state.AccessMode; import org.jboss.portal.wsrp.core.InteractionParams; import org.jboss.portal.wsrp.core.MarkupParams; import org.jboss.portal.wsrp.core.NamedString; Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/ActionRequestProcessor.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/ActionRequestProcessor.java 2009-08-02 14:42:03 UTC (rev 13652) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/ActionRequestProcessor.java 2009-08-02 19:46:00 UTC (rev 13653) @@ -23,13 +23,13 @@ package org.jboss.portal.wsrp.producer; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; -import org.jboss.portal.portlet.state.AccessMode; +import org.jboss.portal.portlet.api.StateString; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.response.HTTPRedirectionResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.UpdateNavigationalStateResponse; +import org.jboss.portal.portlet.api.state.AccessMode; import org.jboss.portal.wsrp.WSRPExceptionFactory; import org.jboss.portal.wsrp.WSRPTypeFactory; import org.jboss.portal.wsrp.WSRPUtils; Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/MarkupHandler.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/MarkupHandler.java 2009-08-02 14:42:03 UTC (rev 13652) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/MarkupHandler.java 2009-08-02 19:46:00 UTC (rev 13653) @@ -23,12 +23,12 @@ package org.jboss.portal.wsrp.producer; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.invocation.response.ErrorResponse; -import org.jboss.portal.portlet.invocation.response.FragmentResponse; -import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.invocation.response.ErrorResponse; +import org.jboss.portal.portlet.api.invocation.response.FragmentResponse; +import org.jboss.portal.portlet.api.invocation.response.HTTPRedirectionResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.UpdateNavigationalStateResponse; import org.jboss.portal.portlet.state.producer.PortletStateChangeRequiredException; import org.jboss.portal.wsrp.WSRPExceptionFactory; import org.jboss.portal.wsrp.core.AccessDeniedFault; Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/MarkupRequest.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/MarkupRequest.java 2009-08-02 14:42:03 UTC (rev 13652) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/MarkupRequest.java 2009-08-02 19:46:00 UTC (rev 13653) @@ -25,7 +25,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; -import org.jboss.portal.portlet.Portlet; +import org.jboss.portal.portlet.api.Portlet; import org.jboss.portal.wsrp.WSRPUtils; import org.jboss.portal.wsrp.core.MarkupType; Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/PortletManagementHandler.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/PortletManagementHandler.java 2009-08-02 14:42:03 UTC (rev 13652) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/PortletManagementHandler.java 2009-08-02 19:46:00 UTC (rev 13653) @@ -25,16 +25,16 @@ import org.jboss.portal.common.i18n.LocalizedString; import org.jboss.portal.common.util.Tools; -import org.jboss.portal.portlet.InvalidPortletIdException; -import org.jboss.portal.portlet.NoSuchPortletException; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.info.PreferenceInfo; -import org.jboss.portal.portlet.info.PreferencesInfo; -import org.jboss.portal.portlet.state.DestroyCloneFailure; -import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.portlet.api.InvalidPortletIdException; +import org.jboss.portal.portlet.api.NoSuchPortletException; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.info.PortletInfo; +import org.jboss.portal.portlet.api.info.PreferenceInfo; +import org.jboss.portal.portlet.api.info.PreferencesInfo; +import org.jboss.portal.portlet.api.state.DestroyCloneFailure; +import org.jboss.portal.portlet.api.state.PropertyChange; +import org.jboss.portal.portlet.api.state.PropertyMap; import org.jboss.portal.registration.Registration; import org.jboss.portal.registration.RegistrationLocal; import org.jboss.portal.wsrp.WSRPConstants; @@ -172,11 +172,11 @@ UserContext userContext = clonePortlet.getUserContext(); checkUserAuthorization(userContext); - org.jboss.portal.portlet.PortletContext portalPC = WSRPUtils.convertToPortalPortletContext(portletContext); + org.jboss.portal.portlet.api.PortletContext portalPC = WSRPUtils.convertToPortalPortletContext(portletContext); try { RegistrationLocal.setRegistration(registration); - org.jboss.portal.portlet.PortletContext response = producer.getInvoker().createClone(portalPC); + org.jboss.portal.portlet.api.PortletContext response = producer.getInvoker().createClone(portalPC); return WSRPUtils.convertToWSRPPortletContext(response); } catch (NoSuchPortletException e) @@ -213,7 +213,7 @@ List portletContexts = new ArrayList(handles.length); for (int i = 0; i < handles.length; i++) { - portletContexts.add(org.jboss.portal.portlet.PortletContext.createPortletContext(handles[i])); + portletContexts.add(org.jboss.portal.portlet.api.PortletContext.createPortletContext(handles[i])); } try @@ -309,7 +309,7 @@ try { RegistrationLocal.setRegistration(registration); - org.jboss.portal.portlet.PortletContext resultContext = + org.jboss.portal.portlet.api.PortletContext resultContext = producer.getInvoker().setProperties(WSRPUtils.convertToPortalPortletContext(portletContext), (PropertyChange[])changes.toArray(new PropertyChange[0])); return WSRPUtils.convertToWSRPPortletContext(resultContext); @@ -358,7 +358,7 @@ try { PropertyMap properties; - org.jboss.portal.portlet.PortletContext jbpContext = WSRPUtils.convertToPortalPortletContext(portletContext); + org.jboss.portal.portlet.api.PortletContext jbpContext = WSRPUtils.convertToPortalPortletContext(portletContext); RegistrationLocal.setRegistration(registration); if (keys != null) Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java 2009-08-02 14:42:03 UTC (rev 13652) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/RenderRequestProcessor.java 2009-08-02 19:46:00 UTC (rev 13653) @@ -24,12 +24,12 @@ package org.jboss.portal.wsrp.producer; import org.jboss.portal.common.net.URLTools; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.RenderInvocation; +import org.jboss.portal.portlet.api.invocation.response.FragmentResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.state.AccessMode; import org.jboss.portal.portlet.impl.jsr168.PortletUtils; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.invocation.response.FragmentResponse; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.state.AccessMode; import org.jboss.portal.wsrp.WSRPConstants; import org.jboss.portal.wsrp.WSRPRewritingConstants; import org.jboss.portal.wsrp.WSRPTypeFactory; Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/RequestProcessor.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/RequestProcessor.java 2009-08-02 14:42:03 UTC (rev 13652) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/RequestProcessor.java 2009-08-02 19:46:00 UTC (rev 13653) @@ -28,16 +28,16 @@ import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.common.util.MarkupInfo; import org.jboss.portal.common.util.Tools; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.spi.PortalContext; -import org.jboss.portal.portlet.spi.SecurityContext; -import org.jboss.portal.portlet.spi.UserContext; -import org.jboss.portal.portlet.spi.WindowContext; -import org.jboss.portal.portlet.state.AccessMode; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.StateString; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.spi.PortalContext; +import org.jboss.portal.portlet.api.spi.SecurityContext; +import org.jboss.portal.portlet.api.spi.UserContext; +import org.jboss.portal.portlet.api.spi.WindowContext; +import org.jboss.portal.portlet.api.state.AccessMode; import org.jboss.portal.registration.Registration; import org.jboss.portal.wsrp.UserContextConverter; import org.jboss.portal.wsrp.WSRPConstants; @@ -105,7 +105,7 @@ // get portlet handle PortletContext wsrpPC = getPortletContext(); WSRPExceptionFactory.throwMissingParametersFaultIfValueIsMissing(wsrpPC, "PortletContext", getContextName()); - org.jboss.portal.portlet.PortletContext portletContext = WSRPUtils.convertToPortalPortletContext(wsrpPC); + org.jboss.portal.portlet.api.PortletContext portletContext = WSRPUtils.convertToPortalPortletContext(wsrpPC); // retrieve the portlet try @@ -359,7 +359,7 @@ } } - private WSRPInstanceContext createInstanceContext(org.jboss.portal.portlet.PortletContext portletContext, final AccessMode accessMode, String instanceId) + private WSRPInstanceContext createInstanceContext(org.jboss.portal.portlet.api.PortletContext portletContext, final AccessMode accessMode, String instanceId) { return new WSRPInstanceContext(portletContext, accessMode, instanceId); } Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2009-08-02 14:42:03 UTC (rev 13652) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2009-08-02 19:46:00 UTC (rev 13653) @@ -25,13 +25,13 @@ import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.common.util.ParameterValidation; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.info.CapabilitiesInfo; -import org.jboss.portal.portlet.info.MetaInfo; -import org.jboss.portal.portlet.info.ModeInfo; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.info.WindowStateInfo; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.info.CapabilitiesInfo; +import org.jboss.portal.portlet.api.info.MetaInfo; +import org.jboss.portal.portlet.api.info.ModeInfo; +import org.jboss.portal.portlet.api.info.PortletInfo; +import org.jboss.portal.portlet.api.info.WindowStateInfo; import org.jboss.portal.registration.Registration; import org.jboss.portal.wsrp.WSRPExceptionFactory; import org.jboss.portal.wsrp.WSRPTypeFactory; Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPInstanceContext.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPInstanceContext.java 2009-08-02 14:42:03 UTC (rev 13652) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPInstanceContext.java 2009-08-02 19:46:00 UTC (rev 13653) @@ -24,10 +24,10 @@ package org.jboss.portal.wsrp.producer; import org.jboss.portal.common.util.ParameterValidation; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.StateEvent; -import org.jboss.portal.portlet.spi.InstanceContext; -import org.jboss.portal.portlet.state.AccessMode; +import org.jboss.portal.portlet.api.PortletContext; +import org.jboss.portal.portlet.api.StateEvent; +import org.jboss.portal.portlet.api.spi.InstanceContext; +import org.jboss.portal.portlet.api.state.AccessMode; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPPortletInvocationContext.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPPortletInvocationContext.java 2009-08-02 14:42:03 UTC (rev 13652) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPPortletInvocationContext.java 2009-08-02 19:46:00 UTC (rev 13653) @@ -26,20 +26,20 @@ import org.jboss.portal.common.NotYetImplemented; import org.jboss.portal.common.net.URLTools; import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.portlet.ContainerURL; -import org.jboss.portal.portlet.PortletURL; -import org.jboss.portal.portlet.ResourceURL; -import org.jboss.portal.portlet.URLFormat; +import org.jboss.portal.portlet.api.ContainerURL; +import org.jboss.portal.portlet.api.PortletURL; +import org.jboss.portal.portlet.api.ResourceURL; +import org.jboss.portal.portlet.api.URLFormat; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.spi.InstanceContext; +import org.jboss.portal.portlet.api.spi.PortalContext; +import org.jboss.portal.portlet.api.spi.PortletInvocationContext; +import org.jboss.portal.portlet.api.spi.SecurityContext; +import org.jboss.portal.portlet.api.spi.UserContext; +import org.jboss.portal.portlet.api.spi.WindowContext; import org.jboss.portal.portlet.impl.spi.AbstractClientContext; import org.jboss.portal.portlet.impl.spi.AbstractPortletInvocationContext; import org.jboss.portal.portlet.impl.spi.AbstractServerContext; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.spi.InstanceContext; -import org.jboss.portal.portlet.spi.PortalContext; -import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.spi.SecurityContext; -import org.jboss.portal.portlet.spi.UserContext; -import org.jboss.portal.portlet.spi.WindowContext; import org.jboss.portal.wsrp.WSRPPortletURL; import org.jboss.portal.wsrp.WSRPRewritingConstants; import org.jboss.portal.wsrp.servlet.ServletAccess; Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2009-08-02 14:42:03 UTC (rev 13652) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2009-08-02 19:46:00 UTC (rev 13653) @@ -23,11 +23,11 @@ package org.jboss.portal.wsrp.producer; -import org.jboss.portal.portlet.NoSuchPortletException; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletInvoker; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.info.RuntimeOptionInfo; +import org.jboss.portal.portlet.api.NoSuchPortletException; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletInvoker; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.info.RuntimeOptionInfo; import org.jboss.portal.registration.Registration; import org.jboss.portal.registration.RegistrationLocal; import org.jboss.portal.registration.RegistrationManager; @@ -384,7 +384,7 @@ this.invoker = invoker; } - Portlet getPortletWith(org.jboss.portal.portlet.PortletContext portletContext, Registration registration) throws InvalidHandleFault, PortletInvokerException + Portlet getPortletWith(org.jboss.portal.portlet.api.PortletContext portletContext, Registration registration) throws InvalidHandleFault, PortletInvokerException { Portlet portlet; try Modified: jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPRequestContext.java =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPRequestContext.java 2009-08-02 14:42:03 UTC (rev 13652) +++ jbossexo/modules/wsrp/trunk/producer/src/main/java/org/jboss/portal/wsrp/producer/WSRPRequestContext.java 2009-08-02 19:46:00 UTC (rev 13653) @@ -25,7 +25,7 @@ import org.apache.commons.fileupload.FileUpload; import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.portlet.spi.RequestContext; +import org.jboss.portal.portlet.api.spi.RequestContext; import org.jboss.portal.wsrp.core.InteractionParams; import org.jboss.portal.wsrp.core.NamedString; import org.jboss.portal.wsrp.core.UploadContext; Added: jbossexo/modules/wsrp/trunk/producer/src/main/webapp/WEB-INF/conf/producer/config.xml =================================================================== --- jbossexo/modules/wsrp/trunk/producer/src/main/webapp/WEB-INF/conf/producer/config.xml (rev 0) +++ jbossexo/modules/wsrp/trunk/producer/src/main/webapp/WEB-INF/conf/producer/config.xml 2009-08-02 19:46:00 UTC (rev 13653) @@ -0,0 +1,40 @@ +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2009, 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. + --> + +<!-- +<!DOCTYPE producer-configuration PUBLIC "-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN" + "http://www.jboss.org/portal/dtd/jboss-wsrp-producer_2_6.dtd"> +--> + +<!-- Configuration using registration with default registration property validator. --> +<producer-configuration xmlns="urn:jboss:portal:wsrp:producer:v2_6" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:portal:wsrp:producer:v2_6 http://www.jboss.org/portal/xsd/jboss-wsrp-producer_2_6.xsd"> + <registration-configuration fullServiceDescriptionRequiresRegistration="true"> + <registration-property-validator>org.jboss.portal.registration.policies.DefaultRegistrationPropertyValidator + </registration-property-validator> + </registration-configuration> +</producer-configuration> + + <!-- Configuration without registration --> + <!--<producer-configuration/>--> \ No newline at end of file