portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r329245 - /portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java
Date Fri, 28 Oct 2005 16:40:39 GMT
Author: taylor
Date: Fri Oct 28 09:40:34 2005
New Revision: 329245

URL: http://svn.apache.org/viewcvs?rev=329245&view=rev
Log:
bring back default pipeline from jetspeed.properties
Scott: please test this

Modified:
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java

Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java?rev=329245&r1=329244&r2=329245&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java
(original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java
Fri Oct 28 09:40:34 2005
@@ -16,13 +16,11 @@
 package org.apache.jetspeed.engine;
 
 import java.io.FileInputStream;
-import java.io.IOException;
 import java.text.DateFormat;
 import java.util.Date;
 import java.util.Map;
 import java.util.Properties;
 
-import javax.naming.NamingException;
 import javax.servlet.ServletConfig;
 
 import org.apache.commons.configuration.Configuration;
@@ -32,7 +30,6 @@
 import org.apache.jetspeed.PortalContext;
 import org.apache.jetspeed.PortalReservedParameters;
 import org.apache.jetspeed.components.ComponentManager;
-import org.apache.jetspeed.components.jndi.JNDIComponent;
 import org.apache.jetspeed.exception.JetspeedException;
 import org.apache.jetspeed.pipeline.Pipeline;
 import org.apache.jetspeed.request.RequestContext;
@@ -191,8 +188,7 @@
     }
 
     public void service( RequestContext context ) throws JetspeedException
-    {
-        
+    {        
             String targetPipeline = context
                     .getRequestParameter(PortalReservedParameters.PIPELINE);
             if (null == targetPipeline)
@@ -200,16 +196,22 @@
                 targetPipeline = (String)context.getAttribute(PortalReservedParameters.PIPELINE);
               
                 if (null == targetPipeline)
                 {
-                    targetPipeline = context.getRequest().getServletPath();             
      
-                    if (null != targetPipeline)
+                    String pipelineKey = context.getRequest().getServletPath();         
          
+                    if (null != pipelineKey)
                     {
-                        targetPipeline = (String)pipelineMapper.get(targetPipeline); 
+                        if (pipelineKey.equals("/portal"))
+                            targetPipeline = this.defaultPipelineName;
+                        else
+                            targetPipeline = (String)pipelineMapper.get(targetPipeline);

                         // System.out.println("pipeline = " + targetPipeline);
                     }
+                    else
+                    {
+                        targetPipeline = this.defaultPipelineName;
+                    }
                 }
             }
-            // tlRequestContext.set(context);
-            Pipeline pipeline = getPipeline();
+            Pipeline pipeline = null;
             if (targetPipeline != null)
             {
                 Pipeline specificPipeline = getPipeline(targetPipeline);
@@ -218,6 +220,9 @@
                     pipeline = specificPipeline;
                 }
             }
+            else
+                pipeline = getPipeline();
+            
             pipeline.invoke(context);
    
     }



---------------------------------------------------------------------
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