ate 2005/03/01 18:51:03
Modified: portal/src/webapp/WEB-INF/assembly Tag:
deployment-refactoring pluto-factories.xml
jetspeed-spring.xml
Log:
New deployment and portlet container invokation configurations.
Revision Changes Path
No revision
No revision
1.3.2.1 +4 -1
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/pluto-factories.xml
Index: pluto-factories.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/pluto-factories.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- pluto-factories.xml 4 Jan 2005 16:23:06 -0000 1.3
+++ pluto-factories.xml 2 Mar 2005 02:51:03 -0000 1.3.2.1
@@ -140,6 +140,9 @@
<property name="servletConfig"><ref
bean="javax.servlet.ServletConfig"/></property>
<property name="props">
<map>
+ <entry key="PortletFactory">
+ <ref bean="portletFactory" />
+ </entry>
<entry key="LocalPortletInvoker">
<ref bean="LocalPortletInvoker" />
</entry>
@@ -191,4 +194,4 @@
class="org.apache.jetspeed.container.services.log.PlutoLogService"
/>
-</beans>
\ No newline at end of file
+</beans>
1.43.2.1 +7 -32
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.43
retrieving revision 1.43.2.1
diff -u -r1.43 -r1.43.2.1
--- jetspeed-spring.xml 10 Feb 2005 23:48:47 -0000 1.43
+++ jetspeed-spring.xml 2 Mar 2005 02:51:03 -0000 1.43.2.1
@@ -377,7 +377,6 @@
>
<constructor-arg
><value>org.apache.jetspeed.request.JetspeedRequestContext</value></constructor-arg>
<constructor-arg ><ref
bean="org.apache.jetspeed.userinfo.UserInfoManager" /></constructor-arg>
- <constructor-arg ><ref bean="portletFactory" /></constructor-arg>
</bean>
<!-- Portlet Window Component -->
@@ -405,26 +404,10 @@
<constructor-arg ><ref
bean="org.apache.jetspeed.container.window.PortletWindowAccessor"
/></constructor-arg>
</bean>
- <!-- Portlet Cache -->
- <bean id="portletCache"
- class="org.apache.jetspeed.cache.PortletCache"
- >
-
- </bean>
-
<!-- Portlet Factory -->
<bean id="portletFactory"
class="org.apache.jetspeed.factory.JetspeedPortletFactory"
>
- <constructor-arg ><ref bean="portletCache" /></constructor-arg>
- </bean>
-
- <!-- Portlet Factory Proxy Accessor-->
- <bean id="portletFactoryProxy"
- class="org.apache.jetspeed.factory.JetspeedPortletFactoryProxy"
- destroy-method="reset"
- >
- <constructor-arg ><ref bean="portletFactory" /></constructor-arg>
</bean>
<!-- Aggregation: Page -->
@@ -455,7 +438,7 @@
<!-- Application Server Manager for Tomcat
Provides hooks into the application server to help us deploy portlet
applications
- as web application into that server. This manager is for Tomcat 4/5
+ as web application into that server. This manager is for Tomcat 5
-->
<!--
<bean
id="org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager"
@@ -498,26 +481,18 @@
<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>
- <constructor-arg ><ref bean="portletCache" /></constructor-arg>
<constructor-arg ><ref bean="portletFactory" /></constructor-arg>
<property name="searchEngine"><ref
bean="org.apache.jetspeed.search.SearchEngine"/></property>
</bean>
-->
<bean id="deployFactory"
class="org.apache.jetspeed.tools.deploy.JetspeedDeployFactory"/>
<bean id="PAM"
- class="org.apache.jetspeed.tools.pamanager.WarInfusionPAM"
+ class="org.apache.jetspeed.tools.pamanager.PortletApplicationManager"
>
-
<constructor-arg><value>${autodeployment.target.dir}</value></constructor-arg>
+ <constructor-arg><ref bean="portletFactory"/></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="portletCache"/></constructor-arg>
- <constructor-arg><ref bean="portletFactory"/></constructor-arg>
- <constructor-arg><ref bean="deployFactory"/></constructor-arg>
- <!-- force deployment to use expanded wars, (i.e. Tomcat 4.X),
default = not specified - inspect webapps to determine -->
- <!-- <constructor-arg
type="boolean"><value>true</value></constructor-arg> -->
- <!-- force deployment to use war files, (i.e. Tomcat 5.X), default =
not specified - inspect webapps to determine -->
- <!-- <constructor-arg
type="boolean"><value>false</value></constructor-arg> -->
<property name="searchEngine"><ref
bean="org.apache.jetspeed.search.SearchEngine"/></property>
</bean>
@@ -525,9 +500,10 @@
<bean id="portletAppDeploymentListener"
class="org.apache.jetspeed.deployment.impl.DeployPortletAppEventListener"
>
- <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.PortletRegistry"
/></constructor-arg>
+ <constructor-arg index="0"><ref bean="PAM"/></constructor-arg>
+ <constructor-arg index="1"><ref
bean="org.apache.jetspeed.components.portletregistry.PortletRegistry"/></constructor-arg>
+ <constructor-arg
index="2"><value>${autodeployment.target.dir}</value></constructor-arg>
+ <constructor-arg
index="3"><value>${applicationRoot}/WEB-INF/apps</value></constructor-arg>
</bean>
<bean id="decoratorDeploymentRegistry"
class="org.apache.jetspeed.deployment.simpleregistry.impl.InMemoryRegistryImpl"
@@ -536,7 +512,6 @@
<bean id="decoratorDeploymentListener"
class="org.apache.jetspeed.deployment.impl.DeployDecoratorEventListener"
>
- <constructor-arg ><ref
bean="decoratorDeploymentRegistry"/></constructor-arg>
<constructor-arg
><value>${applicationRoot}/WEB-INF/decorations</value></constructor-arg>
</bean>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
