weaver 2004/08/01 16:21:57
Modified: webapp/WEB-INF/conf fusion.properties
Added: webapp/WEB-INF/conf/pipelines README
webapp/WEB-INF/conf/assembly pipelines.xml
Log:
Pipeline definitions have been moved into Spring
Revision Changes Path
1.7 +6 -7 jakarta-jetspeed/webapp/WEB-INF/conf/fusion.properties
Index: fusion.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/fusion.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fusion.properties 1 Aug 2004 18:28:55 -0000 1.6
+++ fusion.properties 1 Aug 2004 23:21:57 -0000 1.7
@@ -3,9 +3,9 @@
# 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.
@@ -68,8 +68,6 @@
# -------------------------------------------------------------------
# P I P E L I N E
# -------------------------------------------------------------------
-pipeline.class = org.apache.jetspeed.pipeline.JetspeedPipeline
-pipeline.directory = /WEB-INF/conf/pipelines/
pipeline.default = portlet-pipeline
@@ -99,7 +97,7 @@
#-------------------------------------------------------------------------
-# J M X S E R V I C E
+# J M X S E R V I C E
#-------------------------------------------------------------------------
#
services.JMXService.mbean.descriptor=/WEB-INF/etc/jetspeed/conf/jetspeed-mbeans-descriptors.xml
# services.JMXService.classname=org.apache.jetspeed.services.jmx.JetspeedJMXService
@@ -107,7 +105,7 @@
#
services.JMXService.mbeans.Registry=org.apache.jetspeed.mbeans.registry.RegistryMBeanImpl
#-------------------------------------------------------------------------
-# C A P A B I L I T Y, C O N T E N T E N C O D I N G
+# C A P A B I L I T Y, C O N T E N T E N C O D I N G
#-------------------------------------------------------------------------
content.defaultencoding=iso-8859-1
@@ -131,3 +129,4 @@
jetspeed.root.assembly = /WEB-INF/conf/assembly/jetspeed.groovy
jetspeed.spring.xml = /WEB-INF/conf/assembly/jetspeed-spring.xml
pluto-factories.xml = /WEB-INF/conf/assembly/pluto-factories.xml
+pipelines.xml=/WEB-INF/conf/assembly/pipelines.xml
1.1 jakarta-jetspeed/webapp/WEB-INF/conf/pipelines/README
Index: README
===================================================================
The pipeline definitions have been moved into the Spring configuration file
WEB-INF/assembly/pipelines.xml
1.1 jakarta-jetspeed/webapp/WEB-INF/conf/assembly/pipelines.xml
Index: 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"
/>
<bean id="capabilityValve"
class="org.apache.jetspeed.capabilities.impl.CapabilityValveImpl"
init-method="initialize"
/>
<bean id="securityValve"
class="org.apache.jetspeed.security.impl.SecurityValveImpl"
init-method="initialize"
/>
<bean id="profilerValve"
class="org.apache.jetspeed.profiler.impl.ProfilerValveImpl"
init-method="initialize"
/>
<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"
/>
<bean id="portletValve"
class="org.apache.jetspeed.aggregator.PortletValve"
init-method="initialize"
/>
<bean id="aggregatorValve"
class="org.apache.jetspeed.aggregator.AggregatorValve"
init-method="initialize"
/>
<bean id="cleanUpValve"
class="org.apache.jetspeed.pipeline.valve.impl.CleanupValveImpl"
init-method="initialize"
/>
<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="localizationValve"/>
<ref bean="capabilityValve"/>
<ref bean="securityValve"/>
<ref bean="profilerValve"/>
<ref bean="containerValve"/>
<ref bean="actionValve"/>
<ref bean="aggregatorValve"/>
<ref bean="cleanUpValve"/>
</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="containerValve"/>
<ref bean="actionValve"/>
</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="localizationValve"/>
<ref bean="capabilityValve"/>
<ref bean="containerValve"/>
<ref bean="portletValve"/>
</list>
</constructor-arg>
</bean>
</beans>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
