[pal-cvs 3393] [1127] removed JetspeedDesktop.

svnno****@sourc***** svnno****@sourc*****
2008年 9月 5日 (金) 11:13:03 JST


Revision: 1127
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1127
Author:   shinsuke
Date:     2008-09-05 11:13:03 +0900 (Fri, 05 Sep 2008)

Log Message:
-----------
removed JetspeedDesktop.

Modified Paths:
--------------
    pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/aggregation.xml
    pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/cache.xml
    pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/headtag.xml
    pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/jetspeed-services.xml
    pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/jetspeed-spring.xml
    pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/pipelines.xml
    pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/portal-url-generation.xml
    pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/web.xml

Removed Paths:
-------------
    pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/desktop.xml


-------------- next part --------------
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/aggregation.xml
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/aggregation.xml	2008-09-05 02:08:53 UTC (rev 1126)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/aggregation.xml	2008-09-05 02:13:03 UTC (rev 1127)
@@ -216,30 +216,4 @@
         <!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg>  -->
     </bean>
            
-    <bean id="HeaderAggregatorDesktop" class="org.apache.jetspeed.aggregator.impl.HeaderAggregatorImpl">
-        <constructor-arg index="0">
-            <ref bean="portletFactory" />
-        </constructor-arg>
-        <constructor-arg index="1">
-            <ref bean="PortletWindowAccessor"/>
-        </constructor-arg>
-        <constructor-arg index="2">
-            <ref bean="org.apache.jetspeed.headerresource.HeaderResourceFactory" />
-        </constructor-arg>
-        <constructor-arg index="3" type="boolean">
-            <value>true</value>   <!-- isDesktop == true -->
-        </constructor-arg>
-        <constructor-arg index="4">
-            <ref bean="HeaderResourceConfigurationDesktop"/>
-        </constructor-arg>
-        <constructor-arg index="5">
-            <ref bean="HeaderResourceRegistry"/>
-        </constructor-arg>
-        <constructor-arg index="6">
-            <ref bean="DecorationFactory"/>
-        </constructor-arg>
-        
-        <!-- Uncomment this to HARD CODE your portal URL -->
-        <!-- <constructor-arg><ref bean="BasePortalURL"/></constructor-arg>  -->
-    </bean>
 </beans>

Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/cache.xml
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/cache.xml	2008-09-05 02:08:53 UTC (rev 1126)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/cache.xml	2008-09-05 02:13:03 UTC (rev 1127)
@@ -100,7 +100,7 @@
 	<bean id="decorationConfigurationCache"
 		class="org.apache.jetspeed.cache.impl.EhCacheImpl">
 		<constructor-arg>
-			<ref bean="ehDesktopContentCache" />
+			<ref bean="ehDecorationConfigurationCache" />
 		</constructor-arg>
 	</bean>
 
@@ -135,14 +135,6 @@
 		<property name="cacheName" value="portletApplicationNameCache" />
 	</bean>
 
-	<bean id="ehDesktopContentCache"
-		class="org.springframework.cache.ehcache.EhCacheFactoryBean">
-		<property name="cacheManager">
-			<ref local="cacheManager" />
-		</property>
-		<property name="cacheName" value="desktopContentCache" />
-	</bean>
-
 	<bean id="portletApplicationOidCache"
 		class="org.apache.jetspeed.cache.impl.EhCacheImpl">
 		<constructor-arg>
@@ -157,13 +149,6 @@
 		</constructor-arg>
 	</bean>
 
-	<bean id="desktopContentCache"
-		class="org.apache.jetspeed.cache.impl.EhCacheImpl">
-		<constructor-arg>
-			<ref bean="ehDesktopContentCache" />
-		</constructor-arg>
-	</bean>
-
 	<bean id="ehPortletDefinitionOidCache"
 		class="org.springframework.cache.ehcache.EhCacheFactoryBean">
 		<property name="cacheManager">

