portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smi...@apache.org
Subject svn commit: r540309 - in /portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly: desktop.xml jetspeed-spring.xml pipelines.xml portal-url-generation.xml
Date Mon, 21 May 2007 21:47:26 GMT
Author: smilek
Date: Mon May 21 14:47:25 2007
New Revision: 540309

URL: http://svn.apache.org/viewvc?view=rev&rev=540309
Log:
For desktop only, changed values returned by createActionURL and createRenderURL to be regular
urls (instead of 'javascript:doRender()/doAction()' statement). Added desktop /render pipeline,
which is equivalent to /portlet pipeline except for the addition of the DesktopEncoderRedirectValveImpl
(used by the /render pipeline (desktop-render-pipeline) to allow render requests that are
not initiated via desktop javascript code to result in a page level navigation to the /desktop
pipeline with the correct portlet rendering indicated in the original url).

Modified:
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/pipelines.xml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/portal-url-generation.xml

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml?view=diff&rev=540309&r1=540308&r2=540309
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml Mon May 21 14:47:25 2007
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<beans>
-
-  <!-- Application Server Manager for Tomcat. Comment out for others like JBoss
-  	   Provides hooks into the application server to help us deploy portlet applications
-  	   as web application into that server.  This manager is for Tomcat 5
-  	-->
-
-    <bean id="JetspeedDesktop" class="org.apache.jetspeed.desktop.impl.JetspeedDesktopImpl">
-        <!-- Location of the desktop themes -->
-        <constructor-arg index='0'>
-            <ref bean="DecorationFactory"/>
-        </constructor-arg>
-        <constructor-arg index="1">
-            <ref bean="org.apache.jetspeed.headerresource.HeaderResourceFactory" />
-        </constructor-arg>
-        <constructor-arg index="2">   <!-- desktop servlet path -->
-            <value>/desktop</value>
-        </constructor-arg>        
-        <constructor-arg index="3">   <!-- default desktop layout extension -->
-            <value>.jsp</value>
-        </constructor-arg>
-        <!-- Optional decoration defaults for desktop - bean id 'DesktopConfiguration'
(in headtag.xml)
-             supports the settings 'desktop.decoration.layout' and 'desktop.decoration.portlet',
which if
-             specified, override the values set here -->
-        <constructor-arg index="4">   <!-- default desktop layout decoration  -->
-            <value>tigris</value>
-        </constructor-arg>
-        <constructor-arg index="5">   <!-- default desktop portlet decoration -->
-            <value>tigris</value>
-        </constructor-arg>
- 	    
-        <!-- Uncomment this to HARD CODE your portal URL -->
-        <!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg>
 -->
-     </bean>    
-</beans>
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<beans>
+
+  <!-- Application Server Manager for Tomcat. Comment out for others like JBoss
+  	   Provides hooks into the application server to help us deploy portlet applications
+  	   as web application into that server.  This manager is for Tomcat 5
+  	-->
+
+    <bean id="JetspeedDesktop" class="org.apache.jetspeed.desktop.impl.JetspeedDesktopImpl">
+        <!-- Location of the desktop themes -->
+        <constructor-arg index='0'>
+            <ref bean="DecorationFactory"/>
+        </constructor-arg>
+        <constructor-arg index="1">
+            <ref bean="org.apache.jetspeed.headerresource.HeaderResourceFactory" />
+        </constructor-arg>
+        <constructor-arg index="2">   <!-- desktop servlet path -->
+            <value>/desktop</value>
+        </constructor-arg>        
+        <constructor-arg index="3">   <!-- default desktop layout extension -->
+            <value>.jsp</value>
+        </constructor-arg>
+        <!-- Optional decoration defaults for desktop - bean id 'DesktopConfiguration'
(in headtag.xml)
+             supports the settings 'desktop.decoration.layout' and 'desktop.decoration.portlet',
which if
+             specified, override the values set here -->
+        <constructor-arg index="4">   <!-- default desktop layout decoration  -->
+            <value>tigris</value>
+        </constructor-arg>
+        <constructor-arg index="5">   <!-- default desktop portlet decoration -->
+            <value>tigris</value>
+        </constructor-arg>
+ 	    
+        <!-- Uncomment this to HARD CODE your portal URL -->
+        <!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg>
 -->
+     </bean>    
+</beans>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml?view=diff&rev=540309&r1=540308&r2=540309
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/jetspeed-spring.xml Mon May 21 14:47:25
2007
@@ -124,7 +124,19 @@
     <bean id="Pluto" class="org.apache.pluto.PortletContainerImpl" />
 
     <!-- Desktop Pluto Portlet Container -->
-    <bean id="DesktopPluto" class="org.apache.jetspeed.container.DesktopPortletContainerImpl"
/>
+    <bean id="DesktopPluto" class="org.apache.jetspeed.container.DesktopPortletContainerImpl">
+        
+        <constructor-arg index='0'>
+            <value>/desktop</value>
+        </constructor-arg>
+        <constructor-arg index='1'>
+            <value>/action</value>
+        </constructor-arg>
+        <constructor-arg index='2'>
+            <value>/portlet</value>
+        </constructor-arg>
+        
+    </bean>
     
     <!-- Jetspeed 2's wrapper around Pluto -->
     <!-- settings for this bean will start the underlying pluto portlet container -->

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/pipelines.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/pipelines.xml?view=diff&rev=540309&r1=540308&r2=540309
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/pipelines.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/pipelines.xml Mon May 21 14:47:25
2007
@@ -162,6 +162,14 @@
     </constructor-arg>                
         -->          	
   </bean> 
