elateXam e-assessment

Update of /cvsroot/elateportal/elatePortal/jetspeed-deploy/assembly
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25272/jetspeed-deploy/assembly

Added Files:
	profiler.xml pipelines.xml 
Log Message:
fixed a (security relevant) Resolver behaviour

--- NEW FILE: profiler.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!--
    Copyright 2004 The Apache Software Foundation
    
    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.
    See the License for the specific language governing permissions and
    limitations under the License.
-->
<beans>
	<!-- Profiler -->
	<bean id="profilerImpl" class="org.apache.jetspeed.profiler.impl.JetspeedProfilerImpl" name="profilerImpl" init-method="init">
		<constructor-arg index="0">
			<value>JETSPEED-INF/ojb/profiler_repository.xml</value>
		</constructor-arg>
		<constructor-arg index="1">
			<value>j2</value>
		</constructor-arg>
		<constructor-arg index="2">
			<ref bean="ProfileResolvers"/>
		</constructor-arg>
	</bean>
	<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="ProfileResolvers" class="org.apache.jetspeed.profiler.rules.impl.ProfileResolversImpl">
		<constructor-arg index="0">
			<map>
				<entry key="request">
					<ref bean="StandardResolver"/>
				</entry>
				<entry key="request.session">
					<ref bean="RequestSessionResolver"/>
				</entry>
				<entry key="path">
					<ref bean="PathResolver"/>
				</entry>
				<entry key="path.session">
					<ref bean="PathSessionResolver"/>
				</entry>
				<entry key="hard.coded">
					<ref bean="HardCodedResolver"/>
				</entry>
				<entry key="user">
					<ref bean="UserCriterionResolver"/>
				</entry>
				<entry key="role">
					<ref bean="RoleCriterionResolver"/>
				</entry>
				<entry key="rolecombo">
					<ref bean="RoleComboCriterionResolver"/>
				</entry>
				<entry key="group">
					<ref bean="GroupCriterionResolver"/>
				</entry>
				<entry key="mediatype">
					<ref bean="MediatypeCriterionResolver"/>
				</entry>
				<entry key="language">
					<ref bean="LanguageCriterionResolver"/>
				</entry>
				<entry key="country">
					<ref bean="CountryCriterionResolver"/>
				</entry>
				<entry key="group.role.user">
					<ref bean="GroupRoleUserCriterionResolver"/>
				</entry>
				<entry key="user.attribute">
					<ref bean="UserAttributeResolver"/>
				</entry>
				<entry key="navigation">
					<ref bean="NavigationCriterionResolver"/>
				</entry>
				<entry key="user.agent">
					<ref bean="UserAgentCriterionResolver"/>
				</entry>
			</map>
		</constructor-arg>
	</bean>
	<bean id="StandardResolver" class="org.apache.jetspeed.profiler.rules.impl.StandardResolver"/>
	<bean id="RequestSessionResolver" class="org.apache.jetspeed.profiler.rules.impl.RequestSessionResolver"/>
	<bean id="PathResolver" class="org.apache.jetspeed.profiler.rules.impl.PathResolver"/>
	<bean id="PathSessionResolver" class="org.apache.jetspeed.profiler.rules.impl.PathSessionResolver"/>
	<bean id="HardCodedResolver" class="org.apache.jetspeed.profiler.rules.impl.HardCodedResolver"/>
	<bean id="UserCriterionResolver" class="org.apache.jetspeed.profiler.rules.impl.UserCriterionResolver"/>
	<bean id="RoleCriterionResolver" class="org.apache.jetspeed.profiler.rules.impl.RoleCriterionResolver"/>
	<bean id="RoleComboCriterionResolver" class="org.apache.jetspeed.profiler.rules.impl.RoleComboCriterionResolver"/>
	
	<!-- changed, Thorsten Berger -->
	<bean id="GroupCriterionResolver" class="de.elatePortal.jetspeed.ElatePortalGroupCriterionResolver"/>
	
	<bean id="MediatypeCriterionResolver" class="org.apache.jetspeed.profiler.rules.impl.MediatypeCriterionResolver"/>
	<bean id="LanguageCriterionResolver" class="org.apache.jetspeed.profiler.rules.impl.LanguageCriterionResolver"/>
	<bean id="CountryCriterionResolver" class="org.apache.jetspeed.profiler.rules.impl.CountryCriterionResolver"/>
	<bean id="GroupRoleUserCriterionResolver" class="org.apache.jetspeed.profiler.rules.impl.GroupRoleUserCriterionResolver"/>
	<bean id="UserAttributeResolver" class="org.apache.jetspeed.profiler.rules.impl.UserAttributeResolver"/>
	<bean id="NavigationCriterionResolver" class="org.apache.jetspeed.profiler.rules.impl.NavigationCriterionResolver"/>
	<bean id="UserAgentCriterionResolver" class="org.apache.jetspeed.profiler.rules.impl.UserAgentCriterionResolver"/>