Deleted: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/desktop.xml
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/desktop.xml	2008-09-05 02:08:53 UTC (rev 1126)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/desktop.xml	2008-09-05 02:13:03 UTC (rev 1127)
@@ -1,56 +0,0 @@
-<?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">
-            <ref bean="desktopContentCache" />
-        </constructor-arg>
-        <constructor-arg index="3">   <!-- desktop servlet path -->
-            <value>/desktop</value>
-        </constructor-arg>        
-        <constructor-arg index="4">   <!-- 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="5">   <!-- default desktop layout decoration  -->
-            <value>tigris</value>
-        </constructor-arg>
-        <constructor-arg index="6">   <!-- 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: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/headtag.xml
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/headtag.xml	2008-09-05 02:08:53 UTC (rev 1126)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/headtag.xml	2008-09-05 02:13:03 UTC (rev 1127)
@@ -20,412 +20,24 @@
     <!--  header (html <head>) configuration  -->
 
     <!--  *****  -->
-    <!--  /desktop header configuration  -->
-    <!--  *****  -->
-    <bean id="HeaderResourceConfigurationDesktop" class="java.util.HashMap">
-        <constructor-arg index="0">
-            <map>
-                <entry key="dojo">
-                    <ref bean="DojoConfigurationDesktop" />
-                </entry>
-                <entry key="desktop">
-                    <ref bean="DesktopConfiguration" />
-                </entry>
-                <entry key="header.order">
-                    <list>
-                        <value>header.dojo.parameters</value>            <!-- djConfig definition -->
-                        <value>header.dojo.preinit</value>               <!-- generated djConfig.baseScriptUri definition -->
-                        <value>header.dojo.config</value>                <!-- for adding statements prior to dojo.js load -->
-                        <value>header.dojo.init</value>                  <!-- <script src=".../dojo.js"> -->
-                        <value>header.dojo.requires.core</value>         <!-- dojo.require statements for dojo core modules -->
-                        <value>header.dojo.modules.path</value>          <!-- dojo.registerModulePath statements -->
-                        <value>header.dojo.requires.modules</value>      <!-- dojo.require statements for dojo add-on modules -->
-                        <value>header.dojo.writeincludes</value>         <!-- generated dojo.hostenv.writeIncludes() statement -->
-                        <value>header.dojo.modules.namespace</value>     <!-- dojo.registerNamespace statements -->
-                        <value>header.dojo.style.bodyexpand</value>      <!-- css for body 100% height/width (for some dojo widgets) -->
-                        <!-- <value>header.basetag</value> -->                    <!-- generated <base href=".../jetspeed/"> -->
-                        <value>header.desktop.style.layout</value>       <!-- generated <link href=".../styles.css"> for layout decoration -->
-                        <value>header.desktop.init</value>               <!-- generated desktop startup javascript -->
-                    </list>
-                </entry>
-                <entry key="header.types">
-                    <ref bean="HeaderTypes" />
-                </entry>
-            </map>
-        </constructor-arg>
-    </bean>
-
-    <bean id="DesktopConfiguration" class="java.util.HashMap">
-        <constructor-arg index="0">
-            <map>
-                <!-- layout and portlet decorations -->
-                <entry key="decoration.layout">
-                    <!-- default layout decoration for desktop
-                         this is used when a selected layout decoration does not support desktop -->
-                    <value>blueocean</value>
-                </entry>
-
-                <entry key="decoration.portlet">
-                    <!-- default portlet decoration for desktop
-                         this is used when a selected portlet decoration does not support desktop -->
-                    <value>tigris</value>
-                </entry>
-
-                <!-- page navigation -->
-                <entry key="page.ajaxnavigation">
-                    <!-- enable ajax page navigation - default is false -->
-                    <!-- when set to true, the dojo parameter dojo.parameter.preventBackButtonFix should be set to false -->
-                    <value>true</value>
-                </entry>
-
-                <!-- window modes -->
-                <entry key="window.tiling">
-                    <!-- enable window tiling mode - default is true -->
-                    <value>true</value>
-                </entry>
-                <entry key="window.heightexpand">
-                    <!-- default tiled windows to expand in height to fit content - default is false -->
-                    <value>true</value>
-                </entry>
-
-                <!-- window dimensions -->
-                <entry key="window.height">
-                    <!-- default window height -->
-                    <value>200</value>
-                </entry>
-                <entry key="window.width">
-                    <!-- default window width -->
-                    <value>280</value>
-                </entry>
-
-                <!-- window actions -->
-                <!-- NOTE: each portlet decorator may override any of these properties in its decoratordesktop.properties file -->
-                <entry key="window.action.button.order">
-                    <!-- order, left to right, that action buttons should be rendered -->
-                    <!-- all listed actions are expected to have associated images at derived path -->
-                    <!--    decorations/portlet/{decorator-name}/images/desktop/{action}.gif -->
-
-                    <!-- if an action has no image, it can still be in this list as long as it also appears in -->
-                    <!--    the window.action.noimage entry (the goal here is that the decorator need only override window.action.noimage) -->
-
-                    <!-- of course, each portlet will only display those actions that it supports, etc. -->
-                    <!-- no image mapping is offered because if it is to be supported, it should be from DecoratorAction -->
-                    <!-- some actions, such as "menu" and "restore" have special behaviors (e.g. restore replaces minimize when window is minimized) -->
-                    <list>
-                        <value>menu</value>
-                        <value>config</value>
-                        <value>edit_defaults</value>
-                        <value>edit</value>
-                        <value>view</value>
-                        <value>print</value>
-                        <value>help</value>
-                        <value>minimized</value>
-                        <value>normal</value>
-                        <value>maximized</value>
-                        <value>removeportlet</value>   <!-- activated only when in page edit mode -->
-                    </list>
-                </entry>
-                <entry key="window.action.button.maximum">
-                    <!-- maximum number of action buttons allowed - overflow items will be displayed at top of action menu -->
-                    <value>11</value>
-                </entry>
-                <entry key="window.action.noimage">
-                    <!-- list of actions that do no have images -->
-                    <list>
-                        <value>tile</value>
-                        <value>untile</value>
-                        <value>heightexpand</value>
-                        <value>heightnormal</value>
-                    </list>
-                </entry>
-                <entry key="window.action.menu.order">
-                    <!-- order that the actions should appear in action menu (for each action that is not displayed as a button) -->
-                    <list>
-                        <value>view</value>
-                        <value>maximized</value>
-                        <value>normal</value>
-                        <value>minimized</value>
-                        <value>print</value>
-                        <value>edit</value>
-                        <value>edit_defaults</value>
-                        <value>config</value>
-                        <value>tile</value>
-                        <value>untile</value>
-                        <value>heightexpand</value>
-                        <value>heightnormal</value>
-                        <value>about</value>
-                        <value>help</value>
-                        <value>removeportlet</value>
-                    </list>
-                </entry>
-                <entry key="window.action.button.tooltip">
-                    <!-- display tooltips for window action buttons -->
-                    <value>true</value>
-                </entry>
-
-                <!-- window icons -->
-                <!-- NOTE: each portlet decorator may override any of these properties in its decoratordesktop.properties file -->
-                <entry key="window.icon.enabled">
-                    <!-- display icon for each window -->
-                    <value>true</value>
-                </entry>
-                <entry key="window.icon.path">
-                    <!-- path to window icons -->
-                    <value>/images/portlets/small</value>
-                </entry>
-
-                <!-- page actions -->
-                <entry key="page.action.button.tooltip">
-                    <!-- display tooltips for page action buttons -->
-                    <value>true</value>
-                </entry>
-            </map>
-        </constructor-arg>
-    </bean>
-
-    <bean id="DojoConfigurationDesktop" class="java.util.HashMap">
-        <constructor-arg index="0">
-            <map>
-                <entry key="dojo.enable">
-                    <!-- dojo headers only included if dojo.enable is true -->
-                    <value>true</value>
-                </entry>
-                <entry key="dojo.path">
-                    <!-- path to dojo root from portal context path -->
-                    <!-- used in constructing <script src=".../dojo.js"> and djConfig.baseScriptUri -->
-                    <value>/javascript/dojo/</value>  
-                </entry>
-                <entry key="dojo.parameter.isDebug">
-                    <!-- value for djConfig variable isDebug -->
-                    <value>false</value>
-                </entry>
-                <entry key="dojo.parameter.debugAtAllCosts">
-                    <!-- value for djConfig variable debugAtAllCosts -->
-                    <value>false</value>
-                </entry>
-                <entry key="dojo.parameter.preventBackButtonFix">
-                    <!-- enable back button control -->
-                    <value>false</value>
-                </entry>
-                <entry key="dojo.parameters">
-                    <!-- additional djConfig variables expressed as a json object fragment: -->
-                    <!--    key: value[, key: value]*     -->
-                    <!-- if an entry "dojo.parameters" is defined in HeaderResourceRegistry, its value replaces value -->
-                    <!--    built from the value here as well as dojo.parameter.isDebug and dojo.parameter.debugAtAllCosts -->
-                    <!-- template: var djConfig = { ${value} }; -->
-                    <!-- header section: header.dojo.parameters -->
-                    <value></value>
-                </entry>
-                <entry key="dojo.requires.core">
-                    <!-- list of dojo core modules -->
-                    <!-- template: dojo.require( "${value}" ); -->
-                    <!-- header section: header.dojo.requires.core -->
-                    <ref bean="DojoRequiresDesktop" />
-                </entry>
-                <entry key="dojo.modules.path">
-                    <!-- list of statements intended to be dojo.registerModulePath calls -->
-                    <!-- template: none -->
-                    <!-- values can reference entries in HeaderResourceRegistry -->
-                    <!-- header section: header.dojo.modules.path -->
-                    <!-- note: each entry below refers to a HeaderResourceRegistry entry which is currently an -->
-                    <!--       empty value due to dojo 0.4.0 improvements which make this step unnecessary for these modules -->
-                    <list>
-                        <value>dojo.module.jetspeed.ui.widget</value>
-                        <value>dojo.module.jetspeed.desktop</value>
-                    </list>
-                </entry>
-                <entry key="dojo.requires.modules">
-                    <!-- list of dojo add-on modules -->
-                    <!-- template: dojo.require( "${value}" ); -->
-                    <!-- header section: header.dojo.requires.modules -->
-                    <ref bean="DojoRequiresModulesDesktop" />
-                </entry>
-                <entry key="dojo.modules.namespace">
-                    <!-- list of statements intended to be dojo.registerNamespace calls -->
-                    <!-- template: none -->
-                    <!-- values can reference entries in HeaderResourceRegistry -->
-                    <!-- header section: header.dojo.modules.namespace -->
-                    <!-- note: the entry below refers to a HeaderResourceRegistry entry which is currently an -->
-                    <!--       empty value due to dojo 0.4.0 improvements which make this step unnecessary for this module -->
-                    <list>
-                        <value>dojo.module.widget.jetspeed.ui.widget</value>
-                    </list>
-                </entry>
-            </map>
-        </constructor-arg>
-    </bean>
-
-    <bean id="DojoRequiresDesktop" class="java.util.ArrayList">
-        <constructor-arg index="0">
-            <list>
-                <value>dojo.lang.*</value>
-                <value>dojo.event.*</value>
-                <value>dojo.io.*</value>
-                <value>dojo.widget.*</value>
-                <value>dojo.widget.TabContainer</value>
-                <value>dojo.widget.AccordionContainer</value>
-                <value>dojo.widget.Menu2</value>
-            </list>
-        </constructor-arg>
-    </bean>
-
-    <bean id="DojoRequiresModulesDesktop" class="java.util.ArrayList">
-        <constructor-arg index="0">
-            <list>
-                <value>jetspeed.desktop.core</value>
-                <value>jetspeed.widget.PortletWindow</value>
-                <value>jetspeed.widget.PortalTabContainer</value>
-                <value>jetspeed.widget.PortalAccordionContainer</value>
-                <value>jetspeed.widget.PortalBreadcrumbContainer</value>
-                <value>jetspeed.widget.PortalTooltipManager</value>
-            </list>
-        </constructor-arg>
-    </bean>
-
-
-    <!--  *****  -->
     <!--  /portal header configuration  -->
     <!--  *****  -->
     <bean id="HeaderResourceConfigurationPortal" class="java.util.HashMap">
         <constructor-arg index="0">
             <map>
