portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed/webapp/WEB-INF/conf/assembly jetspeed-spring.xml
Date Mon, 09 Aug 2004 22:44:25 GMT
taylor      2004/08/09 15:44:25

  Modified:    webapp/WEB-INF/conf fusion.properties
               webapp/WEB-INF/conf/assembly jetspeed-spring.xml
  Log:
  Hey fusion boy!
  yas sir, here i am, i keep fusion up to date while you studly code slingers do ya thing
  
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.11      +11 -5     jakarta-jetspeed/webapp/WEB-INF/conf/fusion.properties
  
  Index: fusion.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/fusion.properties,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- fusion.properties	2 Aug 2004 20:54:03 -0000	1.10
  +++ fusion.properties	9 Aug 2004 22:44:25 -0000	1.11
  @@ -3,9 +3,9 @@
   # Licensed under the Apache License, Version 2.0 (the "License");
   # you may not use this file except in compliance with the License.
   # You may obtain a copy of the License at
  -# 
  +#
   #     http://www.apache.org/licenses/LICENSE-2.0
  -# 
  +#
   # Unless required by applicable law or agreed to in writing, software
   # distributed under the License is distributed on an "AS IS" BASIS,
   # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -96,14 +96,20 @@
   
   
   #-------------------------------------------------------------------------
  -# C A P A B I L I T Y,  C O N T E N T  E N C O D I N G  
  +# C A P A B I L I T Y,  C O N T E N T  E N C O D I N G
   #-------------------------------------------------------------------------
   content.defaultencoding=iso-8859-1
   
   
   #---------------------------------------------------------------------------------
   # Run Auto-Deployment set up
  -#---------------------------------------------------------------------------------
  +#----'-----------------------------------------------------------------------------
  +# THE NEXT PROPERTY DEFINITION MAY NOT BE MODIFIED (NOT EVEN BE PADDED WITH WHITESPACE)
  +# BECAUSE ITS FILTERED BY ANT DURING DEPLOYMENT.
  +# ITS CONCREET VALUE WILL BE SET FROM BUILD PROPERTY org.apache.jetspeed.catalina.version.major
  +autodeployment.catalina.version.major=4
  +autodeployment.catalina.base=${applicationRoot}/../../
  +autodeployment.catalina.engine=Catalina
   autodeployment.server=localhost
   autodeployment.port=8080
   autodeployment.user=@AUTODEPLOYMENT_USER@
  
  
  
  1.4       +233 -221  jakarta-jetspeed/webapp/WEB-INF/conf/assembly/jetspeed-spring.xml
  
  Index: jetspeed-spring.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/assembly/jetspeed-spring.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- jetspeed-spring.xml	1 Aug 2004 15:54:19 -0000	1.3
  +++ jetspeed-spring.xml	9 Aug 2004 22:44:25 -0000	1.4
  @@ -16,322 +16,334 @@
   limitations under the License.
   -->
   <beans>
  -   
  -   
  +
  +
      <!-- Commons configuration object generated from jetspeed.properties -->
      <bean id="portal_configuration"
         class="org.apache.commons.configuration.PropertiesConfiguration">
       <constructor-arg>
         <value>${applicationRoot}/WEB-INF/conf/fusion.properties</value>
       </constructor-arg>
  -  </bean>  
  -  
  +  </bean>
  +
     <!-- ServletConfig -->
       <bean id="javax.servlet.ServletConfig"
           class="org.apache.jetspeed.components.factorybeans.ServletConfigFactoryBean"
  -  />             
  +  />
  +
   
   
  -   
     <!-- Portlet Services  -->
  -  <bean id="PortalServices" 
  -  	   class="org.apache.jetspeed.services.JetspeedPortletServices" >
  -  	   <constructor-arg>
  -  	   	<map>
  -  	   	  <entry key="PortletRegistryComponent">
  -  	   	  	<ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistryComponent"
/>
  -  	   	  </entry>
  -  	   	  <entry key="PAM">
  -  	   	  	<ref bean="PAM" />
  -  	   	  </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.PortletRegistryComponent"
