portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r488777 - in /portals/jetspeed-2/trunk/components: cm/src/java/org/apache/jetspeed/mocks/ portal/src/test/org/apache/jetspeed/aggregator/
Date Tue, 19 Dec 2006 19:30:17 GMT
Author: taylor
Date: Tue Dec 19 11:30:16 2006
New Revision: 488777

URL: http://svn.apache.org/viewvc?view=rev&rev=488777
Log:
further progress on getting TestAggregator to run against a portlet app

Modified:
    portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/BaseMockServletContext.java
    portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java
    portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java

Modified: portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/BaseMockServletContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/BaseMockServletContext.java?view=diff&rev=488777&r1=488776&r2=488777
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/BaseMockServletContext.java
(original)
+++ portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/BaseMockServletContext.java
Tue Dec 19 11:30:16 2006
@@ -1,27 +1,27 @@
 package org.apache.jetspeed.mocks;
 
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
 import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
 
-public abstract class BaseMockServletContext implements ServletContext
+import com.mockrunner.mock.web.MockServletContext;
+
+
+public abstract class BaseMockServletContext extends MockServletContext implements ServletContext
 {
     private final Map attributes = new HashMap();
 
+    public BaseMockServletContext()
+    {
+        super();
+    }
     public Object getAttribute(String arg0)
     {
         return attributes.get(arg0);
     }
 
+    /*
     public Enumeration getAttributeNames()
     {
         unsupported();
@@ -145,7 +145,7 @@
         unsupported();
         
     }
-
+*/
     public void removeAttribute(String arg0)
     {
         attributes.remove(arg0);

Modified: portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java?view=diff&rev=488777&r1=488776&r2=488777
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java
(original)
+++ portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java
Tue Dec 19 11:30:16 2006
@@ -17,7 +17,8 @@
     private final Map pathOverrides;
     
     public ResourceLocatingServletContext(File rootPath)
-    {   
+    {
+        super();        
         this.rootPath = rootPath;
         this.pathOverrides = new HashMap();
     }

Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java?view=diff&rev=488777&r1=488776&r2=488777
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java
(original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java
Tue Dec 19 11:30:16 2006
@@ -15,10 +15,11 @@
  */
 package org.apache.jetspeed.aggregator;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.security.Principal;
 import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.HashMap;
+
 import javax.security.auth.Subject;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
@@ -27,35 +28,23 @@
 import junit.framework.TestSuite;
 
 import org.apache.jetspeed.PortalReservedParameters;
-import org.apache.jetspeed.Jetspeed;
-import org.apache.jetspeed.profiler.Profiler;
-import org.apache.jetspeed.profiler.ProfileLocator;
-import org.apache.jetspeed.request.RequestContext;
 import org.apache.jetspeed.aggregator.impl.ContentServerAdapterImpl;
-import org.apache.jetspeed.aggregator.impl.PageAggregatorImpl;
-import org.apache.jetspeed.aggregator.impl.AsyncPageAggregatorImpl;
-import org.apache.jetspeed.aggregator.impl.PortletAggregatorImpl;
+import org.apache.jetspeed.capabilities.Capabilities;
+import org.apache.jetspeed.container.state.NavigationalStateComponent;
+import org.apache.jetspeed.engine.Engine;
 import org.apache.jetspeed.headerresource.HeaderResourceFactory;
 import org.apache.jetspeed.headerresource.impl.HeaderResourceFactoryImpl;
-import org.apache.jetspeed.engine.Engine;
-import org.apache.jetspeed.om.folder.Folder;
-import org.apache.jetspeed.om.page.ContentPage;
-import org.apache.jetspeed.om.page.Fragment;
-import org.apache.jetspeed.om.page.Page;
 import org.apache.jetspeed.om.page.ContentPageImpl;
-import org.apache.jetspeed.om.page.psml.PageImpl;
+import org.apache.jetspeed.om.page.Page;
 import org.apache.jetspeed.page.PageManager;
+import org.apache.jetspeed.profiler.ProfileLocator;
+import org.apache.jetspeed.profiler.Profiler;
+import org.apache.jetspeed.request.JetspeedRequestContext;
+import org.apache.jetspeed.request.RequestContext;
 import org.apache.jetspeed.security.SecurityHelper;
 import org.apache.jetspeed.security.impl.UserPrincipalImpl;
 import org.apache.jetspeed.testhelpers.SpringEngineHelper;
-import org.apache.jetspeed.mockobjects.request.MockRequestContext;
-import org.apache.jetspeed.capabilities.Capabilities;
-import org.apache.jetspeed.capabilities.CapabilityMap;
-import org.apache.jetspeed.request.JetspeedRequestContext;
-import org.apache.jetspeed.container.state.NavigationalStateComponent;
 
-import com.mockrunner.mock.web.MockServletConfig;
-import com.mockrunner.mock.web.MockServletContext;
 import com.mockrunner.mock.web.MockHttpServletRequest;
 import com.mockrunner.mock.web.MockHttpServletResponse;
 import com.mockrunner.mock.web.MockHttpSession;



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message