Author: chris.laprun(a)jboss.com
Date: 2007-04-07 22:35:30 -0400 (Sat, 07 Apr 2007)
New Revision: 6951
Modified:
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/MarkupEndpoint.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/PortletManagementEndpoint.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/RegistrationEndpoint.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/ServiceDescriptionEndpoint.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java
Log:
- Workaround for JBWS-1515: force access to the HttpSession by endpoints so that cookies
are properly transmitted to the client side.
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/MarkupEndpoint.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/MarkupEndpoint.java 2007-04-07
23:00:43 UTC (rev 6950)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/MarkupEndpoint.java 2007-04-08
02:35:30 UTC (rev 6951)
@@ -57,21 +57,25 @@
{
public MarkupResponse getMarkup(GetMarkup getMarkup) throws
UnsupportedWindowStateFault, InvalidCookieFault, InvalidSessionFault, AccessDeniedFault,
InconsistentParametersFault, InvalidHandleFault, UnsupportedLocaleFault,
UnsupportedModeFault, OperationFailedFault, MissingParametersFault,
InvalidUserCategoryFault, InvalidRegistrationFault, UnsupportedMimeTypeFault,
RemoteException
{
+ forceSessionAccess();
return producer.getMarkup(getMarkup);
}
public BlockingInteractionResponse
performBlockingInteraction(PerformBlockingInteraction performBlockingInteraction) throws
InvalidSessionFault, UnsupportedModeFault, UnsupportedMimeTypeFault, OperationFailedFault,
UnsupportedWindowStateFault, UnsupportedLocaleFault, AccessDeniedFault,
PortletStateChangeRequiredFault, InvalidRegistrationFault, MissingParametersFault,
InvalidUserCategoryFault, InconsistentParametersFault, InvalidHandleFault,
InvalidCookieFault, RemoteException
{
+ forceSessionAccess();
return producer.performBlockingInteraction(performBlockingInteraction);
}
public ReturnAny releaseSessions(ReleaseSessions releaseSessions) throws
InvalidRegistrationFault, OperationFailedFault, MissingParametersFault, AccessDeniedFault,
RemoteException
{
+ forceSessionAccess();
return producer.releaseSessions(releaseSessions);
}
public ReturnAny initCookie(InitCookie initCookie) throws AccessDeniedFault,
OperationFailedFault, InvalidRegistrationFault, RemoteException
{
+ forceSessionAccess();
return producer.initCookie(initCookie);
}
}
Modified:
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/PortletManagementEndpoint.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/PortletManagementEndpoint.java 2007-04-07
23:00:43 UTC (rev 6950)
+++
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/PortletManagementEndpoint.java 2007-04-08
02:35:30 UTC (rev 6951)
@@ -55,31 +55,37 @@
public PortletDescriptionResponse getPortletDescription(GetPortletDescription
getPortletDescription) throws AccessDeniedFault, InvalidHandleFault,
InvalidUserCategoryFault, InconsistentParametersFault, MissingParametersFault,
InvalidRegistrationFault, OperationFailedFault, RemoteException
{
+ forceSessionAccess();
return producer.getPortletDescription(getPortletDescription);
}
public PortletContext clonePortlet(ClonePortlet clonePortlet) throws
InvalidUserCategoryFault, AccessDeniedFault, OperationFailedFault, InvalidHandleFault,
InvalidRegistrationFault, InconsistentParametersFault, MissingParametersFault,
RemoteException
{
+ forceSessionAccess();
return producer.clonePortlet(clonePortlet);
}
public DestroyPortletsResponse destroyPortlets(DestroyPortlets destroyPortlets) throws
InconsistentParametersFault, MissingParametersFault, InvalidRegistrationFault,
OperationFailedFault, RemoteException
{
+ forceSessionAccess();
return producer.destroyPortlets(destroyPortlets);
}
public PortletContext setPortletProperties(SetPortletProperties setPortletProperties)
throws OperationFailedFault, InvalidHandleFault, MissingParametersFault,
InconsistentParametersFault, InvalidUserCategoryFault, AccessDeniedFault,
InvalidRegistrationFault, RemoteException
{
+ forceSessionAccess();
return producer.setPortletProperties(setPortletProperties);
}
public PropertyList getPortletProperties(GetPortletProperties getPortletProperties)
throws InvalidHandleFault, MissingParametersFault, InvalidRegistrationFault,
AccessDeniedFault, OperationFailedFault, InconsistentParametersFault,
InvalidUserCategoryFault, RemoteException
{
+ forceSessionAccess();
return producer.getPortletProperties(getPortletProperties);
}
public PortletPropertyDescriptionResponse
getPortletPropertyDescription(GetPortletPropertyDescription getPortletPropertyDescription)
throws MissingParametersFault, InconsistentParametersFault, InvalidUserCategoryFault,
InvalidRegistrationFault, AccessDeniedFault, InvalidHandleFault, OperationFailedFault,
RemoteException
{
+ forceSessionAccess();
return producer.getPortletPropertyDescription(getPortletPropertyDescription);
}
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/RegistrationEndpoint.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/RegistrationEndpoint.java 2007-04-07
23:00:43 UTC (rev 6950)
+++
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/RegistrationEndpoint.java 2007-04-08
02:35:30 UTC (rev 6951)
@@ -45,18 +45,21 @@
public RegistrationContext register(RegistrationData register)
throws MissingParametersFault, OperationFailedFault, RemoteException
{
+ forceSessionAccess();
return producer.register(register);
}
public ReturnAny deregister(RegistrationContext deregister)
throws OperationFailedFault, InvalidRegistrationFault, RemoteException
{
+ forceSessionAccess();
return producer.deregister(deregister);
}
public RegistrationState modifyRegistration(ModifyRegistration modifyRegistration)
throws MissingParametersFault, OperationFailedFault, InvalidRegistrationFault,
RemoteException
{
+ forceSessionAccess();
return producer.modifyRegistration(modifyRegistration);
}
}
Modified:
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/ServiceDescriptionEndpoint.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/ServiceDescriptionEndpoint.java 2007-04-07
23:00:43 UTC (rev 6950)
+++
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/ServiceDescriptionEndpoint.java 2007-04-08
02:35:30 UTC (rev 6951)
@@ -40,6 +40,7 @@
public ServiceDescription getServiceDescription(GetServiceDescription gs)
throws InvalidRegistrationFault, OperationFailedFault, RemoteException
{
+ forceSessionAccess();
return producer.getServiceDescription(gs);
}
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java 2007-04-07
23:00:43 UTC (rev 6950)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java 2007-04-08
02:35:30 UTC (rev 6951)
@@ -53,6 +53,12 @@
producer = (WSRPProducer)JMX.getMBeanProxy(WSRPProducer.class,
WSRPConstants.WSRP_PRODUCER_OBJECT_NAME);
}
+ protected void forceSessionAccess()
+ {
+ // force access to HttpSession to bypass JBWS optimization and allow cookies to be
transmitted to client see: JBWS-1515
+ context.getHttpSession();
+ }
+
protected WSRPProducer producer;
protected ServletEndpointContext context;
}