taylor 2004/11/07 21:21:52
Modified: webapp/WEB-INF/conf/assembly pipelines.xml
jetspeed-spring.xml
webapp/WEB-INF/conf Torque.properties
Added: webapp/WEB-INF/conf/assembly pooled-datasource-support.xml
transaction.xml
Removed: webapp/WEB-INF/conf/assembly jetspeed.groovy
Log:
converting over Fusion to the latest changes in J2 dependencies, DAO
components, etc
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.6 +9 -0
jakarta-jetspeed/webapp/WEB-INF/conf/assembly/pipelines.xml
Index: pipelines.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/assembly/pipelines.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pipelines.xml 11 Aug 2004 21:25:57 -0000 1.5
+++ pipelines.xml 8 Nov 2004 05:21:52 -0000 1.6
@@ -30,6 +30,11 @@
</constructor-arg>
</bean>
+ <bean id="portalURLValve"
+ class="org.apache.jetspeed.container.url.impl.PortalURLValveImpl"
+ init-method="initialize"
+ />
+
<bean id="securityValve"
class="org.apache.jetspeed.fusion.security.impl.FusionSecurityValveImpl"
init-method="initialize"
@@ -103,6 +108,7 @@
<list>
<ref bean="localizationValve"/>
<ref bean="capabilityValve"/>
+ <ref bean="portalURLValve"/>
<ref bean="securityValve"/>
<ref bean="profilerValve"/>
<ref bean="containerValve"/>
@@ -124,6 +130,7 @@
<list>
<ref bean="localizationValve"/>
<ref bean="capabilityValve"/>
+ <ref bean="portalURLValve"/>
<ref bean="securityValve"/>
<ref bean="containerValve"/>
<ref bean="actionValve"/>
@@ -142,6 +149,7 @@
<list>
<ref bean="localizationValve"/>
<ref bean="capabilityValve"/>
+ <ref bean="portalURLValve"/>
<ref bean="securityValve"/>
<ref bean="containerValve"/>
<ref bean="portletValve"/>
@@ -158,6 +166,7 @@
</constructor-arg>
<constructor-arg>
<list>
+ <ref bean="portalURLValve"/>
<ref bean="containerValve"/>
</list>
</constructor-arg>
1.8 +186 -83
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jetspeed-spring.xml 29 Sep 2004 23:03:27 -0000 1.7
+++ jetspeed-spring.xml 8 Nov 2004 05:21:52 -0000 1.8
@@ -32,21 +32,40 @@
/>
-
- <!-- Portlet Services -->
+ <!-- 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="PortletRegistryComponent">
+ <ref
bean="org.apache.jetspeed.components.portletregistry.PortletRegistry" />
+ </entry>
<entry key="PAM">
<ref bean="PAM" />
</entry>
</map>
</constructor-arg>
</bean>
+
+ <bean id="org.apache.jetspeed.prefs.PreferencesProvider"
parent="baseTransactionProxy"
+ name="prefsProvider"
+ >
+ <property name="proxyInterfaces">
+
<value>org.apache.jetspeed.prefs.PreferencesProvider</value>
+ </property>
+
+ <property name="target">
+ <ref bean="PreferencesProviderImpl"/>
+ </property>
+ <property name="transactionAttributes">
+ <props>
+ <prop
key="createNode*">PROPAGATION_REQUIRED</prop>
+ <prop
key="storeNode*">PROPAGATION_REQUIRED</prop>
+ <prop
key="removeNode*">PROPAGATION_REQUIRED</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ </props>
+ </property>
+ </bean>
<!-- ID Generator -->
<bean id="IdGenerator"
@@ -68,102 +87,186 @@
<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="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>
+ <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" >
+ <property name="proxyInterfaces">
+
<value>org.apache.jetspeed.components.portletregistry.PortletRegistry</value>
+ </property>
+
+ <property name="target">
+ <ref bean="portletRegistryImpl"/>
+ </property>
+ <property name="transactionAttributes">
+ <props>
+ <prop
key="register*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop
key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop
key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop
key="save*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletregistry.RegistryException</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ </props>
+ </property>
+ </bean>
+
+<!-- Portlet Entity Access DAO-->
+ <!--
+ <bean id="systemCache"
class="org.apache.jetspeed.cache.general.SimpleHashMapCache" />
+
+ <bean id="systemCachingInterceptor"
class="org.apache.jetspeed.components.interceptors.CachingInterceptor" >
+ <constructor-arg>
+ <ref bean="systemCache"/>
+ </constructor-arg>
+ </bean>
+
+ <bean id="systemRemoveFromCacheInterceptor"
class="org.apache.jetspeed.components.interceptors.RemoveFromCacheInterceptor" >
+ <constructor-arg>
+ <ref bean="systemCache"/>
+ </constructor-arg>
+ </bean>
+
+ <bean id="portletEntityCachingAdvisor"
class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
+ <property name="advice">
+ <ref bean="systemCachingInterceptor"/>
+ </property>
+ <property name="patterns">
+ <list>
+ <value>.*getPortletEntity.*</value>
+ </list>
+ </property>
+ </bean>
+
+ <bean id="portletEntityRemoveFromCacheAdvisor"
class="org.springframework.aop.support.RegexpMethodPointcutAdvisor">
+ <property name="advice">
+ <ref bean="systemRemoveFromCacheInterceptor"/>
+ </property>
+ <property name="patterns">
+ <list>
+ <value>.*removePortletEntity.*</value>
+ </list>
+ </property>
+ </bean>
+
+ -->
+ <!--
+ - PortletEntity business object: OJB implementation, as an inner bean
wrapped
+ - by an outer transactional proxy. The two bean definitions
could have been separate,
+ - but this is cleaner as there is no need to ever access the
unwrapped object.
+ -->
- <!-- 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="portletEntityAccessImpl"
class="org.apache.jetspeed.components.portletentity.PersistenceBrokerPortletEntityAccess"
>
+ <constructor-arg>
+ <ref bean="portletRegistry"/>
+ </constructor-arg>
+ </bean>
+
+
+ <bean
id="org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent"
parent="baseTransactionProxy"
+ name="portletEntityAccess" >
+ <property name="proxyInterfaces">
+
<value>org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent</value>
+ </property>
+ <property name="target">
+ <ref bean="portletEntityAccessImpl"/>
+ </property>
+ <!--
+ <property name="preInterceptors">
+ <list>
+ <ref bean="portletEntityCachingAdvisor"/>
+ <ref
bean="portletEntityRemoveFromCacheAdvisor"/>
+ </list>
+ </property>
+ -->
+ <property name="transactionAttributes">
+ <props>
+ <prop key="remove*">PROPAGATION_REQUIRED</prop>
+ <prop
key="store*">PROPAGATION_REQUIRED,-org.apache.jetspeed.components.portletentity.PortletEntityNotStoredException</prop>
+ <prop key="*">PROPAGATION_SUPPORTS</prop>
+ </props>
+ </property>
+ </bean>
+
+ <!-- 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"
+ name="capabilities"
+ parent="baseTransactionProxy"
+ >
+ <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>
<!-- User Info -->
<bean id="org.apache.jetspeed.userinfo.UserInfoManager"
class="org.apache.jetspeed.fusion.userinfo.impl.FusionUserInfoManagerImpl"
>
- <constructor-arg ><ref
bean="org.apache.jetspeed.components.portletregistry.PortletRegistryComponent"/></constructor-arg>
+ <constructor-arg ><ref
bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></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>
-
- <!-- 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>
+ <!-- Preferences Implementation -->
+ <bean id="PreferencesProviderImpl"
+
class="org.apache.jetspeed.prefs.impl.PersistenceBrokerPreferencesProvider"
+ init-method="init"
+ >
+ <constructor-arg
index="0"><value>META-INF/prefs_repository.xml</value></constructor-arg>
+ <constructor-arg type="boolean"
index="1"><value>false</value></constructor-arg>
+ </bean>
+
+ <!-- Property Manager -->
+ <bean id="PropertyManagerImpl"
+ class="org.apache.jetspeed.prefs.impl.PropertyManagerImpl"
+ >
+ <!-- We don't use the Tx proxied prefs provider so that we can
demarcate Txs
+ exclusively for the PropertyManager -->
+ <constructor-arg ><ref
bean="PreferencesProviderImpl"/></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.state.NavigationalStateComponent"
+
class="org.apache.jetspeed.container.state.impl.JetspeedNavigationalStateComponent"
+ >
+ <constructor-arg
index="0"><value>org.apache.jetspeed.container.state.impl.SessionFullNavigationalState</value></constructor-arg>
+ <constructor-arg
index="1"><value>org.apache.jetspeed.container.url.impl.PathInfoEncodingPortalURL</value></constructor-arg>
+ <constructor-arg
index="2"><value>org.apache.jetspeed.container.state.impl.JetspeedNavigationalStateCodec</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
><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>
+<!-- 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>
-
+
<!-- Pluto Portlet Container -->
<bean id="Pluto" class="org.apache.pluto.PortletContainerImpl" />
@@ -257,7 +360,7 @@
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.portletregistry.PortletRegistry"
/></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>
@@ -270,7 +373,7 @@
>
<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="org.apache.jetspeed.components.portletregistry.PortletRegistry"
/></constructor-arg>
<constructor-arg><ref bean="portletFactory"/></constructor-arg>
</bean>
1.1
jakarta-jetspeed/webapp/WEB-INF/conf/assembly/pooled-datasource-support.xml
Index: pooled-datasource-support.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>
<!-- JNDI -->
<bean id="org.apache.jetspeed.components.jndi.JNDIComponent"
class="org.apache.jetspeed.components.jndi.TyrexJNDIComponent" />
<!-- Pooled Datasource -->
<bean id="org.apache.jetspeed.components.datasource.DatasourceComponent"
class="org.apache.jetspeed.components.datasource.BoundDBCPDatasourceComponent"
init-method="start"
destroy-method="stop">
<constructor-arg
index="0"><value>${org.apache.jetspeed.database.user}</value></constructor-arg>
<constructor-arg
index="1"><value>${org.apache.jetspeed.database.password}</value></constructor-arg>
<constructor-arg
index="2"><value>${org.apache.jetspeed.database.driver}</value></constructor-arg>
<constructor-arg
index="3"><value>${org.apache.jetspeed.database.url}</value></constructor-arg>
<!-- Default pool size -->
<constructor-arg type="int" index="4"
><value>20</value></constructor-arg>
<!-- Time (in millis) to wait before preforming "when exhausted"
action-->
<constructor-arg index="5"><value>5000</value></constructor-arg>
<!-- When exhausted grow -->
<constructor-arg type="byte"
index="6"><value>2</value></constructor-arg>
<!-- Autocommit flag -->
<constructor-arg type="boolean" index="7"
><value>true</value></constructor-arg>
<!-- name to bind datasource to -->
<constructor-arg index="8"><value>jetspeed</value></constructor-arg>
<constructor-arg index="9"><ref
bean="org.apache.jetspeed.components.jndi.JNDIComponent"/></constructor-arg>
</bean>
</beans>
1.1
jakarta-jetspeed/webapp/WEB-INF/conf/assembly/transaction.xml
Index: transaction.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
"http://www.springframework.org/dtd/spring-beans.dtd";>
<!--
- Application context definition for PortletRegistry using Apache OJB.
-->
<beans>
<!-- Transaction manager for a single OJB PersistenceBroker
(alternative to JTA) -->
<bean id="transactionManager"
class="org.springframework.orm.ojb.PersistenceBrokerTransactionManager"/>
<!-- Transaction manager that delegates to JTA (for a transactional
JNDI DataSource) -->
<!--
<bean id="transactionManager"
class="org.springframework.transaction.jta.JtaTransactionManager"/>
-->
<!--
- A parent bean definition which is a base definition for
transaction proxies.
- It is markes as abstract, since it is never supposed to be
instantiated itself.
- We set shared transaction attributes here, following our
naming patterns.
- The attributes can still be overridden in child bean
definitions.
-->
<bean id="baseTransactionProxy"
class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
abstract="true">
<property name="transactionManager"><ref
bean="transactionManager"/></property>
<property name="transactionAttributes">
<props>
<prop key="*">PROPAGATION_REQUIRED</prop>
</props>
</property>
</bean>
</beans>
1.10 +3 -3 jakarta-jetspeed/webapp/WEB-INF/conf/Torque.properties
Index: Torque.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/Torque.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Torque.properties 17 Mar 2004 19:10:26 -0000 1.9
+++ Torque.properties 8 Nov 2004 05:21:52 -0000 1.10
@@ -57,9 +57,9 @@
torque.database.default=default
-torque.database.default.adapter=hypersonic
+# torque.database.default.adapter=hypersonic
### torque.database.default.adapter=mysql
-### torque.database.default.adapter=oracle
+torque.database.default.adapter=oracle
### torque.database.default.adapter=mssql
##
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
