ate 2005/03/23 15:05:48
Modified: portal/src/webapp/WEB-INF/assembly jetspeed-spring.xml
pluto-factories.xml
portal/src/webapp/WEB-INF jboss-web.xml web.xml
portal/src/webapp/WEB-INF/conf jetspeed.properties
Log:
Resolving http://issues.apache.org/jira/browse/JS2-210:
Adapted configurations and JBoss support
Revision Changes Path
1.44 +26 -71
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.44
diff -u -r1.43 -r1.44
--- jetspeed-spring.xml 10 Feb 2005 23:48:47 -0000 1.43
+++ jetspeed-spring.xml 23 Mar 2005 23:05:48 -0000 1.44
@@ -67,6 +67,16 @@
<entry key="EntityAccessor">
<ref
bean='org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent'/>
</entry>
+ <!-- ApplicationServerManager currently only supported for Tomcat.
Comment out for others like JBoss -->
+ <entry key="ApplicationServerManager">
+ <ref
bean="org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager"/>
+ </entry>
+ <entry key="PortletFactory">
+ <ref bean="portletFactory"/>
+ </entry>
+ <entry key="DeploymentManager">
+ <ref bean="deploymentManager"/>
+ </entry>
</map>
</constructor-arg>
</bean>
@@ -377,7 +387,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 +414,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 -->
@@ -453,71 +446,31 @@
<constructor-arg ><ref
bean="org.apache.jetspeed.aggregator.PortletRenderer" /></constructor-arg>
</bean>
- <!-- Application Server Manager for Tomcat
+ <!-- Application Server Manager for Tomcat. Comment out for others like
JBoss
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"
class="org.apache.jetspeed.tools.pamanager.servletcontainer.TomcatManager"
init-method="start" destroy-method="stop"
>
<constructor-arg
index="0"><value>${autodeployment.catalina.base}</value></constructor-arg>
<constructor-arg
index="1"><value>${autodeployment.catalina.engine}</value></constructor-arg>
- <constructor-arg
index="2"><value>${autodeployment.catalina.version.major}</value></constructor-arg>
- <constructor-arg
index="3"><value>${autodeployment.server}</value></constructor-arg>
- <constructor-arg
index="4"><value>${autodeployment.port}</value></constructor-arg>
- <constructor-arg
index="5"><value>${autodeployment.user}</value></constructor-arg>
- <constructor-arg
index="6"><value>${autodeployment.password}</value></constructor-arg>
+ <constructor-arg
index="2"><value>${autodeployment.server}</value></constructor-arg>
+ <constructor-arg
index="3"><value>${autodeployment.port}</value></constructor-arg>
+ <constructor-arg
index="4"><value>${autodeployment.user}</value></constructor-arg>
+ <constructor-arg
index="5"><value>${autodeployment.password}</value></constructor-arg>
</bean>
- -->
- <!--
- Application Server Manager for JBoss.
- To support deployment in JBoss, comment the Tomcat app server
definition above
- and uncomment the JBoss app server manager below
- -->
- <!--
- <bean
id="org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager"
-
class="org.apache.jetspeed.tools.pamanager.servletcontainer.JBossManager"
- init-method="start" />
- -->
-
-
- <!-- Portlet Application Manager
- Deploys portlet application to both Jetspeed's portlet registry
- and to application server Jetspeed is using to process the web
application
- portion of the portlet application.
- -->
- <!--
- <bean id="PAM"
- class="org.apache.jetspeed.tools.pamanager.ApplicationServerPAM"
- init-method="start" destroy-method="stop"
- >
- <constructor-arg
><value>${autodeployment.target.dir}</value></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>
- <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 +478,12 @@
<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>
+ <!-- strip commons-logging and/or log4j jars from war files: for
JBoss set this to true -->
+ <constructor-arg index="4"><value>false</value></constructor-arg>
</bean>
<bean id="decoratorDeploymentRegistry"
class="org.apache.jetspeed.deployment.simpleregistry.impl.InMemoryRegistryImpl"
@@ -536,7 +492,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>
1.4 +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.4
diff -u -r1.3 -r1.4
--- pluto-factories.xml 4 Jan 2005 16:23:06 -0000 1.3
+++ pluto-factories.xml 23 Mar 2005 23:05:48 -0000 1.4
@@ -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.4 +4 -3
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/jboss-web.xml
Index: jboss-web.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/jboss-web.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jboss-web.xml 4 Aug 2004 13:33:28 -0000 1.3
+++ jboss-web.xml 23 Mar 2005 23:05:48 -0000 1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2004 The Apache Software Foundation
@@ -16,10 +16,11 @@
-->
<jboss-web>
<class-loading>
- <loader-repository>
- org.apache.jetspeed:loader=unique-archive-name
+ <loader-repository java2ClassLoadingCompliance="false">
+
org.apache.jetspeed:loader=jetspeed.war<loader-repository-config>java2ParentDelegation=false</loader-repository-config>
</loader-repository>
</class-loading>
+ <security-domain
flushOnSessionInvalidation="true">java:/jaas/Jetspeed</security-domain>
<resource-ref>
<res-ref-name>jdbc/jetspeed</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
1.21 +21 -23 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- web.xml 2 Dec 2004 05:18:09 -0000 1.20
+++ web.xml 23 Mar 2005 23:05:48 -0000 1.21
@@ -108,14 +108,6 @@
<load-on-startup>1</load-on-startup>
</servlet>
- <servlet>
- <servlet-name>JetspeedContainer</servlet-name>
- <display-name>Jetspeed Container</display-name>
- <description>MVC Servlet for Jetspeed Portlet Applications</description>
-
<servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
<!-- Define Velocity template compiler -->
<servlet>
<servlet-name>velocity</servlet-name>
@@ -164,6 +156,11 @@
<servlet-class>org.apache.jetspeed.login.LogoutServlet</servlet-class>
</servlet>
+ <servlet>
+ <servlet-name>ManagerServlet</servlet-name>
+ <servlet-class>org.apache.jetspeed.manager.ManagerServlet</servlet-class>
+ </servlet>
+
<servlet-mapping>
<servlet-name>
jetspeed
@@ -180,10 +177,6 @@
/jetspeed/*
</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>JetspeedContainer</servlet-name>
- <url-pattern>/container/*</url-pattern>
- </servlet-mapping>
<!-- Map *.vm files to Velocity -->
<servlet-mapping>
@@ -191,17 +184,6 @@
<url-pattern>*.vm</url-pattern>
</servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>JetspeedContainer</servlet-name>
- <url-pattern>/container/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>JetspeedContainer</servlet-name>
- <url-pattern>/container/*</url-pattern>
- </servlet-mapping>
-
<servlet-mapping>
<servlet-name>LoginProxyServlet</servlet-name>
<url-pattern>/login/proxy</url-pattern>
@@ -227,6 +209,11 @@
<url-pattern>/login/logout</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>ManagerServlet</servlet-name>
+ <url-pattern>/manager/*</url-pattern>
+ </servlet-mapping>
+
<!-- The Usual Welcome File List -->
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
@@ -251,6 +238,17 @@
</auth-constraint>
</security-constraint>
+ <!-- securing the ManagerServlet -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Manager</web-resource-name>
+ <url-pattern>/manager</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>admin</role-name>
+ </auth-constraint>
+ </security-constraint>
+
<!-- Login configuration uses form-based authentication -->
<login-config>
<auth-method>FORM</auth-method>
1.67 +2 -2
jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/jetspeed.properties
Index: jetspeed.properties
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/conf/jetspeed.properties,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- jetspeed.properties 15 Oct 2004 21:44:31 -0000 1.66
+++ jetspeed.properties 23 Mar 2005 23:05:48 -0000 1.67
@@ -117,7 +117,7 @@
# THE NEXT PROPERTY DEFINITION MAY NOT BE MODIFIED (NOT EVEN BE PADDED WITH
WHITESPACE)
# BECAUSE ITS FILTERED BY ANT DURING DEPLOYMENT.
# ITS CONCREET VALUE WILL BE SET FROM BUILD PROPERTY
org.apache.jetspeed.catalina.version.major
-autodeployment.catalina.version.major=4
+autodeployment.catalina.version.major=5
autodeployment.catalina.base=${applicationRoot}/../../
autodeployment.catalina.engine=Catalina
[EMAIL PROTECTED]@
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