+
+  <bean id="desktopEncoderRedirectValve"
+        class="org.apache.jetspeed.desktop.impl.DesktopEncoderRedirectValveImpl">
+     <!-- /desktop pipeline -->
+     <constructor-arg index="0"><value>/desktop</value></constructor-arg>
   
+     <!-- /render pipeline -->
+     <constructor-arg index="1"><value>/render</value></constructor-arg>
   
+  </bean>
       
   <bean id="portletValve"
         class="org.apache.jetspeed.aggregator.PortletValve"
@@ -342,6 +350,28 @@
         <ref bean="desktopActionValve"/>
     </list>
     </constructor-arg>
+  </bean>
+
+  <bean id="desktop-render-pipeline"
+        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+        init-method="initialize"
+  >
+   <!-- same as /portlet pipeline except for the addition of the desktopEncoderRedirectValve
-->
+   <constructor-arg>
+       <value>DesktopRenderPipeline</value>
+   </constructor-arg>
+   <constructor-arg>
+    <list>
+        <ref bean="desktopEncoderRedirectValve"/>
+        <ref bean="portalURLValve"/>                
+        <ref bean="capabilityValve"/>        
+        <ref bean="securityValve"/>                
+        <ref bean="localizationValve"/>
+        <ref bean="profilerValve"/>                        
+        <ref bean="containerValve"/>
+        <ref bean="portletValveTitleInHeader"/>    
+    </list>
+    </constructor-arg>
   </bean> 
       
   <bean id="portlet-pipeline"
@@ -362,7 +392,7 @@
         <ref bean="portletValveTitleInHeader"/>    
     </list>
     </constructor-arg>
-  </bean> 
+  </bean>
   
   <bean id="ajax-pipeline"
         class="org.apache.jetspeed.pipeline.JetspeedPipeline"
@@ -463,15 +493,23 @@
             </entry>            
             <entry key='/fileserver'>
                 <value>fileserver-pipeline</value>
-            </entry>                        
-            <entry key='/desktop'>                <!-- the key "/desktop" cannot
be changed without editing core.js (at least) -->
-                <value>desktop-pipeline</value>   <!--    must be set in third
argument in JetspeedDesktop bean initialization -->
-            </entry>                                    
-            <entry key='/action'>
-                <value>desktop-action-pipeline</value>
-            </entry>                                                
+            </entry>
             <entry key='/ajax'>
                 <value>ajax-direct-pipeline</value>
+            </entry>
+            <entry key='/desktop'>
+                <value>desktop-pipeline</value>
+            </entry>                              <!-- for jetspeed desktop, the
keys /desktop, /action and /render cannot be changed -->
+                                                  <!-- without also editing src/webapp/javascript/jetspeed/common.js
and these beans: -->
+                                                  <!--    the JetspeedDesktop bean expects
argument for /desktop (3rd arg in constructor) -->
+                                                  <!--    the DesktopPluto bean expects
arguments for /desktop, /action and /render -->
+                                                  <!--    the DesktopPortalURL bean expects
arguments for /render and /action -->
+                                                  <!--    the desktopEncoderRedirectValve
bean expects arguments for /desktop and /render -->
+            <entry key='/action'>
+                <value>desktop-action-pipeline</value>
+            </entry>
+            <entry key='/render'>
+                <value>desktop-render-pipeline</value>
             </entry>
         </map>        
     </constructor-arg>        

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/portal-url-generation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/portal-url-generation.xml?view=diff&rev=540309&r1=540308&r2=540309
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/portal-url-generation.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/portal-url-generation.xml Mon May
21 14:47:25 2007
@@ -54,16 +54,16 @@
   >  	 
        <constructor-arg index='0'><ref bean="NavigationalState"/></constructor-arg>
 	   <constructor-arg index='1'><ref bean="PortalContext"/></constructor-arg>
-      <!-- javascript function for desktop doRender -->
-       <constructor-arg index='2'><value>javascript:doRender</value></constructor-arg>
-      <!-- javascript function for desktop doAction -->      
-       <constructor-arg index='3'><value>javascript:doAction</value></constructor-arg>
     
+      <!-- jetspeed pipeline for desktop render -->
+       <constructor-arg index='2'><value>/render</value></constructor-arg>
+      <!-- jetspeed pipeline for desktop action -->      
+       <constructor-arg index='3'><value>/action</value></constructor-arg>
     
 	   <!-- Uncomment this to HARD CODE your portal URL -->
 	   <!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg>
 -->
   </bean>
     
   <!-- Uncomment this to HARD CODE your portal URL -->
-   <!--
+  <!--
   <bean id="BasePortalURL"
 	    class="org.apache.jetspeed.container.url.impl.BasePortalURLImpl">
        <constructor-arg><ref bean="ProductionConfiguration"/></constructor-arg>
  
@@ -82,4 +82,4 @@
 	   <constructor-arg index='3'><value>DesktopPortalURL</value></constructor-arg>
           
   </bean>
 
-</beans>
\ No newline at end of file
+</beans>



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