/>
  +          </entry>
  +          <entry key="PAM">
  +            <ref bean="PAM" />
  +          </entry>
  +        </map>
  +       </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 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" >
  -  	   <!-- Scan rate for changes in cached files on the file system -->
  -  	   <constructor-arg index="0"><value>120</value></constructor-arg>
  -  	   <!-- Cache size -->
  -  	   <constructor-arg index="1"><value>100</value></constructor-arg>
 	   
  -  </bean>    
  +  <bean id="PageFileCache"
  +       class="org.apache.jetspeed.cache.file.FileCache" >
  +       <!-- Scan rate for changes in cached files on the file system -->
  +       <constructor-arg index="0"><value>120</value></constructor-arg>
  +       <!-- Cache size -->
  +       <constructor-arg index="1"><value>100</value></constructor-arg>
  +  </bean>
   
     <!-- Persistence Store -->
  -  <bean id="persistenceStoreTarget" 
  -  	   class="org.apache.jetspeed.components.persistence.store.ojb.pb.PBStore"  	   
  -  	   singleton="false" >  	   
  -  	   <!-- Name of the DataSource to use for DB operations -->
  -  	   <constructor-arg index="0"><value>jetspeed</value></constructor-arg>
  +  <bean id="persistenceStoreTarget"
  +       class="org.apache.jetspeed.components.persistence.store.ojb.pb.PBStore"
  +       singleton="false" >
  +       <!-- Name of the DataSource to use for DB operations -->
  +       <constructor-arg index="0"><value>jetspeed</value></constructor-arg>
     </bean>
  -  
  +
     <!-- Makes it so that each thread has an its own instance of the PersistenceStore
