portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r646449 [4/7] - in /portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly: ./ alternate/ alternate/versioned-deployment/ boot/
Date Wed, 09 Apr 2008 17:55:05 GMT
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/headtag.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/headtag.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/headtag.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/headtag.xml Wed Apr  9 10:54:56 2008
@@ -1,459 +1,459 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    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.
+  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 xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-    
-    <!--  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>
-
-    <!-- this example HeaderTypes definition can be removed -->
-    <!--    types for all predefined header section names are set automatically -->
-    <!-- supported header types: 
-            script-start
-            script
-            script-end
-            script-tag
-            style
-            link-tag
-            base-tag
-    -->
-    <bean id="HeaderTypes" class="java.util.HashMap">
-        <constructor-arg index="0">
-            <map>
-                <entry key="header.dojo.style.bodyexpand">
-                    <value>style</value>
-                </entry>
-                <entry key="header.dojo.style.bodyexpand.noscroll">
-                    <value>style</value>
-                </entry>
-            </map>
-        </constructor-arg>
-    </bean>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+  <!--  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>
+
+  <!-- this example HeaderTypes definition can be removed -->
+  <!--    types for all predefined header section names are set automatically -->
+  <!-- supported header types: 
+    script-start
+    script
+    script-end
+    script-tag
+    style
+    link-tag
+    base-tag
+  -->
+  <bean id="HeaderTypes" class="java.util.HashMap">
+    <constructor-arg index="0">
+      <map>
+        <entry key="header.dojo.style.bodyexpand">
+          <value>style</value>
+        </entry>
+        <entry key="header.dojo.style.bodyexpand.noscroll">
+          <value>style</value>
+        </entry>
+      </map>
+    </constructor-arg>
+  </bean>
 
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/hierarchical-principal-names.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/hierarchical-principal-names.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/hierarchical-principal-names.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/hierarchical-principal-names.xml Wed Apr  9 10:54:56 2008
@@ -6,54 +6,53 @@
   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
-
+  
+  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 xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-    
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
   <!-- http://issues.apache.org/jira/browse/JS2-527
-  
-       By default, Jetspeed supports hierarchical names for role, group and user principal names. 
-       To make use of that, separate the elements using a dot '.'.
-       Internally, Jetspeed will translate these '.' to '/' to be able to map it on its preference store structure.
-       But, sometimes this isn't wanted, especially with user principal names, as it prohibits using email adresses for instance. 
-       
-       If you don't want hierarchical names support for role, group and/or user principal names, you can disable the default
-       by moving the related MethodInvokatingFactoryBean definition below outside this comment.
-       
+    
+    By default, Jetspeed supports hierarchical names for role, group and user principal names. 
+    To make use of that, separate the elements using a dot '.'.
+    Internally, Jetspeed will translate these '.' to '/' to be able to map it on its preference store structure.
+    But, sometimes this isn't wanted, especially with user principal names, as it prohibits using email adresses for instance. 
+    
+    If you don't want hierarchical names support for role, group and/or user principal names, you can disable the default
+    by moving the related MethodInvokatingFactoryBean definition below outside this comment.
+    
     <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-      <property name="staticMethod">
-        <value>org.apache.jetspeed.security.impl.UserPrincipalImpl.useHierarchicalNames</value>
-      </property>
-      <property name="arguments">
-        <value>false</value>
-      </property>
+    <property name="staticMethod">
+    <value>org.apache.jetspeed.security.impl.UserPrincipalImpl.useHierarchicalNames</value>
+    </property>
+    <property name="arguments">
+    <value>false</value>
+    </property>
     </bean>
-
+    
     <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-      <property name="staticMethod">
-        <value>org.apache.jetspeed.security.impl.RolePrincipalImpl.useHierarchicalNames</value>
-      </property>
-      <property name="arguments">
-        <value>false</value>
-      </property>
+    <property name="staticMethod">
+    <value>org.apache.jetspeed.security.impl.RolePrincipalImpl.useHierarchicalNames</value>
+    </property>
+    <property name="arguments">
+    <value>false</value>
+    </property>
     </bean>
