weaver 2004/08/02 12:04:28
Modified: webapp/WEB-INF/conf/assembly pipelines.xml
pluto-factories.xml
Log:
Added log service for Pluto
Add dep injection into valves
Revision Changes Path
1.2 +38 -7 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pipelines.xml 1 Aug 2004 23:21:57 -0000 1.1
+++ pipelines.xml 2 Aug 2004 19:04:27 -0000 1.2
@@ -24,17 +24,32 @@
<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="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>
+ </bean>
<bean id="profilerValve"
class="org.apache.jetspeed.profiler.impl.ProfilerValveImpl"
init-method="initialize"
- />
+ >
+ <constructor-arg>
+ <ref bean="org.apache.jetspeed.profiler.Profiler" />
+ </constructor-arg>
+ </bean>
<bean id="containerValve"
class="org.apache.jetspeed.container.ContainerValve"
@@ -44,22 +59,38 @@
<bean id="actionValve"
class="org.apache.jetspeed.pipeline.valve.impl.ActionValveImpl"
init-method="initialize"
- />
+ >
+ <constructor-arg>
+ <ref bean="org.apache.pluto.PortletContainer" />
+ </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="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"
- />
+ >
+ <constructor-arg>
+ <ref bean="org.apache.jetspeed.components.persistence.store.PersistenceStore"
/>
+ </constructor-arg>
+ </bean>
<bean id="jetspeed-pipeline"
class="org.apache.jetspeed.pipeline.JetspeedPipeline"
1.2 +4 -30
jakarta-jetspeed/webapp/WEB-INF/conf/assembly/pluto-factories.xml
Index: pluto-factories.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/assembly/pluto-factories.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pluto-factories.xml 1 Aug 2004 15:54:19 -0000 1.1
+++ pluto-factories.xml 2 Aug 2004 19:04:27 -0000 1.2
@@ -112,36 +112,6 @@
<property name="servletConfig"><ref
bean="javax.servlet.ServletConfig"/></property>
</bean>
- <!--
- <bean id="org.apache.pluto.services.information.StaticInformationProvider"
- class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
- >
- <property
name="className"><value>org.apache.jetspeed.services.information.InformationProviderServiceImpl</value></property>
- <property name="servletConfig"><ref
bean="javax.servlet.ServletConfig"/></property>
- </bean>
-
- <bean id="org.apache.pluto.services.information.DynamicInformationProvider"
- class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
- >
- <property
name="className"><value>org.apache.jetspeed.services.information.InformationProviderServiceImpl</value></property>
- <property name="servletConfig"><ref
bean="javax.servlet.ServletConfig"/></property>
- </bean>
-
- <bean id="org.apache.pluto.services.information.PortletActionProvider"
- class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
- >
- <property
name="className"><value>org.apache.jetspeed.services.information.InformationProviderServiceImpl</value></property>
- <property name="servletConfig"><ref
bean="javax.servlet.ServletConfig"/></property>
- </bean>
-
- <bean id="org.apache.pluto.services.information.PortalContextProvider"
- class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
- >
- <property
name="className"><value>org.apache.jetspeed.services.information.InformationProviderServiceImpl</value></property>
- <property name="servletConfig"><ref
bean="javax.servlet.ServletConfig"/></property>
- </bean>
- -->
-
<bean id="javax.servlet.http.HttpServletRequest"
class="org.apache.jetspeed.components.factorybeans.PlutoFactoryFactoryBean"
>
@@ -162,5 +132,9 @@
<property
name="className"><value>org.apache.jetspeed.om.ControllerFactoryImpl</value></property>
<property name="servletConfig"><ref
bean="javax.servlet.ServletConfig"/></property>
</bean>
+
+ <bean id="org.apache.pluto.services.log.LogService"
+ class="org.apache.jetspeed.container.services.log.PlutoLogService"
+ />
</beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