-                <entry key="dojo">
-                    <ref bean="DojoConfigurationPortal" />
-                </entry>
-                <entry key="header.order">
-                    <list>  <!-- note: these are only included if dojo.enable is set to true (below or at runtime) -->
-                        <value>header.dojo.parameters</value>            <!-- djConfig definition -->
-                        <value>header.dojo.preinit</value>               <!-- generated djConfig.baseScriptUri definition -->
-                        <value>header.dojo.config</value>                <!-- for adding statements prior to dojo.js load -->
-                        <value>header.dojo.init</value>                  <!-- <script src=".../dojo.js"> -->
-                        <value>header.dojo.requires.core</value>         <!-- dojo.require statements for dojo core modules -->
-                        <value>header.dojo.modules.path</value>          <!-- dojo.registerModulePath statements -->
-                        <value>header.dojo.requires.modules</value>      <!-- dojo.require statements for dojo add-on modules -->
-                        <value>header.dojo.writeincludes</value>         <!-- generated dojo.hostenv.writeIncludes() statement -->
-                        <value>header.dojo.modules.namespace</value>     <!-- dojo.registerNamespace statements -->
-                        <value>header.dojo.style.bodyexpand</value>      <!-- css for body 100% height/width (for some dojo widgets) -->
-                    </list>
-                </entry>
                 <entry key="header.types">
                     <ref bean="HeaderTypes" />
                 </entry>
             </map>
         </constructor-arg>
     </bean>
