portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r758134 [5/5] - in /portals/jetspeed-2/portal/trunk: applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/solo/ applications/jetspeed/src/main/webapp/decorations/layout/blueocean/ applications/jetspeed/src/main/webapp/decorat...
Date Wed, 25 Mar 2009 03:25:00 GMT
Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/aggregation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/aggregation.xml?rev=758134&r1=758133&r2=758134&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/aggregation.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/aggregation.xml
Wed Mar 25 03:24:47 2009
@@ -21,17 +21,14 @@
   <bean id="org.apache.jetspeed.aggregator.PortletTrackingManager"
     class="org.apache.jetspeed.aggregator.impl.PortletTrackingManagerImpl">
     <meta key="j2:cat" value="default" />
-    <constructor-arg index='0'>
-      <ref bean="PortletWindowAccessor" />
-    </constructor-arg>
     <!-- Default portlet timeout in milliseconds:
       Zero means no portlet timeout option by default.
     -->
-    <constructor-arg index='1'>
+    <constructor-arg index='0'>
       <value>${portal.core.aggregator.portlet.timeout}</value>
     </constructor-arg>
     <!--  Out of service limit, if a portlet entity times out past its limit (or default
limit) n consecutive times, it is taken out of service -->
-    <constructor-arg index="2">
+    <constructor-arg index="1">
       <value>${portal.core.aggregator.portlet.service.limit}</value>
     </constructor-arg>
   </bean>
@@ -62,9 +59,6 @@
       <ref bean="org.apache.pluto.PortletContainer" />
     </constructor-arg>
     <constructor-arg>
-      <ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor" />
-    </constructor-arg>
-    <constructor-arg>
       <ref bean="org.apache.jetspeed.aggregator.WorkerMonitor" />
     </constructor-arg>
     <constructor-arg>
@@ -98,9 +92,6 @@
       <ref bean="org.apache.pluto.PortletContainer" />
     </constructor-arg>
     <constructor-arg>
-      <ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor" />
-    </constructor-arg>
-    <constructor-arg>
       <ref bean="org.apache.jetspeed.aggregator.WorkerMonitor" />
     </constructor-arg>
     <constructor-arg>
@@ -206,21 +197,18 @@
       <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">
+    <constructor-arg index="2" type="boolean">
       <value>false</value><!-- isDesktop == false -->
     </constructor-arg>
-    <constructor-arg index="4">
+    <constructor-arg index="3">
       <ref bean="HeaderResourceConfigurationPortal" />
     </constructor-arg>
-    <constructor-arg index="5">
+    <constructor-arg index="4">
       <ref bean="HeaderResourceRegistry" />
     </constructor-arg>
-    <constructor-arg index="6">
+    <constructor-arg index="5">
       <ref bean="DecorationFactory" />
     </constructor-arg>
 
@@ -234,21 +222,18 @@
       <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">
+    <constructor-arg index="2" type="boolean">
       <value>true</value><!-- isDesktop == true -->
     </constructor-arg>
-    <constructor-arg index="4">
+    <constructor-arg index="3">
       <ref bean="HeaderResourceConfigurationDesktop" />
     </constructor-arg>
-    <constructor-arg index="5">
+    <constructor-arg index="4">
       <ref bean="HeaderResourceRegistry" />
     </constructor-arg>
-    <constructor-arg index="6">
+    <constructor-arg index="5">
       <ref bean="DecorationFactory" />
     </constructor-arg>
 

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml?rev=758134&r1=758133&r2=758134&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml
Wed Mar 25 03:24:47 2009
@@ -388,9 +388,6 @@
       <ref bean="org.apache.jetspeed.page.PageManager" />
     </constructor-arg>
     <constructor-arg index='4'>
-      <ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor" />
-    </constructor-arg>
-    <constructor-arg index='5'>
       <ref bean="PortletActionSecurityBehavior" />
     </constructor-arg>
   </bean>
@@ -502,12 +499,6 @@
     <constructor-arg index='2'>
       <ref bean="org.apache.jetspeed.page.PageManager" />
     </constructor-arg>
-    <constructor-arg index='3'>
-      <ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor" />
-    </constructor-arg>
-    <constructor-arg index='4'>
-      <ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent"
/>
-    </constructor-arg>
     <constructor-arg index='5'>
       <ref bean="PortletActionSecurityBehavior" />
     </constructor-arg>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml?rev=758134&r1=758133&r2=758134&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/deployment.xml
Wed Mar 25 03:24:47 2009
@@ -28,12 +28,6 @@
       <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
     </constructor-arg>
     <constructor-arg>
-      <ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent"
/>
-    </constructor-arg>
-    <constructor-arg>
-      <ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor" />
-    </constructor-arg>
-    <constructor-arg>
       <ref bean="org.apache.jetspeed.security.PermissionManager" />
     </constructor-arg>
     <constructor-arg>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml?rev=758134&r1=758133&r2=758134&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/alternate/versioned-deployment/jetspeed-services.xml
Wed Mar 25 03:24:47 2009
@@ -52,9 +52,6 @@
         <entry key="EntityAccessor">
           <ref bean='org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent'
/>
         </entry>
