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-2/portal/src/webapp/WEB-INF/assembly pipelines.xml jetspeed-spring.xml
Date Sun, 07 Nov 2004 18:44:19 GMT
taylor      2004/11/07 10:44:19

  Modified:    portal/src/webapp/WEB-INF/decorations/portlet/html/tigris/css
                        styles.css
               portal/src/webapp/WEB-INF/assembly pipelines.xml
                        jetspeed-spring.xml
  Log:
  - convert Capabilities component to Spring DAO
  - remove all references to assembly to PersistentStore component
  
  Revision  Changes    Path
  1.3       +2 -2      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/portlet/html/tigris/css/styles.css
  
  Index: styles.css
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/decorations/portlet/html/tigris/css/styles.css,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- styles.css	6 Nov 2004 22:35:49 -0000	1.2
  +++ styles.css	7 Nov 2004 18:44:19 -0000	1.3
  @@ -30,7 +30,7 @@
       Specify the height of the image used
       else it will use the text height    
       **/
  -    height:10px;    
  +    height:8px;    
       font-weight:bold;
   }
    
  @@ -46,7 +46,7 @@
   {
       padding: 2px;
       overflow : scroll;
  -
  +	border: 1px solid #999999
   }
   
   .portlet-tigris .PContentRight
  
  
  
  1.6       +0 -3      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/pipelines.xml
  
  Index: pipelines.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/pipelines.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- pipelines.xml	17 Oct 2004 14:02:38 -0000	1.5
  +++ pipelines.xml	7 Nov 2004 18:44:19 -0000	1.6
  @@ -95,9 +95,6 @@
           class="org.apache.jetspeed.pipeline.valve.impl.CleanupValveImpl"
           init-method="initialize"
     >
  -   <constructor-arg>
  -   	<ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore" />
 	
  -   </constructor-arg>
     </bean> 
     
     <bean id="jetspeed-pipeline"
  
  
  
  1.30      +23 -30    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed-spring.xml
  
  Index: jetspeed-spring.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed-spring.xml,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- jetspeed-spring.xml	30 Oct 2004 00:16:04 -0000	1.29
  +++ jetspeed-spring.xml	7 Nov 2004 18:44:19 -0000	1.30
  @@ -112,39 +112,14 @@
     	   <!-- 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>
  -  
  -  <!-- Makes it so that each thread has an its own instance of the PersistenceStore
-->
  -  <bean id="threadLocalPersistenceStore" 
  -  	    class="org.springframework.aop.target.ThreadLocalTargetSource">
  -     <property name="targetBeanName">
  -     	<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="portletRegistryImpl" class="org.apache.jetspeed.components.portletregistry.PersistenceBrokerPortletRegistry"
init-method="init">
       	<constructor-arg>
       		<value>META-INF/registry_repository.xml</value>
       	</constructor-arg>
       </bean>
  -		
  -    
  +		    
   	<bean id="org.apache.jetspeed.components.portletregistry.PortletRegistry"
   		  name="portletRegistry"
   		  parent="baseTransactionProxy" >
  @@ -271,11 +246,29 @@
   		</property>		  	   
     </bean>
     
  -  <!-- Capabillites -->
  +  <!-- Capabilities DAO-->
  +  <bean id="capabilitiesImpl" class="org.apache.jetspeed.capabilities.impl.JetspeedCapabilities"
init-method="init">
  +    	<constructor-arg>
  +    		<value>META-INF/capabilities-ojb.xml</value>
  +    	</constructor-arg>
  +    </bean>
  +  
  +  <!-- Capabilities -->  
     <bean id="org.apache.jetspeed.capabilities.Capabilities" 
  -  	   class="org.apache.jetspeed.capabilities.impl.JetspeedCapabilities"
  +        name="capabilities"
  +        parent="baseTransactionProxy"        
     >  	   
  -  	   <constructor-arg ><ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"/></constructor-arg>
 	   
  +		<property name="proxyInterfaces">
  +			<value>org.apache.jetspeed.capabilities.Capabilities</value>
  +		</property>
  +		<property name="target">
  +			<ref bean="capabilitiesImpl"/>
  +		</property>
  +		<property name="transactionAttributes">
  +			<props>				
  +				<prop key="*">PROPAGATION_SUPPORTS</prop>
  +			</props>
  +		</property>		  	   
     </bean>
     
      
  
  
  

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