[portal-commits] JBoss Portal SVN: r9052 - in branches/presentation: presentation/src/main/org/jboss/portal/presentation/impl and 1 other directory.

[portal-commits at lists.jboss.org]

Author: julien at jboss.com
Date: 2007-11-20 16:37:13 -0500 (Tue, 20 Nov 2007)
New Revision: 9052

Modified:
   branches/presentation/core-presentation/build.xml
   branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/PresentationContextImpl.java
Log:
- fix build
- make PresentationContextImpl use the DefaultServletContainerFactory instance

Modified: branches/presentation/core-presentation/build.xml
===================================================================
--- branches/presentation/core-presentation/build.xml	2007-11-20 21:36:18 UTC (rev 9051)
+++ branches/presentation/core-presentation/build.xml	2007-11-20 21:37:13 UTC (rev 9052)
@@ -87,7 +87,7 @@
 
       <property name="jboss.portal-presentation.lib" value="../presentation/output/lib"/>
       <path id="jboss.portal-presentation.classpath">
-         <fileset dir="{jboss.portal-presentation.lib}" includes="portal-presentation-lib.jar"/>
+         <pathelement location="../presentation/output/lib/portal-presentation-lib.jar"/>
       </path>
 
       <!-- Configure thirdparty libraries -->

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 21:36:18 UTC (rev 9051)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/PresentationContextImpl.java	2007-11-20 21:37:13 UTC (rev 9052)
@@ -90,8 +90,7 @@
     */
    public ServletContextDispatcher getDispatcher()
    {
-      DefaultServletContainerFactory factory = new DefaultServletContainerFactory();
-      ServletContainer container = factory.getServletContainer();
+      ServletContainer container = DefaultServletContainerFactory.getInstance().getServletContainer();
       return new ServletContextDispatcher(
          invocation.getServerContext().getClientRequest(),
          invocation.getServerContext().getClientResponse(),