-
+    
     <bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-      <property name="staticMethod">
-        <value>org.apache.jetspeed.security.impl.GroupPrincipalImpl.useHierarchicalNames</value>
-      </property>
-      <property name="arguments">
-        <value>false</value>
-      </property>
+    <property name="staticMethod">
+    <value>org.apache.jetspeed.security.impl.GroupPrincipalImpl.useHierarchicalNames</value>
+    </property>
+    <property name="arguments">
+    <value>false</value>
+    </property>
     </bean>
     
   -->

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/importer-page-manager.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/importer-page-manager.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/importer-page-manager.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/importer-page-manager.xml Wed Apr  9 10:54:56 2008
@@ -1,126 +1,180 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-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.
+  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 xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-    
-    <!-- PageManager -->
-  <bean id="ImportPsmlDocumentHandler"      
-       class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >         
-       <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
-       <constructor-arg index="1"><value>.psml</value></constructor-arg>
-       <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.PageImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${java.io.tmpdir}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="ImportPageFileCache"/></constructor-arg>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+  <!-- PageManager -->
+  <bean id="ImportPsmlDocumentHandler" class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler">
+    <constructor-arg index="0">
+      <value>/JETSPEED-INF/castor/page-mapping.xml</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+      <value>.psml</value>
+    </constructor-arg>
+    <constructor-arg index="2">
+      <value>org.apache.jetspeed.om.page.psml.PageImpl</value>
+    </constructor-arg>
+    <constructor-arg index="3">
+      <value>${java.io.tmpdir}</value>
+    </constructor-arg>
+    <constructor-arg index="4">
+      <ref bean="ImportPageFileCache" />
+    </constructor-arg>
   </bean>
-  
-  <bean id="ImportLinkDocumentHandler"       
-       class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >         
-       <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
-       <constructor-arg index="1"><value>.link</value></constructor-arg>
-       <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.LinkImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${java.io.tmpdir}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="ImportPageFileCache"/></constructor-arg>
+
+  <bean id="ImportLinkDocumentHandler" class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler">
+    <constructor-arg index="0">
+      <value>/JETSPEED-INF/castor/page-mapping.xml</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+      <value>.link</value>
+    </constructor-arg>
+    <constructor-arg index="2">
+      <value>org.apache.jetspeed.om.page.psml.LinkImpl</value>
+    </constructor-arg>
+    <constructor-arg index="3">
+      <value>${java.io.tmpdir}</value>
+    </constructor-arg>
+    <constructor-arg index="4">
+      <ref bean="ImportPageFileCache" />
+    </constructor-arg>
   </bean>
-  
-  <bean id="ImportFolderMetaDataDocumentHandler"         
-       class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >         
-       <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
-       <constructor-arg index="1"><value>folder.metadata</value></constructor-arg>
-       <constructor-arg index="2" ><value>org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${java.io.tmpdir}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="ImportPageFileCache"/></constructor-arg>
+
+  <bean id="ImportFolderMetaDataDocumentHandler"
+    class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler">
+    <constructor-arg index="0">
+      <value>/JETSPEED-INF/castor/page-mapping.xml</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+      <value>folder.metadata</value>
+    </constructor-arg>
+    <constructor-arg index="2">
+      <value>org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl</value>
+    </constructor-arg>
+    <constructor-arg index="3">
+      <value>${java.io.tmpdir}</value>
+    </constructor-arg>
+    <constructor-arg index="4">
+      <ref bean="ImportPageFileCache" />
+    </constructor-arg>
   </bean>