-->
  -  <bean id="threadLocalPersistenceStore" 
  -  	    class="org.springframework.aop.target.ThreadLocalTargetSource">
  +  <bean id="threadLocalPersistenceStore"
  +        class="org.springframework.aop.target.ThreadLocalTargetSource">
        <property name="targetBeanName">
  -     	<value>persistenceStoreTarget</value>
  +        <value>persistenceStoreTarget</value>
        </property>
     </bean>
   
     <!-- Helps generate our pre-thread PersistenceStore instance -->
     <bean id="org.apache.jetspeed.components.persistence.store.PersistenceStore"
           class="org.springframework.aop.framework.ProxyFactoryBean"
  -  >             
  +  >
          <property name="targetSource"><ref local="threadLocalPersistenceStore"/></property>
          <property name="proxyInterfaces"><value>org.apache.jetspeed.components.persistence.store.PersistenceStore</value></property>
     </bean>
  -  
  +
     <!-- Portlet Registry DAO-->
  -  <bean id="org.apache.jetspeed.components.portletregistry.PortletRegistryComponent"

  -  	   class="org.apache.jetspeed.components.portletregistry.PortletRegistryComponentImpl"
  -  >  	   
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"/></constructor-arg>
	   
  +  <bean id="org.apache.jetspeed.components.portletregistry.PortletRegistryComponent"
  +       class="org.apache.jetspeed.components.portletregistry.PortletRegistryComponentImpl"
  +  >
  +       <constructor-arg ><ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"/></constructor-arg>
     </bean>
  -  
  +
     <!-- Portlet Entity Access DAO-->
  -  <bean id="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent"

  -  	   class="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponentImpl"
  -  >  	   
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"/></constructor-arg>
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistryComponent"/></constructor-arg>
	   
  +  <bean id="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent"
  +       class="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponentImpl"
  +  >
  +       <constructor-arg ><ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"/></constructor-arg>
  +       <constructor-arg ><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistryComponent"/></constructor-arg>
     </bean>
  -    
  +
     <!-- Capabillites -->
  -  <bean id="org.apache.jetspeed.capabilities.Capabilities" 
  -  	   class="org.apache.jetspeed.capabilities.impl.JetspeedCapabilities"
  -  >  	   
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"/></constructor-arg>
 	   
  +  <bean id="org.apache.jetspeed.capabilities.Capabilities"
  +       class="org.apache.jetspeed.capabilities.impl.JetspeedCapabilities"
  +  >
  +       <constructor-arg ><ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"/></constructor-arg>
     </bean>
  -  
  +
     <!-- Property Manager -->
  -   <bean id="org.apache.jetspeed.prefs.PropertyManager" 
  -  	   class="org.apache.jetspeed.prefs.impl.PropertyManagerImpl"
  -  >  	   
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"/></constructor-arg>
 	   
  +   <bean id="org.apache.jetspeed.prefs.PropertyManager"
  +       class="org.apache.jetspeed.prefs.impl.PropertyManagerImpl"
  +  >
  +       <constructor-arg ><ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"/></constructor-arg>
     </bean>
  -  
  +
     <!-- Preferences Implementation -->
  -   <bean id="org.apache.jetspeed.prefs.PreferencesProvider" 
  -  	   class="org.apache.jetspeed.prefs.impl.PreferencesProviderImpl"
  -  	   init-method="start" destroy-method="stop"
  -  >  	   
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"/></constructor-arg>
 	   
  -  	   <constructor-arg ><value>org.apache.jetspeed.prefs.impl.PreferencesFactoryImpl</value></constructor-arg>
  -  	   <constructor-arg type="boolean"><value>false</value></constructor-arg>
 	     	   
  +   <bean id="org.apache.jetspeed.prefs.PreferencesProvider"
  +       class="org.apache.jetspeed.prefs.impl.PreferencesProviderImpl"
  +       init-method="start" destroy-method="stop"
  +  >
  +       <constructor-arg ><ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"/></constructor-arg>
  +       <constructor-arg ><value>org.apache.jetspeed.prefs.impl.PreferencesFactoryImpl</value></constructor-arg>
  +       <constructor-arg type="boolean"><value>false</value></constructor-arg>
     </bean>
  -  
  +
     <!-- Security: User Manager -->
  -  <bean id="org.apache.jetspeed.security.UserManager" 
  -  	   class="org.apache.jetspeed.security.impl.UserManagerImpl"
  -  >  	   
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"/></constructor-arg>
 	   
  +  <bean id="org.apache.jetspeed.security.UserManager"
  +       class="org.apache.jetspeed.security.impl.UserManagerImpl"
  +  >
  +       <constructor-arg ><ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"/></constructor-arg>
     </bean>
  -  
  +
      <!-- Security: Group Manager -->
  -  <bean id="org.apache.jetspeed.security.GroupManager" 
  -  	   class="org.apache.jetspeed.security.impl.GroupManagerImpl"
  -  >  	   
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"/></constructor-arg>
 	   
  +  <bean id="org.apache.jetspeed.security.GroupManager"
  +       class="org.apache.jetspeed.security.impl.GroupManagerImpl"
  +  >
  +       <constructor-arg ><ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"/></constructor-arg>
     </bean>
  -  
  +
     <!-- Security: Role Manager -->
  -  <bean id="org.apache.jetspeed.security.RoleManager" 
  -  	   class="org.apache.jetspeed.security.impl.RoleManagerImpl"
  -  >  	   
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"/></constructor-arg>
 	   
  +  <bean id="org.apache.jetspeed.security.RoleManager"
  +       class="org.apache.jetspeed.security.impl.RoleManagerImpl"
  +  >
  +       <constructor-arg ><ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"/></constructor-arg>
     </bean>
  -  
  +
    <!-- Security: Permission Manager -->
  -  <bean id="org.apache.jetspeed.security.PermissionManager" 
  -  	   class="org.apache.jetspeed.security.impl.PermissionManagerImpl"
  -  >  	   
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"/></constructor-arg>
 	   
  +  <bean id="org.apache.jetspeed.security.PermissionManager"
  +       class="org.apache.jetspeed.security.impl.PermissionManagerImpl"
  +  >
  +       <constructor-arg ><ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"/></constructor-arg>
     </bean>
  -  
  +
     <!-- Security: RDBMS Policy implemetnation for JAAS -->
  -  <bean id="org.apache.jetspeed.security.impl.RdbmsPolicy" 
  -  	   class="org.apache.jetspeed.security.impl.RdbmsPolicy"
  -  >  	   
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.PermissionManager"/></constructor-arg>
 	   
  +  <bean id="org.apache.jetspeed.security.impl.RdbmsPolicy"
  +       class="org.apache.jetspeed.security.impl.RdbmsPolicy"
  +  >
  +       <constructor-arg ><ref bean="org.apache.jetspeed.security.PermissionManager"/></constructor-arg>
     </bean>
  -  
  +
     <!-- Security: Security Provider -->
  -  <bean id="org.apache.jetspeed.security.SecurityProvider" 
  -  	   class="org.apache.jetspeed.security.impl.SecurityProviderImpl"
  -  >  	   
  -  	   <constructor-arg ><value>login.conf</value></constructor-arg>
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.impl.RdbmsPolicy"/></constructor-arg>
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.security.UserManager"/></constructor-arg>
 	   
  +  <bean id="org.apache.jetspeed.security.SecurityProvider"
  +       class="org.apache.jetspeed.security.impl.SecurityProviderImpl"
  +  >
  +       <constructor-arg ><value>login.conf</value></constructor-arg>
  +       <constructor-arg ><ref bean="org.apache.jetspeed.security.impl.RdbmsPolicy"/></constructor-arg>
  +       <constructor-arg ><ref bean="org.apache.jetspeed.security.UserManager"/></constructor-arg>
     </bean>
  -  
  +
     <!-- User Info -->
  -  <bean id="org.apache.jetspeed.userinfo.UserInfoManager" 
  -  	   class="org.apache.jetspeed.userinfo.impl.UserInfoManagerImpl"
  +  <bean id="org.apache.jetspeed.userinfo.UserInfoManager"
  +       class="org.apache.jetspeed.userinfo.impl.UserInfoManagerImpl"
     >
  -     <constructor-arg ><ref bean="org.apache.jetspeed.security.UserManager"/></constructor-arg>
 	     	   
  +     <constructor-arg ><ref bean="org.apache.jetspeed.security.UserManager"/></constructor-arg>
        <constructor-arg ><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistryComponent"/></constructor-arg>
   
     </bean>
  -  
  +
     <!--  Navigational State component -->
  -  <bean id="org.apache.jetspeed.container.session.NavigationalStateComponent" 
  -  	   class="org.apache.jetspeed.container.session.impl.JetspeedNavigationalStateComponent"
  -  >  	   
  -  	   <constructor-arg index="0"><value>org.apache.jetspeed.container.session.impl.SessionNavigationalState</value></constructor-arg>
  -  	   <constructor-arg index="1"><value>org.apache.jetspeed.container.url.impl.SessionPortalURL</value></constructor-arg>
  -  	   <constructor-arg index="2"><value>_,a,m,s,r,i,pm,ps,:</value></constructor-arg>
 	   
  +  <bean id="org.apache.jetspeed.container.session.NavigationalStateComponent"
  +       class="org.apache.jetspeed.container.session.impl.JetspeedNavigationalStateComponent"
  +  >
  +       <constructor-arg index="0"><value>org.apache.jetspeed.container.session.impl.SessionNavigationalState</value></constructor-arg>
  +       <constructor-arg index="1"><value>org.apache.jetspeed.container.url.impl.SessionPortalURL</value></constructor-arg>
  +       <constructor-arg index="2"><value>_,a,m,s,r,i,pm,ps,:</value></constructor-arg>
     </bean>
  -  
  +
     <!-- Request Context -->
  -   <bean id="org.apache.jetspeed.request.RequestContextComponent" 
  -  	   class="org.apache.jetspeed.request.JetspeedRequestContextComponent"
  -  >  	   
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.container.session.NavigationalStateComponent"
/></constructor-arg>
  -  	   <constructor-arg ><value>org.apache.jetspeed.request.JetspeedRequestContext</value></constructor-arg>
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.userinfo.UserInfoManager"
/></constructor-arg>  	   
  +   <bean id="org.apache.jetspeed.request.RequestContextComponent"
  +       class="org.apache.jetspeed.request.JetspeedRequestContextComponent"
  +  >
  +       <constructor-arg ><ref bean="org.apache.jetspeed.container.session.NavigationalStateComponent"
