Author: chris.laprun(a)jboss.com
Date: 2007-04-25 17:48:13 -0400 (Wed, 25 Apr 2007)
New Revision: 7060
Modified:
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.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:
- Slight behavior change while waiting for JBWS-1515 resolution.
- Only force session access if there is a session in ServletAccess.
- Only try session access on Markup endpoint.
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java 2007-04-25
21:25:41 UTC (rev 7059)
+++
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/MarkupTestCase.java 2007-04-25
21:48:13 UTC (rev 7060)
@@ -136,9 +136,13 @@
HttpSession session = invocationContext.getClientRequest().getSession();
producer.setResponse(invocationContext.getClientResponse());
+ ProducerSessionInformation sessionInfo =
consumer.getProducerSessionInformationFrom(session);
+ ExtendedAssert.assertNull(sessionInfo);
+
consumer.invoke(render);
- ProducerSessionInformation sessionInfo =
consumer.getProducerSessionInformationFrom(session);
+ sessionInfo = consumer.getProducerSessionInformationFrom(session);
+ ExtendedAssert.assertNotNull(sessionInfo);
ExtendedAssert.assertFalse(sessionInfo.isPerGroupCookies());
ExtendedAssert.assertFalse(sessionInfo.isInitCookieDone());
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-25
21:25:41 UTC (rev 7059)
+++
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/PortletManagementEndpoint.java 2007-04-25
21:48:13 UTC (rev 7060)
@@ -55,37 +55,31 @@
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-25
21:25:41 UTC (rev 7059)
+++
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/RegistrationEndpoint.java 2007-04-25
21:48:13 UTC (rev 7060)
@@ -45,21 +45,18 @@
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-25
21:25:41 UTC (rev 7059)
+++
trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/ServiceDescriptionEndpoint.java 2007-04-25
21:48:13 UTC (rev 7060)
@@ -40,7 +40,6 @@
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-25
21:25:41 UTC (rev 7059)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/endpoints/WSRPBaseEndpoint.java 2007-04-25
21:48:13 UTC (rev 7060)
@@ -26,7 +26,9 @@
import org.jboss.portal.jems.as.JMX;
import org.jboss.portal.wsrp.WSRPConstants;
import org.jboss.portal.wsrp.WSRPProducer;
+import org.jboss.portal.wsrp.servlet.ServletAccess;
+import javax.servlet.http.HttpSession;
import javax.xml.rpc.ServiceException;
import javax.xml.rpc.server.ServiceLifecycle;
import javax.xml.rpc.server.ServletEndpointContext;
@@ -55,8 +57,13 @@
protected void forceSessionAccess()
{
- // force access to HttpSession to bypass JBWS optimization and allow cookies to be
transmitted to client see: JBWS-1515
- context.getHttpSession();
+ // Check if there is a session associated with this thread
+ HttpSession portalSession = ServletAccess.getRequest().getSession(false);
+ if (portalSession != null)
+ {
+ // force session access from context so that cookies will be properly tranmitted
to consumers. See JBWS-1515.
+ context.getHttpSession();
+ }
}
protected WSRPProducer producer;