yoavs 2004/08/21 12:14:30
Modified: catalina/src/share/org/apache/catalina/startup Tag:
TOMCAT_5_0 HostConfig.java
tester Tag: TOMCAT_5_0 build.xml
webapps Tag: TOMCAT_5_0 build.xml
webapps/ROOT Tag: TOMCAT_5_0 build.xml
webapps/admin Tag: TOMCAT_5_0 build.xml
webapps/balancer Tag: TOMCAT_5_0 build.xml
webapps/docs Tag: TOMCAT_5_0 build.xml changelog.xml
webapps/manager Tag: TOMCAT_5_0 build.xml
webapps/webdav Tag: TOMCAT_5_0 build.xml
Log:
Fixed Bugzilla 29688 on TOMCAT_5_0 branch, removed "classic" compiler directives
from build.xml files.
Revision Changes Path
No revision
No revision
1.31.2.1 +24 -9
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Index: HostConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -u -r1.31 -r1.31.2.1
--- HostConfig.java 27 May 2004 23:01:01 -0000 1.31
+++ HostConfig.java 21 Aug 2004 19:14:28 -0000 1.31.2.1
@@ -439,8 +439,9 @@
*/
protected void deployDescriptors(File configBase, String[] files) {
- if (!deployXML)
+ if (!deployXML || (files == null)) {
return;
+ }
for (int i = 0; i < files.length; i++) {
@@ -496,6 +497,9 @@
* Deploy WAR files.
*/
protected void deployWARs(File appBase, String[] files) {
+ if (files == null) {
+ return;
+ }
for (int i = 0; i < files.length; i++) {
@@ -506,6 +510,7 @@
if (deployed.contains(files[i]))
continue;
File dir = new File(appBase, files[i]);
+
if (files[i].toLowerCase().endsWith(".war")) {
deployed.add(files[i]);
@@ -528,16 +533,19 @@
File xml = new File
(configBase, files[i].substring
(0, files[i].lastIndexOf(".")) + ".xml");
+
if (!xml.exists()) {
+
try {
+ // Added for Bugzilla 29038
+ if (!configBase.exists()) {
+ configBase.mkdirs();
+ }
+
jar = new JarFile(dir);
entry = jar.getJarEntry("META-INF/context.xml");
if (entry != null) {
istream = jar.getInputStream(entry);
-
- // Added for Bugzilla 29038
- xml.mkdirs();
-
ostream =
new BufferedOutputStream
(new FileOutputStream(xml), 1024);
@@ -646,8 +654,14 @@
/**
* Deploy directories.
+ *
+ * @param appBase The Host appBase
+ * @param files[] The files to deploy
*/
protected void deployDirectories(File appBase, String[] files) {
+ if (files == null) {
+ return;
+ }
for (int i = 0; i < files.length; i++) {
@@ -798,7 +812,8 @@
return;
String files[] = appBase.list();
- for (int i = 0; i < files.length; i++) {
+ if (files != null) {
+ for (int i = 0; i < files.length; i++) {
if (files[i].endsWith(".war")) {
File dir = new File(appBase, files[i]);
Long lastModified = (Long) warLastModified.get(files[i]);
@@ -843,8 +858,8 @@
}
}
}
- }
-
+ }
+ }
}
No revision
No revision
1.5.2.1 +0 -1 jakarta-tomcat-catalina/tester/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/tester/build.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- build.xml 16 Jun 2004 18:04:38 -0000 1.5
+++ build.xml 21 Aug 2004 19:14:28 -0000 1.5.2.1
@@ -7,7 +7,6 @@
<property file="../build.properties"/>
<property file="${user.home}/build.properties"/>
- <property name="build.compiler" value="classic"/>
<property name="api.home" value="../../jakarta-servletapi-5/dist"/>
<property name="tester.build" value="${basedir}/build"/>
<property name="tester.deploy" value="${basedir}/../build"/>
No revision
No revision
1.4.2.1 +0 -1 jakarta-tomcat-catalina/webapps/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/build.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- build.xml 1 Feb 2004 18:25:27 -0000 1.4
+++ build.xml 21 Aug 2004 19:14:28 -0000 1.4.2.1
@@ -9,7 +9,6 @@
<property file="../build.properties"/>
<property file="${user.home}/build.properties"/-->
- <property name="build.compiler" value="classic"/>
<property name="webapps.build" value="${basedir}/build"/>
<property name="webapps.deploy" value="${basedir}/../build"/>
<property name="webapps.dist" value="${basedir}/dist"/>
No revision
No revision
1.1.1.1.2.1 +0 -1 jakarta-tomcat-catalina/webapps/ROOT/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/ROOT/build.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- build.xml 18 Jul 2002 16:48:39 -0000 1.1.1.1
+++ build.xml 21 Aug 2004 19:14:29 -0000 1.1.1.1.2.1
@@ -10,7 +10,6 @@
<property file="../../build.properties"/>
<property file="${user.home}/build.properties"/>
- <property name="build.compiler" value="classic"/>
<property name="webapps.build" value="../build"/>
<property name="webapps.dist" value="../dist"/>
<property name="webapp.name" value="ROOT"/>
No revision
No revision
1.9.2.1 +0 -1 jakarta-tomcat-catalina/webapps/admin/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/build.xml,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- build.xml 4 Apr 2004 10:27:33 -0000 1.9
+++ build.xml 21 Aug 2004 19:14:29 -0000 1.9.2.1
@@ -11,7 +11,6 @@
<property file="${user.home}/build.properties"/>
<!-- Build Defaults -->
- <property name="build.compiler" value="classic"/>
<property name="webapps.build" value="${basedir}/../build"/>
<property name="webapps.dist" value="${basedir}/../dist"/>
<property name="webapp.name" value="admin"/>
No revision
No revision
1.2.2.1 +0 -1 jakarta-tomcat-catalina/webapps/balancer/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/balancer/build.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- build.xml 20 Nov 2003 18:41:52 -0000 1.2
+++ build.xml 21 Aug 2004 19:14:29 -0000 1.2.2.1
@@ -17,7 +17,6 @@
<property file="../../build.properties"/>
<property file="${user.home}/build.properties"/>
- <property name="build.compiler" value="classic"/>
<property name="webapps.build" value="../build"/>
<property name="webapps.dist" value="../dist"/>
<property name="webapp.name" value="balancer"/>
No revision
No revision
1.8.2.1 +0 -1 jakarta-tomcat-catalina/webapps/docs/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/build.xml,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- build.xml 14 Dec 2003 09:11:41 -0000 1.8
+++ build.xml 21 Aug 2004 19:14:29 -0000 1.8.2.1
@@ -10,7 +10,6 @@
<property file="../../build.properties"/>
<property file="${user.home}/build.properties"/>
- <property name="build.compiler" value="classic"/>
<property name="webapps.build" value="../build"/>
<property name="webapps.dist" value="../dist"/>
<property name="webapp.name" value="tomcat-docs"/>
1.70.2.7 +6 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.70.2.6
retrieving revision 1.70.2.7
diff -u -r1.70.2.6 -r1.70.2.7
--- changelog.xml 21 Aug 2004 15:50:03 -0000 1.70.2.6
+++ changelog.xml 21 Aug 2004 19:14:29 -0000 1.70.2.7
@@ -38,6 +38,9 @@
<update>
Updated Jakarta-Commons dependencies: BeanUtils to 1.7.0, Collections to
3.1. (yoavs)
</update>
+ <update>
+ Removed classic compiler directives from Ant build, as we use modern
anyways. (yoavs)
+ </update>
</changelog>
</subsection>
@@ -75,6 +78,9 @@
</fix>
<fix>
<bug>30561</bug>: Broken restart of NamingService. (yoavs)
+ </fix>
+ <fix>
+ <bug>29668</bug>: NPE in HostConfig, directory created for deployed WAR
instead of xml file. (yoavs)
</fix>
</changelog>
</subsection>
No revision
No revision
1.3.2.1 +0 -1 jakarta-tomcat-catalina/webapps/manager/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/build.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- build.xml 26 Mar 2003 09:50:35 -0000 1.3
+++ build.xml 21 Aug 2004 19:14:30 -0000 1.3.2.1
@@ -10,7 +10,6 @@
<property file="../../build.properties"/>
<property file="${user.home}/build.properties"/>
- <property name="build.compiler" value="classic"/>
<property name="webapps.build" value="../build"/>
<property name="webapps.dist" value="../dist"/>
<property name="webapp.name" value="manager"/>
No revision
No revision
1.1.2.1 +0 -1 jakarta-tomcat-catalina/webapps/webdav/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/webdav/build.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- build.xml 1 Feb 2004 18:25:27 -0000 1.1
+++ build.xml 21 Aug 2004 19:14:30 -0000 1.1.2.1
@@ -10,7 +10,6 @@
<property file="../../build.properties"/>
<property file="${user.home}/build.properties"/>
- <property name="build.compiler" value="classic"/>
<property name="webapps.build" value="../build"/>
<property name="webapps.dist" value="../dist"/>
<property name="webapp.name" value="webdav"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
