[portal-commits] JBoss Portal SVN: r13523 - in jbossexo/modules/portlet/trunk: .settings and 80 other directories.

Author: mwringe Date: 2009-07-06 15:28:53 -0400 (Mon, 06 Jul 2009) New Revision: 13523 Added: jbossexo/modules/portlet/trunk/.settings/ jbossexo/modules/portlet/trunk/.settings/org.eclipse.jdt.core.prefs jbossexo/modules/portlet/trunk/.settings/org.maven.ide.eclipse.prefs jbossexo/modules/portlet/trunk/api/ jbossexo/modules/portlet/trunk/api/pom.xml jbossexo/modules/portlet/trunk/api/src/ jbossexo/modules/portlet/trunk/api/src/main/ jbossexo/modules/portlet/trunk/api/src/main/java/ jbossexo/modules/portlet/trunk/api/src/main/java/org/ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/ActionURL.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/ContainerURL.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/InvalidPortletIdException.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/InvokerUnavailableException.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/LifeCyclePhase.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/NoSuchPortletException.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/OpaqueStateString.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/ParametersStateString.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/Portlet.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletCloneFailedException.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletContext.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletInvoker.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletInvokerException.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletURL.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/RenderURL.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/ResourceURL.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/StateEvent.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/StateString.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/StatefulPortletContext.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/TransportGuarantee.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/URLFormat.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/cache/ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/cache/CacheControl.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/cache/CacheLevel.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/cache/CacheScope.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/CacheInfo.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/CapabilitiesInfo.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/EventInfo.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/EventingInfo.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/MetaInfo.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/ModeInfo.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/NavigationInfo.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/ParameterInfo.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/PortletInfo.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/PortletManagedModeInfo.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/PreferenceInfo.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/PreferencesInfo.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/RuntimeOptionInfo.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/SecurityInfo.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/TypeInfo.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/WindowStateInfo.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/ActionInvocation.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/EventInvocation.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/PortletInvocation.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/RenderInvocation.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/ResourceInvocation.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/ContentResponse.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/ErrorResponse.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/FragmentResponse.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/HTTPRedirectionResponse.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/InsufficientPrivilegesResponse.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/InsufficientTransportGuaranteeResponse.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/PortletInvocationResponse.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/RedirectionResponse.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/ResponseProperties.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/RevalidateMarkupResponse.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/SecurityErrorResponse.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/SecurityResponse.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/StreamResponse.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/UnavailableResponse.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/UpdateNavigationalStateResponse.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/ClientContext.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/InstanceContext.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/PortalContext.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/PortletInvocationContext.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/RequestContext.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/SecurityContext.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/ServerContext.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/UserContext.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/WindowContext.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/AccessMode.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/DestroyCloneFailure.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/Property.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/PropertyChange.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/PropertyContext.java jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/PropertyMap.java Removed: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ActionURL.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ContainerURL.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/InvalidPortletIdException.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/InvokerUnavailableException.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/LifeCyclePhase.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/NoSuchPortletException.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/OpaqueStateString.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ParametersStateString.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/Portlet.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletCloneFailedException.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvoker.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvokerException.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletURL.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/RenderURL.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ResourceURL.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/StateEvent.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/StateString.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/StatefulPortletContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/TransportGuarantee.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/URLFormat.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/cache/CacheControl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/cache/CacheLevel.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/cache/CacheScope.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CacheInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/EventInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/EventingInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/MetaInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/ModeInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/NavigationInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/ParameterInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletManagedModeInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PreferenceInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PreferencesInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/RuntimeOptionInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/SecurityInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/TypeInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/WindowStateInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ActionInvocation.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/EventInvocation.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/RenderInvocation.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ResourceInvocation.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ContentResponse.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ErrorResponse.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/FragmentResponse.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/HTTPRedirectionResponse.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/InsufficientPrivilegesResponse.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/InsufficientTransportGuaranteeResponse.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/PortletInvocationResponse.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/RedirectionResponse.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ResponseProperties.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/RevalidateMarkupResponse.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/SecurityErrorResponse.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/SecurityResponse.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/StreamResponse.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/UnavailableResponse.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/UpdateNavigationalStateResponse.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/ClientContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/InstanceContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/PortalContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/PortletInvocationContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/RequestContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/SecurityContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/ServerContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/UserContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/WindowContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AccessMode.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/DestroyCloneFailure.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/Property.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyChange.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyMap.java Modified: jbossexo/modules/portlet/trunk/.classpath jbossexo/modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/BridgeInterceptor.java jbossexo/modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/BridgeResponse.java jbossexo/modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java jbossexo/modules/portlet/trunk/build/ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventControllerContextSafeInvoker.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletController.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/RequestHandler.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/AbstractEventControllerContext.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/AbstractPortletControllerContext.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerPortletInvocationContext.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestFactory.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestParameterMapFactory.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/PortletURLRenderer.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PortletPageNavigationalStateImpl.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/response/PageUpdateResponse.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/response/PortletResponse.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/response/ResourceResponse.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalStateSerialization.java jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletWindowNavigationalState.java jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextFailureTestCase.java jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestConstructorTestCase.java jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestTestCase.java jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/WiringEventControllerContext.java jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/handlers/EventProducerActionHandler.java jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/handlers/EventProducerEventHandler.java jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/handlers/FailingEventHandler.java jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/handlers/NoOpEventHandler.java jbossexo/modules/portlet/trunk/docs/ jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/FederatedPortletInvoker.java jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/FederatingPortletInvoker.java jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatedPortlet.java jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatedPortletInvokerService.java jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/PortletInvokerRegistrationService.java jbossexo/modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java jbossexo/modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/NoInvokersTestCase.java jbossexo/modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java jbossexo/modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/LocalPortletManagement.java jbossexo/modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java jbossexo/modules/portlet/trunk/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/factory/PortletApplicationModelFactory.java jbossexo/modules/portlet/trunk/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/FilterTestEverythingTestCase.java jbossexo/modules/portlet/trunk/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/SecurityConstraintTestEverythingTestCase.java jbossexo/modules/portlet/trunk/pom.xml jbossexo/modules/portlet/trunk/portal/pom.xml jbossexo/modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml jbossexo/modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/AdminPortlet.java jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventAcknowledgement.java jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PagePortletControllerContext.java jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalPrepareResponse.java jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalResponse.java jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/WindowResult.java jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/HeadersTag.java jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletMarkupTag.java jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletTag.java jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletTitleTag.java jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletURLTag.java jbossexo/modules/portlet/trunk/portlet/pom.xml jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvokerInterceptor.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/CCPPInterceptor.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/EventPayloadInterceptor.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/LocalInterceptor.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/ContentRef.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/SoftContentRef.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/StrongContentRef.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletDispatcher.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainer.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/managed/ManagedPortletContainer.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/container/PortletContainerLifeCycle.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCacheInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerEventInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerEventingInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerFilterInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerMetaInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerModeInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerNavigationInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerParameterInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletManagedModeInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferenceInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferencesInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerRuntimeOptionInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerSecurityInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerTypeInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerWindowStateInfo.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/InlineBundle.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletFilterImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletParameterMap.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestAttributes.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ResourceRequestParameterMap.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ActionRequestImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ActionResponseImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/BaseURLImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/CacheControlImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ClientDataRequestImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/EventImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/EventRequestImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/EventResponseImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/MimeResponseImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortalContextImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletConfigImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletContextImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletPreferencesImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletResponseImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletURLImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/RenderRequestImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/RenderResponseImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ResourceRequestImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ResourceResponseImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ResourceURLImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/taglib/PortletTag.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/filter/FilterMetaData.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/security/UserDataConstraintMetaData.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractClientContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractInstanceContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractPortalContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractPortletInvocationContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractSecurityContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractServerContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractWindowContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/producer/PortletStateContextImpl.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/producer/PortletStatePersistenceManagerService.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyContext.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyMap.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/SimplePropertyMap.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortlet.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/PortletState.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/PortletStatePersistenceManager.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortlet.java jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/container/PortletContainerObjectSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletInvokerSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CacheInfoSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventInfoSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventingInfoSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/MetaInfoSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ModeInfoSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ParameterInfoSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferenceInfoSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/TypeInfoSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/WindowStateInfoSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/ClientContextSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/RequestContextSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/UserContextSupport.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/StateStringTestCase.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/CacheInfoTest.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/MetaInfoTest.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/ModeInfoTest.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/SecurityInfoTest.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/ActionURLTestCase.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/TaglibTestCase.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/DispatchedContainerAttributesTestCase.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NFRFContainerAttributesTestCase.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NFRIContainerAttributesTestCase.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NIRFContainerAttributesTestCase.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RFRFContainerAttributesTestCase.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RFRIContainerAttributesTestCase.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RIRFContainerAttributesTestCase.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/taglib/ActionURLTestCase.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/taglib/TaglibTestCase.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ActionContextImpl.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/LocalStoreProducerStatefulPortletInvokerTestCase.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/RemoteStoreProducerStatefulPortletInvokerTestCase.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ValueMapAssert.java jbossexo/modules/portlet/trunk/test/pom.xml jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalServlet.java jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/AbstractMarkupRenderer.java jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/AbstractRendererContext.java jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ControllerResponseRendererFactory.java jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ErrorResponseRenderer.java jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/FragmentRenderer.java jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RedirectResponseRenderer.java jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RendererContext.java jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RendererContextImpl.java jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ResourceRenderer.java jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/SimpleFragmentRenderer.java jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKRendererContext.java jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKServlet.java jbossexo/modules/portlet/trunk/test/src/test/build.xml jbossexo/modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/controller/StateControllerContextTestCase.java Log: Add Julien's patch to separate out the api classes. Modified: jbossexo/modules/portlet/trunk/.classpath =================================================================== --- jbossexo/modules/portlet/trunk/.classpath 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/.classpath 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,12 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry kind="src" output="jsr168api/target/classes" path="jsr168api/src/main/java"/> + <classpathentry kind="src" output="api/target/classes" path="api/src/main/java"/> + <classpathentry kind="src" output="api/target/test-classes" path="api/src/test/java"/> <classpathentry kind="src" output="portlet/target/classes" path="portlet/src/main/java"/> <classpathentry excluding="**" kind="src" output="portlet/target/classes" path="portlet/src/main/resources"/> + <classpathentry kind="src" output="portlet/target/test-classes" path="portlet/src/test/java"/> <classpathentry excluding="**" kind="src" output="portlet/target/test-classes" path="portlet/src/test/resources"/> <classpathentry kind="src" output="controller/target/classes" path="controller/src/main/java"/> + <classpathentry kind="src" output="controller/target/test-classes" path="controller/src/test/java"/> <classpathentry excluding="**" kind="src" output="controller/target/test-classes" path="controller/src/test/resources"/> <classpathentry kind="src" output="bridge/target/classes" path="bridge/src/main/java"/> <classpathentry kind="src" output="federation/target/classes" path="federation/src/main/java"/> + <classpathentry kind="src" output="federation/target/test-classes" path="federation/src/test/java"/> <classpathentry excluding="**" kind="src" output="federation/target/test-classes" path="federation/src/test/resources"/> <classpathentry kind="src" output="management/target/classes" path="management/src/main/java"/> <classpathentry kind="src" output="mc/target/classes" path="mc/src/main/java"/> Added: jbossexo/modules/portlet/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- jbossexo/modules/portlet/trunk/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ jbossexo/modules/portlet/trunk/.settings/org.eclipse.jdt.core.prefs 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,12 @@ +#Mon Jul 06 13:30:53 EDT 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 Added: jbossexo/modules/portlet/trunk/.settings/org.maven.ide.eclipse.prefs =================================================================== --- jbossexo/modules/portlet/trunk/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ jbossexo/modules/portlet/trunk/.settings/org.maven.ide.eclipse.prefs 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,9 @@ +#Mon Jul 06 13:19:18 EDT 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=true +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 Added: jbossexo/modules/portlet/trunk/api/pom.xml =================================================================== --- jbossexo/modules/portlet/trunk/api/pom.xml (rev 0) +++ jbossexo/modules/portlet/trunk/api/pom.xml 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,41 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss.portal.portlet</groupId> + <artifactId>module-parent</artifactId> + <version>trunk-SNAPSHOT</version> + <relativePath>../build/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.portal.portlet</groupId> + <artifactId>portlet-api</artifactId> + <packaging>jar</packaging> + <name>portlet-api</name> + <url>http://maven.apache.org</url> + + <dependencies> + <dependency> + <groupId>org.jboss.portal.common</groupId> + <artifactId>common-common</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.portal.common</groupId> + <artifactId>common-portal</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.portal.web</groupId> + <artifactId>web-web</artifactId> + </dependency> + <dependency> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> + +</project> Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/ActionURL.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/ActionURL.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/ActionURL.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,47 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +import org.jboss.portal.portlet.api.PortletURL; +import org.jboss.portal.portlet.api.StateString; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public interface ActionURL extends PortletURL +{ + /** + * Return the interaction state. + * + * @return the interaction state + */ + StateString getInteractionState(); + + /** + * Return the navigational state that may be null. + * + * @return the navigational state + */ + StateString getNavigationalState(); +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/ActionURL.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/ContainerURL.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/ContainerURL.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/ContainerURL.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,31 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface ContainerURL +{ +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/InvalidPortletIdException.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/InvalidPortletIdException.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/InvalidPortletIdException.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,66 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +import org.jboss.portal.portlet.api.PortletInvokerException; + +/** + * Thrown by the portlet invoker when a portlet id that is not valid. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5989 $ + */ +public class InvalidPortletIdException extends PortletInvokerException +{ + + private String portletId; + + public InvalidPortletIdException(String portletId) + { + super("Invalid portlet id " + portletId); + this.portletId = portletId; + } + + public InvalidPortletIdException(String message, String portletId) + { + super(message); + this.portletId = portletId; + } + + public InvalidPortletIdException(Throwable cause, String portletId) + { + super(cause); + this.portletId = portletId; + } + + public InvalidPortletIdException(String message, Throwable cause, String portletId) + { + super(message, cause); + this.portletId = portletId; + } + + public String getPortletId() + { + return portletId; + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/InvalidPortletIdException.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/InvokerUnavailableException.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/InvokerUnavailableException.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/InvokerUnavailableException.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,52 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +import org.jboss.portal.portlet.api.PortletInvokerException; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision: 5448 $ + * @since 2.4 (May 11, 2006) + */ +public class InvokerUnavailableException extends PortletInvokerException +{ + public InvokerUnavailableException() + { + } + + public InvokerUnavailableException(String message) + { + super(message); + } + + public InvokerUnavailableException(Throwable cause) + { + super(cause); + } + + public InvokerUnavailableException(String message, Throwable cause) + { + super(message, cause); + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/InvokerUnavailableException.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/LifeCyclePhase.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/LifeCyclePhase.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/LifeCyclePhase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,39 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +import javax.xml.bind.annotation.XmlEnumValue; + +/** + * Enumerate the life cycle phase of a Portlet. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public enum LifeCyclePhase +{ + @XmlEnumValue("ACTION_PHASE") ACTION, + @XmlEnumValue("EVENT_PHASE") EVENT, + @XmlEnumValue("RENDER_PHASE") RENDER, + @XmlEnumValue("RESOURCE_PHASE") RESOURCE +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/NoSuchPortletException.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/NoSuchPortletException.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/NoSuchPortletException.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,53 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +/** + * Thrown by the portlet invoker when a portlet id does not exist. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5989 $ + */ +public class NoSuchPortletException extends InvalidPortletIdException +{ + + public NoSuchPortletException(String portletId) + { + super("No such portlet " + portletId, portletId); + } + + public NoSuchPortletException(String message, String portletId) + { + super(message, portletId); + } + + public NoSuchPortletException(Throwable cause, String portletId) + { + super(cause, portletId); + } + + public NoSuchPortletException(String message, Throwable cause, String portletId) + { + super(message, cause, portletId); + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/NoSuchPortletException.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/OpaqueStateString.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/OpaqueStateString.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/OpaqueStateString.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,80 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +import org.jboss.portal.portlet.api.StateString; + +import java.io.DataOutputStream; +import java.io.IOException; + +/** + * An opaque implementation of the navigational state. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public class OpaqueStateString extends StateString +{ + + /** . */ + private String value; + + public OpaqueStateString(String value) + { + if (value == null) + { + throw new IllegalArgumentException("No null value accepted"); + } + this.value = value; + } + + public String getStringValue() + { + return value; + } + + public void writeTo(DataOutputStream out) throws IOException + { + out.writeByte(StateString.OPAQUE); + out.writeUTF(value); + } + + public int hashCode() + { + return value.hashCode(); + } + + public boolean equals(Object o) + { + if (o == this) + { + return true; + } + if (o instanceof OpaqueStateString) + { + OpaqueStateString that = (OpaqueStateString)o; + return value.equals(that.value); + } + return false; + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/OpaqueStateString.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/ParametersStateString.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/ParametersStateString.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/ParametersStateString.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,269 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +import org.jboss.portal.common.io.Serialization; +import org.jboss.portal.common.util.ParameterMap; +import org.jboss.portal.portlet.api.StateString; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.Serializable; +import java.util.Map; + +/** + * A set of parameters. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 6549 $ + */ +public class ParametersStateString extends StateString implements Serializable +{ + + /** The serialVersionUID */ + private static final long serialVersionUID = -8529807471117491810L; + + public static ParametersStateString create() + { + return new ParametersStateString(); + } + + public static ParametersStateString create(Map<String, String[]> parameters) + { + return new ParametersStateString(parameters); + } + + /** + * Create a parameters state string. It assumes that the argument is either an instance of + * <code>ParametersStateString</code> or that it is the string encoded value of a + * <code>ParametersStateString</code>. + * + * @param stateString the state string + * @return a new parameter state string + * @throws IllegalArgumentException if the state string is opaque and does not represent parameters + */ + public static ParametersStateString create(StateString stateString) throws IllegalArgumentException + { + if (stateString == null) + { + throw new IllegalArgumentException("No null state string accepted"); + } + + // + if (stateString instanceof ParametersStateString) + { + // Use the copy constructor + return new ParametersStateString(((ParametersStateString)stateString).parameters); + } + else + { + // Use the deserializing constructor + return new ParametersStateString(stateString.getStringValue()); + } + } + + /** The underlying map that does not have a copy read/write access mode. */ + private ParameterMap parameters; + + protected ParametersStateString(DataInputStream in) throws IOException + { + Map<String, String[]> tmp = Serialization.PARAMETER_MAP.unserialize(in); + + // + parameters = ParameterMap.wrap(tmp); + } + + protected ParametersStateString(String opaqueValue) + { + Map<String, String[]> params = StateString.decodeOpaqueValue(opaqueValue); + if (!params.isEmpty()) + { + parameters = ParameterMap.wrap(params); + } + else + { + parameters = new ParameterMap(); + } + } + + /** Creates an empty parameter set. */ + protected ParametersStateString() + { + this.parameters = new ParameterMap(); + } + + /** + * Copy the parameter map to initialize the object state. + * + * @param parameters the parameter map to clone + * @throws IllegalArgumentException if the parameter map is null or not valid + */ + private ParametersStateString(Map<String, String[]> parameters) + { + this.parameters = ParameterMap.clone(parameters); + } + + /** + * Return the parameter value or null if it does not exist. + * + * @param name the parameter name + * @return the parameter value or null if it does not exist + * @throws IllegalArgumentException if the name is null + */ + public String getValue(String name) throws IllegalArgumentException + { + return parameters.getValue(name); + } + + /** + * Return the parameter values or null if it does not exist. + * + * @param name the value to get + * @return the parameter values + * @throws IllegalArgumentException if the name is null + */ + public String[] getValues(String name) throws IllegalArgumentException + { + return parameters.get(name); + } + + /** Clear all the parameters. */ + public void clear() + { + parameters.clear(); + } + + /** + * Replace all the parameters. + * + * @param map the map to replace + * @throws IllegalArgumentException if the map is not valid + */ + public void replace(Map<String, String[]> map) + { + parameters.replace(map); + } + + /** + * Set the a parameter value. + * + * @param name the parameter name + * @param value the parameter value + * @throws IllegalArgumentException if the name or the value is null + */ + public void setValue(String name, String value) + { + parameters.setValue(name, value); + } + + /** + * Set the parameter values. This method does not make a defensive copy of the values. + * + * @param name the parameter name + * @param values the parameter values + * @throws IllegalArgumentException if the name is null + */ + public void setValues(String name, String[] values) + { + parameters.setValues(name, values); + } + + /** + * Remove a parameter. + * + * @param name the parameter name + * @throws IllegalArgumentException if the name is null + */ + public void remove(String name) + { + parameters.remove(name); + } + + /** + * Return the size. + * + * @return the size + */ + public int getSize() + { + return parameters.size(); + } + + /** + * Return the underlying parameter object. + * + * @return the parameter object + */ + public Map<String, String[]> getParameters() + { + return parameters; + } + + /** + * Retrieves the opaque version associated with this navigational state. + * + * @return a URL-safe String representation of this navigational state. + */ + public String getStringValue() + { + return StateString.encodeAsOpaqueValue(parameters); + } + + public void writeTo(DataOutputStream out) throws IOException + { + if (parameters.isEmpty()) + { + out.writeByte(StateString.EMPTY); + } + else + { + out.writeByte(StateString.SERIALIZED); + Serialization.PARAMETER_MAP.serialize(parameters, out); + } + } + + public String toString() + { + return "StateString[" + parameters + "]"; + } + + public boolean equals(Object obj) + { + if (obj == this) + { + return true; + } + if (obj instanceof ParametersStateString) + { + ParametersStateString that = (ParametersStateString)obj; + return parameters.equals(that.parameters); + } + return false; + } + + public int hashCode() + { + return parameters.hashCode(); + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/ParametersStateString.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/Portlet.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/Portlet.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/Portlet.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,57 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +import org.jboss.portal.portlet.api.info.PortletInfo; +import org.jboss.portal.portlet.api.PortletContext; + +/** + * Defines a logical portlet. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public interface Portlet +{ + /** + * Return the portlet context. + * + * @return the portlet context + */ + PortletContext getContext(); + + /** + * Return the portlet info. + * + * @return the portlet info + */ + PortletInfo getInfo(); + + /** + * Determines whether the described portlet is remote or not. + * + * @return <code>true</code> if the described portlet runs in a remote context (such as WSRP), <code>false</code> + * otherwise + */ + boolean isRemote(); +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/Portlet.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletCloneFailedException.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletCloneFailedException.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletCloneFailedException.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,65 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +import org.jboss.portal.portlet.api.PortletInvokerException; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public class PortletCloneFailedException extends PortletInvokerException +{ + + /** . */ + private String portletId; + + public PortletCloneFailedException(String portletId) + { + super("Portlet clone failure of portlet id " + portletId); + this.portletId = portletId; + } + + public PortletCloneFailedException(String message, String portletId) + { + super(message); + this.portletId = portletId; + } + + public PortletCloneFailedException(Throwable cause, String portletId) + { + super(cause); + this.portletId = portletId; + } + + public PortletCloneFailedException(String message, Throwable cause, String portletId) + { + super(message, cause); + this.portletId = portletId; + } + + public String getPortletId() + { + return portletId; + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletCloneFailedException.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletContext.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletContext.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,119 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +import org.jboss.portal.common.util.ParameterValidation; + +import java.io.Serializable; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision: 6890 $ + * @since 2.6 + */ +public class PortletContext implements Serializable +{ + + /** . */ + protected final String id; + + PortletContext(String id) throws IllegalArgumentException + { + ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(id, "portlet id", "PortletContext"); + this.id = id; + } + + + public boolean equals(Object o) + { + if (this == o) + { + return true; + } + if (o instanceof PortletContext) + { + PortletContext that = (PortletContext)o; + return id.equals(that.id); + } + return false; + } + + public int hashCode() + { + return id.hashCode(); + } + + public String getId() + { + return id; + } + + public String toString() + { + return "PortletContext[" + id + "]"; + } + + public byte[] getState() + { + return null; + } + + /** + * Create a PortletContext based on id and optional state. + * + * @param id the portlet id + * @param state the optional state + * @return a new PortletContext based on the provided information + */ + public static PortletContext createPortletContext(String id, byte[] state) + { + if (state != null && state.length > 0) + { + return new StatefulPortletContext(id, state); + } + else + { + return new PortletContext(id); + } + } + + /** + * Create a PortletContext based on given id and required state: this method will fail if state is not valid. Use + * this method instead of {@link #createPortletContext(String,byte[])} for cases when a state is expected and the + * creation of the PortletContext should fail if no state was given. + * + * @param id the portlet id + * @param state the mandatory state + * @return a new PortletContext + */ + public static PortletContext createStatefulPortletContext(String id, byte[] state) + { + return new StatefulPortletContext(id, state); + } + + public static PortletContext createPortletContext(String portletId) + { + return createPortletContext(portletId, null); + } +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletInvoker.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletInvoker.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletInvoker.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,126 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.state.PropertyChange; +import org.jboss.portal.portlet.api.state.PropertyMap; +import org.jboss.portal.portlet.api.state.DestroyCloneFailure; +import org.jboss.portal.portlet.api.Portlet; + +import java.util.List; +import java.util.Set; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public interface PortletInvoker +{ + /** + * Return the set of portlet exposed. + * + * @return the set of exposed portlets + * @throws PortletInvokerException a portlet invoker exception + */ + Set<Portlet> getPortlets() throws PortletInvokerException; + + /** + * Get information about a specific portlet. + * + * @param portletContext the portlet context in the scope of this invoker + * @return the <code>PortletInfo</code> for the specified portlet + * @throws IllegalArgumentException if the portlet context is null + * @throws PortletInvokerException a portlet invoker exception + */ + Portlet getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException; + + /** + * Invoke an operation on a specific portlet. + * + * @param invocation the portlet invocation + * @return the invocation response + * @throws IllegalArgumentException if the invocation is null + * @throws PortletInvokerException a portlet invoker exception + */ + PortletInvocationResponse invoke(PortletInvocation invocation) throws IllegalArgumentException, PortletInvokerException; + + /** + * Clone a portlet. + * + * @param portletContext the portlet context to clone + * @return the clone id + * @throws IllegalArgumentException if the portletId is null + * @throws UnsupportedOperationException if the invoker does not support this operation + * @throws PortletInvokerException a portlet invoker exception + */ + PortletContext createClone(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException; + + /** + * Destroy a cloned portlet. + * + * @param portletContexts a list of portlet contexts to destroy + * @return a list of {@link org.jboss.portal.portlet.api.state.DestroyCloneFailure}, one per clone that couldn't be + * destroyed + * @throws IllegalArgumentException if the portletContext is null + * @throws UnsupportedOperationException if the invoker does not support this operation + * @throws PortletInvokerException a portlet invoker exception + */ + List<DestroyCloneFailure> destroyClones(List<PortletContext> portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException; + + /** + * Return a subset of the properties of the specified portlet. + * + * @param portletContext the portlet context + * @param keys the set of keys to retrieve + * @return the properties + * @throws IllegalArgumentException if the portletContext or the keys arguments are null + * @throws UnsupportedOperationException if the invoker does not support this operation + * @throws PortletInvokerException a portlet invoker exception + */ + PropertyMap getProperties(PortletContext portletContext, Set<String> keys) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException; + + /** + * Return all the properties of the specified portlet. + * + * @param portletContext the portlet context + * @return the properties + * @throws IllegalArgumentException if the portletContext is null + * @throws UnsupportedOperationException if the invoker does not support this operation + * @throws PortletInvokerException a portlet invoker exception + */ + PropertyMap getProperties(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException; + + /** + * Set the properties on the specified portlet. + * + * @param portletContext the portlet context + * @param changes the changes + * @return the new portlet context + * @throws IllegalArgumentException if the portletContext or the properties is null + * @throws UnsupportedOperationException if the invoker does not support this operation + * @throws PortletInvokerException a portlet invoker exception + */ + PortletContext setProperties(PortletContext portletContext, PropertyChange[] changes) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException; +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletInvokerException.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletInvokerException.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletInvokerException.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,49 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public class PortletInvokerException extends Exception +{ + public PortletInvokerException() + { + } + + public PortletInvokerException(String message) + { + super(message); + } + + public PortletInvokerException(String message, Throwable cause) + { + super(message, cause); + } + + public PortletInvokerException(Throwable cause) + { + super(cause); + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletInvokerException.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletURL.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletURL.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletURL.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,48 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import org.jboss.portal.portlet.api.ContainerURL; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public interface PortletURL extends ContainerURL +{ + /** + * Returns the mode that may be null. + * + * @return the mode + */ + Mode getMode(); + + /** + * Returns the window state that may be null. + * + * @return the window state + */ + WindowState getWindowState(); +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/PortletURL.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/RenderURL.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/RenderURL.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/RenderURL.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,46 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +import java.util.Map; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 2748 $ + */ +public interface RenderURL extends PortletURL +{ + /** + * Return the navigational state that may be null. + * + * @return the navigational state + */ + StateString getNavigationalState(); + + /** + * Returns the public navigational state changes. + * + * @return the public navigational state changes + */ + Map<String, String[]> getPublicNavigationalStateChanges(); +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/ResourceURL.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/ResourceURL.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/ResourceURL.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,78 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +import org.jboss.portal.portlet.api.cache.CacheLevel; +import org.jboss.portal.portlet.api.ContainerURL; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface ResourceURL extends ContainerURL +{ + + /** + * Returns the resource id + * + * @return the resource id + */ + String getResourceId(); + + /** + * Returns the resource state. + * + * @return the resource state + */ + StateString getResourceState(); + + /** + * Returns the resource cacheability. + * + * @return the resource cacheability + */ + CacheLevel getCacheability(); + + /** + * Return the navigational state that may be null. + * + * @return the navigational state + */ + StateString getNavigationalState(); + + /** + * Returns the mode that may be null. + * + * @return the mode + */ + Mode getMode(); + + /** + * Returns the window state that may be null. + * + * @return the window state + */ + WindowState getWindowState(); +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/StateEvent.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/StateEvent.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/StateEvent.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,82 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +import org.jboss.portal.common.util.ParameterValidation; + +/** + * An event that signals state modifications + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision: 7267 $ + * @since 2.6 + */ +public class StateEvent +{ + + /** . */ + private final PortletContext context; + + /** . */ + private final Type type; + + public StateEvent(PortletContext context, Type type) + { + ParameterValidation.throwIllegalArgExceptionIfNull(context, "Portlet context"); + ParameterValidation.throwIllegalArgExceptionIfNull(type, "StateEvent type"); + + // + this.context = context; + this.type = type; + } + + public PortletContext getPortletContext() + { + return context; + } + + public Type getType() + { + return type; + } + + public enum Type + { + + PORTLET_CLONED_EVENT("Portlet Cloned Event"), PORTLET_MODIFIED_EVENT("Portlet Modified Event"); + + /** . */ + private final String description; + + private Type(String description) + { + this.description = description; + } + + public String toString() + { + return description; + } + } +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/StateString.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/StateString.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/StateString.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,211 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +import org.jboss.portal.common.util.Base64; +import org.jboss.portal.portlet.api.ParametersStateString; +import org.jboss.portal.portlet.api.OpaqueStateString; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +/** + * Encapsulate state as a string. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public abstract class StateString implements Serializable +{ + /** . */ + public static final String JBPNS_PREFIX = "JBPNS_"; + protected static final int EMPTY = 0; + protected static final int SERIALIZED = 1; + protected static final int OPAQUE = 2; + /** . */ + private static final String EOF = "__EOF__"; + + /** + * Return the value of the navigational state of the portlet. + * + * @return the string value + */ + public abstract String getStringValue(); + + public abstract void writeTo(DataOutputStream out) throws IOException; + + /** + * Factory method that will create the most appropriate form from the byte representation. + * + * @param in the inputstream to read from + * @return a new state string + * @throws java.io.IOException any IOException + */ + public static StateString create(DataInputStream in) throws IOException + { + if (in == null) + { + throw new IllegalArgumentException(); + } + + // + byte b = in.readByte(); + switch (b) + { + case EMPTY: + return new ParametersStateString(); + case SERIALIZED: + return new ParametersStateString(in); + case OPAQUE: + return new OpaqueStateString(in.readUTF()); + } + + // + throw new IllegalArgumentException("Wrong format unrecognized header " + b); + } + + /** + * Factory method that will create the most appropriate form from the string representation. + * + * @param opaqueValue the opaque value + * @return a new state string + */ + public static StateString create(String opaqueValue) + { + if (opaqueValue == null) + { + throw new IllegalArgumentException(); + } + if (opaqueValue.startsWith(JBPNS_PREFIX)) + { + return new ParametersStateString(opaqueValue); + } + else + { + return new OpaqueStateString(opaqueValue); + } + } + + public static Map<String, String[]> decodeOpaqueValue(String opaqueValue) + { + if (!opaqueValue.startsWith(JBPNS_PREFIX)) + { + throw new IllegalArgumentException("Bad format: [" + opaqueValue + + "] was not encoded by JBoss Portal and thus cannot be decoded."); + } + + // + opaqueValue = opaqueValue.substring(JBPNS_PREFIX.length()); + if (opaqueValue.length() > 0) + { + try + { + byte[] bytes = Base64.decode(opaqueValue, true); + ByteArrayInputStream bais = new ByteArrayInputStream(bytes); + ObjectInputStream ois = new ObjectInputStream(bais); + Map<String, String[]> params = new HashMap<String, String[]>(); + + // + String[] values; + + // read the first String which should be a param name + String current = ois.readUTF(); + + // keep reading until we haven't reached the EOF marker + while (!EOF.equals(current)) + { + // next is the size of the value array + int length = ois.readInt(); + values = new String[length]; + + // read as many Strings as are supposed to be in the array + for (int i = 0; i < length; i++) + { + values[i] = ois.readUTF(); + } + + // we're done for this param, add it to the param map + params.put(current, values); + + // read the next string to loop + current = ois.readUTF(); + } + + return params; + } + catch (Exception e) + { + throw new Error(e); + } + } + else + { + return Collections.emptyMap(); + } + } + + public static String encodeAsOpaqueValue(Map<String, String[]> parameters) + { + if (parameters != null && parameters.size() != 0) + { + try + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ObjectOutputStream oos = new ObjectOutputStream(baos); + for (Map.Entry entry : parameters.entrySet()) + { + String name = (String)entry.getKey(); + oos.writeUTF(name); + String[] values = (String[])entry.getValue(); + int length = values.length; + oos.writeInt(length); + for (String value : values) + { + oos.writeUTF(value); + } + } + oos.writeUTF(EOF); + oos.close(); + byte[] bytes = baos.toByteArray(); + return JBPNS_PREFIX + Base64.encodeBytes(bytes, true); + } + catch (IOException e) + { + throw new RuntimeException(e); + } + } + else + { + return JBPNS_PREFIX; + } + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/StateString.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/StatefulPortletContext.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/StatefulPortletContext.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/StatefulPortletContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,87 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +import org.jboss.portal.common.util.ParameterValidation; + +import java.util.Arrays; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision: 1.1 $ + * @since 2.6 + */ +public class StatefulPortletContext extends PortletContext +{ + + /** . */ + private final byte[] marshalledState; + + StatefulPortletContext(String id, byte[] marshalledState) throws IllegalArgumentException + { + super(id); + + ParameterValidation.throwIllegalArgExceptionIfNull(marshalledState, "Portlet state"); + + this.marshalledState = marshalledState; + } + + + public boolean equals(Object o) + { + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } + if (!super.equals(o)) + { + return false; + } + + StatefulPortletContext that = (StatefulPortletContext)o; + + return Arrays.equals(marshalledState, that.marshalledState); + } + + public int hashCode() + { + int result = super.hashCode(); + result = 31 * result + (marshalledState != null ? marshalledState.hashCode() : 0); + return result; + } + + public byte[] getState() + { + return marshalledState; + } + + public String toString() + { + return "StatefulPortletContext[" + id + "," + marshalledState.length + "]"; + } +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/TransportGuarantee.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/TransportGuarantee.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/TransportGuarantee.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,34 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api; + +/** + * Type safe enumeration class for transport guarantee. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public enum TransportGuarantee +{ + NONE, INTEGRAL, CONFIDENTIAL +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/TransportGuarantee.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/URLFormat.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/URLFormat.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/URLFormat.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -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.jboss.portal.portlet.api; + +/** + * Defines how a container URL should be formatted when rendered. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class URLFormat +{ + + /** . */ + private final Boolean wantSecure; + + /** . */ + private final Boolean wantAuthenticated; + + /** . */ + private final Boolean wantRelative; + + /** . */ + private final Boolean wantEscapeXML; + + public URLFormat(Boolean wantSecure, Boolean wantAuthenticated, Boolean wantRelative, Boolean wantEscapeXML) + { + this.wantSecure = wantSecure; + this.wantAuthenticated = wantAuthenticated; + this.wantRelative = wantRelative; + this.wantEscapeXML = wantEscapeXML; + } + + public Boolean getWantSecure() + { + return wantSecure; + } + + public Boolean getWantAuthenticated() + { + return wantAuthenticated; + } + + public Boolean getWantRelative() + { + return wantRelative; + } + + public Boolean getWantEscapeXML() + { + return wantEscapeXML; + } +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/cache/CacheControl.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/cache/CacheControl.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/cache/CacheControl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,62 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.cache; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class CacheControl +{ + + /** Number of seconds this result remains valid, a value of -1 indicates that it never expires. */ + private final int expirationSecs; + + /** The cache scope for this fragment. */ + private final CacheScope cacheScope; + + /** The validation token. */ + private final String validationToken; + + public CacheControl(int expirationSecs, CacheScope cacheScope, String validationToken) + { + this.expirationSecs = expirationSecs; + this.cacheScope = cacheScope; + this.validationToken = validationToken; + } + + public int getExpirationSecs() + { + return expirationSecs; + } + + public CacheScope getCacheScope() + { + return cacheScope; + } + + public String getValidationToken() + { + return validationToken; + } +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/cache/CacheLevel.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/cache/CacheLevel.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/cache/CacheLevel.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,34 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.cache; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public enum CacheLevel +{ + + FULL, PORTLET, PAGE + +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/cache/CacheScope.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/cache/CacheScope.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/cache/CacheScope.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,34 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.cache; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public enum CacheScope +{ + + PUBLIC, PRIVATE + +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/CacheInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/CacheInfo.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/CacheInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,38 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.info; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public interface CacheInfo +{ + + /** + * The expiration in seconds. + * + * @return the expiration in seconds + */ + int getExpirationSecs(); +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/CacheInfo.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/CapabilitiesInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/CapabilitiesInfo.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/CapabilitiesInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,108 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.info; + +import org.jboss.portal.common.net.media.MediaType; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; + +import java.util.Set; +import java.util.Locale; + +/** + * Gathers capability information (portlet modes, window states, supported media types and locales) regarding a portlet. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + * @since 2.4 + */ +public interface CapabilitiesInfo +{ + /** + * Retrieves all the Media types supported by the associated Portlet. + * + * @return a Set of String representation of supported Media types + */ + Set<MediaType> getMediaTypes(); + + /** + * Retrieves all the portlet modes supported by the associated Portlet. + * + * @return a Set of {@link ModeInfo} reprensenting the supported portlet modes + */ + Set<ModeInfo> getAllModes(); + + /** + * Retrieves the portlet modes supported by the associated Portlet for the specified Media type. + * + * @param mediaType the media type + * @return a Set of {@link ModeInfo} reprensenting the supported portlet modes for the specified Media type + */ + Set<ModeInfo> getModes(MediaType mediaType); + + /** + * Returns a mode info matching a specifed mode or null. + * + * @param mode the mode + * @return the mode info + */ + ModeInfo getMode(Mode mode); + + /** + * Retrieves all the window states supported by the associated Portlet. + * + * @return a Set of {@link WindowStateInfo} reprensenting the supported window states + */ + Set<WindowStateInfo> getAllWindowStates(); + + /** + * Retrieves the window states supported by the associated Portlet for the specified MIME type. + * + * @param mimeType the mime type + * @return a Set of {@link ModeInfo} reprensenting the supported window states for the specified MIME type + */ + Set<WindowStateInfo> getWindowStates(MediaType mimeType); + + /** + * Returns a window state info matching a specifed window state or null. + * + * @param windowState the window state + * @return the window state info + */ + WindowStateInfo getWindowState(WindowState windowState); + + /** + * Retrieves all the locales supported by the associated Portlet. + * + * @return the Set of supported {@link java.util.Locale}s + */ + Set<Locale> getAllLocales(); + + /** + * Retrieves the locales supported by the associated Portlet for the specified MIME type. + * + * @param mimeType the mime type + * @return a Set of supported {@link java.util.Locale}s for the specified MIME type + */ + Set<Locale> getLocales(MediaType mimeType); +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/CapabilitiesInfo.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/EventInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/EventInfo.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/EventInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,52 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.info; + +import org.jboss.portal.common.i18n.LocalizedString; + +import javax.xml.namespace.QName; +import java.util.Collection; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface EventInfo +{ + + QName getName(); + + LocalizedString getDisplayName(); + + LocalizedString getDescription(); + + /** + * Returns the type of the event or null if the event does not declare a type. + * + * @return the type of the event + */ + TypeInfo getType(); + + Collection<QName> getAliases(); + +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/EventingInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/EventingInfo.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/EventingInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,37 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.info; + +import javax.xml.namespace.QName; +import java.util.Map; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface EventingInfo +{ + Map<QName, ? extends EventInfo> getProducedEvents(); + + Map<QName, ? extends EventInfo> getConsumedEvents(); +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/MetaInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/MetaInfo.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/MetaInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,59 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.info; + +import org.jboss.portal.common.i18n.LocalizedString; + +/** + * Portlet metadata (display-name, title, short title, keywords). + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 6818 $ + * @since 2.4 + */ +public interface MetaInfo +{ + + /** Key for display name. */ + String DISPLAY_NAME = "display-name"; + + /** Key for title. */ + String TITLE = "title"; + + /** Key for short title. */ + String SHORT_TITLE = "short-title"; + + /** Key for locale specific keywords associated with this portlet. The keywords are separated by commas. */ + String KEYWORDS = "keywords"; + + /** Key for description. */ + String DESCRIPTION = "description"; + + /** + * Return the meta value of the portlet for a specific key. + * + * @param key the key + * @return an internationalized value + */ + LocalizedString getMetaValue(String key); +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/MetaInfo.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/ModeInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/ModeInfo.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/ModeInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,55 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.info; + +import org.jboss.portal.Mode; +import org.jboss.portal.common.i18n.LocalizedString; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 6818 $ + * @since 2.4 + */ +public interface ModeInfo +{ + /** + * The mode description. + * + * @return the description + */ + LocalizedString getDescription(); + + /** + * The mode value. + * + * @return the mode + */ + Mode getMode(); + + /** + * Retrieves the associated Mode name. + * + * @return the associated Mode name. + */ + String getModeName(); +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/ModeInfo.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/NavigationInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/NavigationInfo.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/NavigationInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,58 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.info; + +import javax.xml.namespace.QName; +import java.util.Collection; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface NavigationInfo +{ + + /** + * Returns a public parameter by using its id or null if it does not exist. + * + * @param id the parameter id + * @return the parameter info object + */ + ParameterInfo getPublicParameter(String id); + + /** + * Returns a public parameter by using its name or null if it does not exist. + * + * @param name the parameter name + * @return the parameter info object + */ + ParameterInfo getPublicParameter(QName name); + + /** + * Returns the collection of known public parameters. + * + * @return the public parameter collection + */ + Collection<? extends ParameterInfo> getPublicParameters(); + +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/ParameterInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/ParameterInfo.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/ParameterInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,45 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.info; + +import org.jboss.portal.common.i18n.LocalizedString; + +import javax.xml.namespace.QName; +import java.util.Collection; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface ParameterInfo +{ + + String getId(); + + QName getName(); + + Collection<QName> getAliases(); + + LocalizedString getDescription(); + +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/PortletInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/PortletInfo.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/PortletInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,116 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.info; + +import java.util.Map; + +/** + * Runtime meta data for a portlet. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + * @since 2.4 + */ +public interface PortletInfo +{ + + /** + * Returns the portlet name. + * + * @return the portlet name + */ + String getName(); + + /** + * Returns the portlet application name. + * + * @return the portlet application name + */ + String getApplicationName(); + + /** + * Retrieves the capabilities of supported by the described portlet. + * + * @return the capabilities of the portlet + */ + CapabilitiesInfo getCapabilities(); + + /** + * Retrieves information about the preferences supported by the described portlet, it must return null if the portlet + * cannot be personalized. + * + * @return the preferences meta data of the portlet + */ + PreferencesInfo getPreferences(); + + /** + * Retrieves the portlet description (title, keywords, etc). + * + * @return the portlet description + */ + MetaInfo getMeta(); + + /** + * Retrieves the security information for the described portlet. + * + * @return the security information + */ + SecurityInfo getSecurity(); + + /** + * Retrieves caching-related information for the described portlet. + * + * @return the caching related information + */ + CacheInfo getCache(); + + /** + * Return the eventing information. + * + * @return the eventing information + */ + EventingInfo getEventing(); + + /** + * Returns the navigation information. + * + * @return the navigation information + */ + NavigationInfo getNavigation(); + + /** + * Returns a generic attachment on the portlet info. + * + * @param type the parameter type + * @return the attachment or null + * @throws IllegalArgumentException if the parameter type is null + */ + <T> T getAttachment(Class<T> type) throws IllegalArgumentException; + + /** + * Retrieves the runtime container options set by the associated portlet, if any. + * + * @return the runtime container options set by the associated portlet, if any + */ + Map<String, RuntimeOptionInfo> getRuntimeOptionsInfo(); +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/PortletInfo.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/PortletManagedModeInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/PortletManagedModeInfo.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/PortletManagedModeInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,42 @@ +/****************************************************************************** + * 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.jboss.portal.portlet.api.info; + +import org.jboss.portal.common.i18n.LocalizedString; + +/** + * Extends the mode info interface to add the notion of portlet managed mode. + * + * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface PortletManagedModeInfo extends ModeInfo +{ + + /** + * Returns the display name of the mode. + * + * @return the display name + */ + LocalizedString getDisplayName(); +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/PreferenceInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/PreferenceInfo.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/PreferenceInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,74 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.info; + +import org.jboss.portal.common.i18n.LocalizedString; + +import java.util.List; + +/** + * Describes a Portlet preference. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 6818 $ + * @since 2.4 + */ +public interface PreferenceInfo +{ + /** + * Retrieves the key associated to the described preference. + * + * @return the key associated to the described preference. + */ + String getKey(); + + /** + * Retrieves the localized display name of the described preference. + * + * @return the localized display name of the described preference. + * @see LocalizedString + */ + LocalizedString getDisplayName(); + + /** + * Retrieves the localized description of the described preference. + * + * @return the localized description of the described preference. + * @see LocalizedString + */ + LocalizedString getDescription(); + + /** + * Return true if the preference is read-only, false otherwise or null if it cannot be determined. + * + * @return <code>true</code> if the described preference is read-only, <code>false</code> otherwise. + */ + Boolean isReadOnly(); + + /** + * Return the default value or null if it cannot be determined (for instance WSRP v1 does not define it). + * + * @return the default value + */ + List<String> getDefaultValue(); +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/PreferenceInfo.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/PreferencesInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/PreferencesInfo.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/PreferencesInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,49 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.info; + +import java.util.Set; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + * @since 2.4 + */ +public interface PreferencesInfo +{ + /** + * Return the immutable set of keys. + * + * @return the keys + */ + Set<String> getKeys(); + + /** + * A preference specified by its key. + * + * @param key the key + * @return the preference info or null if it does not exist + * @throws IllegalArgumentException if the key is null + */ + PreferenceInfo getPreference(String key) throws IllegalArgumentException; +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/PreferencesInfo.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/RuntimeOptionInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/RuntimeOptionInfo.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/RuntimeOptionInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,53 @@ +/* +* 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.jboss.portal.portlet.api.info; + +import org.jboss.portal.common.util.Tools; + +import java.util.Collections; +import java.util.List; +import java.util.Set; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +public interface RuntimeOptionInfo +{ + String JAVAX_PORTLET_ACTION_SCOPED_REQUEST_ATTRIBUTES = "javax.portlet.actionScopedRequestAttributes"; + String NUMBER_OF_CACHED_SCOPES = "numberOfCachedScopes"; + String JAVAX_PORTLET_ESCAPE_XML = "javax.portlet.escapeXml"; + String JAVAX_PORTLET_SERVLET_DEFAULT_SESSION_SCOPE = "javax.portlet.servletDefaultSessionScope"; + + String ORG_JBOSS_PORTLETCONTAINER_REMOTABLE = "org.jboss.portletcontainer.remotable"; + + Set<String> SUPPORTED_OPTIONS = Collections.unmodifiableSet(Tools.toSet( + JAVAX_PORTLET_ACTION_SCOPED_REQUEST_ATTRIBUTES, + JAVAX_PORTLET_ESCAPE_XML, + JAVAX_PORTLET_SERVLET_DEFAULT_SESSION_SCOPE, + ORG_JBOSS_PORTLETCONTAINER_REMOTABLE)); + + String getName(); + + List<String> getValues(); +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/SecurityInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/SecurityInfo.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/SecurityInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,45 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.info; + +import org.jboss.portal.portlet.api.TransportGuarantee; + +import java.util.Set; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public interface SecurityInfo +{ + /** + * @param transportGuarantee the transport guarantee + * @return true if the transport guarantee is contained + */ + boolean containsTransportGuarantee(TransportGuarantee transportGuarantee); + + /** + * @return the set of transport guarantees + */ + Set<TransportGuarantee> getTransportGuarantees(); +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/SecurityInfo.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/TypeInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/TypeInfo.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/TypeInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,38 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.info; + +import javax.xml.bind.annotation.XmlRootElement; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface TypeInfo +{ + + String getName(); + + XmlRootElement getXMLBinding(); + +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/WindowStateInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/WindowStateInfo.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/WindowStateInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,55 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.info; + +import org.jboss.portal.WindowState; +import org.jboss.portal.common.i18n.LocalizedString; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 6818 $ + * @since 2.4 + */ +public interface WindowStateInfo +{ + /** + * The window state description. + * + * @return the window state description + */ + LocalizedString getDescription(); + + /** + * The window state value. + * + * @return the window state value + */ + WindowState getWindowState(); + + /** + * Retrieves the associated window state name. + * + * @return the associated window state name. + */ + String getWindowStateName(); +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/info/WindowStateInfo.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/ActionInvocation.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/ActionInvocation.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/ActionInvocation.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,81 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation; + +import org.jboss.portal.portlet.api.spi.RequestContext; +import org.jboss.portal.portlet.api.spi.PortletInvocationContext; +import org.jboss.portal.portlet.api.StateString; + +import java.util.Map; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public class ActionInvocation extends PortletInvocation +{ + + /** The request context. */ + protected RequestContext requestContext; + + /** . */ + protected StateString interactionState; + + /** . */ + protected Map<String, String[]> form; + + public ActionInvocation(PortletInvocationContext ctx) throws IllegalArgumentException + { + super(ctx); + } + + public StateString getInteractionState() + { + return interactionState; + } + + public void setInteractionState(StateString interactionState) + { + this.interactionState = interactionState; + } + + public Map<String, String[]> getForm() + { + return form; + } + + public void setForm(Map<String, String[]> form) + { + this.form = form; + } + + public RequestContext getRequestContext() + { + return requestContext; + } + + public void setRequestContext(RequestContext requestContext) + { + this.requestContext = requestContext; + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/ActionInvocation.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/EventInvocation.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/EventInvocation.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/EventInvocation.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,67 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation; + +import org.jboss.portal.portlet.api.spi.PortletInvocationContext; + +import javax.xml.namespace.QName; +import java.io.Serializable; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class EventInvocation extends PortletInvocation +{ + + /** . */ + private QName name; + + /** . */ + private Serializable payload; + + public EventInvocation(PortletInvocationContext ctx) throws IllegalArgumentException + { + super(ctx); + } + + public QName getName() + { + return name; + } + + public void setName(QName name) + { + this.name = name; + } + + public Serializable getPayload() + { + return payload; + } + + public void setPayload(Serializable payload) + { + this.payload = payload; + } +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/PortletInvocation.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/PortletInvocation.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/PortletInvocation.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,310 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation; + +import org.jboss.portal.common.invocation.AttributeResolver; +import org.jboss.portal.common.invocation.resolver.MapAttributeResolver; +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.ServerContext; +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.spi.ClientContext; +import org.jboss.portal.portlet.api.PortletContext; +import org.jboss.portal.portlet.api.StateString; +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Map; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 6765 $ + * @since 2.4 + */ +public abstract class PortletInvocation +{ + + /** . */ + protected final AttributeResolver attributes; + + /** . */ + protected StateString navigationalState; + + /** . */ + protected Map<String, String[]> publicNavigationalState; + + /** . */ + protected Mode mode; + + /** . */ + protected WindowState windowState; + + /** The target portlet. */ + protected PortletContext target; + + /** The portlet request attributes. */ + protected Map<String, Object> requestAttributes; + + /** The invocation context. */ + protected PortletInvocationContext ctx; + + /** The portal context. */ + protected PortalContext portalContext; + + /** The client context. */ + protected ClientContext clientContext; + + /** The server context. */ + protected ServerContext serverContext; + + /** The security context. */ + protected SecurityContext securityContext; + + /** The user context. */ + protected UserContext userContext; + + /** The instance context. */ + protected InstanceContext instanceContext; + + /** The window context. */ + protected WindowContext windowContext; + + /** The dispatched request. */ + protected HttpServletRequest dreq; + + /** The dispatched response. */ + protected HttpServletResponse dresp; + + /** + * Create an invocation to a portlet. + * + * @param ctx the portlet invocation context + * @throws IllegalArgumentException if the provided context is null + */ + protected PortletInvocation(PortletInvocationContext ctx) throws IllegalArgumentException + { + if (ctx == null) + { + throw new IllegalArgumentException(); + } + + // + this.ctx = ctx; + this.attributes = new MapAttributeResolver(); + } + + public PortletInvocationContext getContext() + { + return ctx; + } + + public PortletContext getTarget() + { + return target; + } + + public void setTarget(PortletContext target) + { + this.target = target; + } + + /** + * Returns the dispatched http servlet request. + * + * @return the dispatched response + */ + public HttpServletResponse getDispatchedResponse() + { + return dresp; + } + + /** + * Set the dispatched http servlet request. + * + * @param dresp the dispatched response + */ + public void setDispatchedResponse(HttpServletResponse dresp) + { + this.dresp = dresp; + } + + /** + * Returns the dispatched http servlet request. + * + * @return the dispatched request + */ + public HttpServletRequest getDispatchedRequest() + { + return dreq; + } + + /** + * Set the dispatched http servlet request. + * + * @param dreq the dispatched request + */ + public void setDispatchedRequest(HttpServletRequest dreq) + { + this.dreq = dreq; + } + + public StateString getNavigationalState() + { + return navigationalState; + } + + public void setNavigationalState(StateString navigationalState) + { + this.navigationalState = navigationalState; + } + + public Map<String, String[]> getPublicNavigationalState() + { + return publicNavigationalState; + } + + public void setPublicNavigationalState(Map<String, String[]> publicNavigationalState) + { + this.publicNavigationalState = publicNavigationalState; + } + + public Mode getMode() + { + return mode; + } + + public void setMode(Mode mode) + { + this.mode = mode; + } + + public WindowState getWindowState() + { + return windowState; + } + + public void setWindowState(WindowState windowState) + { + this.windowState = windowState; + } + + public PortalContext getPortalContext() + { + return portalContext; + } + + public void setPortalContext(PortalContext portalContext) + { + this.portalContext = portalContext; + } + + public ClientContext getClientContext() + { + return clientContext; + } + + public void setClientContext(ClientContext clientContext) + { + this.clientContext = clientContext; + } + + public ServerContext getServerContext() + { + return serverContext; + } + + public void setServerContext(ServerContext serverContext) + { + this.serverContext = serverContext; + } + + public SecurityContext getSecurityContext() + { + return securityContext; + } + + public void setSecurityContext(SecurityContext securityContext) + { + this.securityContext = securityContext; + } + + public UserContext getUserContext() + { + return userContext; + } + + public void setUserContext(UserContext userContext) + { + this.userContext = userContext; + } + + public InstanceContext getInstanceContext() + { + return instanceContext; + } + + public void setInstanceContext(InstanceContext instanceContext) + { + this.instanceContext = instanceContext; + } + + public WindowContext getWindowContext() + { + return windowContext; + } + + public void setWindowContext(WindowContext windowContext) + { + this.windowContext = windowContext; + } + + public Map<String, Object> getRequestAttributes() + { + return requestAttributes; + } + + public void setRequestAttributes(Map<String, Object> requestAttributes) + { + this.requestAttributes = requestAttributes; + } + + public void setAttribute(String attrKey, Object attrValue) + { + attributes.setAttribute(attrKey, attrValue); + } + + public Object getAttribute(String attrKey) + { + return attributes.getAttribute(attrKey); + } + + public void removeAttribute(Object attrKey) throws IllegalArgumentException + { + attributes.setAttribute(attrKey, null); + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/PortletInvocation.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/RenderInvocation.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/RenderInvocation.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/RenderInvocation.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,54 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation; + +import org.jboss.portal.portlet.api.spi.PortletInvocationContext; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public class RenderInvocation extends PortletInvocation +{ + + /** . */ + private String validationToken; + + public RenderInvocation(PortletInvocationContext ctx) throws IllegalArgumentException + { + super(ctx); + + // + this.ctx = ctx; + } + + public String getValidationToken() + { + return validationToken; + } + + public void setValidationToken(String validationToken) + { + this.validationToken = validationToken; + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/RenderInvocation.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/ResourceInvocation.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/ResourceInvocation.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/ResourceInvocation.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,121 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation; + +import org.jboss.portal.portlet.api.spi.RequestContext; +import org.jboss.portal.portlet.api.spi.PortletInvocationContext; +import org.jboss.portal.portlet.api.StateString; +import org.jboss.portal.portlet.api.cache.CacheLevel; + +import java.util.Map; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class ResourceInvocation extends PortletInvocation +{ + + /** The request context. */ + private RequestContext requestContext; + + /** . */ + private String validationToken; + + /** . */ + private String resourceId; + + /** . */ + private StateString resourceState; + + /** . */ + private Map<String, String[]> form; + + /** . */ + private CacheLevel cacheLevel; + + public ResourceInvocation(PortletInvocationContext ctx) throws IllegalArgumentException + { + super(ctx); + } + + public String getValidationToken() + { + return validationToken; + } + + public void setValidationToken(String validationToken) + { + this.validationToken = validationToken; + } + + public String getResourceId() + { + return resourceId; + } + + public void setResourceId(String resourceId) + { + this.resourceId = resourceId; + } + + public StateString getResourceState() + { + return resourceState; + } + + public void setResourceState(StateString resourceState) + { + this.resourceState = resourceState; + } + + public Map<String, String[]> getForm() + { + return form; + } + + public void setForm(Map<String, String[]> form) + { + this.form = form; + } + + public CacheLevel getCacheLevel() + { + return cacheLevel; + } + + public void setCacheLevel(CacheLevel cacheLevel) + { + this.cacheLevel = cacheLevel; + } + + public RequestContext getRequestContext() + { + return requestContext; + } + + public void setRequestContext(RequestContext requestContext) + { + this.requestContext = requestContext; + } +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/ContentResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/ContentResponse.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/ContentResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,166 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation.response; + +import java.util.Map; + +import org.jboss.portal.portlet.api.cache.CacheControl; + +/** + * Data produced. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5602 $ + */ +public class ContentResponse extends PortletInvocationResponse +{ + + /** . */ + public static final int TYPE_EMPTY = 0; + + /** . */ + public static final int TYPE_CHARS = 1; + + /** . */ + public static final int TYPE_BYTES = 2; + + /** . */ + private final ResponseProperties properties; + + /** . */ + private final Map<String, Object> attributes; + + /** The result content type if any. */ + private String contentType; + + /** . */ + private final byte[] bytes; + + /** . */ + private final String chars; + + /** . */ + private final CacheControl cacheControl; + + public ContentResponse( + ResponseProperties properties, + Map<String, Object> attributes, + String contentType, + byte[] bytes, + String chars, + CacheControl cacheControl) + { + this.properties = properties; + this.attributes = attributes; + this.contentType = contentType; + this.bytes = bytes; + this.chars = chars; + this.cacheControl = cacheControl; + } + + public ResponseProperties getProperties() + { + return properties; + } + + public CacheControl getCacheControl() + { + return cacheControl; + } + + public Map<String, Object> getAttributes() + { + return attributes; + } + + public int getType() + { + if (bytes == null) + { + if (chars == null) + { + return TYPE_EMPTY; + } + else + { + return TYPE_CHARS; + } + } + else + { + return TYPE_BYTES; + } + } + + /** + * Return the content as a string. + * + * @return the content + */ + public String getContent() + { + switch (getType()) + { + case TYPE_CHARS: + return getChars(); + case TYPE_BYTES: + return new String(bytes); + case TYPE_EMPTY: + return ""; + default: + throw new AssertionError(); + } + } + + /** + * Return the bytes of the content held by the fragment. + * + * @return the bytes + * @throws IllegalArgumentException if the type is not bytes + */ + public byte[] getBytes() throws IllegalArgumentException + { + return bytes; + } + + /** + * Return the chars of the content held by the fragment. + * + * @return the chars + * @throws IllegalArgumentException if the type is not chars + */ + public String getChars() throws IllegalArgumentException + { + return chars; + } + + /** + * Return the content type of the generated fragment. + * + * @return the content type + */ + public String getContentType() + { + return contentType; + } +} \ No newline at end of file Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/ErrorResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/ErrorResponse.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/ErrorResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,130 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation.response; + +import org.jboss.portal.common.util.Exceptions; +import org.apache.log4j.Logger; + +/** + * Application level error. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7395 $ + */ +public class ErrorResponse extends PortletInvocationResponse +{ + /** The logged throwable if any. */ + private final Throwable cause; + + /** There must be one error message. */ + private final String message; + + public ErrorResponse(Throwable cause) + { + if (cause == null) + { + throw new IllegalArgumentException("There must be a cause"); + } + this.cause = cause; + this.message = cause.getMessage(); + } + + public ErrorResponse(String message, Throwable cause) + { + if (message == null) + { + throw new IllegalArgumentException("There must be a message"); + } + if (cause == null) + { + throw new IllegalArgumentException("There must be a cause"); + } + this.cause = cause; + this.message = message; + } + + public ErrorResponse(String message) + { + if (message == null) + { + throw new IllegalArgumentException("Message cannot be null."); + } + this.message = message; + this.cause = null; + } + + /** The throwable. Can be a null object. */ + public Throwable getCause() + { + return cause; + } + + /** The logged message. */ + public String getMessage() + { + if (message == null) + { + return cause.getClass().getName(); + } + + return message; + } + + /** + * Logs an error message to the specified logger, using either the message or this ErrorResult's Throwable if + * available. + * + * @param log + * @param logMessage + */ + public void logErrorTo(Logger log, String logMessage) + { + if (cause != null) + { + log.error(logMessage, cause); + } + else + { + log.error(logMessage + "\n" + message); + } + } + + /** + * Provides an HTML description of the error, using either the message or the encapsulated Throwable. + * + * @return + */ + public String toHTML() + { + if (cause != null) + { + return Exceptions.toHTML(cause); + } + else + { + StringBuffer sb = new StringBuffer(255); + sb.append("<div><code>").append(message).append("</code></div>"); + return sb.toString(); + } + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/ErrorResponse.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/FragmentResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/FragmentResponse.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/FragmentResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,82 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation.response; + +import org.jboss.portal.portlet.api.cache.CacheControl; +import org.jboss.portal.Mode; + +import java.util.Set; +import java.util.Map; + +/** + * Data produced. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5602 $ + */ +public class FragmentResponse extends ContentResponse +{ + + /** The title if any. */ + private final String title; + + /** The next modes. */ + private final Set<Mode> nextModes; + + public FragmentResponse( + ResponseProperties properties, + Map<String, Object> attributes, + String contentType, + byte[] bytes, + String chars, + String title, + CacheControl cacheControl, + Set<Mode> nextModes) + { + super(properties, attributes, contentType, bytes, chars, cacheControl); + + // + this.title = title; + this.nextModes = nextModes; + } + + /** + * Return the fragment title. + * + * @return the title. + */ + public String getTitle() + { + return title; + } + + /** + * Returns the next modes. + * + * @return the next modes + */ + public Set<Mode> getNextModes() + { + return nextModes; + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/FragmentResponse.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/HTTPRedirectionResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/HTTPRedirectionResponse.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/HTTPRedirectionResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,46 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation.response; + +/** + * Redirection to an HTTP location. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public class HTTPRedirectionResponse extends RedirectionResponse +{ + + /** . */ + protected final String location; + + public HTTPRedirectionResponse(String location) + { + this.location = location; + } + + public String getLocation() + { + return location; + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/HTTPRedirectionResponse.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/InsufficientPrivilegesResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/InsufficientPrivilegesResponse.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/InsufficientPrivilegesResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,31 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation.response; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5602 $ + */ +public class InsufficientPrivilegesResponse extends SecurityResponse +{ +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/InsufficientPrivilegesResponse.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/InsufficientTransportGuaranteeResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/InsufficientTransportGuaranteeResponse.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/InsufficientTransportGuaranteeResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,31 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation.response; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5602 $ + */ +public class InsufficientTransportGuaranteeResponse extends SecurityResponse +{ +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/InsufficientTransportGuaranteeResponse.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/PortletInvocationResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/PortletInvocationResponse.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/PortletInvocationResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,33 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation.response; + +/** + * The base interface for all result objects. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public class PortletInvocationResponse +{ +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/PortletInvocationResponse.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/RedirectionResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/RedirectionResponse.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/RedirectionResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,33 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation.response; + +/** + * Redirection to something. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public abstract class RedirectionResponse extends PortletInvocationResponse +{ +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/RedirectionResponse.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/ResponseProperties.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/ResponseProperties.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/ResponseProperties.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,87 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation.response; + +import org.jboss.portal.common.util.MultiValuedPropertyMap; +import org.jboss.portal.common.util.SimpleMultiValuedPropertyMap; +import org.w3c.dom.Element; + +import javax.servlet.http.Cookie; +import java.util.List; +import java.util.LinkedList; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public class ResponseProperties +{ + + /** . */ + private MultiValuedPropertyMap<String> transportHeaders = new SimpleMultiValuedPropertyMap<String>(); + + /** . */ + private MultiValuedPropertyMap<Element> markupHeaders = new SimpleMultiValuedPropertyMap<Element>(); + + /** . */ + private List<Cookie> cookies = new LinkedList<Cookie>(); + + public ResponseProperties() + { + } + + public MultiValuedPropertyMap<String> getTransportHeaders() + { + return transportHeaders; + } + + public MultiValuedPropertyMap<Element> getMarkupHeaders() + { + return markupHeaders; + } + + public List<Cookie> getCookies() + { + return cookies; + } + + public void append(ResponseProperties appended) + { + if (appended == null) + { + throw new IllegalArgumentException(); + } + + // + transportHeaders.append(appended.transportHeaders); + markupHeaders.append(appended.markupHeaders); + cookies.addAll(appended.cookies); + } + + public void clear() + { + transportHeaders.clear(); + markupHeaders.clear(); + cookies.clear(); + } +} \ No newline at end of file Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/RevalidateMarkupResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/RevalidateMarkupResponse.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/RevalidateMarkupResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,50 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation.response; + +import org.jboss.portal.portlet.api.cache.CacheControl; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public class RevalidateMarkupResponse extends PortletInvocationResponse +{ + + /** . */ + private final CacheControl cacheControl; + + public RevalidateMarkupResponse(CacheControl cacheControl) + { + if (cacheControl == null) + { + throw new IllegalArgumentException(); + } + this.cacheControl = cacheControl; + } + + public CacheControl getCacheControl() + { + return cacheControl; + } +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/SecurityErrorResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/SecurityErrorResponse.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/SecurityErrorResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,48 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation.response; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5602 $ + */ +public class SecurityErrorResponse extends SecurityResponse +{ + + /** . */ + private Throwable throwable; + + public SecurityErrorResponse(Throwable throwable) + { + if (throwable == null) + { + throw new IllegalArgumentException("There must be a throwable"); + } + this.throwable = throwable; + } + + public Throwable getThrowable() + { + return throwable; + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/SecurityErrorResponse.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/SecurityResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/SecurityResponse.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/SecurityResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,31 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation.response; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 1.1 $ + */ +public class SecurityResponse extends PortletInvocationResponse +{ +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/StreamResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/StreamResponse.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/StreamResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,60 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation.response; + +/** + * Stream a result to the client directly. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public class StreamResponse extends PortletInvocationResponse +{ + + private String contentType; + private byte[] bytes; + + public StreamResponse(String contentType, byte[] bytes) + { + if (contentType == null) + { + throw new IllegalArgumentException("Content type cannot be null"); + } + if (bytes == null) + { + throw new IllegalArgumentException("Bytes cannot be null"); + } + this.contentType = contentType; + this.bytes = bytes; + } + + public String getContentType() + { + return contentType; + } + + public byte[] getBytes() + { + return bytes; + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/StreamResponse.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/UnavailableResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/UnavailableResponse.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/UnavailableResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,61 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation.response; + +/** + * Portlet exists but cannot be used. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public class UnavailableResponse extends PortletInvocationResponse +{ + + /** . */ + private final boolean permanent; + + /** . */ + private final int seconds; + + public UnavailableResponse() + { + this.seconds = 0; + this.permanent = true; + } + + public UnavailableResponse(int seconds) + { + this.seconds = seconds; + this.permanent = false; + } + + public int getUnavailableSeconds() + { + return seconds; + } + + public boolean isPermanent() + { + return permanent; + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/UnavailableResponse.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/UpdateNavigationalStateResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/UpdateNavigationalStateResponse.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/UpdateNavigationalStateResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,192 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.invocation.response; + +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import org.jboss.portal.portlet.api.StateString; + +import javax.xml.namespace.QName; +import java.util.Map; +import java.util.List; +import java.util.Collections; +import java.util.ArrayList; +import java.io.Serializable; + +/** + * Update the navigational state. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5477 $ + */ +public class UpdateNavigationalStateResponse extends PortletInvocationResponse +{ + + /** . */ + private ResponseProperties properties; + + /** The navigational state returned. */ + private StateString navigationalState; + + /** The new window state requested. */ + private WindowState windowState; + + /** The new mode requested. */ + private Mode mode; + + /** The attributes snapshot after the request. */ + private Map<String, Object> attributes; + + /** . */ + private List<Event> producedEvents; + + /** + * The update to the public parameters. Each entry having a zero length value must be interpeted as + * a public parameter removal otherwise it must be interpreted as a public parameter values update. + */ + protected Map<String, String[]> publicNavigationalStateUpdates; + + public UpdateNavigationalStateResponse() + { + navigationalState = null; + windowState = null; + mode = null; + publicNavigationalStateUpdates = null; + producedEvents = Collections.emptyList(); + } + + public ResponseProperties getProperties() + { + return properties; + } + + public void setProperties(ResponseProperties properties) + { + this.properties = properties; + } + + public Map<String, Object> getAttributes() + { + return attributes; + } + + public void setAttributes(Map<String, Object> attributes) + { + this.attributes = attributes; + } + + public Mode getMode() + { + return mode; + } + + public void setMode(Mode mode) + { + this.mode = mode; + } + + public WindowState getWindowState() + { + return windowState; + } + + public void setWindowState(WindowState windowState) + { + this.windowState = windowState; + } + + public StateString getNavigationalState() + { + return navigationalState; + } + + public void setNavigationalState(StateString state) + { + this.navigationalState = state; + } + + public Map<String, String[]> getPublicNavigationalStateUpdates() + { + return publicNavigationalStateUpdates; + } + + public void setPublicNavigationalStateUpdates(Map<String, String[]> publicNavigationalStateUpdates) + { + this.publicNavigationalStateUpdates = publicNavigationalStateUpdates; + } + + public void queueEvent(UpdateNavigationalStateResponse.Event event) + { + if (event == null) + { + throw new IllegalArgumentException("No null event accepted"); + } + + // + if (producedEvents.size() == 0) + { + producedEvents = new ArrayList<Event>(); + } + + // + producedEvents.add(event); + } + + public List<UpdateNavigationalStateResponse.Event> getEvents() + { + return producedEvents; + } + + /** + * An event produced by a state response. + */ + public static class Event + { + + /** The optional event. */ + private QName name; + + /** The optional event payload. */ + private Serializable payload; + + public Event(QName name, Serializable payload) + { + if (name == null) + { + throw new IllegalArgumentException(); + } + this.name = name; + this.payload = payload; + } + + public QName getName() + { + return name; + } + + public Serializable getPayload() + { + return payload; + } + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/invocation/response/UpdateNavigationalStateResponse.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/ClientContext.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/ClientContext.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/ClientContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,47 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.spi; + +import org.jboss.portal.common.util.MultiValuedPropertyMap; + +import javax.servlet.http.Cookie; +import java.util.List; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface ClientContext +{ + + String getMethod(); + + /** + * Returns the properties as seen by the client. + * + * @return the properties + */ + MultiValuedPropertyMap<String> getProperties(); + + List<Cookie> getCookies(); +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/InstanceContext.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/InstanceContext.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/InstanceContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,54 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.spi; + +import org.jboss.portal.portlet.api.StateEvent; +import org.jboss.portal.portlet.api.state.AccessMode; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public interface InstanceContext +{ + /** + * Return an id that can differenciate instances. + * + * @return the instance id + */ + String getId(); + + /** + * Return the access mode to this portlet instance. + * + * @return the access mode + */ + AccessMode getAccessMode(); + + /** + * A state event occured. + * + * @param event the event + */ + void onStateEvent(StateEvent event); +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/InstanceContext.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/PortalContext.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/PortalContext.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/PortalContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,69 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.spi; + +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import org.jboss.portal.common.util.Version; + +import java.util.Map; +import java.util.Set; + +/** + * Represent the context of the portal that performs the invocation. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 6720 $ + */ +public interface PortalContext +{ + public static final Version VERSION = new Version("JBoss Portlet Container", 2, 0, 8, new Version.Qualifier(Version.Qualifier.Prefix.SNAPSHOT), "Community"); + + /** + * Return info about the portal. + * + * @return portal infos + */ + String getInfo(); + + /** + * Return the window states accepted by this portal context. + * + * @return the window states + */ + Set<WindowState> getWindowStates(); + + /** + * Return the modes accepted by this portal context. + * + * @return the modes + */ + Set<Mode> getModes(); + + /** + * Return the set of properties of this portal context. + * + * @return the properties + */ + Map<String, String> getProperties(); +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/PortalContext.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/PortletInvocationContext.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/PortletInvocationContext.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/PortletInvocationContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,83 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.spi; + +import java.io.IOException; +import java.io.Writer; + +import org.jboss.portal.common.util.MarkupInfo; +import org.jboss.portal.portlet.api.ContainerURL; +import org.jboss.portal.portlet.api.URLFormat; + +/** + * Contract that defines what input/services the caller of a portlet container must provide. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5064 $ + */ +public interface PortletInvocationContext +{ + + /** + * todo : move me to client content // see if it is still needed with CC/PP + * + * Return information about the underlying http wire this invocation is performed. + * + * @return the stream info + */ + MarkupInfo getMarkupInfo(); + + /** + * <p>Encodes the specified URL by including the session ID in it, or, if encoding is not needed, returns the URL + * unchanged. The implementation of this method includes the logic to determine whether the session ID needs to be + * encoded in the URL. For example, if the browser supports cookies, or session tracking is turned off, URL encoding + * is unnecessary.</p> + * <p/> + * <p>For robust session tracking, all URLs emitted by a servlet should be run through this method. Otherwise, URL + * rewriting cannot be used with browsers which do not support cookies.</p> + * + * @param url the url to be encoded + * @return the encoded URL if encoding is needed, the unchanged URL otherwise + * @throws IllegalArgumentException if the url is not valid or null + */ + String encodeResourceURL(String url) throws IllegalArgumentException; + + /** + * Renders a container URL. + * + * @param containerURL the portlet url + * @param format the url format + * @return the rendered url + */ + String renderURL(ContainerURL containerURL, URLFormat format); + + /** + * Renders a container URL. + * + * @param writer the writer + * @param containerURL the portlet url + * @param format the url format + * @throws IOException any IOException thrown by the writer + */ + void renderURL(Writer writer, ContainerURL containerURL, URLFormat format) throws IOException; +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/PortletInvocationContext.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/RequestContext.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/RequestContext.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/RequestContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,93 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.spi; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 630 $ + */ +public interface RequestContext +{ + /** + * Returns the name of the character encoding used in the body of this request. This method returns <code>null</code> + * if the request does not specify a character encoding. + * + * @return a <code>String</code> containing the name of the chararacter encoding, or <code>null</code> if the + * request does not specify a character encoding. + */ + String getCharacterEncoding(); + + /** + * Returns the length, in bytes, of the request body which is made available by the input stream, or -1 if the length + * is not known. + * + * @return an integer containing the length of the request body or -1 if the length is not known + */ + int getContentLength(); + + /** + * Returns the MIME type of the body of the request, or null if the type is not known. + * + * @return a <code>String</code> containing the name of the MIME type of the request, or null if the type is not + * known. + */ + String getContentType(); + + /** + * Retrieves the body of the HTTP request from the client to the portal as character data using a + * <code>BufferedReader</code>. The reader translates the character data according to the character encoding used on + * the body. Either this method or {@link #getInputStream} may be called to read the body, not both. + * <p/> + * For HTTP POST data of type application/x-www-form-urlencoded this method throws an + * <code>IllegalStateException</code> as this data has been already processed by the portal/portlet-container and is + * available as request parameters. + * + * @throws java.io.UnsupportedEncodingException if the character set encoding used is not supported and + * the text cannot be decoded + * @throws java.lang.IllegalStateException if {@link #getInputStream} method has been called on this request, + * it is a HTTP POST data of type application/x-www-form-urlencoded. + * @throws java.io.IOException if an input or output exception occurred + * @return a <code>BufferedReader</code> containing the body of the request + * @see #getInputStream + */ + BufferedReader getReader() throws IOException; + + /** + * Retrieves the body of the HTTP request from client to portal as binary data using an <CODE>InputStream</CODE>. + * Either this method or {@link #getReader} may be called to read the body, but not both. + * <p/> + * For HTTP POST data of type application/x-www-form-urlencoded this method throws an + * <code>IllegalStateException</code> as this data has been already processed by the portal/portlet-container and is + * available as request parameters. + * + * @return an input stream containing the body of the request + * @throws java.lang.IllegalStateException if getReader was already called, or it is a HTTP POST data of type + * application/x-www-form-urlencoded + * @throws java.io.IOException if an input or output exception occurred + */ + InputStream getInputStream() throws IOException, IllegalStateException; +} Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/SecurityContext.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/SecurityContext.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/SecurityContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,63 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.spi; + +import java.security.Principal; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public interface SecurityContext +{ + /** + * @return true if is secured + */ + boolean isSecure(); + + /** + * @return true if it is authenticated + */ + boolean isAuthenticated(); + + /** + * @return the auth type + */ + String getAuthType(); + + /** + * @return the remote user + */ + String getRemoteUser(); + + /** + * @return the user principal + */ + Principal getUserPrincipal(); + + /** + * @param roleName the role name + * @return true if the user is in role + */ + boolean isUserInRole(String roleName); +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/SecurityContext.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/ServerContext.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/ServerContext.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/ServerContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,72 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.spi; + +import org.jboss.portal.web.RequestDispatchCallback; +import org.jboss.portal.web.ServletContainer; + +import javax.servlet.ServletContext; + +/** + * Defines the request context contract. It's usage is related to the Servlet Container operational + * environment. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 6929 $ + */ +public interface ServerContext +{ + /** + * Return the scheme value. + * + * @return the scheme + */ + String getScheme(); + + /** + * Return the server name value. + * + * @return the server name + */ + String getServerName(); + + /** + * Return the server port value. + * + * @return the server port + */ + int getServerPort(); + + /** + * Delegate to the request context the dispatching to the target servlet context using the specified spi elements. + * + * @param servletContainer the servlet container spi + * @param targetServletContext the target servlet context + * @param callback the call back to be done after dispatch + * @param handback the hand back object to provide after dispatch to the call back + * @return the call back returned object + * @throws Exception any exception + */ + Object dispatch(ServletContainer servletContainer, ServletContext targetServletContext, RequestDispatchCallback callback, Object handback) throws Exception; + +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/ServerContext.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/UserContext.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/UserContext.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/UserContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,82 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.spi; + +import java.util.List; +import java.util.Locale; +import java.util.Map; + +/** + * The user context valid during the scope of a single request. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public interface UserContext +{ + + /** + * Retrieves the user id or null if it is not known. + * + * @return the user id + */ + String getId(); + + /** + * The user profile information keyed by P3PConstants + * + * @return a map containing user profile informaton + * @see org.jboss.portal.common.p3p.P3PConstants + */ + Map<String, String> getInformations(); + + /** + * Return the user locale. + * + * @return the user locale. + */ + Locale getLocale(); + + /** + * Retrieves the locales that the user is willing to receive information in. + * + * @return the locales ordered according to user preference (preferred first). + */ + List<Locale> getLocales(); + + /** + * Set an attribute related to the user identity. + * + * @param attrKey the attribute key + * @param attrValue the attribute value + */ + void setAttribute(String attrKey, Object attrValue); + + /** + * Returns an attribute related to the user identity. + * + * @param attrKey the attribute key + * @return the attribute value + */ + Object getAttribute(String attrKey); +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/UserContext.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/WindowContext.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/WindowContext.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/WindowContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,37 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.spi; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public interface WindowContext +{ + /** + * Return an id that can differenciate windows. + * + * @return the window id + */ + String getId(); +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/spi/WindowContext.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/AccessMode.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/AccessMode.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/AccessMode.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,55 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.state; + +/** + * Type safe enumeration for the access mode to a portlet. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5776 $ + */ +public enum AccessMode +{ + + /** Read only access mode. */ + READ_ONLY("READ_ONLY"), + + /** Read write access mode. */ + READ_WRITE("READ_WRITE"), + + /** Clone before write access mode. */ + CLONE_BEFORE_WRITE("CLONE_BEFORE_WRITE"); + + /** The type as a string. */ + private final String name; + + private AccessMode(String name) + { + this.name = name; + } + + public String toString() + { + return name; + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/AccessMode.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/DestroyCloneFailure.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/DestroyCloneFailure.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/DestroyCloneFailure.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,86 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.state; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5893 $ + */ +public class DestroyCloneFailure +{ + + /** The clone id. */ + private final String portletId; + + /** . */ + private final String message; + + public DestroyCloneFailure(String portletId, String message) + { + if (portletId == null) + { + throw new IllegalArgumentException("Must provide a portlet id"); + } + this.portletId = portletId; + this.message = message; + } + + public DestroyCloneFailure(String portletId) + { + this(portletId, null); + } + + public String getPortletId() + { + return portletId; + } + + public String getMessage() + { + return message; + } + + public String toString() + { + return "DestroyCloneFailure[" + portletId + "," + message + "]"; + } + + public int hashCode() + { + return portletId.hashCode(); + } + + public boolean equals(Object obj) + { + if (obj == this) + { + return true; + } + if (obj instanceof DestroyCloneFailure) + { + DestroyCloneFailure that = (DestroyCloneFailure)obj; + return portletId.equals(that.portletId); + } + return false; + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/DestroyCloneFailure.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/Property.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/Property.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/Property.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,55 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.state; + +import java.util.List; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5950 $ + */ +public class Property +{ + + /** The property name. */ + protected String name; + + /** The property value. */ + protected List<String> value; + + public Property(String name, List<String> value) + { + this.name = name; + this.value = value; + } + + public String getName() + { + return name; + } + + public List<String> getValue() + { + return value; + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/Property.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/PropertyChange.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/PropertyChange.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/PropertyChange.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,145 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.state; + +import java.util.List; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Arrays; + +/** + * A property change. The class is immutable + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5776 $ + */ +public class PropertyChange +{ + + /** The change is an update of the property value. */ + public static final int PREF_UPDATE = 0; + + /** The change is a reset of the property value. */ + public static final int PREF_RESET = 1; + + /** The key. */ + private final String key; + + /** The immutable value. */ + private final List<String> value; + + /** + * Create a new property update, the list of values will be clone for safety. + * + * @param key the property key + * @param value the property value + * @return an instance representing a property update + */ + public static PropertyChange newUpdate(String key, String value) + { + return new PropertyChange(key, Collections.singletonList(value)); + } + + /** + * Create a new property update, the list of values will be clone for safety. + * + * @param key the property key + * @param value the property value + * @return an instance representing a property update + */ + public static PropertyChange newUpdate(String key, String[] value) + { + if (value == null) + { + throw new IllegalArgumentException("No value provided"); + } + return new PropertyChange(key, Collections.unmodifiableList(Arrays.asList(value.clone()))); + } + + /** + * Create a new property update, the list of values will be clone for safety. + * + * @param key the property key + * @param value the property value + * @return an instance representing a property update + */ + public static PropertyChange newUpdate(String key, List<String> value) + { + if (value == null) + { + throw new IllegalArgumentException("No value provided"); + } + return new PropertyChange(key, Collections.unmodifiableList(new ArrayList<String>(value))); + } + + /** + * Create a new property reset. + * + * @param key the property key + * @return an instance representing a property reset + */ + public static PropertyChange newReset(String key) + { + return new PropertyChange(key, null); + } + + private PropertyChange(String key, List<String> value) + { + if (key == null) + { + throw new IllegalArgumentException("No key provided"); + } + this.key = key; + this.value = value; + } + + /** + * Return the property change type. + * + * @return the property change type + */ + public int getType() + { + return value == null ? PREF_RESET : PREF_UPDATE; + } + + /** + * Return the property key + * + * @return the property key + */ + public String getKey() + { + return key; + } + + /** + * Return the new value or null in case of a property reset. + * + * @return the property value + */ + public List<String> getValue() + { + return value; + } +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/PropertyChange.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/PropertyContext.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/PropertyContext.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/PropertyContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,73 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.state; + +import java.util.Set; +import java.util.List; + +/** + * Exposes to the portlet the interface to deal with the personalization state. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 6757 $ + */ +public interface PropertyContext +{ + + /** The attribute name under which the preferences can be accessed. */ + String PREFERENCES_ATTRIBUTE = "preferences"; + + /** + * Return an immutable set of keys. + * + * @return the set of keys + */ + Set<String> getKeys(); + + /** + * Return for a specified key an immutable list of its values or null if the value does not exist. + * + * @param key the lookup key + * @return the key value or null if it does not exist + * @throws IllegalArgumentException if the key is null + */ + List<String> getValue(String key) throws IllegalArgumentException; + + /** + * Return true if the preferences are globally read only. The value returned by this method is valid only during + * the action request. Any call to this method during the render request will produce a non accurate value. + * + * @return true if the preferences are read only + * @throws IllegalStateException if this is called during render phase + */ + boolean isReadOnly() throws IllegalStateException; + + /** + * Update the preferences. + * + * @param changes the list of changes + * @throws IllegalStateException if the preferences is not writable + * @throws IllegalArgumentException if any change is not valid + */ + void update(PropertyChange[] changes) throws IllegalStateException; +} Property changes on: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/PropertyContext.java ___________________________________________________________________ Name: svn:executable + * Added: jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/PropertyMap.java =================================================================== --- jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/PropertyMap.java (rev 0) +++ jbossexo/modules/portlet/trunk/api/src/main/java/org/jboss/portal/portlet/api/state/PropertyMap.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -0,0 +1,53 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.portlet.api.state; + +import java.util.Map; +import java.util.List; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 6643 $ + */ +public interface PropertyMap extends Map<String, List<String>> +{ + /** + * Return the value for the given key or null if it does not exist. + * + * @param key the requested key + * @return the requested value or null if it does not exist + * @throws IllegalArgumentException if the key is null + */ + List<String> getProperty(String key) throws IllegalArgumentException; + + /** + * Update the value of the given key. If the value object is null it means that the entry must be removed. + * Implementation can throw an unsupported operation exception when it is abnormal to perform an update. + * + * @param key the key to update + * @param value the new value + * @throws UnsupportedOperationException if the operation is not supported + * @throws IllegalArgumentException if the key is null + */ + void setProperty(String key, List<String> value) throws IllegalArgumentException, UnsupportedOperationException; +} Modified: jbossexo/modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/BridgeInterceptor.java =================================================================== --- jbossexo/modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/BridgeInterceptor.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/BridgeInterceptor.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.portlet.bridge; -import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; import org.jboss.portal.portlet.PortletInvokerInterceptor; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.PortletInvokerException; /** * The bridge interceptor set the bridge for the duration of the request made to the portlet. Modified: jbossexo/modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/BridgeResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/BridgeResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/BridgeResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponseWrapper; -import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java =================================================================== --- jbossexo/modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/bridge/src/main/java/org/jboss/portal/portlet/bridge/JBossServletContextProvider.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -32,7 +32,7 @@ import org.apache.portals.bridges.common.ServletContextProvider; import org.jboss.portal.portlet.container.PortletContainer; import org.jboss.portal.portlet.container.ContainerPortletInvoker; -import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; /** * The JBoss implementation of <code>org.apache.portals.bridges.common.ServletContextProvider</code> use thread local Property changes on: jbossexo/modules/portlet/trunk/build ___________________________________________________________________ Name: svn:ignore + target Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventControllerContextSafeInvoker.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventControllerContextSafeInvoker.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/EventControllerContextSafeInvoker.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,7 +25,7 @@ import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.controller.event.EventPhaseContext; import org.jboss.portal.portlet.controller.event.PortletWindowEvent; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; import org.apache.log4j.Logger; /** Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletController.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletController.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletController.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,11 +23,11 @@ package org.jboss.portal.portlet.controller; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.spi.PortletInvocationContext; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.StateString; +import org.jboss.portal.portlet.api.invocation.RenderInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.spi.PortletInvocationContext; import org.jboss.portal.portlet.controller.request.ControllerRequest; import org.jboss.portal.portlet.controller.request.PortletRequest; import org.jboss.portal.portlet.controller.request.PortletResourceRequest; Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletControllerContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,17 +22,17 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.PortletInvokerException; import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.StateControllerContext; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.spi.PortletInvocationContext; +import org.jboss.portal.portlet.api.info.PortletInfo; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.EventInvocation; +import org.jboss.portal.portlet.api.invocation.ResourceInvocation; +import org.jboss.portal.portlet.api.invocation.RenderInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.spi.PortletInvocationContext; import javax.servlet.http.Cookie; import java.util.List; Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -26,9 +26,9 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.StateString; +import org.jboss.portal.portlet.api.info.PortletInfo; import org.jboss.portal.portlet.controller.event.PortletWindowEvent; import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.controller.request.PortletActionRequest; @@ -40,12 +40,12 @@ import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.StateControllerContext; import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; -import org.jboss.portal.portlet.spi.PortletInvocationContext; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.EventInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.ResponseProperties; +import org.jboss.portal.portlet.api.invocation.response.UpdateNavigationalStateResponse; +import org.jboss.portal.portlet.api.spi.PortletInvocationContext; import javax.servlet.http.Cookie; import java.util.List; Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -26,12 +26,12 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.cache.CacheLevel; -import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.StateString; +import org.jboss.portal.portlet.api.spi.PortletInvocationContext; +import org.jboss.portal.portlet.api.cache.CacheLevel; +import org.jboss.portal.portlet.api.invocation.ResourceInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.controller.request.PortletResourceRequest; import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.controller.response.ResourceResponse; Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/RequestHandler.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/RequestHandler.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/RequestHandler.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,13 +24,11 @@ package org.jboss.portal.portlet.controller; import org.apache.log4j.Logger; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.PortletInvokerException; import org.jboss.portal.portlet.controller.request.ControllerRequest; import org.jboss.portal.portlet.controller.response.ControllerResponse; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; -import java.io.IOException; - /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/AbstractEventControllerContext.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/AbstractEventControllerContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/AbstractEventControllerContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.event; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; /** * An implementation of the event controller context that do no ops. Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/EventControllerContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.event; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/AbstractPortletControllerContext.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/AbstractPortletControllerContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/AbstractPortletControllerContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -26,8 +26,8 @@ import org.jboss.portal.common.util.MarkupInfo; import org.jboss.portal.common.io.Serialization; import org.jboss.portal.common.net.media.MediaType; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletInvokerException; import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.impl.spi.AbstractClientContext; @@ -38,15 +38,15 @@ import org.jboss.portal.portlet.impl.spi.AbstractWindowContext; import org.jboss.portal.portlet.impl.spi.AbstractInstanceContext; import org.jboss.portal.portlet.impl.spi.AbstractPortalContext; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.spi.PortalContext; +import org.jboss.portal.portlet.api.info.PortletInfo; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.EventInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.ResourceInvocation; +import org.jboss.portal.portlet.api.invocation.RenderInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.spi.PortletInvocationContext; +import org.jboss.portal.portlet.api.spi.PortalContext; import org.jboss.portal.web.IllegalRequestException; import org.apache.log4j.Logger; Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerPortletInvocationContext.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerPortletInvocationContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerPortletInvocationContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,17 +23,13 @@ package org.jboss.portal.portlet.controller.impl; -import org.jboss.portal.common.invocation.resolver.MapAttributeResolver; -import org.jboss.portal.common.invocation.resolver.PrincipalAttributeResolver; -import org.jboss.portal.common.invocation.resolver.RequestAttributeResolver; import org.jboss.portal.common.util.MarkupInfo; import org.jboss.portal.common.io.Serialization; -import org.jboss.portal.portlet.ContainerURL; -import org.jboss.portal.portlet.URLFormat; +import org.jboss.portal.portlet.api.ContainerURL; +import org.jboss.portal.portlet.api.URLFormat; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.impl.PortletURLRenderer; import org.jboss.portal.portlet.impl.spi.AbstractPortletInvocationContext; -import org.jboss.portal.portlet.invocation.PortletInvocation; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestFactory.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestFactory.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestFactory.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -29,8 +29,8 @@ import org.jboss.portal.common.io.SerializationFilter; import org.jboss.portal.common.util.Base64; import org.jboss.portal.common.util.MapAdapters; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.cache.CacheLevel; +import org.jboss.portal.portlet.api.StateString; +import org.jboss.portal.portlet.api.cache.CacheLevel; import org.jboss.portal.portlet.controller.request.ControllerRequest; import org.jboss.portal.portlet.controller.request.PortletActionRequest; import org.jboss.portal.portlet.controller.request.PortletRenderRequest; Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestParameterMapFactory.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestParameterMapFactory.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/ControllerRequestParameterMapFactory.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,13 +23,13 @@ package org.jboss.portal.portlet.controller.impl; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; -import org.jboss.portal.portlet.ContainerURL; -import org.jboss.portal.portlet.ActionURL; -import org.jboss.portal.portlet.RenderURL; -import org.jboss.portal.portlet.ResourceURL; -import org.jboss.portal.portlet.PortletURL; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.cache.CacheLevel; +import org.jboss.portal.portlet.api.ContainerURL; +import org.jboss.portal.portlet.api.ActionURL; +import org.jboss.portal.portlet.api.StateString; +import org.jboss.portal.portlet.api.RenderURL; +import org.jboss.portal.portlet.api.ResourceURL; +import org.jboss.portal.portlet.api.PortletURL; +import org.jboss.portal.portlet.api.cache.CacheLevel; import org.jboss.portal.common.io.IOTools; import org.jboss.portal.common.io.SerializationFilter; import org.jboss.portal.common.io.Serialization; Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/PortletURLRenderer.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/PortletURLRenderer.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/PortletURLRenderer.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -29,8 +29,8 @@ import org.jboss.portal.common.text.CharBuffer; import org.jboss.portal.common.text.FastURLEncoder; import org.jboss.portal.common.util.Base64; -import org.jboss.portal.portlet.ContainerURL; -import org.jboss.portal.portlet.URLFormat; +import org.jboss.portal.portlet.api.ContainerURL; +import org.jboss.portal.portlet.api.URLFormat; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.impl.ControllerRequestParameterNames; import org.jboss.portal.portlet.controller.impl.ControllerRequestParameterMapFactory; Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/event/EventControllerContextImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,14 +22,14 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.impl.event; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletInvoker; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.PortletInvoker; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.controller.event.PortletWindowEvent; import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.controller.event.EventPhaseContext; -import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.api.info.PortletInfo; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PortletPageNavigationalStateImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PortletPageNavigationalStateImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/impl/state/PortletPageNavigationalStateImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,9 +25,9 @@ import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; -import org.jboss.portal.portlet.info.ParameterInfo; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.info.NavigationInfo; +import org.jboss.portal.portlet.api.info.ParameterInfo; +import org.jboss.portal.portlet.api.info.PortletInfo; +import org.jboss.portal.portlet.api.info.NavigationInfo; import javax.xml.namespace.QName; import java.io.Serializable; Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletActionRequest.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.request; -import org.jboss.portal.portlet.StateString; +import org.jboss.portal.portlet.api.StateString; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/PortletResourceRequest.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.request; -import org.jboss.portal.portlet.StateString; +import org.jboss.portal.portlet.api.StateString; import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; -import org.jboss.portal.portlet.cache.CacheLevel; +import org.jboss.portal.portlet.api.cache.CacheLevel; import java.util.Map; Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/response/PageUpdateResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/response/PageUpdateResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/response/PageUpdateResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,8 +23,8 @@ package org.jboss.portal.portlet.controller.response; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; -import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; +import org.jboss.portal.portlet.api.invocation.response.ResponseProperties; +import org.jboss.portal.portlet.api.invocation.response.UpdateNavigationalStateResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/response/PortletResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/response/PortletResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/response/PortletResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller.response; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/response/ResourceResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/response/ResourceResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/response/ResourceResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.controller.response; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalStateSerialization.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalStateSerialization.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletPageNavigationalStateSerialization.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,7 +25,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.io.Serialization; -import org.jboss.portal.portlet.StateString; +import org.jboss.portal.portlet.api.StateString; import javax.xml.namespace.QName; import java.io.DataInputStream; Modified: jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletWindowNavigationalState.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletWindowNavigationalState.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/state/PortletWindowNavigationalState.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,7 +24,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; -import org.jboss.portal.portlet.StateString; +import org.jboss.portal.portlet.api.StateString; import java.io.Serializable; Modified: jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextFailureTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextFailureTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextFailureTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -34,8 +34,8 @@ import org.jboss.portal.portlet.controller.handlers.EventProducerActionHandler; import org.jboss.portal.portlet.controller.handlers.FailingEventHandler; import org.jboss.portal.portlet.controller.handlers.NoOpEventHandler; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; import org.jboss.unit.api.pojo.annotations.Test; import org.jboss.unit.api.pojo.annotations.Create; import static org.jboss.unit.api.Assert.assertInstanceOf; Modified: jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.controller; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.spi.PortletInvocationContext; +import org.jboss.portal.portlet.api.info.PortletInfo; +import org.jboss.portal.portlet.api.spi.PortletInvocationContext; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.StateControllerContext; import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; @@ -31,15 +31,15 @@ import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.controller.request.ControllerRequest; import org.jboss.portal.portlet.controller.request.PortletActionRequest; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.OpaqueStateString; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.EventInvocation; +import org.jboss.portal.portlet.api.invocation.ResourceInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.RenderInvocation; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.PortletContext; +import org.jboss.portal.portlet.api.OpaqueStateString; import org.jboss.portal.portlet.support.PortletInvokerSupport; import org.jboss.portal.portlet.support.PortletSupport; import org.jboss.portal.common.util.ParameterMap; Modified: jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestConstructorTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestConstructorTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestConstructorTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -28,8 +28,8 @@ import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.OpaqueStateString; +import org.jboss.portal.portlet.api.StateString; +import org.jboss.portal.portlet.api.OpaqueStateString; import org.jboss.portal.common.util.ParameterMap; import static org.jboss.unit.api.Assert.*; import org.jboss.unit.api.pojo.annotations.Test; Modified: jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerRequestTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -26,14 +26,14 @@ import org.jboss.unit.api.pojo.annotations.Test; import org.jboss.portal.portlet.support.PortletInvokerSupport; import org.jboss.portal.portlet.support.PortletSupport; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.OpaqueStateString; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.cache.CacheLevel; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.UpdateNavigationalStateResponse; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.ResourceInvocation; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.OpaqueStateString; +import org.jboss.portal.portlet.api.StateString; +import org.jboss.portal.portlet.api.cache.CacheLevel; import org.jboss.portal.portlet.controller.request.PortletActionRequest; import org.jboss.portal.portlet.controller.request.PortletResourceRequest; import org.jboss.portal.portlet.controller.request.PortletRenderRequest; Modified: jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -35,16 +35,16 @@ import org.jboss.portal.portlet.controller.handlers.EventProducerActionHandler; import org.jboss.portal.portlet.controller.handlers.EventProducerEventHandler; import org.jboss.portal.portlet.controller.handlers.NoOpEventHandler; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.OpaqueStateString; -import org.jboss.portal.portlet.StateString; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.OpaqueStateString; +import org.jboss.portal.portlet.api.StateString; import org.jboss.portal.portlet.support.PortletSupport; import org.jboss.portal.portlet.support.PortletInvokerSupport; import org.jboss.portal.portlet.support.info.EventInfoSupport; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.EventInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.UpdateNavigationalStateResponse; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.EventInvocation; import org.jboss.portal.common.util.Tools; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; Modified: jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/WiringEventControllerContext.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/WiringEventControllerContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/WiringEventControllerContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,7 +25,7 @@ import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.controller.event.PortletWindowEvent; import org.jboss.portal.portlet.controller.event.EventPhaseContext; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; import static org.jboss.unit.api.Assert.*; Modified: jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/handlers/EventProducerActionHandler.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/handlers/EventProducerActionHandler.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/handlers/EventProducerActionHandler.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,10 +23,10 @@ package org.jboss.portal.portlet.controller.handlers; import org.jboss.portal.portlet.support.PortletSupport; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.UpdateNavigationalStateResponse; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.PortletInvokerException; import javax.xml.namespace.QName; Modified: jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/handlers/EventProducerEventHandler.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/handlers/EventProducerEventHandler.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/handlers/EventProducerEventHandler.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,10 +23,10 @@ package org.jboss.portal.portlet.controller.handlers; import org.jboss.portal.portlet.support.PortletSupport; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; -import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.UpdateNavigationalStateResponse; +import org.jboss.portal.portlet.api.invocation.EventInvocation; +import org.jboss.portal.portlet.api.PortletInvokerException; import javax.xml.namespace.QName; Modified: jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/handlers/FailingEventHandler.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/handlers/FailingEventHandler.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/handlers/FailingEventHandler.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,9 +23,9 @@ package org.jboss.portal.portlet.controller.handlers; import org.jboss.portal.portlet.support.PortletSupport; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.EventInvocation; +import org.jboss.portal.portlet.api.PortletInvokerException; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/handlers/NoOpEventHandler.java =================================================================== --- jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/handlers/NoOpEventHandler.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/handlers/NoOpEventHandler.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,10 +23,10 @@ package org.jboss.portal.portlet.controller.handlers; import org.jboss.portal.portlet.support.PortletSupport; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; -import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.UpdateNavigationalStateResponse; +import org.jboss.portal.portlet.api.invocation.EventInvocation; +import org.jboss.portal.portlet.api.PortletInvokerException; import javax.xml.namespace.QName; import java.io.Serializable; Property changes on: jbossexo/modules/portlet/trunk/docs ___________________________________________________________________ Name: svn:ignore + target Modified: jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/FederatedPortletInvoker.java =================================================================== --- jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/FederatedPortletInvoker.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/FederatedPortletInvoker.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.federation; -import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.portlet.api.PortletInvoker; /** * Provide access to a federated invoker. Modified: jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/FederatingPortletInvoker.java =================================================================== --- jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/FederatingPortletInvoker.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/FederatingPortletInvoker.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.federation; -import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.portlet.api.PortletInvoker; import java.util.Collection; Modified: jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatedPortlet.java =================================================================== --- jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatedPortlet.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatedPortlet.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.portlet.federation.impl; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletContext; import org.jboss.portal.portlet.federation.FederatedPortletInvoker; -import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.api.info.PortletInfo; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatedPortletInvokerService.java =================================================================== --- jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatedPortletInvokerService.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatedPortletInvokerService.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,18 +25,18 @@ import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.portlet.federation.FederatedPortletInvoker; import org.jboss.portal.portlet.federation.FederatingPortletInvoker; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.PortletInvoker; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.StateEvent; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.spi.InstanceContext; -import org.jboss.portal.portlet.state.AccessMode; -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.Portlet; +import org.jboss.portal.portlet.api.PortletContext; +import org.jboss.portal.portlet.api.StateEvent; +import org.jboss.portal.portlet.api.PortletInvoker; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.state.PropertyMap; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.spi.InstanceContext; +import org.jboss.portal.portlet.api.state.AccessMode; +import org.jboss.portal.portlet.api.state.DestroyCloneFailure; +import org.jboss.portal.portlet.api.state.PropertyChange; import java.util.ArrayList; import java.util.Collections; Modified: jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java =================================================================== --- jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/FederatingPortletInvokerService.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,19 +22,19 @@ ******************************************************************************/ package org.jboss.portal.portlet.federation.impl; -import org.jboss.portal.portlet.InvokerUnavailableException; -import org.jboss.portal.portlet.NoSuchPortletException; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.portlet.api.InvokerUnavailableException; +import org.jboss.portal.portlet.api.NoSuchPortletException; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletContext; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.PortletInvoker; +import org.jboss.portal.portlet.api.state.PropertyMap; import org.jboss.portal.portlet.federation.FederatedPortletInvoker; import org.jboss.portal.portlet.federation.FederatingPortletInvoker; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.portlet.state.PropertyMap; -import org.jboss.portal.portlet.state.DestroyCloneFailure; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.state.PropertyChange; +import org.jboss.portal.portlet.api.state.DestroyCloneFailure; import org.apache.log4j.Logger; import java.util.Collection; Modified: jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/PortletInvokerRegistrationService.java =================================================================== --- jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/PortletInvokerRegistrationService.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/federation/src/main/java/org/jboss/portal/portlet/federation/impl/PortletInvokerRegistrationService.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.federation.impl; import org.jboss.portal.portlet.federation.FederatingPortletInvoker; -import org.jboss.portal.portlet.PortletInvoker; +import org.jboss.portal.portlet.api.PortletInvoker; /** * Register any portlet invoker into a federating portlet invoker. Modified: jbossexo/modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -27,11 +27,11 @@ import org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService; import org.jboss.portal.portlet.support.PortletInvokerSupport; import org.jboss.portal.portlet.support.PortletSupport; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.info.MetaInfo; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletContext; +import org.jboss.portal.portlet.api.info.PortletInfo; +import org.jboss.portal.portlet.api.info.MetaInfo; import org.jboss.portal.portlet.support.info.PortletInfoSupport; import org.jboss.portal.common.i18n.LocalizedString; Modified: jbossexo/modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/NoInvokersTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/NoInvokersTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/NoInvokersTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.federation; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.PortletInvokerException; import org.jboss.portal.portlet.federation.FederatingPortletInvoker; import org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService; Modified: jbossexo/modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.federation; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.PortletInvokerException; import org.jboss.portal.portlet.support.PortletInvokerSupport; import org.jboss.portal.portlet.federation.FederatingPortletInvoker; import org.jboss.portal.portlet.federation.FederatedPortletInvoker; Modified: jbossexo/modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/LocalPortletManagement.java =================================================================== --- jbossexo/modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/LocalPortletManagement.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/LocalPortletManagement.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,8 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.management; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.container.PortletContainer; +import org.jboss.portal.portlet.api.Portlet; /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> Modified: jbossexo/modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,13 +25,13 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.PortletContext; +import org.jboss.portal.portlet.api.PortletInvokerException; import org.jboss.portal.portlet.PortletInvokerInterceptor; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.RenderInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> Modified: jbossexo/modules/portlet/trunk/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/factory/PortletApplicationModelFactory.java =================================================================== --- jbossexo/modules/portlet/trunk/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/factory/PortletApplicationModelFactory.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/mc/src/main/java/org/jboss/portal/portlet/mc/metadata/factory/PortletApplicationModelFactory.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -27,8 +27,8 @@ import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.portlet.LifeCyclePhase; -import org.jboss.portal.portlet.TransportGuarantee; +import org.jboss.portal.portlet.api.LifeCyclePhase; +import org.jboss.portal.portlet.api.TransportGuarantee; import org.jboss.portal.portlet.impl.metadata.CustomPortletModeMetaData; import org.jboss.portal.portlet.impl.metadata.CustomWindowStateMetaData; import org.jboss.portal.portlet.impl.metadata.ListenerMetaData; Modified: jbossexo/modules/portlet/trunk/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/FilterTestEverythingTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/FilterTestEverythingTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/FilterTestEverythingTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,7 +24,7 @@ import java.util.Locale; -import org.jboss.portal.portlet.LifeCyclePhase; +import org.jboss.portal.portlet.api.LifeCyclePhase; import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData; import org.jboss.portal.portlet.impl.metadata.common.InitParamMetaData; import org.jboss.portal.portlet.impl.metadata.filter.FilterMetaData; Modified: jbossexo/modules/portlet/trunk/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/SecurityConstraintTestEverythingTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/SecurityConstraintTestEverythingTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/mc/src/test/java/org/jboss/portal/portlet/mc/metadata/SecurityConstraintTestEverythingTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,7 +24,7 @@ import java.util.Locale; -import org.jboss.portal.portlet.TransportGuarantee; +import org.jboss.portal.portlet.api.TransportGuarantee; import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData; import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData; import org.jboss.portal.portlet.impl.metadata.portlet.PortletMetaData; Modified: jbossexo/modules/portlet/trunk/pom.xml =================================================================== --- jbossexo/modules/portlet/trunk/pom.xml 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/pom.xml 2009-07-06 19:28:53 UTC (rev 13523) @@ -41,6 +41,7 @@ <module>portal</module> <module>samples</module> <module>docs</module> + <module>api</module> </modules> <activation> <activeByDefault>true</activeByDefault> Modified: jbossexo/modules/portlet/trunk/portal/pom.xml =================================================================== --- jbossexo/modules/portlet/trunk/portal/pom.xml 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portal/pom.xml 2009-07-06 19:28:53 UTC (rev 13523) @@ -39,6 +39,11 @@ <artifactId>portlet-mc</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.jboss.portal.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>concurrent</groupId> Modified: jbossexo/modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml =================================================================== --- jbossexo/modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml 2009-07-06 19:28:53 UTC (rev 13523) @@ -18,6 +18,7 @@ <include>org.jboss.portal.common:common-portal</include> <include>org.jboss.portal.web:web-web</include> <include>org.jboss.portal.portlet:portlet-portlet</include> + <include>org.jboss.portal.portlet:portlet-api</include> <include>javax.ccpp:ccpp</include> <include>javax.portlet:portlet-api</include> Modified: jbossexo/modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml =================================================================== --- jbossexo/modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2009-07-06 19:28:53 UTC (rev 13523) @@ -18,7 +18,8 @@ <include>org.jboss.portal.common:common-portal</include> <include>org.jboss.portal.web:web-web</include> <include>org.jboss.portal.portlet:portlet-portlet</include> - + <include>org.jboss.portal.portlet:portlet-api</include> + <include>javax.xml.bind:jaxb-api</include> <include>apache-log4j:log4j</include> <include>javax.ccpp:ccpp</include> Modified: jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/AdminPortlet.java =================================================================== --- jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/AdminPortlet.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/AdminPortlet.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -28,7 +28,7 @@ import org.jboss.portal.portlet.container.managed.ManagedPortletContainer; import org.jboss.portal.portlet.container.managed.ManagedPortletFilter; import org.jboss.portal.portlet.container.managed.PortletApplicationRegistry; -import org.jboss.portal.portlet.info.MetaInfo; +import org.jboss.portal.portlet.api.info.MetaInfo; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; Modified: jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java =================================================================== --- jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -26,10 +26,10 @@ import org.jboss.portal.portlet.portal.jsp.EventRoute; import org.jboss.portal.portlet.portal.jsp.PagePortletControllerContext; import org.jboss.portal.portlet.portal.jsp.EventAcknowledgement; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; -import org.jboss.portal.portlet.invocation.response.ErrorResponse; -import org.jboss.portal.portlet.ParametersStateString; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.UpdateNavigationalStateResponse; +import org.jboss.portal.portlet.api.invocation.response.ErrorResponse; +import org.jboss.portal.portlet.api.ParametersStateString; import javax.portlet.GenericPortlet; import javax.portlet.RenderRequest; Modified: jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java =================================================================== --- jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,14 +25,14 @@ import org.jboss.portal.portlet.controller.impl.PortletURLRenderer; import org.jboss.portal.portlet.controller.impl.URLParameterConstants; import org.jboss.portal.portlet.controller.impl.ControllerRequestFactory; -import org.jboss.portal.portlet.PortletInvoker; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.URLFormat; +import org.jboss.portal.portlet.api.PortletInvoker; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.URLFormat; import org.jboss.portal.portlet.portal.Constants; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.ErrorResponse; -import org.jboss.portal.portlet.invocation.response.ContentResponse; -import org.jboss.portal.portlet.invocation.response.UnavailableResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.ErrorResponse; +import org.jboss.portal.portlet.api.invocation.response.ContentResponse; +import org.jboss.portal.portlet.api.invocation.response.UnavailableResponse; import org.jboss.portal.portlet.controller.PortletController; import org.jboss.portal.portlet.controller.request.PortletActionRequest; import org.jboss.portal.portlet.controller.impl.ControllerRequestParameterNames; Modified: jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventAcknowledgement.java =================================================================== --- jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventAcknowledgement.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventAcknowledgement.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.portal.jsp; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,10 +25,10 @@ import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.controller.event.PortletWindowEvent; import org.jboss.portal.portlet.controller.event.EventPhaseContext; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.info.PortletInfo; import java.util.Map; import java.util.LinkedHashMap; Modified: jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PagePortletControllerContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PagePortletControllerContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PagePortletControllerContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,16 +22,16 @@ ******************************************************************************/ package org.jboss.portal.portlet.portal.jsp; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.PortletInvoker; -import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.PortletInvoker; +import org.jboss.portal.portlet.api.info.PortletInfo; import org.jboss.portal.portlet.controller.state.StateControllerContext; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalStateSerialization; import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.controller.impl.AbstractPortletControllerContext; import org.jboss.portal.web.IllegalRequestException; import org.jboss.portal.common.io.Serialization; Modified: jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalPrepareResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalPrepareResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalPrepareResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.portal.jsp; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.PortletInvokerException; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.Cookie; Modified: jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalRenderResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,9 +25,9 @@ import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; import org.jboss.portal.portlet.controller.PortletController; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.Portlet; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.Portlet; import org.jboss.portal.WindowState; import javax.servlet.http.HttpServletResponse; Modified: jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PortalResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.portal.jsp; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.PortletInvokerException; import javax.servlet.http.HttpServletResponseWrapper; import javax.servlet.http.HttpServletResponse; Modified: jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/WindowResult.java =================================================================== --- jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/WindowResult.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/WindowResult.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.portal.jsp; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.portal.jsp.WindowDef; /** Modified: jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/HeadersTag.java =================================================================== --- jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/HeadersTag.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/HeadersTag.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,9 +25,9 @@ import org.jboss.portal.portlet.portal.jsp.PortalRenderResponse; import org.jboss.portal.portlet.portal.jsp.WindowResult; import org.jboss.portal.portlet.portal.jsp.PortalPrepareResponse; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.invocation.response.ContentResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.ResponseProperties; +import org.jboss.portal.portlet.api.invocation.response.ContentResponse; import org.jboss.portal.common.util.MultiValuedPropertyMap; import org.jboss.portal.common.xml.XMLTools; import org.w3c.dom.Element; Modified: jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletMarkupTag.java =================================================================== --- jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletMarkupTag.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletMarkupTag.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,8 +23,8 @@ package org.jboss.portal.portlet.portal.jsp.taglib; import org.jboss.portal.portlet.portal.jsp.PortalRenderResponse; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.ContentResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.ContentResponse; import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; import org.jboss.portal.WindowState; Modified: jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletTag.java =================================================================== --- jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletTag.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletTag.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -28,10 +28,10 @@ import org.jboss.portal.portlet.portal.jsp.WindowDef; import org.jboss.portal.portlet.portal.jsp.WindowResult; import org.jboss.portal.portlet.portal.Constants; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.ErrorResponse; -import org.jboss.portal.portlet.invocation.response.UnavailableResponse; -import org.jboss.portal.portlet.invocation.response.ContentResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.ErrorResponse; +import org.jboss.portal.portlet.api.invocation.response.UnavailableResponse; +import org.jboss.portal.portlet.api.invocation.response.ContentResponse; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.util.Tools; Modified: jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletTitleTag.java =================================================================== --- jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletTitleTag.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletTitleTag.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.portal.jsp.taglib; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.FragmentResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.FragmentResponse; import org.jboss.portal.portlet.portal.jsp.PortalRenderResponse; import javax.servlet.jsp.JspException; Modified: jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletURLTag.java =================================================================== --- jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletURLTag.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/taglib/PortletURLTag.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -27,9 +27,9 @@ import org.jboss.portal.portlet.portal.jsp.PortalRenderResponse; import org.jboss.portal.portlet.portal.jsp.PagePortletControllerContext; import org.jboss.portal.portlet.controller.impl.PortletURLRenderer; -import org.jboss.portal.portlet.RenderURL; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.URLFormat; +import org.jboss.portal.portlet.api.RenderURL; +import org.jboss.portal.portlet.api.StateString; +import org.jboss.portal.portlet.api.URLFormat; import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspWriter; Modified: jbossexo/modules/portlet/trunk/portlet/pom.xml =================================================================== --- jbossexo/modules/portlet/trunk/portlet/pom.xml 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/pom.xml 2009-07-06 19:28:53 UTC (rev 13523) @@ -20,6 +20,11 @@ </dependency> --> <dependency> + <groupId>org.jboss.portal.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>javax.portlet</groupId> <artifactId>portlet-api</artifactId> </dependency> @@ -207,4 +212,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ActionURL.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ActionURL.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ActionURL.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,44 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public interface ActionURL extends PortletURL -{ - /** - * Return the interaction state. - * - * @return the interaction state - */ - StateString getInteractionState(); - - /** - * Return the navigational state that may be null. - * - * @return the navigational state - */ - StateString getNavigationalState(); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ContainerURL.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ContainerURL.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ContainerURL.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,31 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public interface ContainerURL -{ -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/InvalidPortletIdException.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/InvalidPortletIdException.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/InvalidPortletIdException.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,64 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -/** - * Thrown by the portlet invoker when a portlet id that is not valid. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5989 $ - */ -public class InvalidPortletIdException extends PortletInvokerException -{ - - private String portletId; - - public InvalidPortletIdException(String portletId) - { - super("Invalid portlet id " + portletId); - this.portletId = portletId; - } - - public InvalidPortletIdException(String message, String portletId) - { - super(message); - this.portletId = portletId; - } - - public InvalidPortletIdException(Throwable cause, String portletId) - { - super(cause); - this.portletId = portletId; - } - - public InvalidPortletIdException(String message, Throwable cause, String portletId) - { - super(message, cause); - this.portletId = portletId; - } - - public String getPortletId() - { - return portletId; - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/InvokerUnavailableException.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/InvokerUnavailableException.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/InvokerUnavailableException.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,50 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -/** - * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> - * @version $Revision: 5448 $ - * @since 2.4 (May 11, 2006) - */ -public class InvokerUnavailableException extends PortletInvokerException -{ - public InvokerUnavailableException() - { - } - - public InvokerUnavailableException(String message) - { - super(message); - } - - public InvokerUnavailableException(Throwable cause) - { - super(cause); - } - - public InvokerUnavailableException(String message, Throwable cause) - { - super(message, cause); - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/LifeCyclePhase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/LifeCyclePhase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/LifeCyclePhase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,39 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -import javax.xml.bind.annotation.XmlEnumValue; - -/** - * Enumerate the life cycle phase of a Portlet. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public enum LifeCyclePhase -{ - @XmlEnumValue("ACTION_PHASE") ACTION, - @XmlEnumValue("EVENT_PHASE") EVENT, - @XmlEnumValue("RENDER_PHASE") RENDER, - @XmlEnumValue("RESOURCE_PHASE") RESOURCE -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/NoSuchPortletException.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/NoSuchPortletException.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/NoSuchPortletException.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,53 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -/** - * Thrown by the portlet invoker when a portlet id does not exist. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5989 $ - */ -public class NoSuchPortletException extends InvalidPortletIdException -{ - - public NoSuchPortletException(String portletId) - { - super("No such portlet " + portletId, portletId); - } - - public NoSuchPortletException(String message, String portletId) - { - super(message, portletId); - } - - public NoSuchPortletException(Throwable cause, String portletId) - { - super(cause, portletId); - } - - public NoSuchPortletException(String message, Throwable cause, String portletId) - { - super(message, cause, portletId); - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/OpaqueStateString.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/OpaqueStateString.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/OpaqueStateString.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,78 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -import java.io.DataOutputStream; -import java.io.IOException; - -/** - * An opaque implementation of the navigational state. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public class OpaqueStateString extends StateString -{ - - /** . */ - private String value; - - public OpaqueStateString(String value) - { - if (value == null) - { - throw new IllegalArgumentException("No null value accepted"); - } - this.value = value; - } - - public String getStringValue() - { - return value; - } - - public void writeTo(DataOutputStream out) throws IOException - { - out.writeByte(StateString.OPAQUE); - out.writeUTF(value); - } - - public int hashCode() - { - return value.hashCode(); - } - - public boolean equals(Object o) - { - if (o == this) - { - return true; - } - if (o instanceof OpaqueStateString) - { - OpaqueStateString that = (OpaqueStateString)o; - return value.equals(that.value); - } - return false; - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ParametersStateString.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ParametersStateString.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ParametersStateString.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,268 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -import org.jboss.portal.common.io.Serialization; -import org.jboss.portal.common.util.ParameterMap; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.io.Serializable; -import java.util.Map; - -/** - * A set of parameters. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6549 $ - */ -public class ParametersStateString extends StateString implements Serializable -{ - - /** The serialVersionUID */ - private static final long serialVersionUID = -8529807471117491810L; - - public static ParametersStateString create() - { - return new ParametersStateString(); - } - - public static ParametersStateString create(Map<String, String[]> parameters) - { - return new ParametersStateString(parameters); - } - - /** - * Create a parameters state string. It assumes that the argument is either an instance of - * <code>ParametersStateString</code> or that it is the string encoded value of a - * <code>ParametersStateString</code>. - * - * @param stateString the state string - * @return a new parameter state string - * @throws IllegalArgumentException if the state string is opaque and does not represent parameters - */ - public static ParametersStateString create(StateString stateString) throws IllegalArgumentException - { - if (stateString == null) - { - throw new IllegalArgumentException("No null state string accepted"); - } - - // - if (stateString instanceof ParametersStateString) - { - // Use the copy constructor - return new ParametersStateString(((ParametersStateString)stateString).parameters); - } - else - { - // Use the deserializing constructor - return new ParametersStateString(stateString.getStringValue()); - } - } - - /** The underlying map that does not have a copy read/write access mode. */ - private ParameterMap parameters; - - protected ParametersStateString(DataInputStream in) throws IOException - { - Map<String, String[]> tmp = Serialization.PARAMETER_MAP.unserialize(in); - - // - parameters = ParameterMap.wrap(tmp); - } - - protected ParametersStateString(String opaqueValue) - { - Map<String, String[]> params = StateString.decodeOpaqueValue(opaqueValue); - if (!params.isEmpty()) - { - parameters = ParameterMap.wrap(params); - } - else - { - parameters = new ParameterMap(); - } - } - - /** Creates an empty parameter set. */ - protected ParametersStateString() - { - this.parameters = new ParameterMap(); - } - - /** - * Copy the parameter map to initialize the object state. - * - * @param parameters the parameter map to clone - * @throws IllegalArgumentException if the parameter map is null or not valid - */ - private ParametersStateString(Map<String, String[]> parameters) - { - this.parameters = ParameterMap.clone(parameters); - } - - /** - * Return the parameter value or null if it does not exist. - * - * @param name the parameter name - * @return the parameter value or null if it does not exist - * @throws IllegalArgumentException if the name is null - */ - public String getValue(String name) throws IllegalArgumentException - { - return parameters.getValue(name); - } - - /** - * Return the parameter values or null if it does not exist. - * - * @param name the value to get - * @return the parameter values - * @throws IllegalArgumentException if the name is null - */ - public String[] getValues(String name) throws IllegalArgumentException - { - return parameters.get(name); - } - - /** Clear all the parameters. */ - public void clear() - { - parameters.clear(); - } - - /** - * Replace all the parameters. - * - * @param map the map to replace - * @throws IllegalArgumentException if the map is not valid - */ - public void replace(Map<String, String[]> map) - { - parameters.replace(map); - } - - /** - * Set the a parameter value. - * - * @param name the parameter name - * @param value the parameter value - * @throws IllegalArgumentException if the name or the value is null - */ - public void setValue(String name, String value) - { - parameters.setValue(name, value); - } - - /** - * Set the parameter values. This method does not make a defensive copy of the values. - * - * @param name the parameter name - * @param values the parameter values - * @throws IllegalArgumentException if the name is null - */ - public void setValues(String name, String[] values) - { - parameters.setValues(name, values); - } - - /** - * Remove a parameter. - * - * @param name the parameter name - * @throws IllegalArgumentException if the name is null - */ - public void remove(String name) - { - parameters.remove(name); - } - - /** - * Return the size. - * - * @return the size - */ - public int getSize() - { - return parameters.size(); - } - - /** - * Return the underlying parameter object. - * - * @return the parameter object - */ - public Map<String, String[]> getParameters() - { - return parameters; - } - - /** - * Retrieves the opaque version associated with this navigational state. - * - * @return a URL-safe String representation of this navigational state. - */ - public String getStringValue() - { - return StateString.encodeAsOpaqueValue(parameters); - } - - public void writeTo(DataOutputStream out) throws IOException - { - if (parameters.isEmpty()) - { - out.writeByte(StateString.EMPTY); - } - else - { - out.writeByte(StateString.SERIALIZED); - Serialization.PARAMETER_MAP.serialize(parameters, out); - } - } - - public String toString() - { - return "StateString[" + parameters + "]"; - } - - public boolean equals(Object obj) - { - if (obj == this) - { - return true; - } - if (obj instanceof ParametersStateString) - { - ParametersStateString that = (ParametersStateString)obj; - return parameters.equals(that.parameters); - } - return false; - } - - public int hashCode() - { - return parameters.hashCode(); - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/Portlet.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/Portlet.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/Portlet.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,56 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -import org.jboss.portal.portlet.info.PortletInfo; - -/** - * Defines a logical portlet. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public interface Portlet -{ - /** - * Return the portlet context. - * - * @return the portlet context - */ - PortletContext getContext(); - - /** - * Return the portlet info. - * - * @return the portlet info - */ - PortletInfo getInfo(); - - /** - * Determines whether the described portlet is remote or not. - * - * @return <code>true</code> if the described portlet runs in a remote context (such as WSRP), <code>false</code> - * otherwise - */ - boolean isRemote(); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletCloneFailedException.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletCloneFailedException.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletCloneFailedException.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,63 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public class PortletCloneFailedException extends PortletInvokerException -{ - - /** . */ - private String portletId; - - public PortletCloneFailedException(String portletId) - { - super("Portlet clone failure of portlet id " + portletId); - this.portletId = portletId; - } - - public PortletCloneFailedException(String message, String portletId) - { - super(message); - this.portletId = portletId; - } - - public PortletCloneFailedException(Throwable cause, String portletId) - { - super(cause); - this.portletId = portletId; - } - - public PortletCloneFailedException(String message, Throwable cause, String portletId) - { - super(message, cause); - this.portletId = portletId; - } - - public String getPortletId() - { - return portletId; - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,119 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -import org.jboss.portal.common.util.ParameterValidation; - -import java.io.Serializable; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> - * @version $Revision: 6890 $ - * @since 2.6 - */ -public class PortletContext implements Serializable -{ - - /** . */ - protected final String id; - - PortletContext(String id) throws IllegalArgumentException - { - ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(id, "portlet id", "PortletContext"); - this.id = id; - } - - - public boolean equals(Object o) - { - if (this == o) - { - return true; - } - if (o instanceof PortletContext) - { - PortletContext that = (PortletContext)o; - return id.equals(that.id); - } - return false; - } - - public int hashCode() - { - return id.hashCode(); - } - - public String getId() - { - return id; - } - - public String toString() - { - return "PortletContext[" + id + "]"; - } - - public byte[] getState() - { - return null; - } - - /** - * Create a PortletContext based on id and optional state. - * - * @param id the portlet id - * @param state the optional state - * @return a new PortletContext based on the provided information - */ - public static PortletContext createPortletContext(String id, byte[] state) - { - if (state != null && state.length > 0) - { - return new StatefulPortletContext(id, state); - } - else - { - return new PortletContext(id); - } - } - - /** - * Create a PortletContext based on given id and required state: this method will fail if state is not valid. Use - * this method instead of {@link #createPortletContext(String,byte[])} for cases when a state is expected and the - * creation of the PortletContext should fail if no state was given. - * - * @param id the portlet id - * @param state the mandatory state - * @return a new PortletContext - */ - public static PortletContext createStatefulPortletContext(String id, byte[] state) - { - return new StatefulPortletContext(id, state); - } - - public static PortletContext createPortletContext(String portletId) - { - return createPortletContext(portletId, null); - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvoker.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvoker.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvoker.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,125 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.portlet.state.PropertyMap; -import org.jboss.portal.portlet.state.DestroyCloneFailure; - -import java.util.List; -import java.util.Set; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public interface PortletInvoker -{ - /** - * Return the set of portlet exposed. - * - * @return the set of exposed portlets - * @throws PortletInvokerException a portlet invoker exception - */ - Set<Portlet> getPortlets() throws PortletInvokerException; - - /** - * Get information about a specific portlet. - * - * @param portletContext the portlet context in the scope of this invoker - * @return the <code>PortletInfo</code> for the specified portlet - * @throws IllegalArgumentException if the portlet context is null - * @throws PortletInvokerException a portlet invoker exception - */ - Portlet getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException; - - /** - * Invoke an operation on a specific portlet. - * - * @param invocation the portlet invocation - * @return the invocation response - * @throws IllegalArgumentException if the invocation is null - * @throws PortletInvokerException a portlet invoker exception - */ - PortletInvocationResponse invoke(PortletInvocation invocation) throws IllegalArgumentException, PortletInvokerException; - - /** - * Clone a portlet. - * - * @param portletContext the portlet context to clone - * @return the clone id - * @throws IllegalArgumentException if the portletId is null - * @throws UnsupportedOperationException if the invoker does not support this operation - * @throws PortletInvokerException a portlet invoker exception - */ - PortletContext createClone(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException; - - /** - * Destroy a cloned portlet. - * - * @param portletContexts a list of portlet contexts to destroy - * @return a list of {@link org.jboss.portal.portlet.state.DestroyCloneFailure}, one per clone that couldn't be - * destroyed - * @throws IllegalArgumentException if the portletContext is null - * @throws UnsupportedOperationException if the invoker does not support this operation - * @throws PortletInvokerException a portlet invoker exception - */ - List<DestroyCloneFailure> destroyClones(List<PortletContext> portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException; - - /** - * Return a subset of the properties of the specified portlet. - * - * @param portletContext the portlet context - * @param keys the set of keys to retrieve - * @return the properties - * @throws IllegalArgumentException if the portletContext or the keys arguments are null - * @throws UnsupportedOperationException if the invoker does not support this operation - * @throws PortletInvokerException a portlet invoker exception - */ - PropertyMap getProperties(PortletContext portletContext, Set<String> keys) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException; - - /** - * Return all the properties of the specified portlet. - * - * @param portletContext the portlet context - * @return the properties - * @throws IllegalArgumentException if the portletContext is null - * @throws UnsupportedOperationException if the invoker does not support this operation - * @throws PortletInvokerException a portlet invoker exception - */ - PropertyMap getProperties(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException; - - /** - * Set the properties on the specified portlet. - * - * @param portletContext the portlet context - * @param changes the changes - * @return the new portlet context - * @throws IllegalArgumentException if the portletContext or the properties is null - * @throws UnsupportedOperationException if the invoker does not support this operation - * @throws PortletInvokerException a portlet invoker exception - */ - PortletContext setProperties(PortletContext portletContext, PropertyChange[] changes) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException; -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvokerException.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvokerException.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvokerException.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,49 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public class PortletInvokerException extends Exception -{ - public PortletInvokerException() - { - } - - public PortletInvokerException(String message) - { - super(message); - } - - public PortletInvokerException(String message, Throwable cause) - { - super(message, cause); - } - - public PortletInvokerException(Throwable cause) - { - super(cause); - } -} Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvokerInterceptor.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvokerInterceptor.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletInvokerInterceptor.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,18 +22,22 @@ ******************************************************************************/ package org.jboss.portal.portlet; -import org.jboss.portal.portlet.state.DestroyCloneFailure; -import org.jboss.portal.portlet.state.PropertyMap; -import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.state.DestroyCloneFailure; +import org.jboss.portal.portlet.api.state.PropertyMap; +import org.jboss.portal.portlet.api.state.PropertyChange; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletContext; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.PortletInvoker; import java.util.Set; import java.util.List; import java.util.concurrent.atomic.AtomicReference; /** - * A base class for {@link org.jboss.portal.portlet.PortletInvoker} interface interceptors. The subclasses + * A base class for {@link org.jboss.portal.portlet.api.PortletInvoker} interface interceptors. The subclasses * extends it and override the intercepted methods. The next interceptor in the chain is wired in the field * {@link #next} of the interceptor. When the interceptor wants to give control to the next interceptor, it must * invoke the same method on the super class. If no next interceptor is configured the invocation of the parent Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletURL.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletURL.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/PortletURL.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,49 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; - -import java.util.Map; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public interface PortletURL extends ContainerURL -{ - /** - * Returns the mode that may be null. - * - * @return the mode - */ - Mode getMode(); - - /** - * Returns the window state that may be null. - * - * @return the window state - */ - WindowState getWindowState(); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/RenderURL.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/RenderURL.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/RenderURL.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,46 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -import java.util.Map; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 2748 $ - */ -public interface RenderURL extends PortletURL -{ - /** - * Return the navigational state that may be null. - * - * @return the navigational state - */ - StateString getNavigationalState(); - - /** - * Returns the public navigational state changes. - * - * @return the public navigational state changes - */ - Map<String, String[]> getPublicNavigationalStateChanges(); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ResourceURL.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ResourceURL.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/ResourceURL.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,77 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -import org.jboss.portal.portlet.cache.CacheLevel; -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public interface ResourceURL extends ContainerURL -{ - - /** - * Returns the resource id - * - * @return the resource id - */ - String getResourceId(); - - /** - * Returns the resource state. - * - * @return the resource state - */ - StateString getResourceState(); - - /** - * Returns the resource cacheability. - * - * @return the resource cacheability - */ - CacheLevel getCacheability(); - - /** - * Return the navigational state that may be null. - * - * @return the navigational state - */ - StateString getNavigationalState(); - - /** - * Returns the mode that may be null. - * - * @return the mode - */ - Mode getMode(); - - /** - * Returns the window state that may be null. - * - * @return the window state - */ - WindowState getWindowState(); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/StateEvent.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/StateEvent.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/StateEvent.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,82 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -import org.jboss.portal.common.util.ParameterValidation; - -/** - * An event that signals state modifications - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> - * @version $Revision: 7267 $ - * @since 2.6 - */ -public class StateEvent -{ - - /** . */ - private final PortletContext context; - - /** . */ - private final Type type; - - public StateEvent(PortletContext context, Type type) - { - ParameterValidation.throwIllegalArgExceptionIfNull(context, "Portlet context"); - ParameterValidation.throwIllegalArgExceptionIfNull(type, "StateEvent type"); - - // - this.context = context; - this.type = type; - } - - public PortletContext getPortletContext() - { - return context; - } - - public Type getType() - { - return type; - } - - public enum Type - { - - PORTLET_CLONED_EVENT("Portlet Cloned Event"), PORTLET_MODIFIED_EVENT("Portlet Modified Event"); - - /** . */ - private final String description; - - private Type(String description) - { - this.description = description; - } - - public String toString() - { - return description; - } - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/StateString.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/StateString.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/StateString.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,209 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -import org.jboss.portal.common.util.Base64; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.Serializable; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - -/** - * Encapsulate state as a string. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public abstract class StateString implements Serializable -{ - /** . */ - public static final String JBPNS_PREFIX = "JBPNS_"; - protected static final int EMPTY = 0; - protected static final int SERIALIZED = 1; - protected static final int OPAQUE = 2; - /** . */ - private static final String EOF = "__EOF__"; - - /** - * Return the value of the navigational state of the portlet. - * - * @return the string value - */ - public abstract String getStringValue(); - - public abstract void writeTo(DataOutputStream out) throws IOException; - - /** - * Factory method that will create the most appropriate form from the byte representation. - * - * @param in the inputstream to read from - * @return a new state string - * @throws java.io.IOException any IOException - */ - public static StateString create(DataInputStream in) throws IOException - { - if (in == null) - { - throw new IllegalArgumentException(); - } - - // - byte b = in.readByte(); - switch (b) - { - case EMPTY: - return new ParametersStateString(); - case SERIALIZED: - return new ParametersStateString(in); - case OPAQUE: - return new OpaqueStateString(in.readUTF()); - } - - // - throw new IllegalArgumentException("Wrong format unrecognized header " + b); - } - - /** - * Factory method that will create the most appropriate form from the string representation. - * - * @param opaqueValue the opaque value - * @return a new state string - */ - public static StateString create(String opaqueValue) - { - if (opaqueValue == null) - { - throw new IllegalArgumentException(); - } - if (opaqueValue.startsWith(JBPNS_PREFIX)) - { - return new ParametersStateString(opaqueValue); - } - else - { - return new OpaqueStateString(opaqueValue); - } - } - - public static Map<String, String[]> decodeOpaqueValue(String opaqueValue) - { - if (!opaqueValue.startsWith(JBPNS_PREFIX)) - { - throw new IllegalArgumentException("Bad format: [" + opaqueValue - + "] was not encoded by JBoss Portal and thus cannot be decoded."); - } - - // - opaqueValue = opaqueValue.substring(JBPNS_PREFIX.length()); - if (opaqueValue.length() > 0) - { - try - { - byte[] bytes = Base64.decode(opaqueValue, true); - ByteArrayInputStream bais = new ByteArrayInputStream(bytes); - ObjectInputStream ois = new ObjectInputStream(bais); - Map<String, String[]> params = new HashMap<String, String[]>(); - - // - String[] values; - - // read the first String which should be a param name - String current = ois.readUTF(); - - // keep reading until we haven't reached the EOF marker - while (!EOF.equals(current)) - { - // next is the size of the value array - int length = ois.readInt(); - values = new String[length]; - - // read as many Strings as are supposed to be in the array - for (int i = 0; i < length; i++) - { - values[i] = ois.readUTF(); - } - - // we're done for this param, add it to the param map - params.put(current, values); - - // read the next string to loop - current = ois.readUTF(); - } - - return params; - } - catch (Exception e) - { - throw new Error(e); - } - } - else - { - return Collections.emptyMap(); - } - } - - public static String encodeAsOpaqueValue(Map<String, String[]> parameters) - { - if (parameters != null && parameters.size() != 0) - { - try - { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - ObjectOutputStream oos = new ObjectOutputStream(baos); - for (Map.Entry entry : parameters.entrySet()) - { - String name = (String)entry.getKey(); - oos.writeUTF(name); - String[] values = (String[])entry.getValue(); - int length = values.length; - oos.writeInt(length); - for (String value : values) - { - oos.writeUTF(value); - } - } - oos.writeUTF(EOF); - oos.close(); - byte[] bytes = baos.toByteArray(); - return JBPNS_PREFIX + Base64.encodeBytes(bytes, true); - } - catch (IOException e) - { - throw new RuntimeException(e); - } - } - else - { - return JBPNS_PREFIX; - } - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/StatefulPortletContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/StatefulPortletContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/StatefulPortletContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,87 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -import org.jboss.portal.common.util.ParameterValidation; - -import java.util.Arrays; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> - * @version $Revision: 1.1 $ - * @since 2.6 - */ -public class StatefulPortletContext extends PortletContext -{ - - /** . */ - private final byte[] marshalledState; - - StatefulPortletContext(String id, byte[] marshalledState) throws IllegalArgumentException - { - super(id); - - ParameterValidation.throwIllegalArgExceptionIfNull(marshalledState, "Portlet state"); - - this.marshalledState = marshalledState; - } - - - public boolean equals(Object o) - { - if (this == o) - { - return true; - } - if (o == null || getClass() != o.getClass()) - { - return false; - } - if (!super.equals(o)) - { - return false; - } - - StatefulPortletContext that = (StatefulPortletContext)o; - - return Arrays.equals(marshalledState, that.marshalledState); - } - - public int hashCode() - { - int result = super.hashCode(); - result = 31 * result + (marshalledState != null ? marshalledState.hashCode() : 0); - return result; - } - - public byte[] getState() - { - return marshalledState; - } - - public String toString() - { - return "StatefulPortletContext[" + id + "," + marshalledState.length + "]"; - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/TransportGuarantee.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/TransportGuarantee.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/TransportGuarantee.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,34 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet; - -/** - * Type safe enumeration class for transport guarantee. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public enum TransportGuarantee -{ - NONE, INTEGRAL, CONFIDENTIAL -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/URLFormat.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/URLFormat.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/URLFormat.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,73 +0,0 @@ -/****************************************************************************** - * 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.jboss.portal.portlet; - -/** - * Defines how a container URL should be formatted when rendered. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class URLFormat -{ - - /** . */ - private final Boolean wantSecure; - - /** . */ - private final Boolean wantAuthenticated; - - /** . */ - private final Boolean wantRelative; - - /** . */ - private final Boolean wantEscapeXML; - - public URLFormat(Boolean wantSecure, Boolean wantAuthenticated, Boolean wantRelative, Boolean wantEscapeXML) - { - this.wantSecure = wantSecure; - this.wantAuthenticated = wantAuthenticated; - this.wantRelative = wantRelative; - this.wantEscapeXML = wantEscapeXML; - } - - public Boolean getWantSecure() - { - return wantSecure; - } - - public Boolean getWantAuthenticated() - { - return wantAuthenticated; - } - - public Boolean getWantRelative() - { - return wantRelative; - } - - public Boolean getWantEscapeXML() - { - return wantEscapeXML; - } -} Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/CCPPInterceptor.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/CCPPInterceptor.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/CCPPInterceptor.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.portlet.aspects.portlet; -import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; import org.jboss.portal.portlet.PortletInvokerInterceptor; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.PortletInvokerException; import javax.ccpp.Profile; import javax.ccpp.Attribute; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,19 +22,19 @@ ******************************************************************************/ package org.jboss.portal.portlet.aspects.portlet; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.RenderInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.RenderInvocation; import org.jboss.portal.portlet.PortletInvokerInterceptor; import org.jboss.portal.portlet.aspects.portlet.cache.ContentRef; import org.jboss.portal.portlet.aspects.portlet.cache.StrongContentRef; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.RevalidateMarkupResponse; -import org.jboss.portal.portlet.invocation.response.ContentResponse; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.ParametersStateString; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.spi.UserContext; -import org.jboss.portal.portlet.cache.CacheControl; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.RevalidateMarkupResponse; +import org.jboss.portal.portlet.api.invocation.response.ContentResponse; +import org.jboss.portal.portlet.api.StateString; +import org.jboss.portal.portlet.api.ParametersStateString; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.spi.UserContext; +import org.jboss.portal.portlet.api.cache.CacheControl; import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.WindowState; import org.jboss.portal.Mode; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -28,11 +28,11 @@ import org.jboss.portal.web.RequestDispatchCallback; import org.jboss.portal.web.ServletContainer; import org.jboss.portal.web.ServletContainerFactory; -import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; import org.jboss.portal.portlet.PortletInvokerInterceptor; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.spi.ServerContext; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.spi.ServerContext; +import org.jboss.portal.portlet.api.PortletInvokerException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/EventPayloadInterceptor.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/EventPayloadInterceptor.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/EventPayloadInterceptor.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,20 +22,20 @@ ******************************************************************************/ package org.jboss.portal.portlet.aspects.portlet; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.EventInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.EventInvocation; import org.jboss.portal.portlet.PortletInvokerInterceptor; -import org.jboss.portal.portlet.invocation.response.ErrorResponse; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.ErrorResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.container.PortletContainer; import org.jboss.portal.portlet.container.ContainerPortletInvoker; import org.jboss.portal.portlet.container.PortletApplication; import org.jboss.portal.portlet.container.PortletApplicationContext; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.info.EventingInfo; -import org.jboss.portal.portlet.info.EventInfo; +import org.jboss.portal.portlet.api.info.PortletInfo; +import org.jboss.portal.portlet.api.info.EventingInfo; +import org.jboss.portal.portlet.api.info.EventInfo; import org.jboss.portal.portlet.impl.info.ContainerTypeInfo; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.PortletInvokerException; import org.jboss.portal.common.io.IOTools; import org.apache.log4j.Logger; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/LocalInterceptor.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/LocalInterceptor.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/LocalInterceptor.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.portlet.aspects.portlet; -import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; import org.jboss.portal.portlet.PortletInvokerInterceptor; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.PortletInvokerException; /** * An interceptor whose purpose is to detect invocation from the local portal. Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/PortletCustomizationInterceptor.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,17 +22,17 @@ ******************************************************************************/ package org.jboss.portal.portlet.aspects.portlet; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.EventInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.EventInvocation; import org.jboss.portal.portlet.PortletInvokerInterceptor; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.spi.InstanceContext; -import org.jboss.portal.portlet.spi.UserContext; -import org.jboss.portal.portlet.state.AccessMode; -import org.jboss.portal.portlet.StateEvent; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.spi.InstanceContext; +import org.jboss.portal.portlet.api.spi.UserContext; +import org.jboss.portal.portlet.api.state.AccessMode; +import org.jboss.portal.portlet.api.StateEvent; +import org.jboss.portal.portlet.api.PortletContext; +import org.jboss.portal.portlet.api.PortletInvokerException; /** * <p>This interceptor takes in charge the management of portlet customization when the invocation carries Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,20 +23,20 @@ package org.jboss.portal.portlet.aspects.portlet; import org.jboss.portal.common.util.UUIDGenerator; -import org.jboss.portal.portlet.ParametersStateString; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.ParametersStateString; +import org.jboss.portal.portlet.api.PortletInvokerException; import org.jboss.portal.portlet.PortletInvokerInterceptor; import org.jboss.portal.portlet.container.ContainerPortletInvoker; import org.jboss.portal.portlet.container.PortletContainer; import org.jboss.portal.portlet.impl.info.ContainerPortletInfo; -import org.jboss.portal.portlet.info.RuntimeOptionInfo; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; +import org.jboss.portal.portlet.api.info.RuntimeOptionInfo; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.EventInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.RenderInvocation; +import org.jboss.portal.portlet.api.invocation.ResourceInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.UpdateNavigationalStateResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,17 +22,17 @@ ******************************************************************************/ package org.jboss.portal.portlet.aspects.portlet; -import org.jboss.portal.portlet.TransportGuarantee; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.TransportGuarantee; +import org.jboss.portal.portlet.api.PortletInvokerException; import org.jboss.portal.portlet.container.ContainerPortletInvoker; import org.jboss.portal.portlet.container.PortletContainer; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.info.SecurityInfo; -import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.info.PortletInfo; +import org.jboss.portal.portlet.api.info.SecurityInfo; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; import org.jboss.portal.portlet.PortletInvokerInterceptor; -import org.jboss.portal.portlet.invocation.response.InsufficientTransportGuaranteeResponse; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.spi.SecurityContext; +import org.jboss.portal.portlet.api.invocation.response.InsufficientTransportGuaranteeResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.spi.SecurityContext; /** * Implement security constaint defined by the portlet spec. Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -26,12 +26,12 @@ import org.jboss.portal.portlet.container.ContainerPortletInvoker; import org.jboss.portal.portlet.container.PortletContainerContext; import org.jboss.portal.portlet.container.managed.PortletApplicationRegistry; -import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; import org.jboss.portal.portlet.PortletInvokerInterceptor; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.UnavailableResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.UnavailableResponse; import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.PortletInvokerException; /** * This aspect has two responsabilities :<br/> <ul> <li>continue the request only if the portlet container valve is Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/ContentRef.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/ContentRef.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/ContentRef.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.aspects.portlet.cache; -import org.jboss.portal.portlet.invocation.response.ContentResponse; +import org.jboss.portal.portlet.api.invocation.response.ContentResponse; import java.io.Serializable; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/SoftContentRef.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/SoftContentRef.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/SoftContentRef.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.aspects.portlet.cache; -import org.jboss.portal.portlet.invocation.response.ContentResponse; +import org.jboss.portal.portlet.api.invocation.response.ContentResponse; import java.lang.ref.WeakReference; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/StrongContentRef.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/StrongContentRef.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/cache/StrongContentRef.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.aspects.portlet.cache; -import org.jboss.portal.portlet.invocation.response.ContentResponse; +import org.jboss.portal.portlet.api.invocation.response.ContentResponse; /** * Use strong references. Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/cache/CacheControl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/cache/CacheControl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/cache/CacheControl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,62 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.cache; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class CacheControl -{ - - /** Number of seconds this result remains valid, a value of -1 indicates that it never expires. */ - private final int expirationSecs; - - /** The cache scope for this fragment. */ - private final CacheScope cacheScope; - - /** The validation token. */ - private final String validationToken; - - public CacheControl(int expirationSecs, CacheScope cacheScope, String validationToken) - { - this.expirationSecs = expirationSecs; - this.cacheScope = cacheScope; - this.validationToken = validationToken; - } - - public int getExpirationSecs() - { - return expirationSecs; - } - - public CacheScope getCacheScope() - { - return cacheScope; - } - - public String getValidationToken() - { - return validationToken; - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/cache/CacheLevel.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/cache/CacheLevel.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/cache/CacheLevel.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,34 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.cache; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public enum CacheLevel -{ - - FULL, PORTLET, PAGE - -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/cache/CacheScope.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/cache/CacheScope.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/cache/CacheScope.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,34 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.cache; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public enum CacheScope -{ - - PUBLIC, PRIVATE - -} Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletDispatcher.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletDispatcher.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletDispatcher.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,9 +23,9 @@ package org.jboss.portal.portlet.container; import org.jboss.portal.portlet.PortletInvokerInterceptor; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.PortletInvokerException; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/ContainerPortletInvoker.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,21 +23,21 @@ package org.jboss.portal.portlet.container; import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.portlet.NoSuchPortletException; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.NoSuchPortletException; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletContext; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.state.PropertyMap; import org.jboss.portal.portlet.impl.info.ContainerPreferencesInfo; import org.jboss.portal.portlet.impl.info.ContainerPortletInfo; import org.jboss.portal.portlet.impl.info.ContainerPreferenceInfo; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.info.PortletInfo; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; import org.jboss.portal.portlet.PortletInvokerInterceptor; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.state.PropertyChange; import org.jboss.portal.portlet.state.SimplePropertyMap; -import org.jboss.portal.portlet.state.DestroyCloneFailure; +import org.jboss.portal.portlet.api.state.DestroyCloneFailure; import java.util.HashMap; import java.util.HashSet; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainer.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainer.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainer.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,10 +23,10 @@ package org.jboss.portal.portlet.container; import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.info.PortletInfo; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -54,7 +54,7 @@ * * @param invocation the portlet invocation * @return the portlet invocation response - * @throws PortletInvokerException a portlet invoker exception + * @throws org.jboss.portal.portlet.api.PortletInvokerException a portlet invoker exception * @throws InvocationException an invocation exception */ PortletInvocationResponse dispatch(PortletInvocation invocation) throws PortletInvokerException, InvocationException; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/managed/ManagedPortletContainer.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/managed/ManagedPortletContainer.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/managed/ManagedPortletContainer.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.container.managed; -import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.api.info.PortletInfo; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/container/PortletContainerLifeCycle.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/container/PortletContainerLifeCycle.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/container/PortletContainerLifeCycle.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -28,7 +28,7 @@ import org.jboss.portal.portlet.container.managed.ManagedObjectRegistryEventListener; import org.jboss.portal.portlet.container.PortletContainerContext; import org.jboss.portal.portlet.container.PortletContainer; -import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.api.info.PortletInfo; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCacheInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCacheInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCacheInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.info; -import org.jboss.portal.portlet.info.CacheInfo; +import org.jboss.portal.portlet.api.info.CacheInfo; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerCapabilitiesInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -27,9 +27,9 @@ import org.jboss.portal.WindowState; import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.common.net.media.MediaTypeMapImpl; -import org.jboss.portal.portlet.info.CapabilitiesInfo; -import org.jboss.portal.portlet.info.ModeInfo; -import org.jboss.portal.portlet.info.WindowStateInfo; +import org.jboss.portal.portlet.api.info.CapabilitiesInfo; +import org.jboss.portal.portlet.api.info.ModeInfo; +import org.jboss.portal.portlet.api.info.WindowStateInfo; import java.util.HashSet; import java.util.Locale; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerEventInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerEventInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerEventInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.info; -import org.jboss.portal.portlet.info.EventInfo; +import org.jboss.portal.portlet.api.info.EventInfo; import org.jboss.portal.common.i18n.LocalizedString; import javax.xml.namespace.QName; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerEventingInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerEventingInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerEventingInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.info; -import org.jboss.portal.portlet.info.EventingInfo; +import org.jboss.portal.portlet.api.info.EventingInfo; import javax.xml.namespace.QName; import java.util.Collections; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerFilterInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerFilterInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerFilterInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.info; -import org.jboss.portal.portlet.LifeCyclePhase; +import org.jboss.portal.portlet.api.LifeCyclePhase; import org.jboss.portal.common.i18n.LocalizedString; import java.util.Map; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -30,7 +30,7 @@ import org.jboss.portal.common.i18n.ResourceBundleManager; import org.jboss.portal.common.reflect.NoSuchClassException; import org.jboss.portal.common.util.ConversionException; -import org.jboss.portal.portlet.LifeCyclePhase; +import org.jboss.portal.portlet.api.LifeCyclePhase; import org.jboss.portal.portlet.impl.metadata.CustomPortletModeMetaData; import org.jboss.portal.portlet.impl.metadata.CustomWindowStateMetaData; import org.jboss.portal.portlet.impl.metadata.ListenerMetaData; @@ -54,8 +54,8 @@ import org.jboss.portal.portlet.impl.metadata.portlet.SupportsMetaData; import org.jboss.portal.portlet.impl.metadata.portlet.WindowStateMetaData; import org.jboss.portal.portlet.impl.metadata.security.SecurityConstraintMetaData; -import org.jboss.portal.portlet.info.MetaInfo; -import org.jboss.portal.portlet.info.RuntimeOptionInfo; +import org.jboss.portal.portlet.api.info.MetaInfo; +import org.jboss.portal.portlet.api.info.RuntimeOptionInfo; import javax.xml.XMLConstants; import javax.xml.namespace.QName; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerMetaInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerMetaInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerMetaInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,11 +23,10 @@ package org.jboss.portal.portlet.impl.info; import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.portlet.info.MetaInfo; +import org.jboss.portal.portlet.api.info.MetaInfo; import java.util.HashMap; import java.util.Map; -import java.util.Locale; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerModeInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerModeInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerModeInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,7 +25,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.portlet.info.ModeInfo; +import org.jboss.portal.portlet.api.info.ModeInfo; import java.util.Locale; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerNavigationInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerNavigationInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerNavigationInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.info; -import org.jboss.portal.portlet.info.NavigationInfo; -import org.jboss.portal.portlet.info.ParameterInfo; +import org.jboss.portal.portlet.api.info.NavigationInfo; +import org.jboss.portal.portlet.api.info.ParameterInfo; import javax.xml.namespace.QName; import java.util.Collection; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerParameterInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerParameterInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerParameterInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.info; -import org.jboss.portal.portlet.info.ParameterInfo; +import org.jboss.portal.portlet.api.info.ParameterInfo; import org.jboss.portal.common.i18n.LocalizedString; import javax.xml.namespace.QName; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,8 +23,8 @@ package org.jboss.portal.portlet.impl.info; import org.jboss.portal.common.i18n.ResourceBundleManager; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.info.RuntimeOptionInfo; +import org.jboss.portal.portlet.api.info.PortletInfo; +import org.jboss.portal.portlet.api.info.RuntimeOptionInfo; import java.util.Collections; import java.util.HashMap; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletManagedModeInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletManagedModeInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletManagedModeInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,7 +24,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.portlet.info.PortletManagedModeInfo; +import org.jboss.portal.portlet.api.info.PortletManagedModeInfo; /** * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferenceInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferenceInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferenceInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.impl.info; import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.portlet.info.PreferenceInfo; +import org.jboss.portal.portlet.api.info.PreferenceInfo; import java.util.List; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferencesInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferencesInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPreferencesInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,8 +23,8 @@ package org.jboss.portal.portlet.impl.info; import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.portlet.info.PreferenceInfo; -import org.jboss.portal.portlet.info.PreferencesInfo; +import org.jboss.portal.portlet.api.info.PreferenceInfo; +import org.jboss.portal.portlet.api.info.PreferencesInfo; import java.util.Collections; import java.util.HashMap; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerRuntimeOptionInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerRuntimeOptionInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerRuntimeOptionInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.info; -import org.jboss.portal.portlet.info.RuntimeOptionInfo; +import org.jboss.portal.portlet.api.info.RuntimeOptionInfo; import java.util.Collections; import java.util.List; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerSecurityInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerSecurityInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerSecurityInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.info; -import org.jboss.portal.portlet.TransportGuarantee; -import org.jboss.portal.portlet.info.SecurityInfo; +import org.jboss.portal.portlet.api.TransportGuarantee; +import org.jboss.portal.portlet.api.info.SecurityInfo; import java.util.Collections; import java.util.HashSet; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerTypeInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerTypeInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerTypeInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.info; -import org.jboss.portal.portlet.info.TypeInfo; +import org.jboss.portal.portlet.api.info.TypeInfo; import javax.xml.bind.annotation.XmlRootElement; import java.lang.reflect.AnnotatedElement; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerWindowStateInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerWindowStateInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerWindowStateInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,7 +25,7 @@ import org.jboss.portal.WindowState; import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.portlet.info.WindowStateInfo; +import org.jboss.portal.portlet.api.info.WindowStateInfo; import java.util.Locale; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/InlineBundle.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/InlineBundle.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/InlineBundle.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,7 +24,7 @@ import org.apache.log4j.Logger; import org.jboss.portal.portlet.impl.info.ContainerPortletInfo; -import org.jboss.portal.portlet.info.MetaInfo; +import org.jboss.portal.portlet.api.info.MetaInfo; import java.util.ArrayList; import java.util.List; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,7 +25,7 @@ import org.jboss.portal.common.concurrent.Valve; import org.jboss.portal.common.i18n.ResourceBundleManager; import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.PortletInvokerException; import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor; import org.jboss.portal.portlet.container.PortletApplication; import org.jboss.portal.portlet.container.PortletInitializationException; @@ -45,15 +45,15 @@ import org.jboss.portal.portlet.impl.jsr168.api.PortletResponseImpl; import org.jboss.portal.portlet.impl.info.ContainerPortletInfo; import org.jboss.portal.portlet.impl.info.ContainerPreferencesInfo; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.portlet.invocation.response.ErrorResponse; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.SecurityErrorResponse; -import org.jboss.portal.portlet.invocation.response.UnavailableResponse; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.RenderInvocation; +import org.jboss.portal.portlet.api.invocation.EventInvocation; +import org.jboss.portal.portlet.api.invocation.ResourceInvocation; +import org.jboss.portal.portlet.api.invocation.response.ErrorResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.SecurityErrorResponse; +import org.jboss.portal.portlet.api.invocation.response.UnavailableResponse; import org.apache.log4j.Logger; import javax.portlet.Portlet; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletFilterImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletFilterImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletFilterImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -26,7 +26,7 @@ import org.jboss.portal.portlet.container.PortletFilterContext; import org.jboss.portal.portlet.container.object.PortletFilterObject; import org.jboss.portal.portlet.impl.info.ContainerFilterInfo; -import org.jboss.portal.portlet.LifeCyclePhase; +import org.jboss.portal.portlet.api.LifeCyclePhase; import org.apache.log4j.Logger; import javax.portlet.PortletContext; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletParameterMap.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletParameterMap.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletParameterMap.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,8 +23,8 @@ package org.jboss.portal.portlet.impl.jsr168; import org.jboss.portal.common.util.TypedMap; -import org.jboss.portal.portlet.info.NavigationInfo; -import org.jboss.portal.portlet.info.ParameterInfo; +import org.jboss.portal.portlet.api.info.NavigationInfo; +import org.jboss.portal.portlet.api.info.ParameterInfo; import java.util.Map; import java.util.HashMap; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestAttributes.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestAttributes.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestAttributes.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,9 +23,8 @@ package org.jboss.portal.portlet.impl.jsr168; import org.jboss.portal.portlet.impl.info.ContainerUserInfo; -import org.jboss.portal.portlet.impl.jsr168.api.PortletRequestImpl; -import org.jboss.portal.portlet.spi.UserContext; -import org.jboss.portal.portlet.spi.SecurityContext; +import org.jboss.portal.portlet.api.spi.UserContext; +import org.jboss.portal.portlet.api.spi.SecurityContext; import org.jboss.portal.portlet.container.PortletContainer; import javax.portlet.PortletRequest; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestParameterMap.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,14 +23,14 @@ package org.jboss.portal.portlet.impl.jsr168; import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.ParametersStateString; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.portlet.info.NavigationInfo; +import org.jboss.portal.portlet.api.StateString; +import org.jboss.portal.portlet.api.ParametersStateString; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.EventInvocation; +import org.jboss.portal.portlet.api.invocation.RenderInvocation; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.ResourceInvocation; +import org.jboss.portal.portlet.api.info.NavigationInfo; import java.util.Iterator; import java.util.Map; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ResourceRequestParameterMap.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ResourceRequestParameterMap.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/ResourceRequestParameterMap.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,8 +23,8 @@ package org.jboss.portal.portlet.impl.jsr168; import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.portlet.info.NavigationInfo; -import org.jboss.portal.portlet.invocation.ResourceInvocation; +import org.jboss.portal.portlet.api.info.NavigationInfo; +import org.jboss.portal.portlet.api.invocation.ResourceInvocation; import java.util.Map; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ActionRequestImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ActionRequestImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ActionRequestImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.jsr168.api; -import org.jboss.portal.portlet.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl; import javax.portlet.ActionRequest; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ActionResponseImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ActionResponseImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ActionResponseImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,10 +23,10 @@ package org.jboss.portal.portlet.impl.jsr168.api; import org.jboss.portal.common.NotYetImplemented; -import org.jboss.portal.portlet.ParametersStateString; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; +import org.jboss.portal.portlet.api.ParametersStateString; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.UpdateNavigationalStateResponse; import javax.portlet.ActionResponse; import java.io.IOException; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/BaseURLImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/BaseURLImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/BaseURLImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,10 +22,11 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.jsr168.api; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.spi.PortletInvocationContext; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.spi.PortletInvocationContext; import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl; -import org.jboss.portal.portlet.URLFormat; +import org.jboss.portal.portlet.api.URLFormat; +import org.jboss.portal.portlet.api.ContainerURL; import javax.portlet.BaseURL; import javax.portlet.PortletSecurityException; @@ -208,7 +209,7 @@ protected abstract InternalContainerURL getContainerURL(); - protected static abstract class InternalContainerURL implements org.jboss.portal.portlet.ContainerURL + protected static abstract class InternalContainerURL implements ContainerURL { protected abstract void setParameter(String name, String value); Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/CacheControlImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/CacheControlImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/CacheControlImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.jsr168.api; -import org.jboss.portal.portlet.cache.CacheScope; +import org.jboss.portal.portlet.api.cache.CacheScope; import javax.portlet.CacheControl; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ClientDataRequestImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ClientDataRequestImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ClientDataRequestImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.jsr168.api; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.portlet.spi.RequestContext; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.ResourceInvocation; +import org.jboss.portal.portlet.api.spi.RequestContext; import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl; import javax.portlet.ClientDataRequest; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/EventImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/EventImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/EventImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.jsr168.api; -import org.jboss.portal.portlet.invocation.EventInvocation; +import org.jboss.portal.portlet.api.invocation.EventInvocation; import javax.portlet.Event; import javax.xml.namespace.QName; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/EventRequestImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/EventRequestImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/EventRequestImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.jsr168.api; -import org.jboss.portal.portlet.invocation.EventInvocation; +import org.jboss.portal.portlet.api.invocation.EventInvocation; import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl; import javax.portlet.EventRequest; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/EventResponseImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/EventResponseImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/EventResponseImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.jsr168.api; -import org.jboss.portal.portlet.invocation.EventInvocation; +import org.jboss.portal.portlet.api.invocation.EventInvocation; import javax.portlet.EventResponse; import javax.portlet.EventRequest; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/MimeResponseImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/MimeResponseImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/MimeResponseImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,14 +22,14 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.jsr168.api; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.RevalidateMarkupResponse; -import org.jboss.portal.portlet.invocation.response.ContentResponse; -import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.info.CacheInfo; -import org.jboss.portal.portlet.cache.CacheScope; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.RevalidateMarkupResponse; +import org.jboss.portal.portlet.api.invocation.response.ContentResponse; +import org.jboss.portal.portlet.api.invocation.response.ResponseProperties; +import org.jboss.portal.portlet.api.info.PortletInfo; +import org.jboss.portal.portlet.api.info.CacheInfo; +import org.jboss.portal.portlet.api.cache.CacheScope; import org.jboss.portal.portlet.impl.jsr168.ContentBuffer; import javax.portlet.MimeResponse; @@ -81,15 +81,15 @@ String contentType, byte[] bytes, String chars, - org.jboss.portal.portlet.cache.CacheControl cacheControl + org.jboss.portal.portlet.api.cache.CacheControl cacheControl ); public PortletInvocationResponse getResponse() { - org.jboss.portal.portlet.cache.CacheControl cc; + org.jboss.portal.portlet.api.cache.CacheControl cc; if (cacheControl != null) { - cc = new org.jboss.portal.portlet.cache.CacheControl( + cc = new org.jboss.portal.portlet.api.cache.CacheControl( cacheControl.getExpirationTime(), cacheControl.isPublicScope() ? CacheScope.PUBLIC : CacheScope.PRIVATE, cacheControl.getETag()); @@ -98,7 +98,7 @@ { PortletInfo info = preq.container.getInfo(); CacheInfo cacheInfo = info.getCache(); - cc = new org.jboss.portal.portlet.cache.CacheControl(cacheInfo.getExpirationSecs(), CacheScope.PRIVATE, null); + cc = new org.jboss.portal.portlet.api.cache.CacheControl(cacheInfo.getExpirationSecs(), CacheScope.PRIVATE, null); } // Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortalContextImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortalContextImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortalContextImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,7 +24,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.common.util.Tools; -import org.jboss.portal.portlet.spi.PortalContext; +import org.jboss.portal.portlet.api.spi.PortalContext; import org.jboss.portal.portlet.impl.jsr168.PortletUtils; import java.util.Enumeration; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletConfigImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletConfigImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletConfigImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -27,7 +27,7 @@ import org.jboss.portal.portlet.impl.info.ContainerParameterInfo; import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo; import org.jboss.portal.portlet.impl.info.ContainerPortletInfo; -import org.jboss.portal.portlet.info.RuntimeOptionInfo; +import org.jboss.portal.portlet.api.info.RuntimeOptionInfo; import javax.portlet.PortletConfig; import javax.portlet.PortletContext; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletContextImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletContextImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletContextImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,8 +23,8 @@ package org.jboss.portal.portlet.impl.jsr168.api; import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo; -import org.jboss.portal.portlet.info.RuntimeOptionInfo; -import org.jboss.portal.portlet.spi.PortalContext; +import org.jboss.portal.portlet.api.info.RuntimeOptionInfo; +import org.jboss.portal.portlet.api.spi.PortalContext; import javax.portlet.PortletContext; import javax.portlet.PortletRequestDispatcher; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletPreferencesImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletPreferencesImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletPreferencesImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,9 +23,9 @@ package org.jboss.portal.portlet.impl.jsr168.api; import org.apache.log4j.Logger; -import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.portlet.state.PropertyContext; -import org.jboss.portal.portlet.info.PreferenceInfo; +import org.jboss.portal.portlet.api.state.PropertyChange; +import org.jboss.portal.portlet.api.state.PropertyContext; +import org.jboss.portal.portlet.api.info.PreferenceInfo; import org.jboss.portal.portlet.impl.info.ContainerPreferencesInfo; import org.jboss.portal.portlet.impl.info.ContainerPreferenceInfo; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletRequestImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -37,16 +37,16 @@ import org.jboss.portal.portlet.impl.info.ContainerPreferencesInfo; import org.jboss.portal.portlet.impl.info.ContainerNavigationInfo; import org.jboss.portal.portlet.impl.info.ContainerPortletInfo; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.spi.ServerContext; -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.spi.ClientContext; -import org.jboss.portal.portlet.state.PropertyContext; -import org.jboss.portal.portlet.info.CapabilitiesInfo; -import org.jboss.portal.portlet.info.ModeInfo; -import org.jboss.portal.portlet.info.PortletManagedModeInfo; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.spi.ServerContext; +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.spi.ClientContext; +import org.jboss.portal.portlet.api.state.PropertyContext; +import org.jboss.portal.portlet.api.info.CapabilitiesInfo; +import org.jboss.portal.portlet.api.info.ModeInfo; +import org.jboss.portal.portlet.api.info.PortletManagedModeInfo; import org.jboss.portal.Mode; import javax.portlet.PortalContext; @@ -582,7 +582,7 @@ ContentInfo si = invocation.getContext().getMarkupInfo(); // - org.jboss.portal.portlet.spi.PortalContext portalContext =invocation.getPortalContext(); + org.jboss.portal.portlet.api.spi.PortalContext portalContext =invocation.getPortalContext(); // Get the modes for this content type CapabilitiesInfo capabilities = container.getInfo().getCapabilities(); Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletResponseImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletResponseImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletResponseImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.jsr168.api; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.ResponseProperties; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.ResponseProperties; import org.jboss.portal.portlet.impl.jsr168.PortletUtils; import org.w3c.dom.Element; import org.w3c.dom.DOMException; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletURLImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletURLImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletURLImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,12 +23,12 @@ package org.jboss.portal.portlet.impl.jsr168.api; import org.jboss.portal.common.util.ParameterMap; -import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; import org.jboss.portal.portlet.impl.jsr168.PortletParameterMap; -import org.jboss.portal.portlet.ActionURL; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.ParametersStateString; -import org.jboss.portal.portlet.RenderURL; +import org.jboss.portal.portlet.api.ActionURL; +import org.jboss.portal.portlet.api.StateString; +import org.jboss.portal.portlet.api.ParametersStateString; +import org.jboss.portal.portlet.api.RenderURL; import org.jboss.portal.Mode; import javax.portlet.PortletMode; @@ -148,7 +148,7 @@ } } - private static abstract class InternalPortletURL extends InternalContainerURL implements org.jboss.portal.portlet.PortletURL + private static abstract class InternalPortletURL extends InternalContainerURL implements org.jboss.portal.portlet.api.PortletURL { /** . */ Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/RenderRequestImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/RenderRequestImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/RenderRequestImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.jsr168.api; -import org.jboss.portal.portlet.invocation.RenderInvocation; +import org.jboss.portal.portlet.api.invocation.RenderInvocation; import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl; import org.jboss.portal.common.NotYetImplemented; import org.jboss.portal.common.util.MultiValuedPropertyMap; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/RenderResponseImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/RenderResponseImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/RenderResponseImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,14 +22,14 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.jsr168.api; -import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.invocation.response.FragmentResponse; -import org.jboss.portal.portlet.invocation.response.ContentResponse; -import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.info.CapabilitiesInfo; -import org.jboss.portal.portlet.info.ModeInfo; -import org.jboss.portal.portlet.cache.CacheControl; +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.ContentResponse; +import org.jboss.portal.portlet.api.invocation.response.ResponseProperties; +import org.jboss.portal.portlet.api.info.PortletInfo; +import org.jboss.portal.portlet.api.info.CapabilitiesInfo; +import org.jboss.portal.portlet.api.info.ModeInfo; +import org.jboss.portal.portlet.api.cache.CacheControl; import org.jboss.portal.Mode; import javax.portlet.RenderResponse; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ResourceRequestImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ResourceRequestImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ResourceRequestImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.jsr168.api; -import org.jboss.portal.portlet.invocation.ResourceInvocation; +import org.jboss.portal.portlet.api.invocation.ResourceInvocation; import org.jboss.portal.portlet.impl.jsr168.ResourceRequestParameterMap; import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl; import org.jboss.portal.common.util.MultiValuedPropertyMap; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ResourceResponseImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ResourceResponseImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ResourceResponseImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,11 +22,11 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.jsr168.api; -import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.portlet.invocation.response.ContentResponse; -import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.cache.CacheLevel; -import org.jboss.portal.portlet.cache.CacheControl; +import org.jboss.portal.portlet.api.invocation.ResourceInvocation; +import org.jboss.portal.portlet.api.invocation.response.ContentResponse; +import org.jboss.portal.portlet.api.invocation.response.ResponseProperties; +import org.jboss.portal.portlet.api.cache.CacheLevel; +import org.jboss.portal.portlet.api.cache.CacheControl; import javax.portlet.ResourceResponse; import javax.portlet.PortletURL; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ResourceURLImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ResourceURLImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/ResourceURLImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,11 +22,11 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.jsr168.api; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.portlet.cache.CacheLevel; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.ParametersStateString; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.ResourceInvocation; +import org.jboss.portal.portlet.api.cache.CacheLevel; +import org.jboss.portal.portlet.api.StateString; +import org.jboss.portal.portlet.api.ParametersStateString; import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; @@ -168,7 +168,7 @@ true); } - private static class InternalResourceURL extends InternalContainerURL implements org.jboss.portal.portlet.ResourceURL + private static class InternalResourceURL extends InternalContainerURL implements org.jboss.portal.portlet.api.ResourceURL { /** . */ Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/StateAwareResponseImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -26,16 +26,16 @@ import org.jboss.portal.Mode; import org.jboss.portal.common.NotYetImplemented; import org.jboss.portal.common.util.Tools; -import org.jboss.portal.portlet.ParametersStateString; +import org.jboss.portal.portlet.api.ParametersStateString; import org.jboss.portal.portlet.impl.info.ContainerEventInfo; import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo; import org.jboss.portal.portlet.impl.info.ContainerTypeInfo; import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl; import org.jboss.portal.portlet.impl.jsr168.PortletParameterMap; -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.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 javax.portlet.PortletMode; import javax.portlet.PortletModeException; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/taglib/PortletTag.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/taglib/PortletTag.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/taglib/PortletTag.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,8 +23,7 @@ package org.jboss.portal.portlet.impl.jsr168.taglib; import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.impl.jsr168.api.RenderRequestImpl; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; import javax.portlet.PortletConfig; import javax.portlet.RenderResponse; @@ -43,7 +42,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.tagext.TagSupport; import java.util.Map; -import java.util.Collections; import java.util.HashMap; /** Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/filter/FilterMetaData.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/filter/FilterMetaData.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/filter/FilterMetaData.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -31,7 +31,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.portlet.LifeCyclePhase; +import org.jboss.portal.portlet.api.LifeCyclePhase; import org.jboss.portal.portlet.impl.metadata.PortletMetaDataConstants; import org.jboss.portal.portlet.impl.metadata.common.InitParamMetaData; import org.jboss.portal.portlet.impl.metadata.adapter.LocalizedStringAdapter; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/security/UserDataConstraintMetaData.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/security/UserDataConstraintMetaData.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/metadata/security/UserDataConstraintMetaData.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import org.jboss.portal.portlet.TransportGuarantee; +import org.jboss.portal.portlet.api.TransportGuarantee; import org.jboss.portal.portlet.impl.metadata.common.DescribableMetaData; /** Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractClientContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractClientContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractClientContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.spi; -import org.jboss.portal.portlet.spi.ClientContext; +import org.jboss.portal.portlet.api.spi.ClientContext; import org.jboss.portal.common.util.MultiValuedPropertyMap; import org.jboss.portal.common.util.SimpleMultiValuedPropertyMap; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractInstanceContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractInstanceContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractInstanceContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.spi; -import org.jboss.portal.portlet.state.AccessMode; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.StateEvent; -import org.jboss.portal.portlet.spi.InstanceContext; +import org.jboss.portal.portlet.api.state.AccessMode; +import org.jboss.portal.portlet.api.PortletContext; +import org.jboss.portal.portlet.api.StateEvent; +import org.jboss.portal.portlet.api.spi.InstanceContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractPortalContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractPortalContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractPortalContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,7 +24,7 @@ import org.jboss.portal.WindowState; import org.jboss.portal.Mode; -import org.jboss.portal.portlet.spi.PortalContext; +import org.jboss.portal.portlet.api.spi.PortalContext; import org.jboss.portal.common.util.Tools; import java.util.Set; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractPortletInvocationContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractPortletInvocationContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractPortletInvocationContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,9 +23,9 @@ package org.jboss.portal.portlet.impl.spi; import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.portlet.ContainerURL; -import org.jboss.portal.portlet.URLFormat; -import org.jboss.portal.portlet.spi.PortletInvocationContext; +import org.jboss.portal.portlet.api.ContainerURL; +import org.jboss.portal.portlet.api.URLFormat; +import org.jboss.portal.portlet.api.spi.PortletInvocationContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -89,11 +89,11 @@ } /** - * Delegates the URL rendition to the method {@link #renderURL(org.jboss.portal.portlet.ContainerURL,org.jboss.portal.portlet.URLFormat)} + * Delegates the URL rendition to the method {@link #renderURL(org.jboss.portal.portlet.api.ContainerURL , org.jboss.portal.portlet.api.URLFormat)} * and then invoke the {@link java.io.Writer#write(String)} method with the returned result. * - * @see org.jboss.portal.portlet.spi.PortletInvocationContext#renderURL(org.jboss.portal.portlet.ContainerURL, - * org.jboss.portal.portlet.URLFormat) + * @see org.jboss.portal.portlet.api.spi.PortletInvocationContext#renderURL(org.jboss.portal.portlet.api.ContainerURL , + * org.jboss.portal.portlet.api.URLFormat) */ public void renderURL(Writer writer, ContainerURL containerURL, URLFormat format) throws IOException { Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.spi; -import org.jboss.portal.portlet.spi.RequestContext; +import org.jboss.portal.portlet.api.spi.RequestContext; import javax.servlet.http.HttpServletRequest; import java.io.BufferedReader; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractSecurityContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractSecurityContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractSecurityContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.spi; -import org.jboss.portal.portlet.spi.SecurityContext; +import org.jboss.portal.portlet.api.spi.SecurityContext; import javax.servlet.http.HttpServletRequest; import java.security.Principal; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractServerContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractServerContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractServerContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.spi; -import org.jboss.portal.portlet.spi.ServerContext; +import org.jboss.portal.portlet.api.spi.ServerContext; import org.jboss.portal.web.RequestDispatchCallback; import org.jboss.portal.web.ServletContainer; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractUserContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -26,7 +26,7 @@ import org.jboss.portal.common.invocation.resolver.PrincipalAttributeResolver; import org.jboss.portal.common.invocation.resolver.MapAttributeResolver; import org.jboss.portal.common.invocation.AttributeResolver; -import org.jboss.portal.portlet.spi.UserContext; +import org.jboss.portal.portlet.api.spi.UserContext; import javax.servlet.http.HttpServletRequest; import java.util.Map; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractWindowContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractWindowContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/spi/AbstractWindowContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.spi; -import org.jboss.portal.portlet.spi.WindowContext; +import org.jboss.portal.portlet.api.spi.WindowContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/StateConverterV0.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.impl.state; -import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.portlet.api.state.PropertyMap; import org.jboss.portal.portlet.state.SimplePropertyMap; import org.jboss.portal.portlet.state.StateConversionException; import org.jboss.portal.portlet.state.StateConverter; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/producer/PortletStateContextImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/producer/PortletStateContextImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/producer/PortletStateContextImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,7 +24,7 @@ import org.jboss.portal.portlet.state.producer.PortletStateContext; import org.jboss.portal.portlet.state.producer.PortletState; -import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.portlet.api.state.PropertyMap; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/producer/PortletStatePersistenceManagerService.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/producer/PortletStatePersistenceManagerService.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/state/producer/PortletStatePersistenceManagerService.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,7 +24,7 @@ import org.jboss.portal.portlet.state.InvalidStateIdException; import org.jboss.portal.portlet.state.NoSuchStateException; -import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.portlet.api.state.PropertyMap; import org.jboss.portal.portlet.state.SimplePropertyMap; import org.jboss.portal.portlet.state.producer.PortletStatePersistenceManager; import org.jboss.portal.portlet.state.producer.PortletStateContext; Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CacheInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CacheInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CacheInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,38 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.info; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public interface CacheInfo -{ - - /** - * The expiration in seconds. - * - * @return the expiration in seconds - */ - int getExpirationSecs(); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/CapabilitiesInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,108 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.info; - -import org.jboss.portal.common.net.media.MediaType; -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; - -import java.util.Set; -import java.util.Locale; - -/** - * Gathers capability information (portlet modes, window states, supported media types and locales) regarding a portlet. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - * @since 2.4 - */ -public interface CapabilitiesInfo -{ - /** - * Retrieves all the Media types supported by the associated Portlet. - * - * @return a Set of String representation of supported Media types - */ - Set<MediaType> getMediaTypes(); - - /** - * Retrieves all the portlet modes supported by the associated Portlet. - * - * @return a Set of {@link ModeInfo} reprensenting the supported portlet modes - */ - Set<ModeInfo> getAllModes(); - - /** - * Retrieves the portlet modes supported by the associated Portlet for the specified Media type. - * - * @param mediaType the media type - * @return a Set of {@link ModeInfo} reprensenting the supported portlet modes for the specified Media type - */ - Set<ModeInfo> getModes(MediaType mediaType); - - /** - * Returns a mode info matching a specifed mode or null. - * - * @param mode the mode - * @return the mode info - */ - ModeInfo getMode(Mode mode); - - /** - * Retrieves all the window states supported by the associated Portlet. - * - * @return a Set of {@link WindowStateInfo} reprensenting the supported window states - */ - Set<WindowStateInfo> getAllWindowStates(); - - /** - * Retrieves the window states supported by the associated Portlet for the specified MIME type. - * - * @param mimeType the mime type - * @return a Set of {@link ModeInfo} reprensenting the supported window states for the specified MIME type - */ - Set<WindowStateInfo> getWindowStates(MediaType mimeType); - - /** - * Returns a window state info matching a specifed window state or null. - * - * @param windowState the window state - * @return the window state info - */ - WindowStateInfo getWindowState(WindowState windowState); - - /** - * Retrieves all the locales supported by the associated Portlet. - * - * @return the Set of supported {@link java.util.Locale}s - */ - Set<Locale> getAllLocales(); - - /** - * Retrieves the locales supported by the associated Portlet for the specified MIME type. - * - * @param mimeType the mime type - * @return a Set of supported {@link java.util.Locale}s for the specified MIME type - */ - Set<Locale> getLocales(MediaType mimeType); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/EventInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/EventInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/EventInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,52 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.info; - -import org.jboss.portal.common.i18n.LocalizedString; - -import javax.xml.namespace.QName; -import java.util.Collection; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public interface EventInfo -{ - - QName getName(); - - LocalizedString getDisplayName(); - - LocalizedString getDescription(); - - /** - * Returns the type of the event or null if the event does not declare a type. - * - * @return the type of the event - */ - TypeInfo getType(); - - Collection<QName> getAliases(); - -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/EventingInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/EventingInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/EventingInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,37 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.info; - -import javax.xml.namespace.QName; -import java.util.Map; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public interface EventingInfo -{ - Map<QName, ? extends EventInfo> getProducedEvents(); - - Map<QName, ? extends EventInfo> getConsumedEvents(); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/MetaInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/MetaInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/MetaInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,59 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.info; - -import org.jboss.portal.common.i18n.LocalizedString; - -/** - * Portlet metadata (display-name, title, short title, keywords). - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6818 $ - * @since 2.4 - */ -public interface MetaInfo -{ - - /** Key for display name. */ - String DISPLAY_NAME = "display-name"; - - /** Key for title. */ - String TITLE = "title"; - - /** Key for short title. */ - String SHORT_TITLE = "short-title"; - - /** Key for locale specific keywords associated with this portlet. The keywords are separated by commas. */ - String KEYWORDS = "keywords"; - - /** Key for description. */ - String DESCRIPTION = "description"; - - /** - * Return the meta value of the portlet for a specific key. - * - * @param key the key - * @return an internationalized value - */ - LocalizedString getMetaValue(String key); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/ModeInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/ModeInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/ModeInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,55 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.info; - -import org.jboss.portal.Mode; -import org.jboss.portal.common.i18n.LocalizedString; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6818 $ - * @since 2.4 - */ -public interface ModeInfo -{ - /** - * The mode description. - * - * @return the description - */ - LocalizedString getDescription(); - - /** - * The mode value. - * - * @return the mode - */ - Mode getMode(); - - /** - * Retrieves the associated Mode name. - * - * @return the associated Mode name. - */ - String getModeName(); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/NavigationInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/NavigationInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/NavigationInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,58 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.info; - -import javax.xml.namespace.QName; -import java.util.Collection; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public interface NavigationInfo -{ - - /** - * Returns a public parameter by using its id or null if it does not exist. - * - * @param id the parameter id - * @return the parameter info object - */ - ParameterInfo getPublicParameter(String id); - - /** - * Returns a public parameter by using its name or null if it does not exist. - * - * @param name the parameter name - * @return the parameter info object - */ - ParameterInfo getPublicParameter(QName name); - - /** - * Returns the collection of known public parameters. - * - * @return the public parameter collection - */ - Collection<? extends ParameterInfo> getPublicParameters(); - -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/ParameterInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/ParameterInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/ParameterInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,45 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.info; - -import org.jboss.portal.common.i18n.LocalizedString; - -import javax.xml.namespace.QName; -import java.util.Collection; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public interface ParameterInfo -{ - - String getId(); - - QName getName(); - - Collection<QName> getAliases(); - - LocalizedString getDescription(); - -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,116 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.info; - -import java.util.Map; - -/** - * Runtime meta data for a portlet. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - * @since 2.4 - */ -public interface PortletInfo -{ - - /** - * Returns the portlet name. - * - * @return the portlet name - */ - String getName(); - - /** - * Returns the portlet application name. - * - * @return the portlet application name - */ - String getApplicationName(); - - /** - * Retrieves the capabilities of supported by the described portlet. - * - * @return the capabilities of the portlet - */ - CapabilitiesInfo getCapabilities(); - - /** - * Retrieves information about the preferences supported by the described portlet, it must return null if the portlet - * cannot be personalized. - * - * @return the preferences meta data of the portlet - */ - PreferencesInfo getPreferences(); - - /** - * Retrieves the portlet description (title, keywords, etc). - * - * @return the portlet description - */ - MetaInfo getMeta(); - - /** - * Retrieves the security information for the described portlet. - * - * @return the security information - */ - SecurityInfo getSecurity(); - - /** - * Retrieves caching-related information for the described portlet. - * - * @return the caching related information - */ - CacheInfo getCache(); - - /** - * Return the eventing information. - * - * @return the eventing information - */ - EventingInfo getEventing(); - - /** - * Returns the navigation information. - * - * @return the navigation information - */ - NavigationInfo getNavigation(); - - /** - * Returns a generic attachment on the portlet info. - * - * @param type the parameter type - * @return the attachment or null - * @throws IllegalArgumentException if the parameter type is null - */ - <T> T getAttachment(Class<T> type) throws IllegalArgumentException; - - /** - * Retrieves the runtime container options set by the associated portlet, if any. - * - * @return the runtime container options set by the associated portlet, if any - */ - Map<String, RuntimeOptionInfo> getRuntimeOptionsInfo(); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletManagedModeInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletManagedModeInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletManagedModeInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,42 +0,0 @@ -/****************************************************************************** - * 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.jboss.portal.portlet.info; - -import org.jboss.portal.common.i18n.LocalizedString; - -/** - * Extends the mode info interface to add the notion of portlet managed mode. - * - * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public interface PortletManagedModeInfo extends ModeInfo -{ - - /** - * Returns the display name of the mode. - * - * @return the display name - */ - LocalizedString getDisplayName(); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PreferenceInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PreferenceInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PreferenceInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,74 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.info; - -import org.jboss.portal.common.i18n.LocalizedString; - -import java.util.List; - -/** - * Describes a Portlet preference. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6818 $ - * @since 2.4 - */ -public interface PreferenceInfo -{ - /** - * Retrieves the key associated to the described preference. - * - * @return the key associated to the described preference. - */ - String getKey(); - - /** - * Retrieves the localized display name of the described preference. - * - * @return the localized display name of the described preference. - * @see LocalizedString - */ - LocalizedString getDisplayName(); - - /** - * Retrieves the localized description of the described preference. - * - * @return the localized description of the described preference. - * @see LocalizedString - */ - LocalizedString getDescription(); - - /** - * Return true if the preference is read-only, false otherwise or null if it cannot be determined. - * - * @return <code>true</code> if the described preference is read-only, <code>false</code> otherwise. - */ - Boolean isReadOnly(); - - /** - * Return the default value or null if it cannot be determined (for instance WSRP v1 does not define it). - * - * @return the default value - */ - List<String> getDefaultValue(); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PreferencesInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PreferencesInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PreferencesInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,49 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.info; - -import java.util.Set; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - * @since 2.4 - */ -public interface PreferencesInfo -{ - /** - * Return the immutable set of keys. - * - * @return the keys - */ - Set<String> getKeys(); - - /** - * A preference specified by its key. - * - * @param key the key - * @return the preference info or null if it does not exist - * @throws IllegalArgumentException if the key is null - */ - PreferenceInfo getPreference(String key) throws IllegalArgumentException; -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/RuntimeOptionInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/RuntimeOptionInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/RuntimeOptionInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,53 +0,0 @@ -/* -* 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.jboss.portal.portlet.info; - -import org.jboss.portal.common.util.Tools; - -import java.util.Collections; -import java.util.List; -import java.util.Set; - -/** - * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> - * @version $Revision$ - */ -public interface RuntimeOptionInfo -{ - String JAVAX_PORTLET_ACTION_SCOPED_REQUEST_ATTRIBUTES = "javax.portlet.actionScopedRequestAttributes"; - String NUMBER_OF_CACHED_SCOPES = "numberOfCachedScopes"; - String JAVAX_PORTLET_ESCAPE_XML = "javax.portlet.escapeXml"; - String JAVAX_PORTLET_SERVLET_DEFAULT_SESSION_SCOPE = "javax.portlet.servletDefaultSessionScope"; - - String ORG_JBOSS_PORTLETCONTAINER_REMOTABLE = "org.jboss.portletcontainer.remotable"; - - Set<String> SUPPORTED_OPTIONS = Collections.unmodifiableSet(Tools.toSet( - JAVAX_PORTLET_ACTION_SCOPED_REQUEST_ATTRIBUTES, - JAVAX_PORTLET_ESCAPE_XML, - JAVAX_PORTLET_SERVLET_DEFAULT_SESSION_SCOPE, - ORG_JBOSS_PORTLETCONTAINER_REMOTABLE)); - - String getName(); - - List<String> getValues(); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/SecurityInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/SecurityInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/SecurityInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,45 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.info; - -import org.jboss.portal.portlet.TransportGuarantee; - -import java.util.Set; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public interface SecurityInfo -{ - /** - * @param transportGuarantee the transport guarantee - * @return true if the transport guarantee is contained - */ - boolean containsTransportGuarantee(TransportGuarantee transportGuarantee); - - /** - * @return the set of transport guarantees - */ - Set<TransportGuarantee> getTransportGuarantees(); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/TypeInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/TypeInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/TypeInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,38 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.info; - -import javax.xml.bind.annotation.XmlRootElement; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public interface TypeInfo -{ - - String getName(); - - XmlRootElement getXMLBinding(); - -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/WindowStateInfo.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/WindowStateInfo.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/WindowStateInfo.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,55 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.info; - -import org.jboss.portal.WindowState; -import org.jboss.portal.common.i18n.LocalizedString; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6818 $ - * @since 2.4 - */ -public interface WindowStateInfo -{ - /** - * The window state description. - * - * @return the window state description - */ - LocalizedString getDescription(); - - /** - * The window state value. - * - * @return the window state value - */ - WindowState getWindowState(); - - /** - * Retrieves the associated window state name. - * - * @return the associated window state name. - */ - String getWindowStateName(); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ActionInvocation.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ActionInvocation.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ActionInvocation.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,81 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation; - -import org.jboss.portal.portlet.spi.RequestContext; -import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.StateString; - -import java.util.Map; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public class ActionInvocation extends PortletInvocation -{ - - /** The request context. */ - protected RequestContext requestContext; - - /** . */ - protected StateString interactionState; - - /** . */ - protected Map<String, String[]> form; - - public ActionInvocation(PortletInvocationContext ctx) throws IllegalArgumentException - { - super(ctx); - } - - public StateString getInteractionState() - { - return interactionState; - } - - public void setInteractionState(StateString interactionState) - { - this.interactionState = interactionState; - } - - public Map<String, String[]> getForm() - { - return form; - } - - public void setForm(Map<String, String[]> form) - { - this.form = form; - } - - public RequestContext getRequestContext() - { - return requestContext; - } - - public void setRequestContext(RequestContext requestContext) - { - this.requestContext = requestContext; - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/EventInvocation.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/EventInvocation.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/EventInvocation.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,67 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation; - -import org.jboss.portal.portlet.spi.PortletInvocationContext; - -import javax.xml.namespace.QName; -import java.io.Serializable; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class EventInvocation extends PortletInvocation -{ - - /** . */ - private QName name; - - /** . */ - private Serializable payload; - - public EventInvocation(PortletInvocationContext ctx) throws IllegalArgumentException - { - super(ctx); - } - - public QName getName() - { - return name; - } - - public void setName(QName name) - { - this.name = name; - } - - public Serializable getPayload() - { - return payload; - } - - public void setPayload(Serializable payload) - { - this.payload = payload; - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/PortletInvocation.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,310 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation; - -import org.jboss.portal.common.invocation.AttributeResolver; -import org.jboss.portal.common.invocation.resolver.MapAttributeResolver; -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.ServerContext; -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.spi.ClientContext; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Map; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6765 $ - * @since 2.4 - */ -public abstract class PortletInvocation -{ - - /** . */ - protected final AttributeResolver attributes; - - /** . */ - protected StateString navigationalState; - - /** . */ - protected Map<String, String[]> publicNavigationalState; - - /** . */ - protected Mode mode; - - /** . */ - protected WindowState windowState; - - /** The target portlet. */ - protected PortletContext target; - - /** The portlet request attributes. */ - protected Map<String, Object> requestAttributes; - - /** The invocation context. */ - protected PortletInvocationContext ctx; - - /** The portal context. */ - protected PortalContext portalContext; - - /** The client context. */ - protected ClientContext clientContext; - - /** The server context. */ - protected ServerContext serverContext; - - /** The security context. */ - protected SecurityContext securityContext; - - /** The user context. */ - protected UserContext userContext; - - /** The instance context. */ - protected InstanceContext instanceContext; - - /** The window context. */ - protected WindowContext windowContext; - - /** The dispatched request. */ - protected HttpServletRequest dreq; - - /** The dispatched response. */ - protected HttpServletResponse dresp; - - /** - * Create an invocation to a portlet. - * - * @param ctx the portlet invocation context - * @throws IllegalArgumentException if the provided context is null - */ - protected PortletInvocation(PortletInvocationContext ctx) throws IllegalArgumentException - { - if (ctx == null) - { - throw new IllegalArgumentException(); - } - - // - this.ctx = ctx; - this.attributes = new MapAttributeResolver(); - } - - public PortletInvocationContext getContext() - { - return ctx; - } - - public PortletContext getTarget() - { - return target; - } - - public void setTarget(PortletContext target) - { - this.target = target; - } - - /** - * Returns the dispatched http servlet request. - * - * @return the dispatched response - */ - public HttpServletResponse getDispatchedResponse() - { - return dresp; - } - - /** - * Set the dispatched http servlet request. - * - * @param dresp the dispatched response - */ - public void setDispatchedResponse(HttpServletResponse dresp) - { - this.dresp = dresp; - } - - /** - * Returns the dispatched http servlet request. - * - * @return the dispatched request - */ - public HttpServletRequest getDispatchedRequest() - { - return dreq; - } - - /** - * Set the dispatched http servlet request. - * - * @param dreq the dispatched request - */ - public void setDispatchedRequest(HttpServletRequest dreq) - { - this.dreq = dreq; - } - - public StateString getNavigationalState() - { - return navigationalState; - } - - public void setNavigationalState(StateString navigationalState) - { - this.navigationalState = navigationalState; - } - - public Map<String, String[]> getPublicNavigationalState() - { - return publicNavigationalState; - } - - public void setPublicNavigationalState(Map<String, String[]> publicNavigationalState) - { - this.publicNavigationalState = publicNavigationalState; - } - - public Mode getMode() - { - return mode; - } - - public void setMode(Mode mode) - { - this.mode = mode; - } - - public WindowState getWindowState() - { - return windowState; - } - - public void setWindowState(WindowState windowState) - { - this.windowState = windowState; - } - - public PortalContext getPortalContext() - { - return portalContext; - } - - public void setPortalContext(PortalContext portalContext) - { - this.portalContext = portalContext; - } - - public ClientContext getClientContext() - { - return clientContext; - } - - public void setClientContext(ClientContext clientContext) - { - this.clientContext = clientContext; - } - - public ServerContext getServerContext() - { - return serverContext; - } - - public void setServerContext(ServerContext serverContext) - { - this.serverContext = serverContext; - } - - public SecurityContext getSecurityContext() - { - return securityContext; - } - - public void setSecurityContext(SecurityContext securityContext) - { - this.securityContext = securityContext; - } - - public UserContext getUserContext() - { - return userContext; - } - - public void setUserContext(UserContext userContext) - { - this.userContext = userContext; - } - - public InstanceContext getInstanceContext() - { - return instanceContext; - } - - public void setInstanceContext(InstanceContext instanceContext) - { - this.instanceContext = instanceContext; - } - - public WindowContext getWindowContext() - { - return windowContext; - } - - public void setWindowContext(WindowContext windowContext) - { - this.windowContext = windowContext; - } - - public Map<String, Object> getRequestAttributes() - { - return requestAttributes; - } - - public void setRequestAttributes(Map<String, Object> requestAttributes) - { - this.requestAttributes = requestAttributes; - } - - public void setAttribute(String attrKey, Object attrValue) - { - attributes.setAttribute(attrKey, attrValue); - } - - public Object getAttribute(String attrKey) - { - return attributes.getAttribute(attrKey); - } - - public void removeAttribute(Object attrKey) throws IllegalArgumentException - { - attributes.setAttribute(attrKey, null); - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/RenderInvocation.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/RenderInvocation.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/RenderInvocation.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,54 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation; - -import org.jboss.portal.portlet.spi.PortletInvocationContext; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public class RenderInvocation extends PortletInvocation -{ - - /** . */ - private String validationToken; - - public RenderInvocation(PortletInvocationContext ctx) throws IllegalArgumentException - { - super(ctx); - - // - this.ctx = ctx; - } - - public String getValidationToken() - { - return validationToken; - } - - public void setValidationToken(String validationToken) - { - this.validationToken = validationToken; - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ResourceInvocation.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ResourceInvocation.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/ResourceInvocation.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,121 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation; - -import org.jboss.portal.portlet.spi.RequestContext; -import org.jboss.portal.portlet.spi.PortletInvocationContext; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.cache.CacheLevel; - -import java.util.Map; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class ResourceInvocation extends PortletInvocation -{ - - /** The request context. */ - private RequestContext requestContext; - - /** . */ - private String validationToken; - - /** . */ - private String resourceId; - - /** . */ - private StateString resourceState; - - /** . */ - private Map<String, String[]> form; - - /** . */ - private CacheLevel cacheLevel; - - public ResourceInvocation(PortletInvocationContext ctx) throws IllegalArgumentException - { - super(ctx); - } - - public String getValidationToken() - { - return validationToken; - } - - public void setValidationToken(String validationToken) - { - this.validationToken = validationToken; - } - - public String getResourceId() - { - return resourceId; - } - - public void setResourceId(String resourceId) - { - this.resourceId = resourceId; - } - - public StateString getResourceState() - { - return resourceState; - } - - public void setResourceState(StateString resourceState) - { - this.resourceState = resourceState; - } - - public Map<String, String[]> getForm() - { - return form; - } - - public void setForm(Map<String, String[]> form) - { - this.form = form; - } - - public CacheLevel getCacheLevel() - { - return cacheLevel; - } - - public void setCacheLevel(CacheLevel cacheLevel) - { - this.cacheLevel = cacheLevel; - } - - public RequestContext getRequestContext() - { - return requestContext; - } - - public void setRequestContext(RequestContext requestContext) - { - this.requestContext = requestContext; - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ContentResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ContentResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ContentResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,166 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation.response; - -import java.util.Map; - -import org.jboss.portal.portlet.cache.CacheControl; - -/** - * Data produced. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5602 $ - */ -public class ContentResponse extends PortletInvocationResponse -{ - - /** . */ - public static final int TYPE_EMPTY = 0; - - /** . */ - public static final int TYPE_CHARS = 1; - - /** . */ - public static final int TYPE_BYTES = 2; - - /** . */ - private final ResponseProperties properties; - - /** . */ - private final Map<String, Object> attributes; - - /** The result content type if any. */ - private String contentType; - - /** . */ - private final byte[] bytes; - - /** . */ - private final String chars; - - /** . */ - private final CacheControl cacheControl; - - public ContentResponse( - ResponseProperties properties, - Map<String, Object> attributes, - String contentType, - byte[] bytes, - String chars, - CacheControl cacheControl) - { - this.properties = properties; - this.attributes = attributes; - this.contentType = contentType; - this.bytes = bytes; - this.chars = chars; - this.cacheControl = cacheControl; - } - - public ResponseProperties getProperties() - { - return properties; - } - - public CacheControl getCacheControl() - { - return cacheControl; - } - - public Map<String, Object> getAttributes() - { - return attributes; - } - - public int getType() - { - if (bytes == null) - { - if (chars == null) - { - return TYPE_EMPTY; - } - else - { - return TYPE_CHARS; - } - } - else - { - return TYPE_BYTES; - } - } - - /** - * Return the content as a string. - * - * @return the content - */ - public String getContent() - { - switch (getType()) - { - case TYPE_CHARS: - return getChars(); - case TYPE_BYTES: - return new String(bytes); - case TYPE_EMPTY: - return ""; - default: - throw new AssertionError(); - } - } - - /** - * Return the bytes of the content held by the fragment. - * - * @return the bytes - * @throws IllegalArgumentException if the type is not bytes - */ - public byte[] getBytes() throws IllegalArgumentException - { - return bytes; - } - - /** - * Return the chars of the content held by the fragment. - * - * @return the chars - * @throws IllegalArgumentException if the type is not chars - */ - public String getChars() throws IllegalArgumentException - { - return chars; - } - - /** - * Return the content type of the generated fragment. - * - * @return the content type - */ - public String getContentType() - { - return contentType; - } -} \ No newline at end of file Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ErrorResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ErrorResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ErrorResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,130 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation.response; - -import org.jboss.portal.common.util.Exceptions; -import org.apache.log4j.Logger; - -/** - * Application level error. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 7395 $ - */ -public class ErrorResponse extends PortletInvocationResponse -{ - /** The logged throwable if any. */ - private final Throwable cause; - - /** There must be one error message. */ - private final String message; - - public ErrorResponse(Throwable cause) - { - if (cause == null) - { - throw new IllegalArgumentException("There must be a cause"); - } - this.cause = cause; - this.message = cause.getMessage(); - } - - public ErrorResponse(String message, Throwable cause) - { - if (message == null) - { - throw new IllegalArgumentException("There must be a message"); - } - if (cause == null) - { - throw new IllegalArgumentException("There must be a cause"); - } - this.cause = cause; - this.message = message; - } - - public ErrorResponse(String message) - { - if (message == null) - { - throw new IllegalArgumentException("Message cannot be null."); - } - this.message = message; - this.cause = null; - } - - /** The throwable. Can be a null object. */ - public Throwable getCause() - { - return cause; - } - - /** The logged message. */ - public String getMessage() - { - if (message == null) - { - return cause.getClass().getName(); - } - - return message; - } - - /** - * Logs an error message to the specified logger, using either the message or this ErrorResult's Throwable if - * available. - * - * @param log - * @param logMessage - */ - public void logErrorTo(Logger log, String logMessage) - { - if (cause != null) - { - log.error(logMessage, cause); - } - else - { - log.error(logMessage + "\n" + message); - } - } - - /** - * Provides an HTML description of the error, using either the message or the encapsulated Throwable. - * - * @return - */ - public String toHTML() - { - if (cause != null) - { - return Exceptions.toHTML(cause); - } - else - { - StringBuffer sb = new StringBuffer(255); - sb.append("<div><code>").append(message).append("</code></div>"); - return sb.toString(); - } - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/FragmentResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/FragmentResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/FragmentResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,82 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation.response; - -import org.jboss.portal.portlet.cache.CacheControl; -import org.jboss.portal.Mode; - -import java.util.Set; -import java.util.Map; - -/** - * Data produced. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5602 $ - */ -public class FragmentResponse extends ContentResponse -{ - - /** The title if any. */ - private final String title; - - /** The next modes. */ - private final Set<Mode> nextModes; - - public FragmentResponse( - ResponseProperties properties, - Map<String, Object> attributes, - String contentType, - byte[] bytes, - String chars, - String title, - CacheControl cacheControl, - Set<Mode> nextModes) - { - super(properties, attributes, contentType, bytes, chars, cacheControl); - - // - this.title = title; - this.nextModes = nextModes; - } - - /** - * Return the fragment title. - * - * @return the title. - */ - public String getTitle() - { - return title; - } - - /** - * Returns the next modes. - * - * @return the next modes - */ - public Set<Mode> getNextModes() - { - return nextModes; - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/HTTPRedirectionResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/HTTPRedirectionResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/HTTPRedirectionResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,46 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation.response; - -/** - * Redirection to an HTTP location. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public class HTTPRedirectionResponse extends RedirectionResponse -{ - - /** . */ - protected final String location; - - public HTTPRedirectionResponse(String location) - { - this.location = location; - } - - public String getLocation() - { - return location; - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/InsufficientPrivilegesResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/InsufficientPrivilegesResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/InsufficientPrivilegesResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,31 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation.response; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5602 $ - */ -public class InsufficientPrivilegesResponse extends SecurityResponse -{ -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/InsufficientTransportGuaranteeResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/InsufficientTransportGuaranteeResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/InsufficientTransportGuaranteeResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,31 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation.response; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5602 $ - */ -public class InsufficientTransportGuaranteeResponse extends SecurityResponse -{ -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/PortletInvocationResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/PortletInvocationResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/PortletInvocationResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,33 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation.response; - -/** - * The base interface for all result objects. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public class PortletInvocationResponse -{ -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/RedirectionResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/RedirectionResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/RedirectionResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,33 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation.response; - -/** - * Redirection to something. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public abstract class RedirectionResponse extends PortletInvocationResponse -{ -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ResponseProperties.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ResponseProperties.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/ResponseProperties.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,87 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation.response; - -import org.jboss.portal.common.util.MultiValuedPropertyMap; -import org.jboss.portal.common.util.SimpleMultiValuedPropertyMap; -import org.w3c.dom.Element; - -import javax.servlet.http.Cookie; -import java.util.List; -import java.util.LinkedList; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public class ResponseProperties -{ - - /** . */ - private MultiValuedPropertyMap<String> transportHeaders = new SimpleMultiValuedPropertyMap<String>(); - - /** . */ - private MultiValuedPropertyMap<Element> markupHeaders = new SimpleMultiValuedPropertyMap<Element>(); - - /** . */ - private List<Cookie> cookies = new LinkedList<Cookie>(); - - public ResponseProperties() - { - } - - public MultiValuedPropertyMap<String> getTransportHeaders() - { - return transportHeaders; - } - - public MultiValuedPropertyMap<Element> getMarkupHeaders() - { - return markupHeaders; - } - - public List<Cookie> getCookies() - { - return cookies; - } - - public void append(ResponseProperties appended) - { - if (appended == null) - { - throw new IllegalArgumentException(); - } - - // - transportHeaders.append(appended.transportHeaders); - markupHeaders.append(appended.markupHeaders); - cookies.addAll(appended.cookies); - } - - public void clear() - { - transportHeaders.clear(); - markupHeaders.clear(); - cookies.clear(); - } -} \ No newline at end of file Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/RevalidateMarkupResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/RevalidateMarkupResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/RevalidateMarkupResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,50 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation.response; - -import org.jboss.portal.portlet.cache.CacheControl; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public class RevalidateMarkupResponse extends PortletInvocationResponse -{ - - /** . */ - private final CacheControl cacheControl; - - public RevalidateMarkupResponse(CacheControl cacheControl) - { - if (cacheControl == null) - { - throw new IllegalArgumentException(); - } - this.cacheControl = cacheControl; - } - - public CacheControl getCacheControl() - { - return cacheControl; - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/SecurityErrorResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/SecurityErrorResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/SecurityErrorResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,48 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation.response; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5602 $ - */ -public class SecurityErrorResponse extends SecurityResponse -{ - - /** . */ - private Throwable throwable; - - public SecurityErrorResponse(Throwable throwable) - { - if (throwable == null) - { - throw new IllegalArgumentException("There must be a throwable"); - } - this.throwable = throwable; - } - - public Throwable getThrowable() - { - return throwable; - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/SecurityResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/SecurityResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/SecurityResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,31 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation.response; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public class SecurityResponse extends PortletInvocationResponse -{ -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/StreamResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/StreamResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/StreamResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,60 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation.response; - -/** - * Stream a result to the client directly. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public class StreamResponse extends PortletInvocationResponse -{ - - private String contentType; - private byte[] bytes; - - public StreamResponse(String contentType, byte[] bytes) - { - if (contentType == null) - { - throw new IllegalArgumentException("Content type cannot be null"); - } - if (bytes == null) - { - throw new IllegalArgumentException("Bytes cannot be null"); - } - this.contentType = contentType; - this.bytes = bytes; - } - - public String getContentType() - { - return contentType; - } - - public byte[] getBytes() - { - return bytes; - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/UnavailableResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/UnavailableResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/UnavailableResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,61 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation.response; - -/** - * Portlet exists but cannot be used. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public class UnavailableResponse extends PortletInvocationResponse -{ - - /** . */ - private final boolean permanent; - - /** . */ - private final int seconds; - - public UnavailableResponse() - { - this.seconds = 0; - this.permanent = true; - } - - public UnavailableResponse(int seconds) - { - this.seconds = seconds; - this.permanent = false; - } - - public int getUnavailableSeconds() - { - return seconds; - } - - public boolean isPermanent() - { - return permanent; - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/UpdateNavigationalStateResponse.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/UpdateNavigationalStateResponse.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/invocation/response/UpdateNavigationalStateResponse.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,192 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.invocation.response; - -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; -import org.jboss.portal.portlet.StateString; - -import javax.xml.namespace.QName; -import java.util.Map; -import java.util.List; -import java.util.Collections; -import java.util.ArrayList; -import java.io.Serializable; - -/** - * Update the navigational state. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5477 $ - */ -public class UpdateNavigationalStateResponse extends PortletInvocationResponse -{ - - /** . */ - private ResponseProperties properties; - - /** The navigational state returned. */ - private StateString navigationalState; - - /** The new window state requested. */ - private WindowState windowState; - - /** The new mode requested. */ - private Mode mode; - - /** The attributes snapshot after the request. */ - private Map<String, Object> attributes; - - /** . */ - private List<Event> producedEvents; - - /** - * The update to the public parameters. Each entry having a zero length value must be interpeted as - * a public parameter removal otherwise it must be interpreted as a public parameter values update. - */ - protected Map<String, String[]> publicNavigationalStateUpdates; - - public UpdateNavigationalStateResponse() - { - navigationalState = null; - windowState = null; - mode = null; - publicNavigationalStateUpdates = null; - producedEvents = Collections.emptyList(); - } - - public ResponseProperties getProperties() - { - return properties; - } - - public void setProperties(ResponseProperties properties) - { - this.properties = properties; - } - - public Map<String, Object> getAttributes() - { - return attributes; - } - - public void setAttributes(Map<String, Object> attributes) - { - this.attributes = attributes; - } - - public Mode getMode() - { - return mode; - } - - public void setMode(Mode mode) - { - this.mode = mode; - } - - public WindowState getWindowState() - { - return windowState; - } - - public void setWindowState(WindowState windowState) - { - this.windowState = windowState; - } - - public StateString getNavigationalState() - { - return navigationalState; - } - - public void setNavigationalState(StateString state) - { - this.navigationalState = state; - } - - public Map<String, String[]> getPublicNavigationalStateUpdates() - { - return publicNavigationalStateUpdates; - } - - public void setPublicNavigationalStateUpdates(Map<String, String[]> publicNavigationalStateUpdates) - { - this.publicNavigationalStateUpdates = publicNavigationalStateUpdates; - } - - public void queueEvent(UpdateNavigationalStateResponse.Event event) - { - if (event == null) - { - throw new IllegalArgumentException("No null event accepted"); - } - - // - if (producedEvents.size() == 0) - { - producedEvents = new ArrayList<Event>(); - } - - // - producedEvents.add(event); - } - - public List<UpdateNavigationalStateResponse.Event> getEvents() - { - return producedEvents; - } - - /** - * An event produced by a state response. - */ - public static class Event - { - - /** The optional event. */ - private QName name; - - /** The optional event payload. */ - private Serializable payload; - - public Event(QName name, Serializable payload) - { - if (name == null) - { - throw new IllegalArgumentException(); - } - this.name = name; - this.payload = payload; - } - - public QName getName() - { - return name; - } - - public Serializable getPayload() - { - return payload; - } - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/ClientContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/ClientContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/ClientContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,47 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.spi; - -import org.jboss.portal.common.util.MultiValuedPropertyMap; - -import javax.servlet.http.Cookie; -import java.util.List; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public interface ClientContext -{ - - String getMethod(); - - /** - * Returns the properties as seen by the client. - * - * @return the properties - */ - MultiValuedPropertyMap<String> getProperties(); - - List<Cookie> getCookies(); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/InstanceContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/InstanceContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/InstanceContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,54 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.spi; - -import org.jboss.portal.portlet.StateEvent; -import org.jboss.portal.portlet.state.AccessMode; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public interface InstanceContext -{ - /** - * Return an id that can differenciate instances. - * - * @return the instance id - */ - String getId(); - - /** - * Return the access mode to this portlet instance. - * - * @return the access mode - */ - AccessMode getAccessMode(); - - /** - * A state event occured. - * - * @param event the event - */ - void onStateEvent(StateEvent event); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/PortalContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/PortalContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/PortalContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,69 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.spi; - -import org.jboss.portal.Mode; -import org.jboss.portal.WindowState; -import org.jboss.portal.common.util.Version; - -import java.util.Map; -import java.util.Set; - -/** - * Represent the context of the portal that performs the invocation. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6720 $ - */ -public interface PortalContext -{ - public static final Version VERSION = new Version("JBoss Portlet Container", 2, 0, 8, new Version.Qualifier(Version.Qualifier.Prefix.SNAPSHOT), "Community"); - - /** - * Return info about the portal. - * - * @return portal infos - */ - String getInfo(); - - /** - * Return the window states accepted by this portal context. - * - * @return the window states - */ - Set<WindowState> getWindowStates(); - - /** - * Return the modes accepted by this portal context. - * - * @return the modes - */ - Set<Mode> getModes(); - - /** - * Return the set of properties of this portal context. - * - * @return the properties - */ - Map<String, String> getProperties(); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/PortletInvocationContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/PortletInvocationContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/PortletInvocationContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,83 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.spi; - -import java.io.IOException; -import java.io.Writer; - -import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.portlet.ContainerURL; -import org.jboss.portal.portlet.URLFormat; - -/** - * Contract that defines what input/services the caller of a portlet container must provide. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5064 $ - */ -public interface PortletInvocationContext -{ - - /** - * todo : move me to client content // see if it is still needed with CC/PP - * - * Return information about the underlying http wire this invocation is performed. - * - * @return the stream info - */ - MarkupInfo getMarkupInfo(); - - /** - * <p>Encodes the specified URL by including the session ID in it, or, if encoding is not needed, returns the URL - * unchanged. The implementation of this method includes the logic to determine whether the session ID needs to be - * encoded in the URL. For example, if the browser supports cookies, or session tracking is turned off, URL encoding - * is unnecessary.</p> - * <p/> - * <p>For robust session tracking, all URLs emitted by a servlet should be run through this method. Otherwise, URL - * rewriting cannot be used with browsers which do not support cookies.</p> - * - * @param url the url to be encoded - * @return the encoded URL if encoding is needed, the unchanged URL otherwise - * @throws IllegalArgumentException if the url is not valid or null - */ - String encodeResourceURL(String url) throws IllegalArgumentException; - - /** - * Renders a container URL. - * - * @param containerURL the portlet url - * @param format the url format - * @return the rendered url - */ - String renderURL(ContainerURL containerURL, URLFormat format); - - /** - * Renders a container URL. - * - * @param writer the writer - * @param containerURL the portlet url - * @param format the url format - * @throws IOException any IOException thrown by the writer - */ - void renderURL(Writer writer, ContainerURL containerURL, URLFormat format) throws IOException; -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/RequestContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/RequestContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/RequestContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,93 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.spi; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 630 $ - */ -public interface RequestContext -{ - /** - * Returns the name of the character encoding used in the body of this request. This method returns <code>null</code> - * if the request does not specify a character encoding. - * - * @return a <code>String</code> containing the name of the chararacter encoding, or <code>null</code> if the - * request does not specify a character encoding. - */ - String getCharacterEncoding(); - - /** - * Returns the length, in bytes, of the request body which is made available by the input stream, or -1 if the length - * is not known. - * - * @return an integer containing the length of the request body or -1 if the length is not known - */ - int getContentLength(); - - /** - * Returns the MIME type of the body of the request, or null if the type is not known. - * - * @return a <code>String</code> containing the name of the MIME type of the request, or null if the type is not - * known. - */ - String getContentType(); - - /** - * Retrieves the body of the HTTP request from the client to the portal as character data using a - * <code>BufferedReader</code>. The reader translates the character data according to the character encoding used on - * the body. Either this method or {@link #getInputStream} may be called to read the body, not both. - * <p/> - * For HTTP POST data of type application/x-www-form-urlencoded this method throws an - * <code>IllegalStateException</code> as this data has been already processed by the portal/portlet-container and is - * available as request parameters. - * - * @throws java.io.UnsupportedEncodingException if the character set encoding used is not supported and - * the text cannot be decoded - * @throws java.lang.IllegalStateException if {@link #getInputStream} method has been called on this request, - * it is a HTTP POST data of type application/x-www-form-urlencoded. - * @throws java.io.IOException if an input or output exception occurred - * @return a <code>BufferedReader</code> containing the body of the request - * @see #getInputStream - */ - BufferedReader getReader() throws IOException; - - /** - * Retrieves the body of the HTTP request from client to portal as binary data using an <CODE>InputStream</CODE>. - * Either this method or {@link #getReader} may be called to read the body, but not both. - * <p/> - * For HTTP POST data of type application/x-www-form-urlencoded this method throws an - * <code>IllegalStateException</code> as this data has been already processed by the portal/portlet-container and is - * available as request parameters. - * - * @return an input stream containing the body of the request - * @throws java.lang.IllegalStateException if getReader was already called, or it is a HTTP POST data of type - * application/x-www-form-urlencoded - * @throws java.io.IOException if an input or output exception occurred - */ - InputStream getInputStream() throws IOException, IllegalStateException; -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/SecurityContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/SecurityContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/SecurityContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,63 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.spi; - -import java.security.Principal; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public interface SecurityContext -{ - /** - * @return true if is secured - */ - boolean isSecure(); - - /** - * @return true if it is authenticated - */ - boolean isAuthenticated(); - - /** - * @return the auth type - */ - String getAuthType(); - - /** - * @return the remote user - */ - String getRemoteUser(); - - /** - * @return the user principal - */ - Principal getUserPrincipal(); - - /** - * @param roleName the role name - * @return true if the user is in role - */ - boolean isUserInRole(String roleName); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/ServerContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/ServerContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/ServerContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,72 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.spi; - -import org.jboss.portal.web.RequestDispatchCallback; -import org.jboss.portal.web.ServletContainer; - -import javax.servlet.ServletContext; - -/** - * Defines the request context contract. It's usage is related to the Servlet Container operational - * environment. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6929 $ - */ -public interface ServerContext -{ - /** - * Return the scheme value. - * - * @return the scheme - */ - String getScheme(); - - /** - * Return the server name value. - * - * @return the server name - */ - String getServerName(); - - /** - * Return the server port value. - * - * @return the server port - */ - int getServerPort(); - - /** - * Delegate to the request context the dispatching to the target servlet context using the specified spi elements. - * - * @param servletContainer the servlet container spi - * @param targetServletContext the target servlet context - * @param callback the call back to be done after dispatch - * @param handback the hand back object to provide after dispatch to the call back - * @return the call back returned object - * @throws Exception any exception - */ - Object dispatch(ServletContainer servletContainer, ServletContext targetServletContext, RequestDispatchCallback callback, Object handback) throws Exception; - -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/UserContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/UserContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/UserContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,82 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.spi; - -import java.util.List; -import java.util.Locale; -import java.util.Map; - -/** - * The user context valid during the scope of a single request. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public interface UserContext -{ - - /** - * Retrieves the user id or null if it is not known. - * - * @return the user id - */ - String getId(); - - /** - * The user profile information keyed by P3PConstants - * - * @return a map containing user profile informaton - * @see org.jboss.portal.common.p3p.P3PConstants - */ - Map<String, String> getInformations(); - - /** - * Return the user locale. - * - * @return the user locale. - */ - Locale getLocale(); - - /** - * Retrieves the locales that the user is willing to receive information in. - * - * @return the locales ordered according to user preference (preferred first). - */ - List<Locale> getLocales(); - - /** - * Set an attribute related to the user identity. - * - * @param attrKey the attribute key - * @param attrValue the attribute value - */ - void setAttribute(String attrKey, Object attrValue); - - /** - * Returns an attribute related to the user identity. - * - * @param attrKey the attribute key - * @return the attribute value - */ - Object getAttribute(String attrKey); -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/WindowContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/WindowContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/spi/WindowContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,37 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.spi; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public interface WindowContext -{ - /** - * Return an id that can differenciate windows. - * - * @return the window id - */ - String getId(); -} Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,6 +22,11 @@ ******************************************************************************/ package org.jboss.portal.portlet.state; +import org.jboss.portal.portlet.api.state.PropertyMap; +import org.jboss.portal.portlet.api.state.PropertyContext; +import org.jboss.portal.portlet.api.state.PropertyChange; +import org.jboss.portal.portlet.api.state.AccessMode; + import java.util.Collections; import java.util.Set; import java.util.List; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyMap.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyMap.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AbstractPropertyMap.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,6 +23,7 @@ package org.jboss.portal.portlet.state; import org.jboss.portal.common.util.TypedMap; +import org.jboss.portal.portlet.api.state.PropertyMap; import java.util.Map; import java.util.List; Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AccessMode.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AccessMode.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/AccessMode.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,55 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.state; - -/** - * Type safe enumeration for the access mode to a portlet. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5776 $ - */ -public enum AccessMode -{ - - /** Read only access mode. */ - READ_ONLY("READ_ONLY"), - - /** Read write access mode. */ - READ_WRITE("READ_WRITE"), - - /** Clone before write access mode. */ - CLONE_BEFORE_WRITE("CLONE_BEFORE_WRITE"); - - /** The type as a string. */ - private final String name; - - private AccessMode(String name) - { - this.name = name; - } - - public String toString() - { - return name; - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/DestroyCloneFailure.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/DestroyCloneFailure.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/DestroyCloneFailure.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,86 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.state; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5893 $ - */ -public class DestroyCloneFailure -{ - - /** The clone id. */ - private final String portletId; - - /** . */ - private final String message; - - public DestroyCloneFailure(String portletId, String message) - { - if (portletId == null) - { - throw new IllegalArgumentException("Must provide a portlet id"); - } - this.portletId = portletId; - this.message = message; - } - - public DestroyCloneFailure(String portletId) - { - this(portletId, null); - } - - public String getPortletId() - { - return portletId; - } - - public String getMessage() - { - return message; - } - - public String toString() - { - return "DestroyCloneFailure[" + portletId + "," + message + "]"; - } - - public int hashCode() - { - return portletId.hashCode(); - } - - public boolean equals(Object obj) - { - if (obj == this) - { - return true; - } - if (obj instanceof DestroyCloneFailure) - { - DestroyCloneFailure that = (DestroyCloneFailure)obj; - return portletId.equals(that.portletId); - } - return false; - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/Property.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/Property.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/Property.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,55 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.state; - -import java.util.List; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5950 $ - */ -public class Property -{ - - /** The property name. */ - protected String name; - - /** The property value. */ - protected List<String> value; - - public Property(String name, List<String> value) - { - this.name = name; - this.value = value; - } - - public String getName() - { - return name; - } - - public List<String> getValue() - { - return value; - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyChange.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyChange.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyChange.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,145 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.state; - -import java.util.List; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Arrays; - -/** - * A property change. The class is immutable - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5776 $ - */ -public class PropertyChange -{ - - /** The change is an update of the property value. */ - public static final int PREF_UPDATE = 0; - - /** The change is a reset of the property value. */ - public static final int PREF_RESET = 1; - - /** The key. */ - private final String key; - - /** The immutable value. */ - private final List<String> value; - - /** - * Create a new property update, the list of values will be clone for safety. - * - * @param key the property key - * @param value the property value - * @return an instance representing a property update - */ - public static PropertyChange newUpdate(String key, String value) - { - return new PropertyChange(key, Collections.singletonList(value)); - } - - /** - * Create a new property update, the list of values will be clone for safety. - * - * @param key the property key - * @param value the property value - * @return an instance representing a property update - */ - public static PropertyChange newUpdate(String key, String[] value) - { - if (value == null) - { - throw new IllegalArgumentException("No value provided"); - } - return new PropertyChange(key, Collections.unmodifiableList(Arrays.asList(value.clone()))); - } - - /** - * Create a new property update, the list of values will be clone for safety. - * - * @param key the property key - * @param value the property value - * @return an instance representing a property update - */ - public static PropertyChange newUpdate(String key, List<String> value) - { - if (value == null) - { - throw new IllegalArgumentException("No value provided"); - } - return new PropertyChange(key, Collections.unmodifiableList(new ArrayList<String>(value))); - } - - /** - * Create a new property reset. - * - * @param key the property key - * @return an instance representing a property reset - */ - public static PropertyChange newReset(String key) - { - return new PropertyChange(key, null); - } - - private PropertyChange(String key, List<String> value) - { - if (key == null) - { - throw new IllegalArgumentException("No key provided"); - } - this.key = key; - this.value = value; - } - - /** - * Return the property change type. - * - * @return the property change type - */ - public int getType() - { - return value == null ? PREF_RESET : PREF_UPDATE; - } - - /** - * Return the property key - * - * @return the property key - */ - public String getKey() - { - return key; - } - - /** - * Return the new value or null in case of a property reset. - * - * @return the property value - */ - public List<String> getValue() - { - return value; - } -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyContext.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,73 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.state; - -import java.util.Set; -import java.util.List; - -/** - * Exposes to the portlet the interface to deal with the personalization state. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6757 $ - */ -public interface PropertyContext -{ - - /** The attribute name under which the preferences can be accessed. */ - String PREFERENCES_ATTRIBUTE = "preferences"; - - /** - * Return an immutable set of keys. - * - * @return the set of keys - */ - Set<String> getKeys(); - - /** - * Return for a specified key an immutable list of its values or null if the value does not exist. - * - * @param key the lookup key - * @return the key value or null if it does not exist - * @throws IllegalArgumentException if the key is null - */ - List<String> getValue(String key) throws IllegalArgumentException; - - /** - * Return true if the preferences are globally read only. The value returned by this method is valid only during - * the action request. Any call to this method during the render request will produce a non accurate value. - * - * @return true if the preferences are read only - * @throws IllegalStateException if this is called during render phase - */ - boolean isReadOnly() throws IllegalStateException; - - /** - * Update the preferences. - * - * @param changes the list of changes - * @throws IllegalStateException if the preferences is not writable - * @throws IllegalArgumentException if any change is not valid - */ - void update(PropertyChange[] changes) throws IllegalStateException; -} Deleted: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyMap.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyMap.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/PropertyMap.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -1,53 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.jboss.portal.portlet.state; - -import java.util.Map; -import java.util.List; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 6643 $ - */ -public interface PropertyMap extends Map<String, List<String>> -{ - /** - * Return the value for the given key or null if it does not exist. - * - * @param key the requested key - * @return the requested value or null if it does not exist - * @throws IllegalArgumentException if the key is null - */ - List<String> getProperty(String key) throws IllegalArgumentException; - - /** - * Update the value of the given key. If the value object is null it means that the entry must be removed. - * Implementation can throw an unsupported operation exception when it is abnormal to perform an update. - * - * @param key the key to update - * @param value the new value - * @throws UnsupportedOperationException if the operation is not supported - * @throws IllegalArgumentException if the key is null - */ - void setProperty(String key, List<String> value) throws IllegalArgumentException, UnsupportedOperationException; -} Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/SimplePropertyMap.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/SimplePropertyMap.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/SimplePropertyMap.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,6 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.state; +import org.jboss.portal.portlet.api.state.PropertyMap; + import java.util.HashMap; import java.util.Map; import java.util.List; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortlet.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortlet.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortlet.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.portlet.state.consumer; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletContext; +import org.jboss.portal.portlet.api.info.PortletInfo; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,22 +23,22 @@ package org.jboss.portal.portlet.state.consumer; import org.jboss.portal.common.NotYetImplemented; -import org.jboss.portal.portlet.InvalidPortletIdException; -import org.jboss.portal.portlet.NoSuchPortletException; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.StateEvent; +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.PortletContext; +import org.jboss.portal.portlet.api.StateEvent; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.state.PropertyMap; import org.jboss.portal.portlet.PortletInvokerInterceptor; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.spi.InstanceContext; -import org.jboss.portal.portlet.state.AccessMode; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.spi.InstanceContext; +import org.jboss.portal.portlet.api.state.AccessMode; import org.jboss.portal.portlet.state.InvalidStateIdException; import org.jboss.portal.portlet.state.NoSuchStateException; -import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.portlet.state.PropertyMap; -import org.jboss.portal.portlet.state.DestroyCloneFailure; +import org.jboss.portal.portlet.api.state.PropertyChange; +import org.jboss.portal.portlet.api.state.DestroyCloneFailure; import java.util.ArrayList; import java.util.List; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/PortletState.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/PortletState.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/PortletState.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.state.producer; -import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.portlet.api.state.PropertyMap; import org.jboss.portal.portlet.state.SimplePropertyMap; import java.io.Serializable; Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/PortletStatePersistenceManager.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/PortletStatePersistenceManager.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/PortletStatePersistenceManager.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,7 +24,7 @@ import org.jboss.portal.portlet.state.InvalidStateIdException; import org.jboss.portal.portlet.state.NoSuchStateException; -import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.portlet.api.state.PropertyMap; /** * An abstraction for enabling state management on the producer side. Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortlet.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortlet.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortlet.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.portlet.state.producer; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletContext; +import org.jboss.portal.portlet.api.info.PortletInfo; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,36 +23,36 @@ package org.jboss.portal.portlet.state.producer; import org.jboss.portal.common.invocation.InvocationException; -import org.jboss.portal.portlet.InvalidPortletIdException; -import org.jboss.portal.portlet.NoSuchPortletException; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.StateEvent; -import org.jboss.portal.portlet.StatefulPortletContext; -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.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.invocation.ResourceInvocation; +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.StatefulPortletContext; +import org.jboss.portal.portlet.api.PortletContext; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.StateEvent; +import org.jboss.portal.portlet.api.state.PropertyMap; +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.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.EventInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.RenderInvocation; +import org.jboss.portal.portlet.api.invocation.ResourceInvocation; import org.jboss.portal.portlet.PortletInvokerInterceptor; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.spi.InstanceContext; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.spi.InstanceContext; import org.jboss.portal.portlet.state.AbstractPropertyContext; -import org.jboss.portal.portlet.state.AccessMode; -import org.jboss.portal.portlet.state.DestroyCloneFailure; +import org.jboss.portal.portlet.api.state.AccessMode; +import org.jboss.portal.portlet.api.state.DestroyCloneFailure; import org.jboss.portal.portlet.state.InvalidStateIdException; import org.jboss.portal.portlet.state.NoSuchStateException; -import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.portlet.api.state.PropertyChange; +import org.jboss.portal.portlet.api.state.PropertyContext; import org.jboss.portal.portlet.state.SimplePropertyMap; import org.jboss.portal.portlet.state.StateConversionException; import org.jboss.portal.portlet.state.StateConverter; import org.jboss.portal.portlet.state.StateManagementPolicy; -import org.jboss.portal.portlet.state.PropertyContext; import org.apache.log4j.Logger; import java.util.ArrayList; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/container/PortletContainerObjectSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/container/PortletContainerObjectSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/container/PortletContainerObjectSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,10 +23,10 @@ package org.jboss.portal.portlet.container; import org.jboss.portal.portlet.container.object.PortletContainerObject; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.info.PortletInfo; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.PortletInvokerException; import org.jboss.portal.common.invocation.InvocationException; import java.util.Map; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletInvokerSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletInvokerSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletInvokerSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,19 +22,19 @@ ******************************************************************************/ package org.jboss.portal.portlet.support; -import org.jboss.portal.portlet.InvalidPortletIdException; -import org.jboss.portal.portlet.NoSuchPortletException; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.PortletInvoker; -import org.jboss.portal.portlet.PortletInvokerException; +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.PortletContext; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.PortletInvoker; +import org.jboss.portal.portlet.api.state.PropertyMap; import org.jboss.portal.portlet.support.info.PortletInfoSupport; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.state.PropertyChange; +import org.jboss.portal.portlet.api.state.DestroyCloneFailure; import org.jboss.portal.portlet.state.SimplePropertyMap; -import org.jboss.portal.portlet.state.DestroyCloneFailure; import java.util.HashMap; import java.util.HashSet; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,16 +22,16 @@ ******************************************************************************/ package org.jboss.portal.portlet.support; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.Portlet; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.PortletContext; +import org.jboss.portal.portlet.api.Portlet; import org.jboss.portal.portlet.support.info.PortletInfoSupport; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.EventInvocation; +import org.jboss.portal.portlet.api.invocation.RenderInvocation; +import org.jboss.portal.portlet.api.invocation.ResourceInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; import static org.jboss.unit.api.Assert.*; import java.util.ArrayList; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CacheInfoSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CacheInfoSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CacheInfoSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.support.info; -import org.jboss.portal.portlet.info.CacheInfo; +import org.jboss.portal.portlet.api.info.CacheInfo; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.portlet.support.info; -import org.jboss.portal.portlet.info.CapabilitiesInfo; -import org.jboss.portal.portlet.info.ModeInfo; -import org.jboss.portal.portlet.info.WindowStateInfo; +import org.jboss.portal.portlet.api.info.CapabilitiesInfo; +import org.jboss.portal.portlet.api.info.ModeInfo; +import org.jboss.portal.portlet.api.info.WindowStateInfo; import org.jboss.portal.Mode; import org.jboss.portal.WindowState; import org.jboss.portal.common.net.media.MediaType; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventInfoSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventInfoSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventInfoSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.support.info; -import org.jboss.portal.portlet.info.EventInfo; -import org.jboss.portal.portlet.info.TypeInfo; +import org.jboss.portal.portlet.api.info.EventInfo; +import org.jboss.portal.portlet.api.info.TypeInfo; import org.jboss.portal.common.i18n.LocalizedString; import javax.xml.namespace.QName; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventingInfoSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventingInfoSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventingInfoSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.support.info; -import org.jboss.portal.portlet.info.EventingInfo; +import org.jboss.portal.portlet.api.info.EventingInfo; import javax.xml.namespace.QName; import java.util.Collections; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/MetaInfoSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/MetaInfoSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/MetaInfoSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.support.info; import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.portlet.info.MetaInfo; +import org.jboss.portal.portlet.api.info.MetaInfo; import java.util.HashMap; import java.util.Locale; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ModeInfoSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ModeInfoSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ModeInfoSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,7 +24,7 @@ import org.jboss.portal.Mode; import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.portlet.info.ModeInfo; +import org.jboss.portal.portlet.api.info.ModeInfo; import java.util.Locale; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.support.info; -import org.jboss.portal.portlet.info.NavigationInfo; -import org.jboss.portal.portlet.info.ParameterInfo; +import org.jboss.portal.portlet.api.info.NavigationInfo; +import org.jboss.portal.portlet.api.info.ParameterInfo; import javax.xml.namespace.QName; import java.util.Collection; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ParameterInfoSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ParameterInfoSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ParameterInfoSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.support.info; -import org.jboss.portal.portlet.info.ParameterInfo; +import org.jboss.portal.portlet.api.info.ParameterInfo; import org.jboss.portal.common.i18n.LocalizedString; import javax.xml.namespace.QName; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.portlet.support.info; -import org.jboss.portal.portlet.info.CapabilitiesInfo; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.info.RuntimeOptionInfo; +import org.jboss.portal.portlet.api.info.CapabilitiesInfo; +import org.jboss.portal.portlet.api.info.PortletInfo; +import org.jboss.portal.portlet.api.info.RuntimeOptionInfo; import java.util.Map; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferenceInfoSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferenceInfoSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferenceInfoSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.support.info; import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.portlet.info.PreferenceInfo; +import org.jboss.portal.portlet.api.info.PreferenceInfo; import java.util.Locale; import java.util.List; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.support.info; -import org.jboss.portal.portlet.info.PreferenceInfo; -import org.jboss.portal.portlet.info.PreferencesInfo; +import org.jboss.portal.portlet.api.info.PreferenceInfo; +import org.jboss.portal.portlet.api.info.PreferencesInfo; import java.util.HashMap; import java.util.Map; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,8 +23,8 @@ package org.jboss.portal.portlet.support.info; import org.jboss.portal.common.util.Tools; -import org.jboss.portal.portlet.TransportGuarantee; -import org.jboss.portal.portlet.info.SecurityInfo; +import org.jboss.portal.portlet.api.TransportGuarantee; +import org.jboss.portal.portlet.api.info.SecurityInfo; import java.util.Set; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/TypeInfoSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/TypeInfoSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/TypeInfoSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.support.info; -import org.jboss.portal.portlet.info.TypeInfo; +import org.jboss.portal.portlet.api.info.TypeInfo; import javax.xml.bind.annotation.XmlRootElement; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/WindowStateInfoSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/WindowStateInfoSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/WindowStateInfoSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,7 +24,7 @@ import org.jboss.portal.WindowState; import org.jboss.portal.common.i18n.LocalizedString; -import org.jboss.portal.portlet.info.WindowStateInfo; +import org.jboss.portal.portlet.api.info.WindowStateInfo; import java.util.Locale; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/ClientContextSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/ClientContextSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/ClientContextSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,12 +22,11 @@ ******************************************************************************/ package org.jboss.portal.portlet.support.spi; -import org.jboss.portal.portlet.spi.ClientContext; +import org.jboss.portal.portlet.api.spi.ClientContext; import org.jboss.portal.common.util.MultiValuedPropertyMap; import javax.servlet.http.Cookie; import java.util.List; -import java.util.Set; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,9 +22,9 @@ ******************************************************************************/ package org.jboss.portal.portlet.support.spi; -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.StateEvent; +import org.jboss.portal.portlet.api.spi.InstanceContext; +import org.jboss.portal.portlet.api.state.AccessMode; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,9 +24,9 @@ import org.jboss.portal.common.invocation.AbstractInvocationContext; import org.jboss.portal.common.util.MarkupInfo; -import org.jboss.portal.portlet.ContainerURL; -import org.jboss.portal.portlet.URLFormat; -import org.jboss.portal.portlet.spi.PortletInvocationContext; +import org.jboss.portal.portlet.api.ContainerURL; +import org.jboss.portal.portlet.api.URLFormat; +import org.jboss.portal.portlet.api.spi.PortletInvocationContext; import java.io.Writer; import java.io.IOException; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/RequestContextSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/RequestContextSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/RequestContextSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.support.spi; -import org.jboss.portal.portlet.spi.RequestContext; +import org.jboss.portal.portlet.api.spi.RequestContext; import java.io.BufferedReader; import java.io.IOException; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.support.spi; -import org.jboss.portal.portlet.spi.SecurityContext; +import org.jboss.portal.portlet.api.spi.SecurityContext; import java.security.Principal; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/UserContextSupport.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/UserContextSupport.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/UserContextSupport.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.portlet.support.spi; -import org.jboss.portal.portlet.spi.UserContext; +import org.jboss.portal.portlet.api.spi.UserContext; import java.util.List; import java.util.Locale; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/StateStringTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/StateStringTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/StateStringTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,9 +23,9 @@ package org.jboss.portal.test.portlet; import org.jboss.portal.common.util.MapBuilder; -import org.jboss.portal.portlet.OpaqueStateString; -import org.jboss.portal.portlet.ParametersStateString; -import org.jboss.portal.portlet.StateString; +import org.jboss.portal.portlet.api.OpaqueStateString; +import org.jboss.portal.portlet.api.ParametersStateString; +import org.jboss.portal.portlet.api.StateString; import static org.jboss.unit.api.Assert.assertEquals; import org.jboss.unit.api.pojo.annotations.Test; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/CacheInfoTest.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/CacheInfoTest.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/CacheInfoTest.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,8 +23,8 @@ package org.jboss.portal.test.portlet.info; import org.jboss.portal.portlet.container.managed.ManagedPortletContainer; -import org.jboss.portal.portlet.info.CacheInfo; -import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.api.info.CacheInfo; +import org.jboss.portal.portlet.api.info.PortletInfo; import static org.jboss.unit.api.Assert.*; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -27,10 +27,10 @@ import org.jboss.portal.WindowState; import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.portlet.container.managed.ManagedPortletContainer; -import org.jboss.portal.portlet.info.CapabilitiesInfo; -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.info.CapabilitiesInfo; +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 static org.jboss.unit.api.Assert.*; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/MetaInfoTest.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/MetaInfoTest.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/MetaInfoTest.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,8 +24,8 @@ import org.jboss.portal.common.i18n.LocalizedString; import org.jboss.portal.portlet.container.managed.ManagedPortletContainer; -import org.jboss.portal.portlet.info.MetaInfo; -import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.api.info.MetaInfo; +import org.jboss.portal.portlet.api.info.PortletInfo; import static org.jboss.unit.api.Assert.*; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/ModeInfoTest.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/ModeInfoTest.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/ModeInfoTest.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,8 +25,8 @@ import org.jboss.portal.Mode; import org.jboss.portal.common.net.media.MediaType; import org.jboss.portal.portlet.container.managed.ManagedPortletContainer; -import org.jboss.portal.portlet.info.CapabilitiesInfo; -import org.jboss.portal.portlet.info.ModeInfo; +import org.jboss.portal.portlet.api.info.CapabilitiesInfo; +import org.jboss.portal.portlet.api.info.ModeInfo; import static org.jboss.unit.api.Assert.*; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,7 +25,7 @@ import org.jboss.portal.portlet.container.managed.ManagedPortletContainer; import org.jboss.portal.portlet.impl.info.ContainerPreferenceInfo; import org.jboss.portal.portlet.impl.info.ContainerPreferencesInfo; -import org.jboss.portal.portlet.info.PortletInfo; +import org.jboss.portal.portlet.api.info.PortletInfo; import static org.jboss.unit.api.Assert.*; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/SecurityInfoTest.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,10 +22,10 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.info; -import org.jboss.portal.portlet.TransportGuarantee; +import org.jboss.portal.portlet.api.TransportGuarantee; import org.jboss.portal.portlet.container.managed.ManagedPortletContainer; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.info.SecurityInfo; +import org.jboss.portal.portlet.api.info.PortletInfo; +import org.jboss.portal.portlet.api.info.SecurityInfo; import static org.jboss.unit.api.Assert.*; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/ActionURLTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/ActionURLTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/ActionURLTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -29,9 +29,6 @@ import org.jboss.portal.unit.base.AbstractUniversalTestPortlet; import org.jboss.portal.unit.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.impl.jsr168.api.PortletURLImpl; -import org.jboss.portal.portlet.impl.jsr168.api.PortletRequestImpl; import org.jboss.unit.driver.DriverResponse; import org.jboss.unit.driver.response.EndTestResponse; import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; @@ -45,7 +42,6 @@ import javax.portlet.WindowState; import javax.portlet.PortletMode; import java.io.IOException; -import java.io.StringWriter; /** * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/TaglibTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/TaglibTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr168/ext/taglib/TaglibTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,34 +22,19 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.jsr168.ext.taglib; -import org.jboss.portal.unit.PortletTestCase; import org.jboss.portal.unit.PortletTestContext; -import org.jboss.portal.unit.actions.PortletRenderTestAction; -import org.jboss.portal.unit.actions.ServletServiceTestAction; -import org.jboss.portal.test.portlet.framework.UTP1; -import org.jboss.portal.test.portlet.framework.UTS1; -import org.jboss.portal.unit.annotations.TestCase; -import org.jboss.portal.unit.PortletTestContext; -import org.jboss.portal.unit.base.AbstractUniversalTestPortlet; -import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor; import org.jboss.unit.driver.DriverResponse; import org.jboss.unit.driver.response.EndTestResponse; import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; import static org.jboss.unit.api.Assert.assertEquals; -import javax.portlet.Portlet; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; -import javax.portlet.PortletSession; import javax.portlet.PortletRequestDispatcher; import javax.portlet.PortletException; import javax.portlet.PortletRequest; -import javax.servlet.Servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import java.io.IOException; import java.io.Writer; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/DispatchedContainerAttributesTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/DispatchedContainerAttributesTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/DispatchedContainerAttributesTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -32,7 +32,7 @@ import org.jboss.portal.unit.actions.PortletResourceTestAction; import org.jboss.portal.test.portlet.framework.UTP1; import org.jboss.portal.test.portlet.framework.UTS1; -import org.jboss.portal.portlet.LifeCyclePhase; +import org.jboss.portal.portlet.api.LifeCyclePhase; import org.jboss.portal.common.util.Tools; import org.jboss.unit.driver.DriverResponse; import org.jboss.unit.driver.response.EndTestResponse; @@ -61,7 +61,6 @@ import java.util.Map; import java.util.HashMap; import java.util.Set; -import java.util.HashSet; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NFRFContainerAttributesTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NFRFContainerAttributesTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NFRFContainerAttributesTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,7 +25,7 @@ import org.jboss.portal.unit.PortletTestCase; import org.jboss.portal.unit.Assertion; import org.jboss.portal.unit.annotations.TestCase; -import org.jboss.portal.portlet.LifeCyclePhase; +import org.jboss.portal.portlet.api.LifeCyclePhase; import javax.portlet.PortletRequestDispatcher; import javax.portlet.PortletRequest; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NFRIContainerAttributesTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NFRIContainerAttributesTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NFRIContainerAttributesTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,7 +25,7 @@ import org.jboss.portal.unit.PortletTestCase; import org.jboss.portal.unit.Assertion; import org.jboss.portal.unit.annotations.TestCase; -import org.jboss.portal.portlet.LifeCyclePhase; +import org.jboss.portal.portlet.api.LifeCyclePhase; import javax.portlet.PortletRequestDispatcher; import javax.portlet.PortletRequest; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NIRFContainerAttributesTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NIRFContainerAttributesTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/NIRFContainerAttributesTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,7 +25,7 @@ import org.jboss.portal.unit.PortletTestCase; import org.jboss.portal.unit.Assertion; import org.jboss.portal.unit.annotations.TestCase; -import org.jboss.portal.portlet.LifeCyclePhase; +import org.jboss.portal.portlet.api.LifeCyclePhase; import javax.portlet.PortletRequestDispatcher; import javax.portlet.PortletRequest; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RFRFContainerAttributesTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RFRFContainerAttributesTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RFRFContainerAttributesTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,7 +25,7 @@ import org.jboss.portal.unit.PortletTestCase; import org.jboss.portal.unit.Assertion; import org.jboss.portal.unit.annotations.TestCase; -import org.jboss.portal.portlet.LifeCyclePhase; +import org.jboss.portal.portlet.api.LifeCyclePhase; import javax.portlet.PortletRequestDispatcher; import javax.portlet.PortletRequest; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RFRIContainerAttributesTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RFRIContainerAttributesTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RFRIContainerAttributesTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,7 +25,7 @@ import org.jboss.portal.unit.PortletTestCase; import org.jboss.portal.unit.Assertion; import org.jboss.portal.unit.annotations.TestCase; -import org.jboss.portal.portlet.LifeCyclePhase; +import org.jboss.portal.portlet.api.LifeCyclePhase; import javax.portlet.PortletRequestDispatcher; import javax.portlet.PortletRequest; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RIRFContainerAttributesTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RIRFContainerAttributesTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/dispatcher/RIRFContainerAttributesTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,7 +25,7 @@ import org.jboss.portal.unit.PortletTestCase; import org.jboss.portal.unit.Assertion; import org.jboss.portal.unit.annotations.TestCase; -import org.jboss.portal.portlet.LifeCyclePhase; +import org.jboss.portal.portlet.api.LifeCyclePhase; import javax.portlet.PortletRequestDispatcher; import javax.portlet.PortletRequest; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/taglib/ActionURLTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/taglib/ActionURLTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/taglib/ActionURLTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -29,9 +29,6 @@ import org.jboss.portal.unit.base.AbstractUniversalTestPortlet; import org.jboss.portal.unit.actions.PortletRenderTestAction; import org.jboss.portal.test.portlet.framework.UTP1; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.impl.jsr168.api.PortletURLImpl; -import org.jboss.portal.portlet.impl.jsr168.api.PortletRequestImpl; import org.jboss.unit.driver.DriverResponse; import org.jboss.unit.driver.response.EndTestResponse; import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/taglib/TaglibTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/taglib/TaglibTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/jsr286/tck/taglib/TaglibTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,17 +23,15 @@ package org.jboss.portal.test.portlet.jsr286.tck.taglib; import org.jboss.portal.unit.PortletTestContext; -import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor; import static org.jboss.unit.api.Assert.assertEquals; import javax.portlet.PortletRequestDispatcher; import javax.portlet.PortletRequest; -import javax.portlet.PortletResponse; import javax.portlet.RenderResponse; import javax.portlet.RenderRequest; import javax.portlet.PortletException; -import javax.servlet.ServletRequest; import java.io.Writer; import java.io.IOException; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,8 +23,8 @@ package org.jboss.portal.test.portlet.navigation; -import org.jboss.portal.portlet.ParametersStateString; -import org.jboss.portal.portlet.StateString; +import org.jboss.portal.portlet.api.ParametersStateString; +import org.jboss.portal.portlet.api.StateString; import static org.jboss.unit.api.Assert.assertEquals; import static org.jboss.unit.api.Assert.assertNotNull; import org.jboss.unit.api.pojo.annotations.Test; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,24 +24,24 @@ import org.jboss.portal.common.util.Tools; import org.jboss.portal.common.i18n.LocalizedString; -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.PortletContext; +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.PortletContext; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.state.PropertyMap; import org.jboss.portal.portlet.support.info.PortletInfoSupport; import org.jboss.portal.portlet.support.PortletSupport; -import org.jboss.portal.portlet.info.MetaInfo; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.info.MetaInfo; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; import org.jboss.portal.portlet.state.AbstractPropertyContext; -import org.jboss.portal.portlet.state.AccessMode; -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.state.AccessMode; +import org.jboss.portal.portlet.api.state.DestroyCloneFailure; +import org.jboss.portal.portlet.api.state.PropertyChange; +import org.jboss.portal.portlet.api.state.PropertyContext; import org.jboss.portal.portlet.state.SimplePropertyMap; -import org.jboss.portal.portlet.state.PropertyContext; import static org.jboss.unit.api.Assert.*; import org.jboss.unit.api.pojo.annotations.Test; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ActionContextImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ActionContextImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ActionContextImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,7 +23,7 @@ package org.jboss.portal.test.portlet.state; import org.jboss.portal.portlet.support.spi.PortletInvocationContextSupport; -import org.jboss.portal.portlet.spi.PortletInvocationContext; +import org.jboss.portal.portlet.api.spi.PortletInvocationContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,9 +22,10 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.state; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletContext; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.state.PropertyMap; import org.jboss.portal.portlet.support.info.PortletInfoSupport; import org.jboss.portal.portlet.support.PortletInvokerSupport; import org.jboss.portal.portlet.support.PortletSupport; @@ -33,11 +34,10 @@ import org.jboss.portal.portlet.impl.state.consumer.ConsumerPersistenceManagerService; import org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService; import org.jboss.portal.portlet.impl.spi.AbstractInstanceContext; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.state.AccessMode; -import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.state.AccessMode; +import org.jboss.portal.portlet.api.state.PropertyChange; import org.jboss.portal.portlet.state.StateConverter; import org.jboss.portal.portlet.state.consumer.ConsumerPortletInvoker; import org.jboss.portal.portlet.state.consumer.ConsumerPortlet; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/LocalStoreProducerStatefulPortletInvokerTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/LocalStoreProducerStatefulPortletInvokerTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/LocalStoreProducerStatefulPortletInvokerTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.state; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.PortletContext; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.PortletContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,18 +22,18 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.state; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletContext; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.state.PropertyMap; import org.jboss.portal.portlet.impl.state.StateManagementPolicyService; import org.jboss.portal.portlet.impl.state.StateConverterV0; import org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService; import org.jboss.portal.portlet.impl.spi.AbstractInstanceContext; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.state.AccessMode; -import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.state.AccessMode; +import org.jboss.portal.portlet.api.state.PropertyChange; import org.jboss.portal.portlet.state.StateConverter; import org.jboss.portal.portlet.state.producer.ProducerPortletInvoker; import org.jboss.portal.portlet.state.producer.ProducerPortlet; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/RemoteStoreProducerStatefulPortletInvokerTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/RemoteStoreProducerStatefulPortletInvokerTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/RemoteStoreProducerStatefulPortletInvokerTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.state; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.PortletContext; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.PortletContext; import org.jboss.portal.portlet.impl.spi.AbstractInstanceContext; /** Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,7 +23,7 @@ package org.jboss.portal.test.portlet.state; import org.jboss.portal.portlet.impl.state.StateConverterV0; -import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.portlet.api.state.PropertyMap; import org.jboss.portal.portlet.state.SimplePropertyMap; import org.jboss.portal.portlet.state.StateConversionException; import org.jboss.portal.portlet.state.StateConverter; Modified: jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ValueMapAssert.java =================================================================== --- jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ValueMapAssert.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ValueMapAssert.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,7 +22,7 @@ ******************************************************************************/ package org.jboss.portal.test.portlet.state; -import org.jboss.portal.portlet.state.PropertyMap; +import org.jboss.portal.portlet.api.state.PropertyMap; import java.util.HashSet; import java.util.List; Modified: jbossexo/modules/portlet/trunk/test/pom.xml =================================================================== --- jbossexo/modules/portlet/trunk/test/pom.xml 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/test/pom.xml 2009-07-06 19:28:53 UTC (rev 13523) @@ -44,6 +44,11 @@ <artifactId>portlet-mc</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.jboss.portal.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>apache-log4j</groupId> @@ -250,7 +255,7 @@ <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}"/> <property name="dependency.jsr168api.jar" value="${maven.dependency.javax.portlet.portlet-api.jar.path}"/> <property name="dependency.ccpp.jar" value="${maven.dependency.javax.ccpp.ccpp.jar.path}"/> - <property name="dependency.jaxb.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/> + <property name="dependency.jaxb.jar" value="${maven.dependency.sun-jaxb.jaxb-api.jar.path}"/> <property name="dependency.portal-common-common.jar" value="${maven.dependency.org.jboss.portal.common.common-common.jar.path}"/> <property name="dependency.portal-common-portal.jar" value="${maven.dependency.org.jboss.portal.common.common-portal.jar.path}"/> @@ -262,6 +267,7 @@ <property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-controller.jar.path}"/> <property name="dependency.portal-portlet-mc.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-mc.jar.path}"/> <property name="dependency.portal-portlet-tests.test-jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-portlet.tests.test-jar.path}"/> + <property name="dependency.portal-portlet-api.jar" value="${maven.dependency.org.jboss.portal.portlet.portlet-api.jar.path}"/> <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/> <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/> @@ -279,7 +285,7 @@ <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/> <property name="dependency.jboss-reflect.jar" value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/> <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/> - <property name="dependency.jaxb.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/> +<!-- <property name="dependency.jaxb.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/> --> <property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/> <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/> <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/> Modified: jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalServlet.java =================================================================== --- jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalServlet.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalServlet.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -27,7 +27,7 @@ import org.jboss.portal.portlet.controller.impl.URLParameterConstants; import org.jboss.portal.portlet.controller.request.ControllerRequest; import org.jboss.portal.portlet.controller.response.ControllerResponse; -import org.jboss.portal.portlet.invocation.response.ResponseProperties; +import org.jboss.portal.portlet.api.invocation.response.ResponseProperties; import org.jboss.portal.portlet.test.controller.ControllerResponseRendererFactory; import org.jboss.portal.portlet.test.controller.PageRenderer; import org.jboss.portal.portlet.test.controller.PortletControllerContextImpl; Modified: jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/AbstractMarkupRenderer.java =================================================================== --- jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/AbstractMarkupRenderer.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/AbstractMarkupRenderer.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,7 +24,7 @@ package org.jboss.portal.portlet.test.controller; import org.jboss.portal.common.util.MultiValuedPropertyMap; -import org.jboss.portal.portlet.invocation.response.ResponseProperties; +import org.jboss.portal.portlet.api.invocation.response.ResponseProperties; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; Modified: jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/AbstractRendererContext.java =================================================================== --- jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/AbstractRendererContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/AbstractRendererContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -26,8 +26,8 @@ import org.jboss.portal.portlet.controller.PortletController; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.impl.AbstractPortletControllerContext; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.PortletInvokerException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Modified: jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ControllerResponseRendererFactory.java =================================================================== --- jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ControllerResponseRendererFactory.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ControllerResponseRendererFactory.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -29,11 +29,11 @@ import org.jboss.portal.portlet.controller.response.ResourceResponse; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.StateControllerContext; -import org.jboss.portal.portlet.invocation.response.ErrorResponse; -import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.invocation.response.ContentResponse; +import org.jboss.portal.portlet.api.invocation.response.ErrorResponse; +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.ResponseProperties; +import org.jboss.portal.portlet.api.invocation.response.ContentResponse; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> Modified: jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ErrorResponseRenderer.java =================================================================== --- jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ErrorResponseRenderer.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ErrorResponseRenderer.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,7 +24,7 @@ package org.jboss.portal.portlet.test.controller; import org.apache.log4j.Logger; -import org.jboss.portal.portlet.invocation.response.ErrorResponse; +import org.jboss.portal.portlet.api.invocation.response.ErrorResponse; import java.io.IOException; Modified: jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/FragmentRenderer.java =================================================================== --- jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/FragmentRenderer.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/FragmentRenderer.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,8 +23,8 @@ package org.jboss.portal.portlet.test.controller; -import org.jboss.portal.portlet.invocation.response.ErrorResponse; -import org.jboss.portal.portlet.invocation.response.ContentResponse; +import org.jboss.portal.portlet.api.invocation.response.ErrorResponse; +import org.jboss.portal.portlet.api.invocation.response.ContentResponse; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> Modified: jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java =================================================================== --- jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PageRenderer.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -25,12 +25,12 @@ import org.jboss.portal.common.util.MultiValuedPropertyMap; import org.jboss.portal.common.xml.XMLTools; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.invocation.response.ErrorResponse; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.invocation.response.ContentResponse; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.invocation.response.ErrorResponse; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.response.ResponseProperties; +import org.jboss.portal.portlet.api.invocation.response.ContentResponse; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.w3c.dom.Element; Modified: jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,10 +23,10 @@ package org.jboss.portal.portlet.test.controller; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletContext; -import org.jboss.portal.portlet.PortletInvoker; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletContext; +import org.jboss.portal.portlet.api.PortletInvoker; +import org.jboss.portal.portlet.api.PortletInvokerException; import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.controller.impl.event.EventControllerContextImpl; import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl; @@ -34,8 +34,8 @@ import org.jboss.portal.portlet.controller.state.StateControllerContext; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalStateSerialization; -import org.jboss.portal.portlet.invocation.PortletInvocation; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; import org.jboss.portal.web.IllegalRequestException; import org.jboss.portal.common.io.Serialization; import org.jboss.portal.common.mc.bootstrap.WebBootstrap; Modified: jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RedirectResponseRenderer.java =================================================================== --- jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RedirectResponseRenderer.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RedirectResponseRenderer.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,7 +23,7 @@ package org.jboss.portal.portlet.test.controller; -import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse; +import org.jboss.portal.portlet.api.invocation.response.HTTPRedirectionResponse; import java.io.IOException; Modified: jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RendererContext.java =================================================================== --- jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RendererContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RendererContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,10 +24,9 @@ import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.RenderInvocation; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletRequest; Modified: jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RendererContextImpl.java =================================================================== --- jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RendererContextImpl.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/RendererContextImpl.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.portlet.test.controller; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletInvokerException; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletInvokerException; import java.util.Collection; Modified: jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ResourceRenderer.java =================================================================== --- jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ResourceRenderer.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/ResourceRenderer.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -24,7 +24,7 @@ package org.jboss.portal.portlet.test.controller; import org.jboss.portal.common.io.IOTools; -import org.jboss.portal.portlet.invocation.response.ContentResponse; +import org.jboss.portal.portlet.api.invocation.response.ContentResponse; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; Modified: jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/SimpleFragmentRenderer.java =================================================================== --- jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/SimpleFragmentRenderer.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/SimpleFragmentRenderer.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,8 +23,8 @@ package org.jboss.portal.portlet.test.controller; -import org.jboss.portal.portlet.invocation.response.ErrorResponse; -import org.jboss.portal.portlet.invocation.response.ContentResponse; +import org.jboss.portal.portlet.api.invocation.response.ErrorResponse; +import org.jboss.portal.portlet.api.invocation.response.ContentResponse; import java.io.UnsupportedEncodingException; Modified: jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java =================================================================== --- jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,17 +23,17 @@ package org.jboss.portal.portlet.test.tck; import org.jboss.portal.portlet.controller.impl.AbstractPortletControllerContext; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.PortletInvoker; -import org.jboss.portal.portlet.PortletContext; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.PortletInvoker; +import org.jboss.portal.portlet.api.PortletContext; import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.controller.state.StateControllerContext; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalState; import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl; import org.jboss.portal.portlet.controller.impl.event.EventControllerContextImpl; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.PortletInvocation; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.PortletInvocation; import org.jboss.portal.web.IllegalRequestException; import org.jboss.portal.common.io.Serialization; import org.jboss.portal.common.mc.bootstrap.WebBootstrap; Modified: jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKRendererContext.java =================================================================== --- jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKRendererContext.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKRendererContext.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -23,9 +23,9 @@ package org.jboss.portal.portlet.test.tck; import org.jboss.portal.portlet.test.controller.AbstractRendererContext; -import org.jboss.portal.portlet.Portlet; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.NoSuchPortletException; +import org.jboss.portal.portlet.api.Portlet; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.NoSuchPortletException; import java.util.Collection; import java.util.ArrayList; Modified: jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKServlet.java =================================================================== --- jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKServlet.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKServlet.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -30,8 +30,8 @@ import org.jboss.portal.portlet.controller.PortletController; import org.jboss.portal.portlet.controller.response.ControllerResponse; import org.jboss.portal.portlet.controller.request.ControllerRequest; -import org.jboss.portal.portlet.invocation.response.ResponseProperties; -import org.jboss.portal.portlet.Portlet; +import org.jboss.portal.portlet.api.invocation.response.ResponseProperties; +import org.jboss.portal.portlet.api.Portlet; import org.jboss.portal.web.WebRequest; import org.jboss.portal.web.WebResponse; import org.jboss.portal.web.endpoint.EndPointServlet; Modified: jbossexo/modules/portlet/trunk/test/src/test/build.xml =================================================================== --- jbossexo/modules/portlet/trunk/test/src/test/build.xml 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/test/src/test/build.xml 2009-07-06 19:28:53 UTC (rev 13523) @@ -88,6 +88,7 @@ <path id="portal-portlet-shared"> <path location="${dependency.portal-portlet-portlet.jar}"/> + <path location="${dependency.portal-portlet-api.jar}"/> <path location="${dependency.jsr168api.jar}"/> </path> Modified: jbossexo/modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/controller/StateControllerContextTestCase.java =================================================================== --- jbossexo/modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/controller/StateControllerContextTestCase.java 2009-07-06 16:06:22 UTC (rev 13522) +++ jbossexo/modules/portlet/trunk/test/src/test/java/org/jboss/portal/portlet/controller/StateControllerContextTestCase.java 2009-07-06 19:28:53 UTC (rev 13523) @@ -29,16 +29,16 @@ import org.jboss.portal.portlet.controller.state.PortletWindowNavigationalState; import org.jboss.portal.portlet.controller.state.PortletPageNavigationalStateSerialization; import org.jboss.portal.portlet.controller.event.EventControllerContext; -import org.jboss.portal.portlet.info.PortletInfo; -import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.ParametersStateString; -import org.jboss.portal.portlet.StateString; -import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse; -import org.jboss.portal.portlet.invocation.ActionInvocation; -import org.jboss.portal.portlet.invocation.EventInvocation; -import org.jboss.portal.portlet.invocation.ResourceInvocation; -import org.jboss.portal.portlet.invocation.RenderInvocation; -import org.jboss.portal.portlet.spi.PortletInvocationContext; +import org.jboss.portal.portlet.api.info.PortletInfo; +import org.jboss.portal.portlet.api.PortletInvokerException; +import org.jboss.portal.portlet.api.ParametersStateString; +import org.jboss.portal.portlet.api.StateString; +import org.jboss.portal.portlet.api.invocation.response.PortletInvocationResponse; +import org.jboss.portal.portlet.api.invocation.ActionInvocation; +import org.jboss.portal.portlet.api.invocation.EventInvocation; +import org.jboss.portal.portlet.api.invocation.ResourceInvocation; +import org.jboss.portal.portlet.api.invocation.RenderInvocation; +import org.jboss.portal.portlet.api.spi.PortletInvocationContext; import org.jboss.portal.common.NotYetImplemented; import org.jboss.portal.common.io.IOTools; import org.jboss.portal.Mode;