Author: chris.laprun(a)jboss.com Date: 2010-10-02 12:03:25 -0400 (Sat, 02 Oct 2010) New Revision: 4468 Removed: components/wsrp/trunk/wsrp-producer-war/src/main/webapp/WEB-INF/classes/ Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/MarkupEndpoint.java components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/PortletManagementEndpoint.java components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/RegistrationEndpoint.java components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/ServiceDescriptionEndpoint.java components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/MarkupEndpoint.java components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/PortletManagementEndpoint.java components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/RegistrationEndpoint.java components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/ServiceDescriptionEndpoint.java Log: - GTNWSRP-53: Completely deactivate handler. Extensions had already been deactivated in the handler proper. Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/MarkupEndpoint.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/MarkupEndpoint.java 2010-10-02 14:59:33 UTC (rev 4467) +++ components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/MarkupEndpoint.java 2010-10-02 16:03:25 UTC (rev 4468) @@ -79,7 +79,6 @@ import org.oasis.wsrp.v2.UnsupportedMode; import org.oasis.wsrp.v2.UnsupportedWindowState; -import javax.jws.HandlerChain; import javax.jws.WebParam; import javax.xml.ws.Holder; import java.util.List; @@ -97,7 +96,6 @@ wsdlLocation = "/WEB-INF/wsdl/wsrp_services.wsdl", endpointInterface = "org.oasis.wsrp.v1.WSRPV1MarkupPortType" ) -@HandlerChain(file = "wshandlers.xml") public class MarkupEndpoint extends WSRPBaseEndpoint implements WSRPV1MarkupPortType { public void performBlockingInteraction( Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/PortletManagementEndpoint.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/PortletManagementEndpoint.java 2010-10-02 14:59:33 UTC (rev 4467) +++ components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/PortletManagementEndpoint.java 2010-10-02 16:03:25 UTC (rev 4468) @@ -71,7 +71,6 @@ import org.oasis.wsrp.v2.ResourceSuspended; import org.oasis.wsrp.v2.SetPortletProperties; -import javax.jws.HandlerChain; import javax.jws.WebParam; import javax.xml.ws.Holder; import java.util.List; @@ -89,7 +88,6 @@ wsdlLocation = "/WEB-INF/wsdl/wsrp_services.wsdl", endpointInterface = "org.oasis.wsrp.v1.WSRPV1PortletManagementPortType" ) -@HandlerChain(file = "wshandlers.xml") public class PortletManagementEndpoint extends WSRPBaseEndpoint implements WSRPV1PortletManagementPortType { public void getPortletPropertyDescription( Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/RegistrationEndpoint.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/RegistrationEndpoint.java 2010-10-02 14:59:33 UTC (rev 4467) +++ components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/RegistrationEndpoint.java 2010-10-02 16:03:25 UTC (rev 4468) @@ -48,7 +48,6 @@ import org.oasis.wsrp.v2.RegistrationState; import org.oasis.wsrp.v2.ResourceSuspended; -import javax.jws.HandlerChain; import javax.jws.WebParam; import javax.xml.ws.Holder; import java.util.List; @@ -66,7 +65,6 @@ wsdlLocation = "/WEB-INF/wsdl/wsrp_services.wsdl", endpointInterface = "org.oasis.wsrp.v1.WSRPV1RegistrationPortType" ) -@HandlerChain(file = "wshandlers.xml") public class RegistrationEndpoint extends WSRPBaseEndpoint implements WSRPV1RegistrationPortType { Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/ServiceDescriptionEndpoint.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/ServiceDescriptionEndpoint.java 2010-10-02 14:59:33 UTC (rev 4467) +++ components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v1/ServiceDescriptionEndpoint.java 2010-10-02 16:03:25 UTC (rev 4468) @@ -46,7 +46,6 @@ import org.oasis.wsrp.v2.ResourceSuspended; import org.oasis.wsrp.v2.ServiceDescription; -import javax.jws.HandlerChain; import javax.jws.WebParam; import javax.xml.ws.Holder; import java.util.List; @@ -63,7 +62,6 @@ wsdlLocation = "/WEB-INF/wsdl/wsrp_services.wsdl", endpointInterface = "org.oasis.wsrp.v1.WSRPV1ServiceDescriptionPortType" ) -@HandlerChain(file = "wshandlers.xml") public class ServiceDescriptionEndpoint extends WSRPBaseEndpoint implements WSRPV1ServiceDescriptionPortType { public void getServiceDescription( Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/MarkupEndpoint.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/MarkupEndpoint.java 2010-10-02 14:59:33 UTC (rev 4467) +++ components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/MarkupEndpoint.java 2010-10-02 16:03:25 UTC (rev 4468) @@ -68,7 +68,6 @@ import org.oasis.wsrp.v2.UserContext; import org.oasis.wsrp.v2.WSRPV2MarkupPortType; -import javax.jws.HandlerChain; import javax.jws.WebParam; import javax.xml.ws.Holder; import java.util.List; @@ -87,7 +86,6 @@ wsdlLocation = "/WEB-INF/wsdl/wsrp-2.0-services.wsdl", endpointInterface = "org.oasis.wsrp.v2.WSRPV2MarkupPortType" ) -@HandlerChain(file = "wshandlers.xml") public class MarkupEndpoint extends WSRPBaseEndpoint implements WSRPV2MarkupPortType { public void handleEvents( Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/PortletManagementEndpoint.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/PortletManagementEndpoint.java 2010-10-02 14:59:33 UTC (rev 4467) +++ components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/PortletManagementEndpoint.java 2010-10-02 16:03:25 UTC (rev 4468) @@ -72,10 +72,8 @@ import org.oasis.wsrp.v2.UserContext; import org.oasis.wsrp.v2.WSRPV2PortletManagementPortType; -import javax.jws.HandlerChain; import javax.jws.WebParam; import javax.xml.ws.Holder; - import java.util.ArrayList; import java.util.List; @@ -92,7 +90,6 @@ wsdlLocation = "/WEB-INF/wsdl/wsrp-2.0-services.wsdl", endpointInterface = "org.oasis.wsrp.v2.WSRPV2PortletManagementPortType" ) -@HandlerChain(file = "wshandlers.xml") public class PortletManagementEndpoint extends WSRPBaseEndpoint implements WSRPV2PortletManagementPortType { public void getPortletPropertyDescription( @@ -230,9 +227,9 @@ throws AccessDenied, ExportByValueNotSupported, InconsistentParameters, InvalidHandle, InvalidRegistration, InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended { ExportPortlets exportPortlets = WSRPTypeFactory.createExportPortlets(registrationContext, portletContext, userContext, lifetime.value, exportByValueRequired); - + ExportPortletsResponse exportPortletsResponse = producer.exportPortlets(exportPortlets); - + lifetime.value = exportPortletsResponse.getLifetime(); exportContext.value = exportPortletsResponse.getExportContext(); exportedPortlet.value = exportPortletsResponse.getExportedPortlet(); @@ -254,9 +251,9 @@ throws AccessDenied, ExportNoLongerValid, InconsistentParameters, InvalidRegistration, InvalidUserCategory, MissingParameters, ModifyRegistrationRequired, OperationFailed, OperationNotSupported, ResourceSuspended { ImportPortlets importPortlets = WSRPTypeFactory.createImportPortlets(registrationContext, importContext, importPortlet, userContext, lifetime); - + ImportPortletsResponse importPortletsResponse = producer.importPortlets(importPortlets); - + importedPortlets.value = importPortletsResponse.getImportedPortlets(); importFailed.value = importPortletsResponse.getImportFailed(); resourceList.value = importPortletsResponse.getResourceList(); @@ -269,9 +266,9 @@ @WebParam(name = "userContext", targetNamespace = "urn:oasis:names:tc:wsrp:v2:types") UserContext userContext) { ReleaseExport releaseExport = WSRPTypeFactory.createReleaseExport(registrationContext, exportContext, userContext); - + producer.releaseExport(releaseExport); - + //release export isn't suppose to return anything return new ArrayList<Extension>(); } Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/RegistrationEndpoint.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/RegistrationEndpoint.java 2010-10-02 14:59:33 UTC (rev 4467) +++ components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/RegistrationEndpoint.java 2010-10-02 16:03:25 UTC (rev 4468) @@ -44,7 +44,6 @@ import org.oasis.wsrp.v2.UserContext; import org.oasis.wsrp.v2.WSRPV2RegistrationPortType; -import javax.jws.HandlerChain; import javax.jws.WebParam; import javax.xml.ws.Holder; import java.util.List; @@ -62,7 +61,6 @@ wsdlLocation = "/WEB-INF/wsdl/wsrp-2.0-services.wsdl", endpointInterface = "org.oasis.wsrp.v2.WSRPV2RegistrationPortType" ) -@HandlerChain(file = "wshandlers.xml") public class RegistrationEndpoint extends WSRPBaseEndpoint implements WSRPV2RegistrationPortType { public void register( Modified: components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/ServiceDescriptionEndpoint.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/ServiceDescriptionEndpoint.java 2010-10-02 14:59:33 UTC (rev 4467) +++ components/wsrp/trunk/wsrp-producer-war/src/main/java/org/gatein/wsrp/endpoints/v2/ServiceDescriptionEndpoint.java 2010-10-02 16:03:25 UTC (rev 4468) @@ -45,7 +45,6 @@ import org.oasis.wsrp.v2.UserContext; import org.oasis.wsrp.v2.WSRPV2ServiceDescriptionPortType; -import javax.jws.HandlerChain; import javax.jws.WebParam; import javax.xml.ws.Holder; import java.util.List; @@ -62,7 +61,6 @@ wsdlLocation = "/WEB-INF/wsdl/wsrp-2.0-services.wsdl", endpointInterface = "org.oasis.wsrp.v2.WSRPV2ServiceDescriptionPortType" ) -@HandlerChain(file = "wshandlers.xml") public class ServiceDescriptionEndpoint extends WSRPBaseEndpoint implements WSRPV2ServiceDescriptionPortType { public void getServiceDescription(