portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r708231 - in /portals/jetspeed-2/portal/branches: JETSPEED-2.1.2-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/engine/ JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/engine/
Date Mon, 27 Oct 2008 16:24:42 GMT
Author: taylor
Date: Mon Oct 27 09:24:42 2008
New Revision: 708231

URL: http://svn.apache.org/viewvc?rev=708231&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-914
I changed this patch a little and removed the request parameter/pipeline support from the
service() 

Modified:
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java
    portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java?rev=708231&r1=708230&r2=708231&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java
(original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.2-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java
Mon Oct 27 09:24:42 2008
@@ -189,26 +189,21 @@
     public void service( RequestContext context ) throws JetspeedException
     {        
         long start = System.currentTimeMillis();
-        String targetPipeline = context
-                .getRequestParameter(PortalReservedParameters.PIPELINE);
+        String targetPipeline = (String)context.getAttribute(PortalReservedParameters.PIPELINE);
               
         if (null == targetPipeline)
         {
-            targetPipeline = (String)context.getAttribute(PortalReservedParameters.PIPELINE);
               
-            if (null == targetPipeline)
+            String pipelineKey = context.getRequest().getServletPath();                 
  
+            if (null != pipelineKey)
             {
-                String pipelineKey = context.getRequest().getServletPath();             
      
-                if (null != pipelineKey)
-                {
-                    if (pipelineKey.equals("/portal"))
-                        targetPipeline = this.defaultPipelineName;
-                    else
-                        targetPipeline = (String)pipelineMapper.get(pipelineKey); 
-                    // System.out.println("pipeline = " + targetPipeline);
-                }
-                else
-                {
+                if (pipelineKey.equals("/portal"))
                     targetPipeline = this.defaultPipelineName;
-                }
+                else
+                    targetPipeline = (String)pipelineMapper.get(pipelineKey); 
+                // System.out.println("pipeline = " + targetPipeline);
+            }
+            else
+            {
+                targetPipeline = this.defaultPipelineName;
             }
         }
         Pipeline pipeline = null;

Modified: portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java?rev=708231&r1=708230&r2=708231&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java
(original)
+++ portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java
Mon Oct 27 09:24:42 2008
@@ -189,26 +189,21 @@
     public void service( RequestContext context ) throws JetspeedException
     {        
         long start = System.currentTimeMillis();
-        String targetPipeline = context
-                .getRequestParameter(PortalReservedParameters.PIPELINE);
+        String targetPipeline = (String)context.getAttribute(PortalReservedParameters.PIPELINE);
               
         if (null == targetPipeline)
         {
-            targetPipeline = (String)context.getAttribute(PortalReservedParameters.PIPELINE);
               
-            if (null == targetPipeline)
+            String pipelineKey = context.getRequest().getServletPath();                 
  
+            if (null != pipelineKey)
             {
-                String pipelineKey = context.getRequest().getServletPath();             
      
-                if (null != pipelineKey)
-                {
-                    if (pipelineKey.equals("/portal"))
-                        targetPipeline = this.defaultPipelineName;
-                    else
-                        targetPipeline = (String)pipelineMapper.get(pipelineKey); 
-                    // System.out.println("pipeline = " + targetPipeline);
-                }
-                else
-                {
+                if (pipelineKey.equals("/portal"))
                     targetPipeline = this.defaultPipelineName;
-                }
+                else
+                    targetPipeline = (String)pipelineMapper.get(pipelineKey); 
+                // System.out.println("pipeline = " + targetPipeline);
+            }
+            else
+            {
+                targetPipeline = this.defaultPipelineName;
             }
         }
         Pipeline pipeline = null;



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