</beans>

--- NEW FILE: pipelines.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<!--
Copyright 2004 The Apache Software Foundation

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.
See the License for the specific language governing permissions and
limitations under the License.
-->
<beans>
  <bean id="localizationValve"
        class="org.apache.jetspeed.localization.impl.LocalizationValveImpl"
        init-method="initialize"
  >
    <constructor-arg>
      <value><!--@...>
    </constructor-arg>
  </bean> 
  
  <bean id="capabilityValve"
        class="org.apache.jetspeed.capabilities.impl.CapabilityValveImpl"
        init-method="initialize"
  >
   <constructor-arg>
       <ref bean="org.apache.jetspeed.capabilities.Capabilities" />
   </constructor-arg>
  </bean> 
  
  <bean id="portalURLValve"
        class="org.apache.jetspeed.container.url.impl.PortalURLValveImpl"
        init-method="initialize"
   >
   <constructor-arg>
       <ref bean="NavigationalStateComponent" />
   </constructor-arg>            
  </bean>
          
  <bean id="securityValve"
        class="org.apache.jetspeed.security.impl.SecurityValveImpl"
        init-method="initialize"
  >
   <constructor-arg>
       <ref bean="org.apache.jetspeed.profiler.Profiler" />
   </constructor-arg>
   <constructor-arg>
       <ref bean="org.apache.jetspeed.security.UserManager" />
   </constructor-arg>
   <constructor-arg>
       <ref bean="PortalStatistics" />
   </constructor-arg>   
  </bean> 
  
  <bean id="passwordCredentialValve"
        class="org.apache.jetspeed.security.impl.PasswordCredentialValveImpl"
        init-method="initialize"
  />
  
  <bean id="loginValidationValve"
        class="org.apache.jetspeed.security.impl.LoginValidationValveImpl"
        init-method="initialize">
	  <!-- remove (from the session) the following list of session attributes upon login -->
       <constructor-arg index="0">
            <list>
                <value>org.apache.jetspeed.powertool.actions</value>
            </list>		   
	   </constructor-arg>	  
  </bean>
  <bean id="profilerValve"
        class="org.apache.jetspeed.profiler.impl.ProfilerValveImpl"
        init-method="initialize"
  >
   <constructor-arg index="0">
       <ref bean="org.apache.jetspeed.profiler.Profiler" />
   </constructor-arg>
   <constructor-arg index="1">
       <ref bean="org.apache.jetspeed.portalsite.PortalSite" />
   </constructor-arg>
   <constructor-arg index="2">
       <ref bean="org.apache.jetspeed.page.PageManager" />
   </constructor-arg>
   <!--
       request fallback to root folder/page enabled by default;
       if set to false, requests generate HTTP 403/404 errors
       for access errors or missing pages
   -->
   <constructor-arg index="3"><value>true</value></constructor-arg>    
   <!--
       use last visited page histories to select default page
       for folder navigational urls; if set to false, the
       default page specified in PSML, (or the first page in
       the folder), is always selected
   -->
   <constructor-arg index="4"><value>true</value></constructor-arg>    
  </bean> 
  
  <bean id="containerValve"
        class="org.apache.jetspeed.container.ContainerValve"
        init-method="initialize"
  /> 
  
  <bean id="actionValve"
        class="org.apache.jetspeed.pipeline.valve.impl.ActionValveImpl"
        init-method="initialize"
  >
   <constructor-arg>
       <ref bean="org.apache.pluto.PortletContainer" />
   </constructor-arg>
   <constructor-arg>   
       <ref bean="PortletWindowAccessor" />    
   </constructor-arg>   
    <!-- 
         Setting to true will force Action response isCommitted to true
         as there is a bug in Websphere 5 where request.isCommitted always returns false
         Set this boolean to TRUE if running on Websphere 5 pre-cumulative fix 5.1.1.9  
    <constructor-arg type="boolean">
        <value>false</value>
    </constructor-arg>                
        -->       
  </bean> 

  <bean id="desktopActionValve"
        class="org.apache.jetspeed.pipeline.valve.impl.ActionValveImpl"
        init-method="initialize"
  >
   <constructor-arg>
       <ref bean="org.apache.pluto.DesktopPortletContainer" />
   </constructor-arg>
   <constructor-arg>   
       <ref bean="PortletWindowAccessor" />    
   </constructor-arg>   
  </bean> 
      
  <bean id="portletValve"
        class="org.apache.jetspeed.aggregator.PortletValve"
        init-method="initialize"
  >
   <constructor-arg>
       <ref bean="org.apache.jetspeed.aggregator.PortletAggregator"/>
   </constructor-arg>
  </bean> 

  <bean id="fileServerValve"
        class="org.apache.jetspeed.aggregator.FileServerValve"
        init-method="initialize"
  >
     <!-- portlet -->
     <constructor-arg index="0"><value>demo::ContentViewer</value></constructor-arg>    
     <!-- entity -->
     <constructor-arg index="1"><value>public.content.21</value></constructor-arg>    
  </bean> 
  
  <bean id="aggregatorValve"
        class="org.apache.jetspeed.aggregator.AggregatorValve"
        init-method="initialize"
  >
   <constructor-arg>
       <ref bean="org.apache.jetspeed.aggregator.PageAggregator"/>
   </constructor-arg>
  </bean> 
  
  <bean id="cleanUpValve"
        class="org.apache.jetspeed.pipeline.valve.impl.CleanupValveImpl"
        init-method="initialize"
  >
  </bean> 

  <bean id="AJAXValve"
        class="org.apache.jetspeed.ajax.AJAXValve"
        init-method="initialize"
  >
   <constructor-arg>
       <ref bean="AJAXService"/>
   </constructor-arg>
  </bean> 
  
  <bean id="DecorationValve"
        class="org.apache.jetspeed.decoration.DecorationValve"
        init-method="initialize">
        <constructor-arg>
            <ref bean="DecorationFactory" />
        </constructor-arg>
		<constructor-arg>			
			 <ref bean="PortletWindowAccessor" />
		</constructor-arg>
  </bean>

  <bean id="loginViewValve"
        class="org.apache.jetspeed.login.impl.LoginJSPViewValve"
        init-method="initialize"
  >
    <constructor-arg>
      <value>/WEB-INF/templates/login</value>
    </constructor-arg>
  </bean> 

  <bean id="desktopValve"
        class="org.apache.jetspeed.desktop.impl.DesktopValveImpl"
  > 
    <constructor-arg>
        <ref bean="JetspeedDesktop" />
    </constructor-arg>      
  </bean>

  <bean id="elatePortalValve"
		class="de.elatePortal.jetspeed.ElatePortalValve"/>      

  <bean id="jetspeed-pipeline"
        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
        init-method="initialize"
  >
   <constructor-arg>
       <value>JetspeedPipeline</value>
   </constructor-arg>
   <constructor-arg>
    <list>
      <ref bean="capabilityValve"/>
      <ref bean="portalURLValve"/>
      <ref bean="securityValve"/>
      <ref bean="localizationValve"/>
      <ref bean="passwordCredentialValve"/>
      <ref bean="loginValidationValve"/>
      <ref bean="elatePortalValve"/>
      <ref bean="profilerValve"/>
      <ref bean="containerValve"/>
      <ref bean="actionValve"/>
      <ref bean="DecorationValve" />
      <ref bean="aggregatorValve"/>
      <ref bean="cleanUpValve"/>
    </list>
    </constructor-arg>
  </bean> 
  
  <bean id="login-pipeline"
        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
        init-method="initialize"
  >
   <constructor-arg>
       <value>LoginPipeline</value>
   </constructor-arg>
   <constructor-arg>
    <list>
      <ref bean="capabilityValve"/>
      <ref bean="localizationValve"/>
      <ref bean="loginViewValve"/>
    </list>
    </constructor-arg>
  </bean> 

  <bean id="action-pipeline"
        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
        init-method="initialize"
  >
   <constructor-arg>
       <value>ActionPipeline</value>
   </constructor-arg>
   <constructor-arg>
    <list>
        <ref bean="localizationValve"/>
        <ref bean="capabilityValve"/>
        <ref bean="portalURLValve"/>
        <ref bean="containerValve"/>
        <ref bean="actionValve"/>
    </list>
    </constructor-arg>
  </bean> 

  <bean id="desktop-action-pipeline"
        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
        init-method="initialize"
  >
   <constructor-arg>
       <value>DesktopActionPipeline</value>
   </constructor-arg>
   <constructor-arg>
    <list>
        <ref bean="securityValve"/>                        
        <ref bean="localizationValve"/>
        <ref bean="capabilityValve"/>
        <ref bean="portalURLValve"/>
        <ref bean="profilerValve"/>        
        <ref bean="containerValve"/>
        <ref bean="desktopActionValve"/>
    </list>
    </constructor-arg>
  </bean> 
      
  <bean id="portlet-pipeline"
        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
        init-method="initialize"
  >
   <constructor-arg>
       <value>PortletPipeline</value>
   </constructor-arg>
   <constructor-arg>
    <list>
        <ref bean="portalURLValve"/>                
        <ref bean="capabilityValve"/>        
        <ref bean="securityValve"/>                
        <ref bean="localizationValve"/>
        <ref bean="elatePortalValve"/>
        <ref bean="profilerValve"/>                        
        <ref bean="containerValve"/>
        <ref bean="portletValve"/>    
    </list>
    </constructor-arg>
  </bean> 
  
  <bean id="ajax-pipeline"
        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
        init-method="initialize"
  >
   <constructor-arg>
       <value>AjaxPipeline</value>
   </constructor-arg>
   <constructor-arg>
    <list>
        <ref bean="capabilityValve"/>
        <ref bean="portalURLValve"/>                
        <ref bean="securityValve"/>                
        <ref bean="localizationValve"/>
        <ref bean="profilerValve"/>                        
        <ref bean="containerValve"/>
        <!-- TODO: replace layout valve with Ajax valve -->
        <ref bean="layoutValve"/>
    </list>
    </constructor-arg>
  </bean> 

  <bean id="fileserver-pipeline"
        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
        init-method="initialize"
  >
   <constructor-arg>
       <value>FileServerPipeline</value>
   </constructor-arg>
   <constructor-arg>
    <list>
        <ref bean="portalURLValve"/>                
        <ref bean="securityValve"/>                
        <ref bean="localizationValve"/>
        <ref bean="profilerValve"/>                        
        <ref bean="containerValve"/>
        <ref bean="fileServerValve"/>            
        <ref bean="portletValve"/>    
    </list>
    </constructor-arg>
  </bean> 

  <bean id="desktop-pipeline"
        class="org.apache.jetspeed.pipeline.JetspeedPipeline"
        init-method="initialize"
  >
   <constructor-arg>
       <value>DesktopPipeline</value>
   </constructor-arg>
   <constructor-arg>
    <list>
        <ref bean="capabilityValve"/>
        <ref bean="portalURLValve"/>                
        <ref bean="securityValve"/>                
        <ref bean="localizationValve"/>
        <ref bean="profilerValve"/>                        
        <ref bean="desktopValve"/>
    </list>
    </constructor-arg>
  </bean> 
      
  <bean id='pipeline-map'
        class='java.util.HashMap'>
    <constructor-arg>
        <map>
            <entry key='/portlet'>
                <value>portlet-pipeline</value>
            </entry>            
            <entry key='/portal'>
                <value>jetspeed-pipeline</value>
            </entry>
            <entry key='/ajaxapi'>
                <value>ajax-pipeline</value>
            </entry>
            <entry key='/login'>
                <value>jetspeed-pipeline</value>
            </entry>            
            <entry key='/fileserver'>
                <value>fileserver-pipeline</value>
            </entry>                        
            <entry key='/desktop'>
                <value>desktop-pipeline</value>
            </entry>                                    
            <entry key='/action'>
                <value>desktop-action-pipeline</value>
            </entry>                                                
        </map>        
    </constructor-arg>        
  </bean>

  <bean id="debugValve"
        class="org.apache.jetspeed.pipeline.valve.impl.DebugValveImpl"
  /> 

          
</beans>