Author: julien(a)jboss.com
Date: 2007-01-15 20:58:12 -0500 (Mon, 15 Jan 2007)
New Revision: 6013
Modified:
trunk/server/src/main/org/jboss/portal/server/ServerRequest.java
trunk/server/src/main/org/jboss/portal/server/servlet/PortalServlet.java
trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java
Log:
forgot to move PublishAssignmentHandler to core-cms integration
Modified: trunk/server/src/main/org/jboss/portal/server/ServerRequest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/ServerRequest.java 2007-01-16 01:56:16
UTC (rev 6012)
+++ trunk/server/src/main/org/jboss/portal/server/ServerRequest.java 2007-01-16 01:58:12
UTC (rev 6013)
@@ -40,11 +40,11 @@
/** The server used during the request. */
protected Server server;
- protected ServerInvocation invocation;
+ protected ServerInvocationContext invocationContext;
- public ServerRequest(ServerInvocation invocation)
+ public ServerRequest(ServerInvocationContext invocationContext)
{
- this.invocation = invocation;
+ this.invocationContext = invocationContext;
}
public Object getUser()
@@ -64,7 +64,7 @@
this.user = user;
//
- invocation.setAttribute(ServerInvocation.REQUEST_SCOPE,
ServerInvocation.IDENTITY_KEY, user);
+ invocationContext.setAttribute(ServerInvocation.REQUEST_SCOPE,
ServerInvocation.IDENTITY_KEY, user);
}
public Server getServer()
Modified: trunk/server/src/main/org/jboss/portal/server/servlet/PortalServlet.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/servlet/PortalServlet.java 2007-01-16
01:56:16 UTC (rev 6012)
+++ trunk/server/src/main/org/jboss/portal/server/servlet/PortalServlet.java 2007-01-16
01:58:12 UTC (rev 6013)
@@ -359,7 +359,7 @@
mediaType);
//
- ServerRequest request = new ServerRequest();
+ ServerRequest request = new ServerRequest(invocationCtx);
request.setServer(server);
//
Modified: trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java 2007-01-16 01:56:16
UTC (rev 6012)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java 2007-01-16 01:58:12
UTC (rev 6013)
@@ -211,7 +211,7 @@
public static ServerRequest createServerRequest()
{
final HttpServletRequest clientRequest = new TestHttpServletRequest();
- return new ServerRequest();
+ return new ServerRequest(null);
}
public static class TestContext implements ServletContext
Show replies by date