-    <bean id="DojoConfigurationPortal" class="java.util.HashMap">
-        <constructor-arg index="0">
-            <map>
-                <entry key="dojo.enable">
-                    <!-- dojo headers only included if dojo.enable is true; leaving it up to one or more portlets to set this -->
-                    <value>false</value>
-                </entry>
-                <entry key="dojo.path">
-                    <!-- path to dojo root from portal context path -->
-                    <!-- used in constructing <script src=".../dojo.js"> and djConfig.baseScriptUri -->
-                    <value>/javascript/dojo/</value>
-                </entry>
-                <entry key="dojo.parameter.isDebug">
-                    <!-- value for djConfig variable isDebug -->
-                    <value>false</value>
-                </entry>
-                <entry key="dojo.parameter.debugAtAllCosts">
-                    <!-- value for djConfig variable debugAtAllCosts -->
-                    <value>false</value>
-                </entry>
-                <entry key="dojo.parameters">
-                    <!-- additional djConfig variables expressed as a json object fragment: -->
-                    <!--    key: value[, key: value]*     -->
-                    <!-- if an entry "dojo.parameters" is defined in HeaderResourceRegistry, its value replaces value -->
-                    <!--    built from the value here as well as dojo.parameter.isDebug and dojo.parameter.debugAtAllCosts -->
-                    <!-- template: var djConfig = { ${value} }; -->
-                    <!-- header section: header.dojo.parameters -->
-                    <value></value>
-                </entry>
-                <entry key="dojo.requires.core">
-                    <!-- list of dojo core modules -->
-                    <!-- template: dojo.require( "${value}" ); -->
-                    <!-- header section: header.dojo.requires.core -->
-                    <list>
-                        <value>dojo.lang.*</value>
-                        <value>dojo.event.*</value>
-                        <value>dojo.io.*</value>
-                        <value>dojo.widget.*</value>
-                    </list>
-                </entry>
-                <entry key="dojo.modules.path">
-                    <!-- list of statements intended to be dojo.registerModulePath calls -->
-                    <!-- template: none -->
-                    <!-- values can reference entries in HeaderResourceRegistry -->
-                    <!-- header section: header.dojo.modules.path -->
-                    <!-- note: each entry below refers to a HeaderResourceRegistry entry which is currently an -->
-                    <!--       empty value due to dojo 0.4.0 improvements which make this step unnecessary for these modules -->
-                    <list>
-                        <value>dojo.module.jetspeed.ui.widget</value>
-                        <value>dojo.module.jetspeed.desktop</value>
-                    </list>
-                </entry>
-                <entry key="dojo.requires.modules">
-                    <!-- list of dojo add-on modules -->
-                    <!-- template: dojo.require( "${value}" ); -->
-                    <!-- header section: header.dojo.requires.modules -->
-                    <list>
-                        <value>jetspeed.common</value>
-                    </list>
-                </entry>
-                <entry key="dojo.modules.namespace">
-                    <!-- list of statements intended to be dojo.registerNamespace calls -->
-                    <!-- template: none -->
-                    <!-- values can reference entries in HeaderResourceRegistry -->
-                    <!-- header section: header.dojo.modules.namespace -->
-                    <!-- note: the entry below refers to a HeaderResourceRegistry entry which is currently an -->
-                    <!--       empty value due to dojo 0.4.0 improvements which make this step unnecessary for this module -->
-                    <list>
-                        <value>dojo.module.widget.jetspeed.ui.widget</value>
-                    </list>
-                </entry>
-            </map>
-        </constructor-arg>
-    </bean>
 
