ate 2005/03/01 18:52:12
Modified: installer/src Tag: deployment-refactoring build.xml
. Tag: deployment-refactoring project.properties
portal/src/webapp/WEB-INF Tag: deployment-refactoring
web.xml
portal/src/webapp/WEB-INF/conf Tag: deployment-refactoring
jetspeed.properties
maven-plugin Tag: deployment-refactoring plugin.jelly
portal/src/resources Tag: deployment-refactoring
jetspeed-tomcat-5.5.xml
portal Tag: deployment-refactoring maven.xml
Added: portal/src/resources Tag: deployment-refactoring
jetspeed-tomcat-5.xml
Log:
New build and runtime configuration definitions to support Tomcat 5.5 and
drop support for Tomcat 4.1
Revision Changes Path
No revision
No revision
1.1.2.1 +3 -4 jakarta-jetspeed-2/installer/src/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/installer/src/build.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- build.xml 8 Dec 2004 16:57:02 -0000 1.1
+++ build.xml 2 Mar 2005 02:52:12 -0000 1.1.2.1
@@ -56,13 +56,12 @@
</copy>
<!-- Set up tomcat's local security -->
- <copy file="${basedir}/resources/jetspeed.xml"
tofile="${tomcat.home}/conf/Catalina/localhost/jetspeed.xml" overwrite="true">
+ <copy file="${basedir}/resources/jetspeed-tomcat-5.xml"
tofile="${tomcat.home}/conf/Catalina/localhost/jetspeed.xml" overwrite="true">
<filterset begintoken="@" endtoken="@">
<filter token="USERNAME" value="${db.username}"/>
<filter token="PASSWORD" value="${db.password}"/>
<filter token="DRIVER" value="${jdbc.driver}"/>
<filter token="URL" value="${db.url}"/>
- <filter token="USE_CONTEXTCLASSLOADER" value=""/>
</filterset>
</copy>
@@ -84,7 +83,7 @@
in a test failure (TestSpringEngine)
This property therefore MUST remain defined EXACTLY as
specified for this filter to be able to work
-->
- <filterset begintoken="autodeployment.catalina.version.major"
endtoken="4">
+ <filterset begintoken="autodeployment.catalina.version.major"
endtoken="5">
<filter token="="
value="autodeployment.catalina.version.major=5"/>
</filterset>
<filterset begintoken="autodeployment.port" endtoken="8080">
@@ -110,4 +109,4 @@
</target>
-</project>
\ No newline at end of file
+</project>
No revision
No revision
1.32.2.1 +2 -2 jakarta-jetspeed-2/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/project.properties,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -u -r1.32 -r1.32.2.1
--- project.properties 20 Jan 2005 01:52:52 -0000 1.32
+++ project.properties 2 Mar 2005 02:52:12 -0000 1.32.2.1
@@ -84,8 +84,8 @@
# See:
# http://portals.apache.org/jetspeed-2/getting-started.html
-#org.apache.jetspeed.server.home = /jakarta-tomcat-4.1.30
-#org.apache.jetspeed.catalina.version.major = 4
+#org.apache.jetspeed.server.home = /jakarta-tomcat-5.0.30
+#org.apache.jetspeed.catalina.version.major = 5
#org.apache.jetspeed.server.shared =
${org.apache.jetspeed.server.home}/shared/lib
#org.apache.jetspeed.deploy.war.dir =
${org.apache.jetspeed.server.home}/webapps
#org.apache.jetspeed.services.autodeployment.user = <username>
No revision
No revision
1.20.2.1 +0 -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.20.2.1
diff -u -r1.20 -r1.20.2.1
--- web.xml 2 Dec 2004 05:18:09 -0000 1.20
+++ web.xml 2 Mar 2005 02:52:12 -0000 1.20.2.1
@@ -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>
@@ -180,10 +172,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 +179,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>
No revision
No revision
1.66.2.1 +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.66.2.1
diff -u -r1.66 -r1.66.2.1
--- jetspeed.properties 15 Oct 2004 21:44:31 -0000 1.66
+++ jetspeed.properties 2 Mar 2005 02:52:12 -0000 1.66.2.1
@@ -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]@
No revision
No revision
1.28.2.1 +7 -9 jakarta-jetspeed-2/maven-plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/maven-plugin/plugin.jelly,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -u -r1.28 -r1.28.2.1
--- plugin.jelly 21 Jan 2005 19:23:44 -0000 1.28
+++ plugin.jelly 2 Mar 2005 02:52:12 -0000 1.28.2.1
@@ -191,7 +191,7 @@
in a test failure (TestSpringEngine)
This property therefore MUST remain defined EXACTLY as
specified for this filter to be able to work
-->
- <filterset begintoken="autodeployment.catalina.version.major"
endtoken="4">
+ <filterset begintoken="autodeployment.catalina.version.major"
endtoken="5">
<filter token="="
value="autodeployment.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
</filterset>
<filterset begintoken="autodeployment.port" endtoken="8080">
@@ -231,7 +231,7 @@
in a test failure (TestSpringEngine)
This property therefore MUST remain defined EXACTLY as specified
for this filter to be able to work
-->
- <filterset begintoken="autodeployment.catalina.version.major"
endtoken="4">
+ <filterset begintoken="autodeployment.catalina.version.major"
endtoken="5">
<filter token="="
value="autodeployment.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
</filterset>
</copy>
@@ -291,23 +291,21 @@
<j:set var="catalina_version_major"
value="${org.apache.jetspeed.catalina.version.major}"/>
<echo>Build jetspeed.xml for Tomcat version
${catalina_version_major}</echo>
<j:choose>
- <j:when test="${catalina_version_major == '5'}" >
- <j:set var="context_dir"
value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost"/>
- <j:set var="use_contextclassloader"
value='useContextClassLoader="false"'/>
+ <j:when test="${catalina_version_major == '5.5'}" >
+ <j:set var="context_file_source" value="jetspeed-tomcat-5.5.xml"/>
</j:when>
<j:otherwise>
- <j:set var="context_dir"
value="${org.apache.jetspeed.deploy.war.dir}"/>
- <j:set var="use_contextclassloader" value=""/>
+ <j:set var="context_file_source" value="jetspeed-tomcat-5.xml"/>
</j:otherwise>
</j:choose>
+ <j:set var="context_file_target"
value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost/jetspeed.xml"/>
- <copy
file="${org.apache.jetspeed.plugin.root}/plugin-resources/jetspeed.xml"
tofile="${context_dir}/jetspeed.xml" overwrite="true">
+ <copy
file="${org.apache.jetspeed.plugin.root}/plugin-resources/${context_file_source}"
tofile="${context_file_target}" overwrite="true">
<filterset begintoken="@" endtoken="@">
<filter token="USERNAME"
value="${org.apache.jetspeed.production.database.user}"/>
<filter token="PASSWORD"
value="${org.apache.jetspeed.production.database.password}"/>
<filter token="DRIVER"
value="${org.apache.jetspeed.production.database.driver}"/>
<filter token="URL"
value="${org.apache.jetspeed.production.database.url}"/>
- <filter token="USE_CONTEXTCLASSLOADER"
value="${use_contextclassloader}"/>
</filterset>
</copy>
No revision
No revision
1.1.2.1 +3 -3
jakarta-jetspeed-2/portal/src/resources/jetspeed-tomcat-5.5.xml
Index: jetspeed-tomcat-5.5.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/resources/jetspeed-tomcat-5.5.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- jetspeed-tomcat-5.5.xml 3 Dec 2004 04:30:46 -0000 1.1
+++ jetspeed-tomcat-5.5.xml 2 Mar 2005 02:52:12 -0000 1.1.2.1
@@ -20,13 +20,13 @@
userClassNames="org.apache.jetspeed.security.impl.UserPrincipalImpl"
roleClassNames="org.apache.jetspeed.security.impl.RolePrincipalImpl"
useContextClassLoader="false"
- debug="3"/>
+ debug="0"/>
<Resource name="jdbc/jetspeed" auth="Container"
factory="org.apache.commons.dbcp.BasicDataSourceFactory"
- type="javax.sql.DataSource" username="j2" password="digital"
- driverClassName="com.mysql.jdbc.Driver"
url="jdbc:mysql://j2-server/j2?autoReconnect=true"
+ type="javax.sql.DataSource" username="@USERNAME@"
password="@PASSWORD@"
+ driverClassName="@DRIVER@" url="@URL@"
maxActive="100" maxIdle="30" maxWait="10000"/>
</Context>
No revision
Index: jetspeed-tomcat-5.5.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/resources/jetspeed-tomcat-5.5.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- jetspeed-tomcat-5.5.xml 3 Dec 2004 04:30:46 -0000 1.1
+++ jetspeed-tomcat-5.5.xml 2 Mar 2005 02:52:12 -0000 1.1.2.1
@@ -20,13 +20,13 @@
userClassNames="org.apache.jetspeed.security.impl.UserPrincipalImpl"
roleClassNames="org.apache.jetspeed.security.impl.RolePrincipalImpl"
useContextClassLoader="false"
- debug="3"/>
+ debug="0"/>
<Resource name="jdbc/jetspeed" auth="Container"
factory="org.apache.commons.dbcp.BasicDataSourceFactory"
- type="javax.sql.DataSource" username="j2" password="digital"
- driverClassName="com.mysql.jdbc.Driver"
url="jdbc:mysql://j2-server/j2?autoReconnect=true"
+ type="javax.sql.DataSource" username="@USERNAME@"
password="@PASSWORD@"
+ driverClassName="@DRIVER@" url="@URL@"
maxActive="100" maxIdle="30" maxWait="10000"/>
</Context>
No revision
Index: jetspeed-tomcat-5.5.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/resources/jetspeed-tomcat-5.5.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- jetspeed-tomcat-5.5.xml 3 Dec 2004 04:30:46 -0000 1.1
+++ jetspeed-tomcat-5.5.xml 2 Mar 2005 02:52:12 -0000 1.1.2.1
@@ -20,13 +20,13 @@
userClassNames="org.apache.jetspeed.security.impl.UserPrincipalImpl"
roleClassNames="org.apache.jetspeed.security.impl.RolePrincipalImpl"
useContextClassLoader="false"
- debug="3"/>
+ debug="0"/>
<Resource name="jdbc/jetspeed" auth="Container"
factory="org.apache.commons.dbcp.BasicDataSourceFactory"
- type="javax.sql.DataSource" username="j2" password="digital"
- driverClassName="com.mysql.jdbc.Driver"
url="jdbc:mysql://j2-server/j2?autoReconnect=true"
+ type="javax.sql.DataSource" username="@USERNAME@"
password="@PASSWORD@"
+ driverClassName="@DRIVER@" url="@URL@"
maxActive="100" maxIdle="30" maxWait="10000"/>
</Context>
1.1.2.1 +80 -0
jakarta-jetspeed-2/portal/src/resources/Attic/jetspeed-tomcat-5.xml
No revision
No revision
1.119.2.1 +8 -15 jakarta-jetspeed-2/portal/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
retrieving revision 1.119
retrieving revision 1.119.2.1
diff -u -r1.119 -r1.119.2.1
--- maven.xml 2 Feb 2005 03:21:40 -0000 1.119
+++ maven.xml 2 Mar 2005 02:52:12 -0000 1.119.2.1
@@ -415,22 +415,20 @@
<j:set var="catalina_version_major"
value="${org.apache.jetspeed.catalina.version.major}"/>
<j:choose>
- <j:when test="${catalina_version_major == '5'}" >
- <j:set var="context_dir"
value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost"/>
- <j:set var="use_contextclassloader"
value='useContextClassLoader="false"'/>
+ <j:when test="${catalina_version_major == '5.5'}" >
+ <j:set var="context_file_source" value="jetspeed-tomcat-5.5.xml"/>
</j:when>
<j:otherwise>
- <j:set var="context_dir"
value="${org.apache.jetspeed.deploy.war.dir}"/>
- <j:set var="use_contextclassloader" value=""/>
+ <j:set var="context_file_source" value="jetspeed-tomcat-5.xml"/>
</j:otherwise>
</j:choose>
- <copy file="./src/resources/jetspeed.xml"
tofile="${context_dir}/jetspeed.xml" overwrite="true">
+ <j:set var="context_file_target"
value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost/jetspeed.xml"/>
+ <copy file="./src/resources/${context_file_source}"
tofile="${context_file_target}" overwrite="true">
<filterset begintoken="@" endtoken="@">
<filter token="USERNAME"
value="${org.apache.jetspeed.production.database.user}"/>
<filter token="PASSWORD"
value="${org.apache.jetspeed.production.database.password}"/>
<filter token="DRIVER"
value="${org.apache.jetspeed.production.database.driver}"/>
<filter token="URL"
value="${org.apache.jetspeed.production.database.url}"/>
- <filter token="USE_CONTEXTCLASSLOADER"
value="${use_contextclassloader}"/>
</filterset>
</copy>
<attainGoal name="catalina:base-shared" />
@@ -651,7 +649,7 @@
in a test failure (TestSpringEngine)
This property therefore MUST remain defined EXACTLY as specified
for this filter to be able to work
-->
- <filterset begintoken="autodeployment.catalina.version.major"
endtoken="4">
+ <filterset begintoken="autodeployment.catalina.version.major"
endtoken="5">
<filter token="="
value="autodeployment.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
</filterset>
<filterset begintoken="autodeployment.port" endtoken="8080">
@@ -681,15 +679,10 @@
<delete file="${org.apache.jetspeed.deploy.war.dir}/rss.war"/>
<delete dir="${org.apache.jetspeed.deploy.war.dir}/jpetstore"/>
<delete file="${org.apache.jetspeed.deploy.war.dir}/jpetstore.war"/>
+<!--
<j:set var="catalina_version_major"
value="${org.apache.jetspeed.catalina.version.major}"/>
- <j:choose>
- <j:when test="${catalina_version_major == '5'}" >
+-->
<j:set var="context_dir"
value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost"/>
- </j:when>
- <j:otherwise>
- <j:set var="context_dir"
value="${org.apache.jetspeed.deploy.war.dir}"/>
- </j:otherwise>
- </j:choose>
<delete file="${context_dir}/${org.apache.jetspeed.portal.name}.xml"/>
<delete file="${context_dir}/security.xml"/>
</goal>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
