rwatler     2005/01/24 16:51:12

  Modified:    portal/src/webapp/WEB-INF/assembly page-manager.xml
  Log:
  detab and fix PageManager comment
  
  Revision  Changes    Path
  1.7       +102 -102  
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/page-manager.xml
  
  Index: page-manager.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/page-manager.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- page-manager.xml  19 Jan 2005 03:26:02 -0000      1.6
  +++ page-manager.xml  25 Jan 2005 00:51:12 -0000      1.7
  @@ -19,123 +19,123 @@
   
     <!-- Profiler DAO-->
     <bean id="profilerImpl" 
class="org.apache.jetspeed.profiler.impl.JetspeedProfilerImpl" 
init-method="init">
  -        <constructor-arg 
index="0"><value>META-INF/profiler-ojb.xml</value></constructor-arg>
  -        <constructor-arg index="1"><value>j1</value></constructor-arg>
  +       <constructor-arg 
index="0"><value>META-INF/profiler-ojb.xml</value></constructor-arg>
  +       <constructor-arg index="1"><value>j1</value></constructor-arg>
       </bean>
     
     <!-- Profiler -->  
     <bean id="org.apache.jetspeed.profiler.Profiler" 
           name="profiler"
           parent="baseTransactionProxy"        
  -  >             
  -             <property name="proxyInterfaces">
  -                     <value>org.apache.jetspeed.profiler.Profiler</value>
  -             </property>
  -             <property name="target">
  -                     <ref bean="profilerImpl"/>
  -             </property>
  -             <property name="transactionAttributes">
  -                     <props>                         
  -                             <prop 
key="setRuleForPrincipal">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
  -                             <prop 
key="store*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
  -                             <prop 
key="delete*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
  -                             <prop key="*">PROPAGATION_SUPPORTS</prop>
  -                     </props>
  -             </property>                        
  -  </bean>
  -     
  -  <bean id="PsmlDocumentHandler"       
  -        
class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >     
        
  -        <constructor-arg 
index="0"><value>/META-INF/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.Page</value></constructor-arg>           
  -        <constructor-arg index="3" 
><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
  -        <constructor-arg index="4" ><ref 
bean="PageFileCache"/></constructor-arg>
  -  </bean>
  -  
  -  <bean id="LinkDocumentHandler"        
  -        
class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >     
        
  -        <constructor-arg 
index="0"><value>/META-INF/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.Link</value></constructor-arg>           
  -        <constructor-arg index="3" 
><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
  -        <constructor-arg index="4" ><ref 
bean="PageFileCache"/></constructor-arg>
  -  </bean>
  -  
  -  <bean id="DocumentSetDocumentHandler"         
  -        
class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >     
        
  -        <constructor-arg 
index="0"><value>/META-INF/page-mapping.xml</value></constructor-arg>
  -        <constructor-arg index="1"><value>.ds</value></constructor-arg>
  -        <constructor-arg index="2" 
><value>org.apache.jetspeed.om.folder.DocumentSet</value></constructor-arg>     
     
  -        <constructor-arg index="3" 
><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
  -        <constructor-arg index="4" ><ref 
bean="PageFileCache"/></constructor-arg>
  -  </bean>
  -  
  -  <bean id="FolderMetaDataDocumentHandler"              
  -        
class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >     
        
  -        <constructor-arg 
index="0"><value>/META-INF/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.FolderMetaData</value></constructor-arg>  
     
  -        <constructor-arg index="3" 
><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
  -        <constructor-arg index="4" ><ref 
bean="PageFileCache"/></constructor-arg>
  -  </bean>
  -  
  -  <bean id="PageSecurityDocumentHandler"        
  -        
class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >     
        
  -        <constructor-arg 
index="0"><value>/META-INF/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.PageSecurity</value></constructor-arg>      
     
  -        <constructor-arg index="3" 
><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
  -        <constructor-arg index="4" ><ref 
bean="PageFileCache"/></constructor-arg>
  +  >        
  +        <property name="proxyInterfaces">
  +            <value>org.apache.jetspeed.profiler.Profiler</value>
  +        </property>
  +        <property name="target">
  +            <ref bean="profilerImpl"/>
  +        </property>
  +        <property name="transactionAttributes">
  +            <props>             
  +                <prop 
key="setRuleForPrincipal">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
  +                <prop 
key="store*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
  +                <prop 
key="delete*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.profiler.ProfilerException</prop>
  +                <prop key="*">PROPAGATION_SUPPORTS</prop>
  +            </props>
  +        </property>            
  +  </bean>
  +    
  +  <bean id="PsmlDocumentHandler"      
  +       
class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >     
    
  +       <constructor-arg 
index="0"><value>/META-INF/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.Page</value></constructor-arg>       
  +       <constructor-arg index="3" 
><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
  +       <constructor-arg index="4" ><ref 
bean="PageFileCache"/></constructor-arg>
  +  </bean>
  +  
  +  <bean id="LinkDocumentHandler"       
  +       
class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >     
    
  +       <constructor-arg 
index="0"><value>/META-INF/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.Link</value></constructor-arg>       
  +       <constructor-arg index="3" 
><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
  +       <constructor-arg index="4" ><ref 
bean="PageFileCache"/></constructor-arg>
  +  </bean>
  +  
  +  <bean id="DocumentSetDocumentHandler"        
  +       
class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >     
    
  +       <constructor-arg 
index="0"><value>/META-INF/page-mapping.xml</value></constructor-arg>
  +       <constructor-arg index="1"><value>.ds</value></constructor-arg>
  +       <constructor-arg index="2" 