-  
-  <bean id="ImportPageSecurityDocumentHandler"       
-       class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >         
-       <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
-       <constructor-arg index="1"><value>page.security</value></constructor-arg>
-       <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.PageSecurityImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${java.io.tmpdir}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="ImportPageFileCache"/></constructor-arg>
+
+  <bean id="ImportPageSecurityDocumentHandler"
+    class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler">
+    <constructor-arg index="0">
+      <value>/JETSPEED-INF/castor/page-mapping.xml</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+      <value>page.security</value>
+    </constructor-arg>
+    <constructor-arg index="2">
+      <value>org.apache.jetspeed.om.page.psml.PageSecurityImpl</value>
+    </constructor-arg>
+    <constructor-arg index="3">
+      <value>${java.io.tmpdir}</value>
+    </constructor-arg>
+    <constructor-arg index="4">
+      <ref bean="ImportPageFileCache" />
+    </constructor-arg>
   </bean>
-  
-  <bean id="ImportDocumentHandlerFactory"        
-       class="org.apache.jetspeed.page.document.psml.DocumentHandlerFactoryImpl" >      
-        <constructor-arg>
-        <map>
-          <entry key=".psml">
-            <ref bean="ImportPsmlDocumentHandler" />
-          </entry>
-          <entry key=".link">
-            <ref bean="ImportLinkDocumentHandler" />
-          </entry>  
-          <entry key="folder.metadata">
-            <ref bean="ImportFolderMetaDataDocumentHandler" />
-          </entry>        
-          <entry key="page.security">
-            <ref bean="ImportPageSecurityDocumentHandler" />
-          </entry>        
-        </map>
-       </constructor-arg>
+
+  <bean id="ImportDocumentHandlerFactory" class="org.apache.jetspeed.page.document.psml.DocumentHandlerFactoryImpl">
+    <constructor-arg>
+      <map>
+        <entry key=".psml">
+          <ref bean="ImportPsmlDocumentHandler" />
+        </entry>
+        <entry key=".link">
+          <ref bean="ImportLinkDocumentHandler" />
+        </entry>
+        <entry key="folder.metadata">
+          <ref bean="ImportFolderMetaDataDocumentHandler" />
+        </entry>
+        <entry key="page.security">
+          <ref bean="ImportPageSecurityDocumentHandler" />
+        </entry>
+      </map>
+    </constructor-arg>
+  </bean>
+
+  <bean id="ImportFolderHandler" class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler">
+    <constructor-arg index="0">
+      <value>${java.io.tmpdir}</value>
+    </constructor-arg>
+    <constructor-arg index="1">
+      <ref bean="ImportDocumentHandlerFactory" />
+    </constructor-arg>
+    <constructor-arg index="2">
+      <ref bean="ImportPageFileCache" />
+    </constructor-arg>
+  </bean>
+
+  <bean id="org.apache.jetspeed.page.CastorPageManager" name="importerCastorPageManager"
+    class="org.apache.jetspeed.page.psml.CastorXmlPageManager">
+    <constructor-arg index="0">
+      <ref bean="ImportIdGenerator" />
+    </constructor-arg>
+    <constructor-arg index="1">
+      <ref bean="ImportDocumentHandlerFactory" />
+    </constructor-arg>
+    <constructor-arg index="2">
+      <ref bean="ImportFolderHandler" />
+    </constructor-arg>
+    <constructor-arg index="3">
+      <ref bean="ImportPageFileCache" />
+    </constructor-arg>
+    <!-- permissions security enabled flag, default=false -->
+    <constructor-arg index="4">
+      <value>false</value>
+    </constructor-arg>
+    <!-- constraints security enabled flag, default=true -->
+    <constructor-arg index="5">
+      <value>false</value>
+    </constructor-arg>
+  </bean>
+
+  <!-- Page File Cache -->
+  <bean id="ImportPageFileCache" class="org.apache.jetspeed.cache.file.FileCache" init-method="startFileScanner"
+    destroy-method="stopFileScanner">
+    <!-- Scan rate for changes in cached files on the file system -->
+    <constructor-arg index="0">
+      <value>10</value>
+    </constructor-arg>
+    <!-- Cache size -->
+    <constructor-arg index="1">
+      <value>100</value>
+    </constructor-arg>
+  </bean>
+
+  <bean id="ImportIdGenerator" class="org.apache.jetspeed.idgenerator.JetspeedIdGenerator" init-method="start"
+    destroy-method="stop">
+    <!-- ID Start value -->
+    <constructor-arg index="0">
+      <value>65536</value>
+    </constructor-arg>
+    <!-- ID Prefix -->
+    <constructor-arg index="1">
+      <value>P-</value>
+    </constructor-arg>
+    <!-- ID Suffix -->
+    <constructor-arg index="2">
+      <value></value>
+    </constructor-arg>
   </bean>