/></constructor-arg>
  +       <constructor-arg ><value>org.apache.jetspeed.request.JetspeedRequestContext</value></constructor-arg>
  +       <constructor-arg ><ref bean="org.apache.jetspeed.userinfo.UserInfoManager"
/></constructor-arg>
     </bean>
  -  
  +
     <!-- Portlet Window Component -->
  -  <bean id="org.apache.jetspeed.container.window.PortletWindowAccessor" 
  -  	   class="org.apache.jetspeed.container.window.impl.PortletWindowAccessorImpl"
  -  >  	   
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent"
/></constructor-arg>
  +  <bean id="org.apache.jetspeed.container.window.PortletWindowAccessor"
  +       class="org.apache.jetspeed.container.window.impl.PortletWindowAccessorImpl"
  +  >
  +       <constructor-arg ><ref bean="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent"
/></constructor-arg>
     </bean>
  -  
  +
     <!-- Pluto Portlet Container -->
  -  <bean id="Pluto" class="org.apache.pluto.PortletContainerImpl" />  	   
  -  
  +  <bean id="Pluto" class="org.apache.pluto.PortletContainerImpl" />
  +
     <!-- Jetspeed 2's wrapper around Pluto -->
  -  <bean id="org.apache.pluto.PortletContainer" 
  -  	   class="org.apache.jetspeed.container.JetspeedPortletContainerWrapper"  >  	  

  -  	   <constructor-arg ><ref bean="Pluto" /></constructor-arg>
  +  <bean id="org.apache.pluto.PortletContainer"
  +       class="org.apache.jetspeed.container.JetspeedPortletContainerWrapper"  >
  +       <constructor-arg ><ref bean="Pluto" /></constructor-arg>
     </bean>
  -  
  +
     <!-- Portlet Renderer -->
  -  <bean id="org.apache.jetspeed.aggregator.PortletRenderer" 
  -  	   class="org.apache.jetspeed.aggregator.impl.PortletRendererImpl"  
  -  	   init-method="start" destroy-method="stop"
  -  >  	   
  -  	   <constructor-arg ><ref bean="org.apache.pluto.PortletContainer" /></constructor-arg>
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor"
/></constructor-arg>
  +  <bean id="org.apache.jetspeed.aggregator.PortletRenderer"
  +       class="org.apache.jetspeed.aggregator.impl.PortletRendererImpl"
  +       init-method="start" destroy-method="stop"
  +  >
  +       <constructor-arg ><ref bean="org.apache.pluto.PortletContainer" /></constructor-arg>
  +       <constructor-arg ><ref bean="org.apache.jetspeed.container.window.PortletWindowAccessor"