-
     <!--  *****  -->
     <!--  shared /portal and /desktop header configuration  -->
     <!--  *****  -->
     <bean id="HeaderResourceRegistry" class="java.util.HashMap">
         <constructor-arg index="0">
             <map>
-                <!-- override of content for header fragments added with specified key -->
-                <!-- also acts as way to refer to a shared value within these header configuration settings -->
-                <!-- also, when generating final content, if a header section is included in header.order -->
-                <!--    and it has empty content, then an entry here matching the header section name will -->
-                <!--    be used for content -->
-                <entry key="dojo.module.jetspeed.ui.widget">
-                    <!-- <value>dojo.hostenv.setModulePrefix('jetspeed.ui.widget', '../desktop/widget');</value> --> <!-- dojo 0.3.1 -->
-                    <!-- <value>dojo.registerModulePath("jetspeed.widget", "../desktop/widget");</value> --> <!-- dojo 0.4.0 -->
-                    <!-- note: current value is empty due to dojo 0.4.0 improvements which make this step unnecessary for this module -->
-                    <value></value>
-                </entry>
-                <entry key="dojo.module.jetspeed.desktop">
-                    <!-- <value>dojo.hostenv.setModulePrefix('jetspeed.desktop', '../desktop/core');</value> --> <!-- dojo 0.3.1 -->
-                    <!-- <value>dojo.registerModulePath("jetspeed.desktop", "../desktop/core");</value> --> <!-- dojo 0.4.0 -->
-                    <!-- note: current value is empty due to dojo 0.4.0 improvements which make this step unnecessary for this module -->
-                    <value></value>
-                </entry>
-                <entry key="dojo.module.widget.jetspeed.ui.widget">
-                    <!-- <value>dojo.widget.manager.registerWidgetPackage('jetspeed.ui.widget');</value> --> <!-- dojo 0.3.1 -->
-                    <!-- <value>dojo.registerNamespace("jetspeed", 'jetspeed.widget', function(name){ return "jetspeed.widget."+dojo.string.capitalize(name);});</value> -->  <!-- dojo 0.4.0 -->
-                    <!-- note: current value is empty due to dojo 0.4.0 improvements which make this step unnecessary for this module -->
-                    <value></value>
-                </entry>
-                <entry key="header.dojo.style.bodyexpand">   <!-- dojo.style.bodyexpand -->
-                    <!-- make the body expand to fill the visible window -->
-                    <value>html, body { width: 100%; height: 100%; padding: 0 0 0 0; margin: 0 0 0 0; }</value>
-                    <!-- <value>html, body { padding: 0 0 0 0; margin: 0 0 0 0; }</value> -->
-                </entry>
-                <entry key="header.dojo.style.bodyexpand.noscroll">   <!-- dojo.style.bodyexpand.noscroll -->
-                    <!-- make the body expand to fill the visible window - erase window level scrollbars -->
-                    <value>html, body { width: 100%; height: 100%; overflow: hidden; padding: 0 0 0 0; margin: 0 0 0 0; }</value>
-                </entry>
             </map>
         </constructor-arg>
     </bean>

Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/jetspeed-services.xml
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/jetspeed-services.xml	2008-09-05 02:08:53 UTC (rev 1126)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/jetspeed-services.xml	2008-09-05 02:13:03 UTC (rev 1127)
@@ -87,9 +87,6 @@
 		  <entry key="DecorationFactory">
             <ref bean="DecorationFactory"/>
           </entry>
