taylor 2005/01/18 19:26:02
Modified: portal/src/webapp/WEB-INF/assembly page-manager.xml
jetspeed-spring.xml
Log:
- moved profiler assembly to page manager assembly file
- added defaultRule parameter to profiler
Revision Changes Path
1.6 +27 -0
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- page-manager.xml 19 Nov 2004 03:07:43 -0000 1.5
+++ page-manager.xml 19 Jan 2005 03:26:02 -0000 1.6
@@ -16,6 +16,33 @@
limitations under the License.
-->
<beans>
+
+ <!-- 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>
+ </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" >
1.39 +1 -29
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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- jetspeed-spring.xml 5 Jan 2005 04:22:52 -0000 1.38
+++ jetspeed-spring.xml 19 Jan 2005 03:26:02 -0000 1.39
@@ -223,35 +223,7 @@
</props>
</property>
</bean>
-
- <!-- Profiler DAO-->
- <bean id="profilerImpl"
class="org.apache.jetspeed.profiler.impl.JetspeedProfilerImpl"
init-method="init">
- <constructor-arg>
- <value>META-INF/profiler-ojb.xml</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>
-
+
<!-- Capabilities DAO-->
<bean id="capabilitiesImpl"
class="org.apache.jetspeed.capabilities.impl.JetspeedCapabilities"
init-method="init">
<constructor-arg>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