/></constructor-arg>
     </bean>
  -  
  +
     <!-- Portlet Cache -->
  -  <bean id="portletCache" 
  -  	   class="org.apache.jetspeed.cache.PortletCache"  
  -  >  	   
  +  <bean id="portletCache"
  +       class="org.apache.jetspeed.cache.PortletCache"
  +  >
   
     </bean>
  -  
  +
     <!-- Portlet Factory -->
  -  <bean id="portletFactory" 
  -  	   class="org.apache.jetspeed.factory.JetspeedPortletFactory"  
  -  >  	   
  -  	   <constructor-arg ><ref bean="portletCache" /></constructor-arg>
 	   
  +  <bean id="portletFactory"
  +       class="org.apache.jetspeed.factory.JetspeedPortletFactory"
  +  >
  +       <constructor-arg ><ref bean="portletCache" /></constructor-arg>
     </bean>
  -  
  +
     <!-- Portlet Factory Proxy Accessor-->
  -  <bean id="portletFactoryProxy" 
  -  	   class="org.apache.jetspeed.factory.JetspeedPortletFactoryProxy"
  -  	   destroy-method="reset"  
  -  >  	   
  -  	   <constructor-arg ><ref bean="portletFactory" /></constructor-arg>
 	   
  +  <bean id="portletFactoryProxy"
  +       class="org.apache.jetspeed.factory.JetspeedPortletFactoryProxy"
  +       destroy-method="reset"
  +  >
  +       <constructor-arg ><ref bean="portletFactory" /></constructor-arg>
     </bean>
  -  	   
  +
     <!-- Aggregation: Page -->
  -  <bean id="org.apache.jetspeed.aggregator.PageAggregator" 
  -  	   class="org.apache.jetspeed.aggregator.impl.PageAggregatorImpl"  >  	   
  -  	   <constructor-arg index="0" ><ref bean="org.apache.jetspeed.aggregator.PortletRenderer"