-		  <entry key="Desktop">
-            <ref bean="JetspeedDesktop"/>
-          </entry>
 		  <entry key="PermissionManager">
             <ref bean="org.apache.jetspeed.security.PermissionManager"/>
           </entry>		            

Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/jetspeed-spring.xml
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/jetspeed-spring.xml	2008-09-05 02:08:53 UTC (rev 1126)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/jetspeed-spring.xml	2008-09-05 02:13:03 UTC (rev 1127)
@@ -107,21 +107,6 @@
     <!-- Pluto Portlet Container -->
     <bean id="Pluto" class="org.apache.pluto.PortletContainerImpl" />
 
-    <!-- Desktop Pluto Portlet Container -->
-    <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 -->
     <bean id="org.apache.pluto.PortletContainer" class="org.apache.jetspeed.container.JetspeedPortletContainerWrapper" init-method="start"
@@ -146,30 +131,6 @@
 		</property>
     </bean>
 
-    <!-- Jetspeed 2's wrapper around Desktop Pluto container -->
-    <!-- settings for this bean will start the underlying pluto portlet container -->
-    <bean id="org.apache.pluto.DesktopPortletContainer" class="org.apache.jetspeed.container.JetspeedPortletContainerWrapper" init-method="start"
-        destroy-method="shutdown">
-        <constructor-arg>
-            <ref bean="DesktopPluto" />
-        </constructor-arg>
-        <constructor-arg>
-            <value>${portal.name}Desktop</value>
-        </constructor-arg>
-        <constructor-arg>
-            <ref bean="ServletConfig" />
-        </constructor-arg>
-        <constructor-arg>
-            <ref bean="Engine" />
-        </constructor-arg>
-		<property name="requestFactory">
-			<ref bean="ServletRequestFactory" />
-		</property>
-		<property name="responseFactory">
-			<ref bean="ServletResponseFactory" />
-		</property>
-    </bean>
-    
     <!-- Adds jetspeed.properties as our configuration object to support ${...} vars -->
     <!-- ${applicationRoot} is acutally set as a system property via the SpringEngine -->
 

Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/pipelines.xml
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/pipelines.xml	2008-09-05 02:08:53 UTC (rev 1126)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/pipelines.xml	2008-09-05 02:13:03 UTC (rev 1127)
@@ -214,37 +214,6 @@
         -->          	
   </bean> 
 
