portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r328279 - in /portals/jetspeed-2/trunk: components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java src/webapp/WEB-INF/assembly/pipelines.xml
Date Tue, 25 Oct 2005 06:18:54 GMT
Author: taylor
Date: Mon Oct 24 23:18:50 2005
New Revision: 328279

URL: http://svn.apache.org/viewcvs?rev=328279&view=rev
Log:
allow for pipelines to be mapped from the servlet path:
/ajax -> ajax-pipeline
/portal -> jetspeed-pipeline (default)
/portlet -> portlet-pipeline

Modified:
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/pipelines.xml

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=328279&r1=328278&r2=328279&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
Mon Oct 24 23:18:50 2005
@@ -196,16 +196,16 @@
             String targetPipeline = context
                     .getRequestParameter(PortalReservedParameters.PIPELINE);
             if (null == targetPipeline)
-            {                
-                targetPipeline = context.getRequest().getServletPath();
+            {
+                targetPipeline = (String)context.getAttribute(PortalReservedParameters.PIPELINE);
               
                 if (null == targetPipeline)
                 {
-                    targetPipeline = (String)context.getAttribute(PortalReservedParameters.PIPELINE);
-                }
-                else
-                {
-                    targetPipeline = (String)pipelineMapper.get(targetPipeline); 
-                    System.out.println("pipeline = " + targetPipeline);
+                    targetPipeline = context.getRequest().getServletPath();             
      
+                    if (null != targetPipeline)
+                    {
+                        targetPipeline = (String)pipelineMapper.get(targetPipeline); 
+                        // System.out.println("pipeline = " + targetPipeline);
+                    }
                 }
             }
             // tlRequestContext.set(context);

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/pipelines.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/pipelines.xml?rev=328279&r1=328278&r2=328279&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/pipelines.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/pipelines.xml Mon Oct 24 23:18:50
2005
@@ -238,6 +238,9 @@
             <entry key='/ajax'>
                 <value>ajax-pipeline</value>
             </entry>
+            <entry key='/login'>
+                <value>jetspeed-pipeline</value>
+            </entry>            
         </map>        
     </constructor-arg>        
   </bean>



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