-        <entry key="WindowAccessor">
-          <ref bean='org.apache.jetspeed.container.window.PortletWindowAccessor' />
-        </entry>
         <entry key="PortletFactory">
           <ref bean="portletFactory" />
         </entry>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml?rev=758134&r1=758133&r2=758134&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/deployment.xml
Wed Mar 25 03:24:47 2009
@@ -61,12 +61,6 @@
       <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
     </constructor-arg>
     <constructor-arg>
-      <ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent"
/>
-    </constructor-arg>
-    <constructor-arg>
-      <ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor" />
-    </constructor-arg>
-    <constructor-arg>
       <ref bean="org.apache.jetspeed.security.PermissionManager" />
     </constructor-arg>
     <constructor-arg>

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=758134&r1=758133&r2=758134&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 Mar 25 03:24:47 2009
@@ -53,9 +53,6 @@
         <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"
/>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml?rev=758134&r1=758133&r2=758134&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml
Wed Mar 25 03:24:47 2009
@@ -83,28 +83,6 @@
     <property name="objectType" value="org.apache.jetspeed.request.RequestContextComponent"></property>
   </bean>
 
-  <!-- Portlet Window Component -->
-  <bean id="PortletWindowAccessor" class="org.apache.jetspeed.container.window.impl.PortletWindowAccessorImpl"
-    name="org.apache.jetspeed.container.window.PortletWindowAccessor">
-    <meta key="j2:cat" value="default" />
-    <constructor-arg index='0'>
-      <ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent"
/>
-    </constructor-arg>
-    <constructor-arg index='1'>
-      <ref bean="portletFactory" />
-    </constructor-arg>
-    <constructor-arg index='2'>
-      <ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
-    </constructor-arg>
-    <constructor-arg index='3'>
-      <ref bean="portletWindowCache" />
-    </constructor-arg>
-    <!-- enable window validation -->
-    <constructor-arg type="boolean" index='4'>
-      <value>false</value>
-    </constructor-arg>
-  </bean>
-
   <!-- Pluto Portlet Container -->
   <bean id="Pluto" class="org.apache.pluto.container.impl.PortletContainerImpl">
     <meta key="j2:cat" value="default" />

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml?rev=758134&r1=758133&r2=758134&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pipelines.xml
Wed Mar 25 03:24:47 2009
@@ -195,9 +195,6 @@
       <ref bean="org.apache.pluto.PortletContainer" />
     </constructor-arg>
     <constructor-arg>
-      <ref bean="PortletWindowAccessor" />
-    </constructor-arg>
-    <constructor-arg>
       <ref bean="portletContentCache" />
     </constructor-arg>
     <!-- 
@@ -217,9 +214,6 @@
       <ref bean="org.apache.pluto.DesktopPortletContainer" />
     </constructor-arg>
     <constructor-arg>
-      <ref bean="PortletWindowAccessor" />
-    </constructor-arg>
-    <constructor-arg>
       <ref bean="portletContentCache" />
     </constructor-arg>
     <!-- 
@@ -313,9 +307,6 @@
       <ref bean="DecorationFactory" />
     </constructor-arg>
     <constructor-arg index='1'>
-      <ref bean="PortletWindowAccessor" />
-    </constructor-arg>
-    <constructor-arg index='2'>
       <ref bean="org.apache.jetspeed.security.SecurityAccessController" />
     </constructor-arg>
     <!-- 
@@ -364,9 +355,6 @@
     <constructor-arg>
       <ref bean="org.apache.pluto.PortletContainer" />
     </constructor-arg>
-    <constructor-arg>
-      <ref bean="PortletWindowAccessor" />
-    </constructor-arg>
   </bean>
 
   <bean id="cleanupPortalURLValve"
@@ -567,6 +555,7 @@
         <ref bean="localizationValve" />
         <ref bean="capabilityValve" />
         <ref bean="portalURLValve" />
+        <ref bean="profilerValve" />
         <ref bean="containerValve" />
         <ref bean="actionValve" />
       </list>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml?rev=758134&r1=758133&r2=758134&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
Wed Mar 25 03:24:47 2009
@@ -47,7 +47,6 @@
     <bean id='org.apache.pluto.services.EventCoordinationService'
           class='org.apache.jetspeed.events.EventCoordinationServiceImpl'>
       <meta key="j2:cat" value="default" />                 
-      <constructor-arg><ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor"/></constructor-arg>
                
       <constructor-arg><ref bean="org.apache.jetspeed.events.PortletEventQueue"/></constructor-arg>
       <constructor-arg><ref bean="PortalStatistics"/></constructor-arg>
       <constructor-arg><ref bean="org.apache.jetspeed.aggregator.PortletTrackingManager"/></constructor-arg>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/portal-url-generation.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/portal-url-generation.xml?rev=758134&r1=758133&r2=758134&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/portal-url-generation.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/portal-url-generation.xml
Wed Mar 25 03:24:47 2009
@@ -23,9 +23,6 @@
     <constructor-arg>
       <ref bean="PortalContext" />
     </constructor-arg>
-    <constructor-arg>
-      <ref bean="PortletWindowAccessor" />
-    </constructor-arg>
   </bean>
 
   <!-- Navigation state we are currently using -->



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