-  <bean id="desktopActionValve"
-        class="org.apache.jetspeed.pipeline.valve.impl.ActionValveImpl"
-        init-method="initialize"
-  >
-   <constructor-arg>
-       <ref bean="org.apache.pluto.DesktopPortletContainer" />
-   </constructor-arg>
-   <constructor-arg>   
-       <ref bean="PortletWindowAccessor" />    
-   </constructor-arg>   
-   <constructor-arg>
-    	<ref bean="portletContentCache"/>
-   </constructor-arg>      
-    <!-- 
-         Setting to true will force Action response isCommitted to true
-         as there is a bug in Websphere 5 where request.isCommitted always returns false
-         Set this boolean to TRUE if running on Websphere 5 pre-cumulative fix 5.1.1.9  
-    <constructor-arg type="boolean">
-        <value>false</value>
-    </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"
         init-method="initialize"
@@ -291,15 +260,6 @@
    </constructor-arg>
   </bean> 
 
-  <bean id="headerAggregatorValveDesktop"
-        class="org.apache.jetspeed.aggregator.HeaderAggregatorValve"
-        init-method="initialize"
-  >
-   <constructor-arg>
-       <ref bean="HeaderAggregatorDesktop"/>
-   </constructor-arg>
-  </bean> 
-      
   <bean id="cleanUpValve"
         class="org.apache.jetspeed.pipeline.valve.impl.CleanupValveImpl"
         init-method="initialize"
@@ -356,14 +316,6 @@
     </constructor-arg>
   </bean> 
 
-  <bean id="desktopValve"
-        class="org.apache.jetspeed.desktop.impl.DesktopValveImpl"
-  > 
-    <constructor-arg>
-        <ref bean="JetspeedDesktop" />
-    </constructor-arg>      
-  </bean>
-      
   <bean id="resourceValve"
         class="org.apache.jetspeed.resource.ResourceValveImpl"
         init-method="initialize">
@@ -581,49 +533,6 @@
     </constructor-arg>
   </bean> 
 
