You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2006/03/21 05:41:47 UTC
svn commit: r387407 - in
/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly: desktop.xml
pipelines.xml portal-url-generation.xml
Author: taylor
Date: Mon Mar 20 20:41:45 2006
New Revision: 387407
URL: http://svn.apache.org/viewcvs?rev=387407&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-514
assembly changes for desktop
Added:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml
Modified:
portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/pipelines.xml
portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/portal-url-generation.xml
Added: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml?rev=387407&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml (added)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/desktop.xml Mon Mar 20 20:41:45 2006
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed 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"
+ name="JetspeedDesktop">
+ <!-- Location of the desktop themes -->
+ <constructor-arg index="0">
+ <value>/desktop-themes/</value>
+ </constructor-arg>
+ <!-- Default Theme (if not specified in page) -->
+ <constructor-arg index="1">
+ <value>blue</value>
+ </constructor-arg>
+ <!-- Default Theme file extension -->
+ <constructor-arg index="2">
+ <value>.jsp</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/pipelines.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/pipelines.xml?rev=387407&r1=387406&r2=387407&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 Mar 20 20:41:45 2006
@@ -37,8 +37,12 @@
<bean id="portalURLValve"
class="org.apache.jetspeed.container.url.impl.PortalURLValveImpl"
init-method="initialize"
- />
-
+ >
+ <constructor-arg>
+ <ref bean="NavigationalStateComponent" />
+ </constructor-arg>
+ </bean>
+
<bean id="securityValve"
class="org.apache.jetspeed.security.impl.SecurityValveImpl"
init-method="initialize"
@@ -169,7 +173,15 @@
<value>/WEB-INF/templates/login</value>
</constructor-arg>
</bean>
-
+
+ <bean id="desktopValve"
+ class="org.apache.jetspeed.desktop.impl.DesktopValveImpl"
+ >
+ <constructor-arg>
+ <ref bean="JetspeedDesktop" />
+ </constructor-arg>
+ </bean>
+
<bean id="jetspeed-pipeline"
class="org.apache.jetspeed.pipeline.JetspeedPipeline"
init-method="initialize"
@@ -289,7 +301,26 @@
</list>
</constructor-arg>
</bean>
-
+
+ <bean id="desktop-pipeline"
+ class="org.apache.jetspeed.pipeline.JetspeedPipeline"
+ init-method="initialize"
+ >
+ <constructor-arg>
+ <value>DesktopPipeline</value>
+ </constructor-arg>
+ <constructor-arg>
+ <list>
+ <ref bean="capabilityValve"/>
+ <ref bean="portalURLValve"/>
+ <ref bean="securityValve"/>
+ <ref bean="localizationValve"/>
+ <ref bean="profilerValve"/>
+ <ref bean="desktopValve"/>
+ </list>
+ </constructor-arg>
+ </bean>
+
<bean id='pipeline-map'
class='java.util.HashMap'>
<constructor-arg>
@@ -309,6 +340,9 @@
<entry key='/fileserver'>
<value>fileserver-pipeline</value>
</entry>
+ <entry key='/desktop'>
+ <value>desktop-pipeline</value>
+ </entry>
</map>
</constructor-arg>
</bean>
@@ -316,5 +350,6 @@
<bean id="debugValve"
class="org.apache.jetspeed.pipeline.valve.impl.DebugValveImpl"
/>
-
+
+
</beans>
Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/portal-url-generation.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/portal-url-generation.xml?rev=387407&r1=387406&r2=387407&view=diff
==============================================================================
--- 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 Mar 20 20:41:45 2006
@@ -43,6 +43,19 @@
<!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg> -->
</bean>
+ <!-- PortalURL we are currently using -->
+ <bean id="DesktopPortalURL"
+ class="org.apache.jetspeed.container.url.impl.DesktopEncodingPortalURL"
+ singleton="false"
+ >
+ <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>
+ <!-- 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"
@@ -58,8 +71,9 @@
name="org.apache.jetspeed.container.state.NavigationalStateComponent"
>
<constructor-arg index="0"><value>NavigationalState</value></constructor-arg>
- <constructor-arg index="1"><value>PortalURL</value></constructor-arg>
- <constructor-arg><ref bean="PortalContext"/></constructor-arg>
+ <constructor-arg index="1"><value>PortalURL</value></constructor-arg>
+ <constructor-arg index='2'><ref bean="PortalContext"/></constructor-arg>
+ <constructor-arg index='3'><value>DesktopPortalURL</value></constructor-arg>
</bean>
</beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org