-  
-  <bean id="ImportFolderHandler"         
-       class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler" >         
-       <constructor-arg index="0"><value>${java.io.tmpdir}</value></constructor-arg>
-       <constructor-arg index="1"><ref bean="ImportDocumentHandlerFactory"/></constructor-arg>
-       <constructor-arg index="2"><ref bean="ImportPageFileCache"/></constructor-arg>        
-  </bean>
-    
-  <bean id="org.apache.jetspeed.page.CastorPageManager" 
-       name="importerCastorPageManager"
-       class="org.apache.jetspeed.page.psml.CastorXmlPageManager">         
-       <constructor-arg index="0"><ref bean="ImportIdGenerator"/></constructor-arg>
-       <constructor-arg index="1"><ref bean="ImportDocumentHandlerFactory"/></constructor-arg>
-       <constructor-arg index="2"><ref bean="ImportFolderHandler"/></constructor-arg>
-       <constructor-arg index="3"><ref bean="ImportPageFileCache"/></constructor-arg>        
-       <!-- permissions security enabled flag, default=false -->
-       <constructor-arg index="4"><value>false</value></constructor-arg>
-       <!-- constraints security enabled flag, default=true -->
-       <constructor-arg index="5"><value>false</value></constructor-arg>
-  </bean>
-
-    <!-- Page File Cache -->
-    <bean id="ImportPageFileCache" class="org.apache.jetspeed.cache.file.FileCache" init-method="startFileScanner" destroy-method="stopFileScanner">
-        <!-- Scan rate for changes in cached files on the file system -->
-        <constructor-arg index="0">
-            <value>10</value>
-        </constructor-arg>
-        <!-- Cache size -->
-        <constructor-arg index="1">
-            <value>100</value>
-        </constructor-arg>
-    </bean>
-
-    <bean id="ImportIdGenerator" class="org.apache.jetspeed.idgenerator.JetspeedIdGenerator" init-method="start" destroy-method="stop">
-        <!-- ID Start value -->
-        <constructor-arg index="0">
-            <value>65536</value>
-        </constructor-arg>
-        <!-- ID Prefix -->
-        <constructor-arg index="1">
-            <value>P-</value>
-        </constructor-arg>
-        <!-- ID Suffix -->
-        <constructor-arg index="2">
-            <value></value>
-        </constructor-arg>
-    </bean>
 
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-base.xml Wed Apr  9 10:54:56 2008
@@ -1,50 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    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.
+  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 xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-    
-    <!-- ID Generator -->
-    <bean id="IdGenerator" class="org.apache.jetspeed.idgenerator.JetspeedIdGenerator" init-method="start" destroy-method="stop">
-        <!-- ID Start value -->
-        <constructor-arg index="0">
-            <value>65536</value>
-        </constructor-arg>
-        <!-- ID Prefix -->
-        <constructor-arg index="1">
-            <value>P-</value>
-        </constructor-arg>
-        <!-- ID Suffix -->
-        <constructor-arg index="2">
-            <value></value>
-        </constructor-arg>
-    </bean>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-    <!-- Page File Cache -->
-    <bean id="PageFileCache" class="org.apache.jetspeed.cache.file.FileCache" init-method="startFileScanner" destroy-method="stopFileScanner">
-        <!-- Scan rate for changes in cached files on the file system -->
-        <constructor-arg index="0">
-            <value>10</value>
-        </constructor-arg>
-        <!-- Cache size -->
-        <constructor-arg index="1">
-            <value>100</value>
-        </constructor-arg>
-    </bean>
+  <!-- ID Generator -->
+  <bean id="IdGenerator" class="org.apache.jetspeed.idgenerator.JetspeedIdGenerator" init-method="start"
+    destroy-method="stop">
+    <!-- ID Start value -->
+    <constructor-arg index="0">
+      <value>65536</value>
+    </constructor-arg>
+    <!-- ID Prefix -->
+    <constructor-arg index="1">
+      <value>P-</value>
+    </constructor-arg>
+    <!-- ID Suffix -->
+    <constructor-arg index="2">
+      <value></value>
+    </constructor-arg>
+  </bean>
+
+  <!-- Page File Cache -->
+  <bean id="PageFileCache" class="org.apache.jetspeed.cache.file.FileCache" init-method="startFileScanner"
+    destroy-method="stopFileScanner">
+    <!-- Scan rate for changes in cached files on the file system -->
+    <constructor-arg index="0">
+      <value>10</value>
+    </constructor-arg>
+    <!-- Cache size -->
+    <constructor-arg index="1">
+      <value>100</value>
+    </constructor-arg>
+  </bean>
 
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-production.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-production.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-production.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-production.xml Wed Apr  9 10:54:56 2008
@@ -1,29 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    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.
+  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 xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-    
-    <!-- Production configuration holds properties that can be configured at runtime by system administrator -->
-    <!-- NOTE: you will probably want to put the property file OUTSIDE the web application -->
-    <bean id="ProductionConfiguration" class="org.apache.commons.configuration.PropertiesConfiguration">
-        <constructor-arg>
-            <value>${applicationRoot}/WEB-INF/conf/jetspeed-production.properties</value>
-        </constructor-arg>
-    </bean>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+  <!-- Production configuration holds properties that can be configured at runtime by system administrator -->
+  <!-- NOTE: you will probably want to put the property file OUTSIDE the web application -->
+  <bean id="ProductionConfiguration" class="org.apache.commons.configuration.PropertiesConfiguration">
+    <constructor-arg>
+      <value>${applicationRoot}/WEB-INF/conf/jetspeed-production.properties</value>
+    </constructor-arg>
+  </bean>
 </beans>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml?rev=646449&r1=646448&r2=646449&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-services.xml Wed Apr  9 10:54:56 2008