-  <bean id="desktop-action-pipeline"
-        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
-        init-method="initialize"
-  >
-   <constructor-arg>
-       <value>DesktopActionPipeline</value>
-   </constructor-arg>
-   <constructor-arg>
-    <list>
-        <ref bean="securityValve"/>                        
-        <ref bean="localizationValve"/>
-        <ref bean="capabilityValve"/>
-        <ref bean="portalURLValve"/>
-        <ref bean="profilerValve"/>        
-        <ref bean="containerValve"/>
-        <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="resourceValve"/>
-        <ref bean="portletValveTitleInHeader"/>    
-    </list>
-    </constructor-arg>
-  </bean> 
-      
   <bean id="portlet-pipeline"
         class="org.apache.jetspeed.pipeline.JetspeedPipeline"
         init-method="initialize"
@@ -705,46 +614,6 @@
     </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="headerAggregatorValveDesktop"/>          
-        <ref bean="desktopValve"/>
-    </list>
-    </constructor-arg>
-  </bean> 
-
-  <bean id="dtconfigure-pipeline"
-        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
-        init-method="initialize"
-  >
-   <constructor-arg>
-       <value>DesktopConfigurePipeline</value>
-   </constructor-arg>
-   <constructor-arg>
-    <list>
-        <ref bean="capabilityValve"/>
-        <ref bean="portalURLValve"/>                
-        <ref bean="securityValve"/>                
-        <ref bean="localizationValve"/>
-        <ref bean="profilerValve"/>                        
-        <ref bean="headerAggregatorValveDesktop"/>          
-        <ref bean="desktopValve"/>
-    </list>
-    </constructor-arg>
-  </bean> 
-
   <bean id="healthcheck-pipeline" class="org.apache.jetspeed.pipeline.JetspeedPipeline" init-method="initialize">
     <constructor-arg>
       <value>HealthCheckPipeline</value>
@@ -779,26 +648,9 @@
             <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>
             <entry key='/configure'>
                 <value>configure-pipeline</value>
             </entry>            
-            <entry key='/dtconfigure'>
-                <value>dtconfigure-pipeline</value>
-            </entry>                        
             <entry key='/healthcheck'>
                 <value>healthcheck-pipeline</value>
             </entry>

Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/portal-url-generation.xml
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/portal-url-generation.xml	2008-09-05 02:08:53 UTC (rev 1126)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/portal-url-generation.xml	2008-09-05 02:13:03 UTC (rev 1127)
@@ -60,21 +60,6 @@
 	   <!-- <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>
-      <!-- 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"
@@ -92,7 +77,7 @@
        <constructor-arg index="0"><value>NavigationalState</value></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>            
+	   <constructor-arg index='3'><value></value></constructor-arg>
   </bean>
 
 </beans>

Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/web.xml
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/web.xml	2008-09-05 02:08:53 UTC (rev 1126)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/web.xml	2008-09-05 02:13:03 UTC (rev 1127)
@@ -185,44 +185,16 @@
        </servlet-name>
        <url-pattern>/ajax/*</url-pattern>
     </servlet-mapping>            
-<!--
     <servlet-mapping>
        <servlet-name>
           jetspeed
        </servlet-name>
-       <url-pattern>/desktop/*</url-pattern>
-    </servlet-mapping>            
--->
-    <servlet-mapping>
-       <servlet-name>
-          jetspeed
-       </servlet-name>
-       <url-pattern>/action/*</url-pattern>
-    </servlet-mapping>            
-    <servlet-mapping>
-       <servlet-name>
-          jetspeed
-       </servlet-name>
-       <url-pattern>/render/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-       <servlet-name>
-          jetspeed
-       </servlet-name>
        <url-pattern>/configure/*</url-pattern>
     </servlet-mapping>
-<!--
     <servlet-mapping>
        <servlet-name>
           jetspeed
        </servlet-name>
-       <url-pattern>/dtconfigure/*</url-pattern>
-    </servlet-mapping>
--->
-    <servlet-mapping>
-       <servlet-name>
-          jetspeed
-       </servlet-name>
        <url-pattern>/healthcheck/*</url-pattern>
     </servlet-mapping>
 


pal-cvs メーリングリストの案内