><value>org.apache.jetspeed.om.folder.DocumentSet</value></constructor-arg>     
 
  +       <constructor-arg index="3" 
><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
  +       <constructor-arg index="4" ><ref 
bean="PageFileCache"/></constructor-arg>
  +  </bean>
  +  
  +  <bean id="FolderMetaDataDocumentHandler"         
  +       
class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >     
    
  +       <constructor-arg 
index="0"><value>/META-INF/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.FolderMetaData</value></constructor-arg>  
     
  +       <constructor-arg index="3" 
><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
  +       <constructor-arg index="4" ><ref 
bean="PageFileCache"/></constructor-arg>
  +  </bean>
  +  
  +  <bean id="PageSecurityDocumentHandler"       
  +       
class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >     
    
  +       <constructor-arg 
index="0"><value>/META-INF/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.PageSecurity</value></constructor-arg>      
 
  +       <constructor-arg index="3" 
><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
  +       <constructor-arg index="4" ><ref 
bean="PageFileCache"/></constructor-arg>
     </bean>
     
  -  <bean id="DocumentHandlerFactory"             
  -        class="org.apache.jetspeed.page.document.DocumentHandlerFactoryImpl" 
>          
  +  <bean id="DocumentHandlerFactory"        
  +       class="org.apache.jetspeed.page.document.DocumentHandlerFactoryImpl" 
>      
           <constructor-arg>
  -             <map>
  -               <entry key=".psml">
  -                     <ref bean="PsmlDocumentHandler" />
  -               </entry>
  -               <entry key=".link">
  -                     <ref bean="LinkDocumentHandler" />
  -               </entry>      
  -               <entry key=".ds">
  -                     <ref bean="DocumentSetDocumentHandler" />
  -               </entry>      
  -               <entry key="folder.metadata">
  -                     <ref bean="FolderMetaDataDocumentHandler" />
  -               </entry>                
  -               <entry key="page.security">
  -                     <ref bean="PageSecurityDocumentHandler" />
  -               </entry>                
  -             </map>
  -        </constructor-arg>
  -  </bean>
  -  
  -  <bean id="FolderHandler"              
  -        class="org.apache.jetspeed.page.document.FileSystemFolderHandler" >  
           
  -        <constructor-arg 
index="0"><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
  -        <constructor-arg index="1"><ref 
bean="DocumentHandlerFactory"/></constructor-arg>
  -        <constructor-arg index="2"><ref 
bean="PageFileCache"/></constructor-arg>        
  +        <map>
  +          <entry key=".psml">
  +            <ref bean="PsmlDocumentHandler" />
  +          </entry>
  +          <entry key=".link">
  +            <ref bean="LinkDocumentHandler" />
  +          </entry>  
  +          <entry key=".ds">
  +            <ref bean="DocumentSetDocumentHandler" />
  +          </entry>  
  +          <entry key="folder.metadata">
  +            <ref bean="FolderMetaDataDocumentHandler" />
  +          </entry>        
  +          <entry key="page.security">
  +            <ref bean="PageSecurityDocumentHandler" />
  +          </entry>        
  +        </map>
  +       </constructor-arg>
  +  </bean>
  +  
  +  <bean id="FolderHandler"         
  +       class="org.apache.jetspeed.page.document.FileSystemFolderHandler" >   
      
  +       <constructor-arg 
index="0"><value>${applicationRoot}/WEB-INF/pages</value></constructor-arg>
  +       <constructor-arg index="1"><ref 
bean="DocumentHandlerFactory"/></constructor-arg>
  +       <constructor-arg index="2"><ref 
bean="PageFileCache"/></constructor-arg>        
     </bean>
  -     
  -     
  +    
  +    
     <!-- PageManager -->
     <bean id="org.apache.jetspeed.page.PageManager" 
  -        name="pageManager"
  -        class="org.apache.jetspeed.page.impl.CastorXmlPageManager">          
   
  -        <constructor-arg index="0"><ref 
bean="IdGenerator"/></constructor-arg>
  -        <constructor-arg index="1"><ref 
bean="DocumentHandlerFactory"/></constructor-arg>
  -        <constructor-arg index="2"><ref 
bean="FolderHandler"/></constructor-arg>
  -        <constructor-arg index="3"><ref 
bean="PageFileCache"/></constructor-arg>        
  +       name="pageManager"
  +       class="org.apache.jetspeed.page.impl.CastorXmlPageManager">         
  +       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
  +       <constructor-arg index="1"><ref 
bean="DocumentHandlerFactory"/></constructor-arg>
  +       <constructor-arg index="2"><ref 
bean="FolderHandler"/></constructor-arg>
  +       <constructor-arg index="3"><ref 
bean="PageFileCache"/></constructor-arg>        
          <!-- size of profiled page context LRU cache, default=100 -->
  -        <constructor-arg index="4"><value>100</value></constructor-arg>
  +       <constructor-arg index="4"><value>100</value></constructor-arg>
          <!-- profiling enabled flag, default=true -->
  -        <constructor-arg index="5"><value>true</value></constructor-arg>
  -       <!-- permissions security enabled flag, default=true -->
  -        <constructor-arg index="6"><value>false</value></constructor-arg>
  +       <constructor-arg index="5"><value>true</value></constructor-arg>
  +       <!-- permissions security enabled flag, default=false -->
  +       <constructor-arg index="6"><value>false</value></constructor-arg>
          <!-- constraints security enabled flag, default=true -->
  -        <constructor-arg index="7"><value>true</value></constructor-arg>
  +       <constructor-arg index="7"><value>true</value></constructor-arg>
     </bean>
   
   </beans>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to