/></constructor-arg>
  -  	   <!-- Aggregation Strategies:
  -  	   	    0 = PageAggregatorImpl.STRATEGY_SEQUENTIAL
  -  	   	    1 = PageAggregatorImpl.STRATEGY_PARALLEL
  -  	   	 -->
  -  	   <constructor-arg index="1"><value>0</value></constructor-arg>
  +  <bean id="org.apache.jetspeed.aggregator.PageAggregator"
  +       class="org.apache.jetspeed.aggregator.impl.PageAggregatorImpl"  >
  +       <constructor-arg index="0" ><ref bean="org.apache.jetspeed.aggregator.PortletRenderer"
/></constructor-arg>
  +       <!-- Aggregation Strategies:
  +            0 = PageAggregatorImpl.STRATEGY_SEQUENTIAL
  +            1 = PageAggregatorImpl.STRATEGY_PARALLEL
  +         -->
  +       <constructor-arg index="1"><value>0</value></constructor-arg>
  +       <constructor-arg index="2">
  +        <list>
  +            <value>portlet/{mediaType}/jetspeed</value>
  +            <value>portlet/{mediaType}</value>
  +            <value>layout/{mediaType}</value>
  +            <value>generic/{mediaType}</value>
  +            <value>{mediaType}</value>
  +        </list>
  +       </constructor-arg>
     </bean>
  -  
  +
     <!-- Aggregation: Portlet -->
  -  <bean id="org.apache.jetspeed.aggregator.PortletAggregator" 
  -  	   class="org.apache.jetspeed.aggregator.impl.PortletAggregatorImpl"  >  	   
  -  	   <constructor-arg  ><ref bean="org.apache.jetspeed.aggregator.PortletRenderer"
/></constructor-arg>
  -  </bean>
  -  
  -  <!-- Application Server Manager 
  -  	   Provides hooks into the application server to help us deploy portlet applications
  -  	   as web application into that server.
  -  	-->
  -  <bean id="org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager"

  -  	   class="org.apache.jetspeed.tools.pamanager.servletcontainer.TomcatManager" 
  -  	   init-method="start" destroy-method="stop"
  -  >  	   
  -  	   <constructor-arg index="0"><value>${autodeployment.server}</value></constructor-arg>
  -  	   <constructor-arg index="1"><value>${autodeployment.port}</value></constructor-arg>
  -  	   <constructor-arg index="2"><value>${autodeployment.user}</value></constructor-arg>
  -  	   <constructor-arg index="3"><value>${autodeployment.password}</value></constructor-arg>
  -  </bean>
  -  
  -  <!-- Portlet Application Manager 
  -  	   Deploys portlet application to both Jetspeed's portlet registry
  -  	   and to application server Jetspeed is using to process the web application
  -  	   portion of the portlet application.
  -  	-->
  -   <bean id="PAM" 	
  -  	   class="org.apache.jetspeed.fusion.tools.pamanager.FusionAppServerPAM" 
  -  	   init-method="start" destroy-method="stop"
  -  >  	   
  -  	   <constructor-arg ><value>${autodeployment.target.dir}</value></constructor-arg>
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistryComponent"
/></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.tools.pamanager.servletcontainer.ApplicationServerManager"
/></constructor-arg>
  -  	   <constructor-arg ><ref bean="portletCache" /></constructor-arg>
 
  +  <bean id="org.apache.jetspeed.aggregator.PortletAggregator"
  +       class="org.apache.jetspeed.aggregator.impl.PortletAggregatorImpl"  >
  +       <constructor-arg  ><ref bean="org.apache.jetspeed.aggregator.PortletRenderer"
