Author: julien(a)jboss.com
Date: 2007-11-20 12:53:53 -0500 (Tue, 20 Nov 2007)
New Revision: 9045
Modified:
branches/presentation/presentation/build.xml
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/PresentationContextImpl.java
Log:
make presentation module compile with latest 2.6
Modified: branches/presentation/presentation/build.xml
===================================================================
--- branches/presentation/presentation/build.xml 2007-11-20 17:51:42 UTC (rev 9044)
+++ branches/presentation/presentation/build.xml 2007-11-20 17:53:53 UTC (rev 9045)
@@ -87,23 +87,22 @@
&libraries;
<path id="library.classpath">
+ <path refid="jboss.portal/modules/common.classpath"/>
+ <path refid="jboss.portal/modules/web.classpath"/>
+ <path refid="jboss.portal/modules/portlet.classpath"/>
<path refid="jbossas/core.libs.classpath"/>
<path refid="sun.servlet.classpath"/>
<path refid="apache.log4j.classpath"/>
- <path refid="junit.junit.classpath"/>
- <path refid="gwt.gwt.classpath"/>
- <path refid="mygwt.mygwt.classpath"/>
- <path refid="httpunit.httpunit.classpath"/>
+ <path refid="junit.junit.classpath"/>
+ <path refid="gwt.gwt.classpath"/>
+ <path refid="mygwt.mygwt.classpath"/>
+ <path refid="httpunit.httpunit.classpath"/>
</path>
<!-- Configure modules -->
<call target="configure-modules"/>
<path id="dependentmodule.classpath">
- <path refid="jboss.portlet-api.classpath"/>
- <path refid="jboss.portal-jems.classpath"/>
- <path refid="jboss.portal-common.classpath"/>
<path refid="jboss.portal-server.classpath"/>
- <path refid="jboss.portal-web.classpath"/>
</path>
<!--+=======================================+-->
Modified:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/PresentationContextImpl.java
===================================================================
---
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/PresentationContextImpl.java 2007-11-20
17:51:42 UTC (rev 9044)
+++
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/PresentationContextImpl.java 2007-11-20
17:53:53 UTC (rev 9045)
@@ -22,23 +22,25 @@
******************************************************************************/
package org.jboss.portal.presentation.impl;
-import javax.servlet.http.HttpSession;
-
import org.jboss.portal.presentation.client.PresentationContext;
+import org.jboss.portal.presentation.impl.model.UIContextImpl;
+import org.jboss.portal.presentation.model.UIContext;
+import org.jboss.portal.presentation.model.UIObject;
+import org.jboss.portal.presentation.protocol.LinkActivation;
import org.jboss.portal.presentation.protocol.ServerAction;
-import org.jboss.portal.presentation.protocol.LinkActivation;
import org.jboss.portal.presentation.protocol.UIObjectAction;
-import org.jboss.portal.presentation.model.UIContext;
-import org.jboss.portal.presentation.model.UIObject;
import org.jboss.portal.presentation.server.PresentationServer;
-import org.jboss.portal.presentation.impl.model.UIContextImpl;
+import org.jboss.portal.server.AbstractServerURL;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.server.ServerURL;
-import org.jboss.portal.server.AbstractServerURL;
import org.jboss.portal.server.request.URLContext;
import org.jboss.portal.server.request.URLFormat;
+import org.jboss.portal.web.ServletContainer;
import org.jboss.portal.web.ServletContextDispatcher;
+import org.jboss.portal.web.impl.DefaultServletContainerFactory;
+import javax.servlet.http.HttpSession;
+
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*
@@ -88,8 +90,12 @@
*/
public ServletContextDispatcher getDispatcher()
{
- return new
ServletContextDispatcher(this.invocation.getServerContext().getClientRequest(),
- this.invocation.getServerContext().getClientResponse(),
this.invocation.getRequest().getServer().getServletContainerContext());
+ DefaultServletContainerFactory factory = new DefaultServletContainerFactory();
+ ServletContainer container = factory.getServletContainer();
+ return new ServletContextDispatcher(
+ invocation.getServerContext().getClientRequest(),
+ invocation.getServerContext().getClientResponse(),
+ container);
}
/**