You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/08/15 06:33:18 UTC
svn commit: r686143 [1/3] - in /geronimo/server/trunk: ./
plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/ repository/
repository/org/apache/tomcat/
repository/org/apache/tomcat/catalina/6.0.16-G652117/
repository/org/apache/tomcat/catalin...
Author: dwoods
Date: Thu Aug 14 21:33:17 2008
New Revision: 686143
URL: http://svn.apache.org/viewvc?rev=686143&view=rev
Log:
GERONIMO-4245 Upgrade to private build of Tomcat 6.0.18 with our Geronimo required patches integrated for catalina.jar and jasper.jar. Also some JSP updates were required to handle a Jasper change introduced in Tomcat 6.0.17.
Added:
geronimo/server/trunk/repository/org/apache/tomcat/6.0.18-G678601.README.TXT
geronimo/server/trunk/repository/org/apache/tomcat/TOMCAT_6_0_18-G678601.patch
geronimo/server/trunk/repository/org/apache/tomcat/catalina/6.0.18-G678601/
geronimo/server/trunk/repository/org/apache/tomcat/catalina/6.0.18-G678601/catalina-6.0.18-G678601.jar (with props)
geronimo/server/trunk/repository/org/apache/tomcat/catalina/6.0.18-G678601/catalina-6.0.18-G678601.jar.md5
geronimo/server/trunk/repository/org/apache/tomcat/catalina/6.0.18-G678601/catalina-6.0.18-G678601.jar.sha1
geronimo/server/trunk/repository/org/apache/tomcat/jasper/6.0.18-G678601/
geronimo/server/trunk/repository/org/apache/tomcat/jasper/6.0.18-G678601/jasper-6.0.18-G678601.jar (with props)
geronimo/server/trunk/repository/org/apache/tomcat/jasper/6.0.18-G678601/jasper-6.0.18-G678601.jar.md5
geronimo/server/trunk/repository/org/apache/tomcat/jasper/6.0.18-G678601/jasper-6.0.18-G678601.jar.sha1
Removed:
geronimo/server/trunk/repository/org/apache/tomcat/catalina/6.0.16-G652117/
geronimo/server/trunk/repository/org/apache/tomcat/jasper/6.0.16-G652117/
Modified:
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp
geronimo/server/trunk/pom.xml
geronimo/server/trunk/repository/pom.xml
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp?rev=686143&r1=686142&r2=686143&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddView.jsp Thu Aug 14 21:33:17 2008
@@ -130,8 +130,8 @@
<td align="left" width="5%"><input type="checkbox" name="graph_ids" value="<%=rs.getString("graph_id")%>"></td>
<td align="left"><a href="javascript: void(0)" onClick="openNewWindow('/monitoring/monitoringPopUpGraph.jsp?graph_id=<%=rs.getString("graph_id")%>','graph','width=800,height=300','title=<%=rs.getString("name") %>')"><%=rs.getString("name") %></a></td>
<td align="left"><%=rs.getString("timeframe")%> min.</td>
- <td align="left"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=rs.getString("server_id")%>" /></portlet:actionURL>"><%=rs2.getString("name")%></a></td>
- <td align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditGraph" /><portlet:param name="graph_id" value="<%=rs.getString("graph_id")%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png"></a></td>
+ <td align="left"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value='<%=rs.getString("server_id")%>' /></portlet:actionURL>"><%=rs2.getString("name")%></a></td>
+ <td align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditGraph" /><portlet:param name="graph_id" value='<%=rs.getString("graph_id")%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png"></a></td>
</tr>
<%
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp?rev=686143&r1=686142&r2=686143&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditView.jsp Thu Aug 14 21:33:17 2008
@@ -165,8 +165,8 @@
<td align="left" width="5%"><input type="checkbox" name="graph_ids" value="<%=rs.getString("graph_id")%>" <%if (graphsList.contains(rs.getInt("graph_id"))){%> checked<%}%>></td>
<td align="left"><a href="javascript: void(0)" onClick="openNewWindow('/monitoring/monitoringPopUpGraph.jsp?graph_id=<%=rs.getString("graph_id")%>','graph','width=800,height=300','title=<%=rs.getString("name") %>')"><%=rs.getString("name")%></a></td>
<td align="left"><%=rs.getString("timeframe")%> min.</td>
- <td align="left"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value="<%=rs.getString("server_id")%>" /></portlet:actionURL>"><%=rs2.getString("name")%></a></td>
- <td align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditGraph" /><portlet:param name="graph_id" value="<%=rs.getString("graph_id")%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png"></a></td>
+ <td align="left"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showServer" /><portlet:param name="server_id" value='<%=rs.getString("server_id")%>' /></portlet:actionURL>"><%=rs2.getString("name")%></a></td>
+ <td align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditGraph" /><portlet:param name="graph_id" value='<%=rs.getString("graph_id")%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png"></a></td>
</tr>
<%
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp?rev=686143&r1=686142&r2=686143&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringNormal.jsp Thu Aug 14 21:33:17 2008
@@ -70,11 +70,11 @@
</c:otherwise>
</c:choose>
<tr>
- <td class="${backgroundClass}" width="30%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showView" /><portlet:param name="view_id" value="<%=rs.getString("view_id")%>" /></portlet:actionURL>"><%=rs.getString("name")%></a></td>
+ <td class="${backgroundClass}" width="30%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showView" /><portlet:param name="view_id" value='<%=rs.getString("view_id")%>' /></portlet:actionURL>"><%=rs.getString("name")%></a></td>
<td class="${backgroundClass}" width="10%" align="center"><%=rs.getString("graph_count")%></td>
<td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("added").substring(0,16)%></td>
<td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("modified").substring(0,16)%></td>
- <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value="<%=rs.getString("view_id")%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png">Edit</a></td>
+ <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value='<%=rs.getString("view_id")%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png">Edit</a></td>
</tr>
<%
}
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp?rev=686143&r1=686142&r2=686143&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViewServer.jsp Thu Aug 14 21:33:17 2008
@@ -309,7 +309,7 @@
<%
} else if (collecting == 0){
%>
- <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="enableServerViewQuery" /><portlet:param name="server_id" value="<%=server_id%>" /><portlet:param name="snapshotDuration" value="<%= "" + (snapshotDuration * 1000 * 60) %>" /></portlet:actionURL>">Enable Query</a></li>
+ <li><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="enableServerViewQuery" /><portlet:param name="server_id" value="<%=server_id%>" /><portlet:param name="snapshotDuration" value='<%= "" + (snapshotDuration * 1000 * 60) %>' /></portlet:actionURL>">Enable Query</a></li>
<%
}
else if (collecting == -1){
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp?rev=686143&r1=686142&r2=686143&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringViews.jsp Thu Aug 14 21:33:17 2008
@@ -68,11 +68,11 @@
</c:otherwise>
</c:choose>
<tr>
- <td class="${backgroundClass}" width="30%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showView" /><portlet:param name="view_id" value="<%=rs.getString("view_id")%>" /></portlet:actionURL>"><%=rs.getString("name")%></a></td>
+ <td class="${backgroundClass}" width="30%" align="center"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="showView" /><portlet:param name="view_id" value='<%=rs.getString("view_id")%>' /></portlet:actionURL>"><%=rs.getString("name")%></a></td>
<td class="${backgroundClass}" width="10%" align="center"><%=rs.getString("graph_count")%></td>
<td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("added").substring(0,16)%></td>
<td class="${backgroundClass}" width="15%" align="center"><%=rs.getString("modified").substring(0,16)%></td>
- <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value="<%=rs.getString("view_id")%>" /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png">Edit</a></td>
+ <td class="${backgroundClass}" width="15%" align="center"><a href="<portlet:actionURL portletMode="edit"><portlet:param name="action" value="showEditView" /><portlet:param name="view_id" value='<%=rs.getString("view_id")%>' /></portlet:actionURL>"><img border=0 src="/monitoring/images/edit-b.png">Edit</a></td>
</tr>
<%
}
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=686143&r1=686142&r2=686143&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Aug 14 21:33:17 2008
@@ -1081,7 +1081,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper</artifactId>
- <version>6.0.16-G652117</version>
+ <version>6.0.18-G678601</version>
</dependency>
<dependency>
@@ -1111,7 +1111,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>6.0.16-G652117</version>
+ <version>6.0.18-G678601</version>
</dependency>
<dependency>
@@ -2022,7 +2022,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper</artifactId>
- <version>6.0.16-G652117</version>
+ <version>6.0.18-G678601</version>
</dependency>
</dependencies>
</plugin>
Added: geronimo/server/trunk/repository/org/apache/tomcat/6.0.18-G678601.README.TXT
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/org/apache/tomcat/6.0.18-G678601.README.TXT?rev=686143&view=auto
==============================================================================
--- geronimo/server/trunk/repository/org/apache/tomcat/6.0.18-G678601.README.TXT (added)
+++ geronimo/server/trunk/repository/org/apache/tomcat/6.0.18-G678601.README.TXT Thu Aug 14 21:33:17 2008
@@ -0,0 +1,70 @@
+Private Build of Tomcat for Geronimo.
+
+How to build Tomcat 6_0_18 with modifications for Geronimo:
+
+Checkout tomcat 6.0.18
+ svn co https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_18 tomcat_6_0_18
+
+svn info for Tomcat image:
+Path: TOMCAT_6_0_18
+URL: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_18
+Repository Root: https://svn.apache.org/repos/asf
+Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68
+Revision: 686112
+Node Kind: directory
+Last Changed Author: remm
+Last Changed Rev: 678601
+Last Changed Date: 2008-07-21 20:07:28 -0400 (Mon, 21 Jul 2008)
+
+
+Apply the patch
+
+cd tomcat_6_0_18
+patch -p0 -u < TOMCAT_6_0_18-G678601.patch
+Answer 'y' to any prompts of "Reversed (or previously applied) patch detected! Assume -R? [n]"
+
+Force delete these three files
+ svn delete java/org/apache/jasper/runtime/AnnotationHelper.java --force
+ svn delete java/org/apache/AnnotationProcessor.java --force
+ svn delete java/org/apache/catalina/util/DefaultAnnotationProcessor.java --force
+
+Add the following files
+ java/org/apache/InstanceManager.java
+ java/org/apache/jasper/runtime/InstanceManagerFactory.java
+ java/org/apache/catalina/core/DefaultInstanceManager.java
+ java/org/apache/catalina/core/RestrictedListeners.properties
+ java/org/apache/catalina/deploy/Injectable.java
+ java/org/apache/catalina/deploy/InjectionTarget.java
+
+Build tomcat
+ cd tomcat_6_0_18
+ Per tomcat build instructions install ant-1.6.5 or later and set ANT_HOME as well as add ant/bin to PATH
+ You must run as the super user for the first build that downloads more ant & eclipse artifacts
+ ant download - to setup build for tomcat
+ Exit super user
+ ant - to build tomcat artifacts
+
+Copy to appropriate jars and rename into geronimo/repository
+ cd tomcat_6_0_18
+ cp output/build/lib/catalina.jar <geronimo-root>/repository/org/apache/tomcat/catalina/6.0.18-G678601/catalina-6.0.18-G678601.jar
+ cp output/build/lib/jasper.jar <geronimo-root>/repository/org/apache/tomcat/jasper/6.0.18-G678601/jasper-6.0.18-G678601.jar
+
+How the patch was created (tomcat_6_0_18-G678601.patch):
+
+Checkout tomcat 6.0.18
+ svn co https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_18 tomcat_6_0_18
+
+
+Apply patch from prior Tomcat release (6.0.16)
+ patch -p0 -u < TOMCAT_6_0_16-G652117.patch
+
+Original way to apply the individual patches
+ Apply annotations patch
+ patch -p0 -u < TOMCAT_6_0_14-G604245.patch
+ fix patch conflicts
+ Apply the Webdav security fix patch
+ patch -p0 -u < TOMCAT_6_0_14-G614585.patch
+
+Create the patch:
+ svn diff > TOMCAT_6_0_18-G678601.patch
+