portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r758267 - in /portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly: ajax-layout.xml cache.xml desktop.xml jetspeed-spring.xml pluto-services.xml servlet-api.xml
Date Wed, 25 Mar 2009 14:22:21 GMT
Author: woonsan
Date: Wed Mar 25 14:22:15 2009
New Revision: 758267

URL: http://svn.apache.org/viewvc?rev=758267&view=rev
Log:
JS2-938: Changes assembly configuration according to Ate's change on this issue.
Now, it can be started with no error, but the actual rendering is not working yet.

Modified:
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/ajax-layout.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/jetspeed-spring.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/pluto-services.xml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/servlet-api.xml

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=758267&r1=758266&r2=758267&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 14:22:15 2009
@@ -499,7 +499,7 @@
     <constructor-arg index='2'>
       <ref bean="org.apache.jetspeed.page.PageManager" />
     </constructor-arg>
-    <constructor-arg index='5'>
+    <constructor-arg index='3'>
       <ref bean="PortletActionSecurityBehavior" />
     </constructor-arg>
   </bean>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml?rev=758267&r1=758266&r2=758267&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/cache.xml
Wed Mar 25 14:22:15 2009
@@ -233,21 +233,6 @@
         </constructor-arg>
     </bean>
     
-    <bean id="ehPortletWindowCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
-        <meta key="j2:cat" value="default,cache" />
-        <property name="cacheManager">
-            <ref local="cacheManager" />
-        </property>
-        <property name="cacheName" value="portletWindowCache" />
-    </bean>
-    
-    <bean id="portletWindowCache" class="org.apache.jetspeed.cache.impl.EhPortletWindowCache">
-        <meta key="j2:cat" value="default,cache" />
-        <constructor-arg index="0">
-            <ref bean="ehPortletWindowCache" />
-        </constructor-arg>
-    </bean>
-    
     <bean id="ehInternalPageFileCache" class="org.springframework.cache.ehcache.EhCacheFactoryBean">
         <meta key="j2:cat" value="default,cache" />
         <property name="cacheManager">

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml?rev=758267&r1=758266&r2=758267&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/desktop.xml
Wed Mar 25 14:22:15 2009
@@ -78,12 +78,6 @@
     <constructor-arg>
       <value>${portal.name}Desktop</value>
     </constructor-arg>
-    <property name="requestFactory">
-      <ref bean="ServletRequestFactory" />
-    </property>
-    <property name="responseFactory">
-      <ref bean="ServletResponseFactory" />
-    </property>
   </bean>
 
 </beans>

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=758267&r1=758266&r2=758267&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 14:22:15 2009
@@ -71,10 +71,9 @@
   <bean id="org.apache.jetspeed.request.RequestContextComponent"
     class="org.apache.jetspeed.request.JetspeedRequestContextComponent">
     <meta key="j2:cat" value="default,registry" />
-    <constructor-arg index='0'><ref bean="ServletRequestFactory" /></constructor-arg>
-    <constructor-arg index='1'><ref bean="ServletResponseFactory" /></constructor-arg>
-    <constructor-arg index='2'><ref bean="org.apache.jetspeed.userinfo.UserInfoManager"
/></constructor-arg>
-    <constructor-arg index='3'><ref bean="RequestContextObjects" /></constructor-arg>
+    <constructor-arg index='0'><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"
/></constructor-arg>
+    <constructor-arg index='1'><ref bean="org.apache.jetspeed.userinfo.UserInfoManager"
/></constructor-arg>
+    <constructor-arg index='2'><ref bean="RequestContextObjects" /></constructor-arg>
   </bean>
 
   <bean class="org.apache.jetspeed.components.factorybeans.NullReferenceFactoryBean">
@@ -102,12 +101,6 @@
     <constructor-arg>
       <value>${portal.name}</value>
     </constructor-arg>
-    <property name="requestFactory">
-      <ref bean="ServletRequestFactory" />
-    </property>
-    <property name="responseFactory">
-      <ref bean="ServletResponseFactory" />
-    </property>
   </bean>
 
   <!-- HeaderResource Factory -->

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=758267&r1=758266&r2=758267&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 14:22:15 2009
@@ -106,8 +106,7 @@
         <meta key="j2:cat" value="default" />
         <constructor-arg index="0"><ref bean="javax.servlet.ServletConfig" /></constructor-arg>
         <constructor-arg index="1"><ref bean="PortalContext" /></constructor-arg>
-        <constructor-arg index="2"><ref bean="portletFactory" /></constructor-arg>
        
-        <constructor-arg index="3"><ref bean="PortletRequestResponseUnwrapper"/></constructor-arg>
+        <constructor-arg index="2"><ref bean="portletFactory" /></constructor-arg>
     </bean>
 
 </beans>
\ No newline at end of file

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/servlet-api.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/servlet-api.xml?rev=758267&r1=758266&r2=758267&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/servlet-api.xml
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/assembly/servlet-api.xml
Wed Mar 25 14:22:15 2009
@@ -24,17 +24,6 @@
     <meta key="j2:cat" value="default" />
   </bean>
 
-  <bean id="ServletRequestFactory" name="javax.servlet.http.HttpServletRequest"
-    class="org.apache.jetspeed.engine.servlet.ServletRequestFactoryImpl">
-    <meta key="j2:cat" value="default" />
-    <constructor-arg><ref bean="org.apache.pluto.services.NamespaceMapper"/></constructor-arg>
  
-  </bean>
-
-  <bean id="ServletResponseFactory" name="javax.servlet.http.HttpServletResponse"
-    class="org.apache.jetspeed.engine.servlet.ServletResponseFactoryImpl">
-    <meta key="j2:cat" value="default" />
-  </bean>
-  
   <!--  
     PortletRequestResponseUnwrapper finds servlet request or servlet response from portlet
request or portlet response by unwrapping.
     Third-party module can provide an implementation to decorate the real request or response
object of a servlet container.



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