/></constructor-arg>
  +  </bean>
  +
  +  <!-- Application Server Manager
  +       Provides hooks into the application server to help us deploy portlet applications
  +       as web application into that server.
  +    -->
  +  <bean id="org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager"
  +       class="org.apache.jetspeed.tools.pamanager.servletcontainer.TomcatManager"
  +       init-method="start" destroy-method="stop"
  +  >
  +       <constructor-arg index="0"><value>${autodeployment.catalina.base}</value></constructor-arg>
  +       <constructor-arg index="1"><value>${autodeployment.catalina.engine}</value></constructor-arg>
  +       <constructor-arg index="2"><value>${autodeployment.catalina.version.major}</value></constructor-arg>
  +       <constructor-arg index="3"><value>${autodeployment.server}</value></constructor-arg>
  +       <constructor-arg index="4"><value>${autodeployment.port}</value></constructor-arg>
  +       <constructor-arg index="5"><value>${autodeployment.user}</value></constructor-arg>
  +       <constructor-arg index="6"><value>${autodeployment.password}</value></constructor-arg>
     </bean>
  -  
  +
  +  <!-- Portlet Application Manager
  +       Deploys portlet application to both Jetspeed's portlet registry
  +       and to application server Jetspeed is using to process the web application
  +       portion of the portlet application.
  +    -->
  +   <bean id="PAM"
  +       class="org.apache.jetspeed.fusion.tools.pamanager.FusionAppServerPAM"
  +       init-method="start" destroy-method="stop"
  +  >
  +       <constructor-arg ><value>${autodeployment.target.dir}</value></constructor-arg>
  +       <constructor-arg ><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistryComponent"
/></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.tools.pamanager.servletcontainer.ApplicationServerManager"
/></constructor-arg>
  +       <constructor-arg ><ref bean="portletCache" /></constructor-arg>
  +  </bean>
  +
     <!-- Portlet Application deployment event listener -->
  -  <bean id="portletAppDeploymentListener" 
  -  	   class="org.apache.jetspeed.deployment.impl.DeployPortletAppEventListener"   	   
  -  > 	
  +  <bean id="portletAppDeploymentListener"
  +       class="org.apache.jetspeed.deployment.impl.DeployPortletAppEventListener"
  +  >
          <constructor-arg ><value>${autodeployment.staging.dir}</value></constructor-arg>
  -  	   <constructor-arg ><ref bean="PAM" /></constructor-arg>
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistryComponent"
/></constructor-arg>
  -  	   <constructor-arg><ref bean="portletFactory"/></constructor-arg>
  +       <constructor-arg ><ref bean="PAM" /></constructor-arg>
  +       <constructor-arg ><ref bean="org.apache.jetspeed.components.portletregistry.PortletRegistryComponent"
/></constructor-arg>
  +       <constructor-arg><ref bean="portletFactory"/></constructor-arg>
     </bean>
  -  
  +
     <!-- The deployment manager watches a specific staging directory for
  -  	   deploying components.  What components get deployed depend of
  -  	   DeploymentEventListeners registered to it.
  +       deploying components.  What components get deployed depend of
  +       DeploymentEventListeners registered to it.
      -->
  -  <bean id="deploymentManager" 
  -  	   class="org.apache.jetspeed.deployment.impl.StandardDeploymentManager" 
  -  	   init-method="start" destroy-method="stop"
  -  >  	   
  -  	   <constructor-arg ><value>${autodeployment.staging.dir}</value></constructor-arg>
  +  <bean id="deploymentManager"
  +       class="org.apache.jetspeed.deployment.impl.StandardDeploymentManager"
  +       init-method="start" destroy-method="stop"
  +  >
  +       <constructor-arg ><value>${autodeployment.staging.dir}</value></constructor-arg>
          <constructor-arg type="long" ><value>${autodeployment.delay}</value></constructor-arg>
          <constructor-arg >
            <list>
  -            <ref bean="portletAppDeploymentListener"/>      
  +            <ref bean="portletAppDeploymentListener"/>
            </list>
          </constructor-arg>
     </bean>
   
  -  
  -  
  +
  +
     <!-- Adds jetspeed.properties as our configuration object to support ${...} vars -->
     <!-- ${applicationRoot} is acutally set as a system property via the SpringEngine
-->
   
     <bean id="placeholderConfig"
         class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
       <property name="location"><value>file:///${applicationRoot}/WEB-INF/conf/fusion.properties</value></property>
  -  </bean>  
  -  
  +  </bean>
  +
   </beans>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message