@@ -1,141 +1,139 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-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.
+  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 xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-    
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
   <!-- Portlet Services  -->
-  <bean id="PortalServices" 
-  	   class="org.apache.jetspeed.services.JetspeedPortletServices" >
-  	   <constructor-arg>
-  	   	<map>
-  	   	  <entry key="PortletRegistryComponent">
-  	   	  	<ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
-  	   	  </entry>
-  	   	  <entry key="SearchComponent">
-  	   	  	<ref bean="org.apache.jetspeed.search.SearchEngine"/>
-  	   	  </entry>
-  	   	  <entry key="PAM">
-  	   	  	<ref bean="PAM" />
-  	   	  </entry>		  
-  	   	  <entry key="UserManager">
-  	   	    <ref bean="org.apache.jetspeed.security.UserManager"/>
-  	   	  </entry>
-  	   	  <entry key="PageManager">
-  	   	    <ref bean="org.apache.jetspeed.page.PageManager"/>
-  	   	  </entry>
-  	   	  <entry key="RoleManager">
-  	   	    <ref bean="org.apache.jetspeed.security.RoleManager"/>
-  	   	  </entry>
-  	   	  <entry key="GroupManager">
-  	   	    <ref bean="org.apache.jetspeed.security.GroupManager"/>
-  	   	  </entry>  	
-  	   	  <entry key="Profiler">
-  	   	  	<ref bean="org.apache.jetspeed.profiler.Profiler"/>
-  	   	  </entry>   	  
-  	   	  <entry key="SSO">
-  	   	  	<ref bean="org.apache.jetspeed.sso.SSOProvider"/>
-  	   	  </entry>   	  
-  	   	  <entry key="EntityAccessor">
-  	   	  	 <ref bean='org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent'/>
-  	   	  </entry>
-  	   	  <entry key="WindowAccessor">
-  	   	  	 <ref bean='org.apache.jetspeed.container.window.PortletWindowAccessor'/>
-  	   	  </entry>
-          <!-- ApplicationServerManager currently only supported for Tomcat. Comment out for others like JBoss -->
-          <entry key="ApplicationServerManager">
-            <ref bean="org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager"/>
-          </entry>
-          <entry key="PortletFactory">
-            <ref bean="portletFactory"/>
-          </entry>
-          <entry key="DeploymentManager">
-            <ref bean="deploymentManager"/>
-          </entry>
-          <entry key='IdGenerator'>
-            <ref bean='IdGenerator'/>
-          </entry>
-          <entry key='Powertools'>
-            <ref bean='Powertools'/>
-          </entry>
-          <entry key="HeaderResource">
-            <ref bean="org.apache.jetspeed.headerresource.HeaderResourceFactory"/>
-          </entry>
-		  <entry key="TemplateLocator">
-            <ref bean="TemplateLocator"/>
-          </entry>
-		  <entry key="DecorationLocator">
-            <ref bean="DecorationLocator"/>
-          </entry>		  
-		  <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>		            
-		  <entry key="PortalStatistics">
-            <ref bean="PortalStatistics"/>
-          </entry>		            
-		  <entry key="PortalAdministration">
-            <ref bean="PortalAdministration"/>
-          </entry>		            
-          <entry key="PreferencesProvider">
-            <ref bean="org.apache.jetspeed.prefs.PreferencesProvider"/>
-          </entry>
-          <entry key="org.apache.jetspeed.container.session.PortalSessionsManager">
-            <ref bean="org.apache.jetspeed.container.session.PortalSessionsManager"/>
-          </entry>
-          <entry key="SecurityAccessController">
-            <ref bean="org.apache.jetspeed.security.SecurityAccessController"/>
-          </entry>
-          <entry key="PortletTrackingManager">
-            <ref bean="org.apache.jetspeed.aggregator.PortletTrackingManager"/>
-          </entry>
-          <entry key ="PortalAuthenticationConfiguration">
-          	<ref bean="org.apache.jetspeed.administration.PortalAuthenticationConfiguration"/>
-          </entry>
-          <entry key ="PortalConfiguration">
-          	<ref bean="PortalConfiguration"/>
-          </entry>
-          <entry key="ImporterManager">
-            <ref bean="importerCastorPageManager"/>
-          </entry>          
-          <entry key="decorationContentCache">
-          	<ref bean="decorationContentCache"/>
-          </entry>
-          <entry key="portletContentCache">
-          	<ref bean="portletContentCache"/>
-          </entry>          
-          <entry key="AuditActivity">
-          	<ref bean="org.apache.jetspeed.audit.AuditActivity"/>
-          </entry>          
-  	   	  <entry key="JetspeedSerializer">
-  	   	    <ref bean="org.apache.jetspeed.serializer.JetspeedSerializer"/>
-  	   	  </entry>
-  	   	  <!-- first uncomment the below service bean in security-spi-atn.xml
-         <entry key="PasswordEncodingService">
-           <ref bean="org.apache.jetspeed.security.PasswordEncodingService" />
-         </entry>
--->          
-  	   	</map>
-  	   </constructor-arg>
+  <bean id="PortalServices" class="org.apache.jetspeed.services.JetspeedPortletServices">
+    <constructor-arg>
+      <map>
+        <entry key="PortletRegistryComponent">
+          <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
+        </entry>
+        <entry key="SearchComponent">
+          <ref bean="org.apache.jetspeed.search.SearchEngine" />
+        </entry>
+        <entry key="PAM">
+          <ref bean="PAM" />
+        </entry>
+        <entry key="UserManager">
+          <ref bean="org.apache.jetspeed.security.UserManager" />
+        </entry>
+        <entry key="PageManager">
+          <ref bean="org.apache.jetspeed.page.PageManager" />
+        </entry>
+        <entry key="RoleManager">
+          <ref bean="org.apache.jetspeed.security.RoleManager" />
+        </entry>
+        <entry key="GroupManager">
+          <ref bean="org.apache.jetspeed.security.GroupManager" />
+        </entry>
+        <entry key="Profiler">
+          <ref bean="org.apache.jetspeed.profiler.Profiler" />
+        </entry>
+        <entry key="SSO">
+          <ref bean="org.apache.jetspeed.sso.SSOProvider" />
+        </entry>
+        <entry key="EntityAccessor">
+          <ref bean='org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent' />
+        </entry>
+        <entry key="WindowAccessor">
+          <ref bean='org.apache.jetspeed.container.window.PortletWindowAccessor' />
+        </entry>
+        <!-- ApplicationServerManager currently only supported for Tomcat. Comment out for others like JBoss -->
+        <entry key="ApplicationServerManager">
+          <ref bean="org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager" />
+        </entry>
+        <entry key="PortletFactory">
+          <ref bean="portletFactory" />
+        </entry>
+        <entry key="DeploymentManager">
+          <ref bean="deploymentManager" />
+        </entry>
+        <entry key='IdGenerator'>
+          <ref bean='IdGenerator' />
+        </entry>
+        <entry key='Powertools'>
+          <ref bean='Powertools' />
+        </entry>
+        <entry key="HeaderResource">
+          <ref bean="org.apache.jetspeed.headerresource.HeaderResourceFactory" />
+        </entry>
+        <entry key="TemplateLocator">
+          <ref bean="TemplateLocator" />
+        </entry>
+        <entry key="DecorationLocator">
+          <ref bean="DecorationLocator" />
+        </entry>
+        <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>
+        <entry key="PortalStatistics">
+          <ref bean="PortalStatistics" />
+        </entry>
+        <entry key="PortalAdministration">
+          <ref bean="PortalAdministration" />
+        </entry>
+        <entry key="PreferencesProvider">
+          <ref bean="org.apache.jetspeed.prefs.PreferencesProvider" />
+        </entry>
+        <entry key="org.apache.jetspeed.container.session.PortalSessionsManager">
+          <ref bean="org.apache.jetspeed.container.session.PortalSessionsManager" />
+        </entry>
+        <entry key="SecurityAccessController">
+          <ref bean="org.apache.jetspeed.security.SecurityAccessController" />
+        </entry>
+        <entry key="PortletTrackingManager">
+          <ref bean="org.apache.jetspeed.aggregator.PortletTrackingManager" />
+        </entry>
+        <entry key="PortalAuthenticationConfiguration">
+          <ref bean="org.apache.jetspeed.administration.PortalAuthenticationConfiguration" />
+        </entry>
+        <entry key="PortalConfiguration">
+          <ref bean="PortalConfiguration" />
+        </entry>
+        <entry key="ImporterManager">
+          <ref bean="importerCastorPageManager" />
+        </entry>
+        <entry key="decorationContentCache">
+          <ref bean="decorationContentCache" />
+        </entry>
+        <entry key="portletContentCache">
+          <ref bean="portletContentCache" />
+        </entry>
+        <entry key="AuditActivity">
+          <ref bean="org.apache.jetspeed.audit.AuditActivity" />
+        </entry>
+        <entry key="JetspeedSerializer">
+          <ref bean="org.apache.jetspeed.serializer.JetspeedSerializer" />
+        </entry>
+        <!-- first uncomment the below service bean in security-spi-atn.xml
+          <entry key="PasswordEncodingService">
+          <ref bean="org.apache.jetspeed.security.PasswordEncodingService" />
+          </entry>
+        -->
+      </map>
+    </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


Mime
View raw message