You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ha...@apache.org on 2001/11/24 13:08:00 UTC
cvs commit: jakarta-avalon-cornerstone/apps/bay/src/java/org/apache/avalon/bay/delegate CatalinaClassLoader.java
hammant 01/11/24 04:08:00
Modified: apps/bay build.xml
apps/bay/src/java/org/apache/avalon/bay/blocks BayImpl.java
apps/bay/src/java/org/apache/avalon/bay/delegate
CatalinaClassLoader.java
Added: apps/bay/src/java/org/apache/avalon/bay Constants.java
Log:
Bay working again with Tomcat 4.0.1
Revision Changes Path
1.12 +8 -4 jakarta-avalon-cornerstone/apps/bay/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/bay/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 2001/11/10 21:43:02 1.11
+++ build.xml 2001/11/24 12:08:00 1.12
@@ -13,6 +13,10 @@
<property name="Name" value="Bay"/>
<property name="version" value="0.7"/>
<property name="year" value="1999-2001"/>
+
+ <!-- see also Constants.java -->
+ <property name="tomcat.dir" value="jakarta-tomcat-4.0.1"/>
+
<property name="build.debug" value="on"/>
<property name="build.optimize" value="off"/>
@@ -104,12 +108,12 @@
<target name="all" depends="main,docs" description="Generate build products including docs"/>
<target name="catalina-test" description="Test for Presence of catalina">
- <available file="jakarta-tomcat-4.0/bin/bootstrap.jar"
+ <available file="${tomcat.dir}/bin/bootstrap.jar"
property="catalina.present"/>
</target>
<target name="catalina-warn" unless="catalina.present" description="Warning for absence of catalina">
- <fail message="Catalina should be unzipped to the bay directory as a directory called jakarta-tomcat-4.0 such that bay/jakarta-tomcat-4.0/bin/ and bay/jakarta-tomcat-4.0/lib/ exist."/>
+ <fail message="Catalina should be unzipped to the bay directory as a directory called ${tomcat.dir} such that bay/${tomcat.dir}/bin/ and bay/${tomcat.dir}/lib/ exist."/>
</target>
<target name="sars" depends="jars, catalina-test, catalina-warn">
@@ -128,7 +132,7 @@
</lib>
-->
- <zipfileset dir="jakarta-tomcat-4.0" prefix="jakarta-tomcat-4.0">
+ <zipfileset dir="${tomcat.dir}" prefix="${tomcat.dir}">
<include name="**"/>
</zipfileset>
@@ -256,8 +260,8 @@
<target name="install" depends="main" description="Installs into Phoenix">
<!-- <fail message="install.dir not specified." unless="install.dir"/> -->
<echo message="Installing to ${install.dir}" />
- <delete dir="${install.dir}/avalon-bay" />
<copy file="${build.lib}/avalon-bay.sar" todir="${install.dir}" />
+ <delete dir="${install.dir}/avalon-bay" />
</target>
<target name="uninstall" description="Uninstalls from Phoenix">
1.1 jakarta-avalon-cornerstone/apps/bay/src/java/org/apache/avalon/bay/Constants.java
Index: Constants.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE file.
*/
package org.apache.avalon.bay;
public interface Constants {
public String JAKARTATOMCAT4 = "jakarta-tomcat-4.0.1";
}
1.6 +2 -1 jakarta-avalon-cornerstone/apps/bay/src/java/org/apache/avalon/bay/blocks/BayImpl.java
Index: BayImpl.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/bay/src/java/org/apache/avalon/bay/blocks/BayImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BayImpl.java 2001/11/10 21:34:04 1.5
+++ BayImpl.java 2001/11/24 12:08:00 1.6
@@ -25,6 +25,7 @@
import org.apache.avalon.bay.delegate.Engine;
import org.apache.avalon.bay.delegate.CatalinaClassLoader;
import org.apache.avalon.bay.delegate.Connector;
+import org.apache.avalon.bay.Constants;
import java.io.File;
@@ -63,7 +64,7 @@
{
m_context = (BlockContext)context;
File baseDirectory = m_context.getBaseDirectory();
- m_CatalinaHome = baseDirectory.getAbsolutePath() + File.separator + "jakarta-tomcat-4.0";
+ m_CatalinaHome = baseDirectory.getAbsolutePath() + File.separator + Constants.JAKARTATOMCAT4;
System.setProperty("catalina.home",m_CatalinaHome);
System.setProperty("catalina.base",m_CatalinaHome);
mCatalinaClassLoader = CatalinaClassLoader.createCatalinaClassLoader(baseDirectory);
1.5 +10 -6 jakarta-avalon-cornerstone/apps/bay/src/java/org/apache/avalon/bay/delegate/CatalinaClassLoader.java
Index: CatalinaClassLoader.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/bay/src/java/org/apache/avalon/bay/delegate/CatalinaClassLoader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CatalinaClassLoader.java 2001/10/28 13:11:53 1.4
+++ CatalinaClassLoader.java 2001/11/24 12:08:00 1.5
@@ -7,6 +7,8 @@
*/
package org.apache.avalon.bay.delegate;
+import org.apache.avalon.bay.Constants;
+
import java.net.URLClassLoader;
import java.net.URL;
import java.net.MalformedURLException;
@@ -20,7 +22,7 @@
*
*
* @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class CatalinaClassLoader extends URLClassLoader {
@@ -52,15 +54,17 @@
public static CatalinaClassLoader createCatalinaClassLoader(File root) {
- System.out.println("loading...");
+ System.out.println("CatalinaClassLoader.loading...");
Vector urls = new Vector();
String rootPath = root.getAbsolutePath();
- addJars(urls, rootPath + File.separator + "jakarta-tomcat-4.0" + File.separator + "common" + File.separator + "lib");
- addJars(urls, rootPath + File.separator + "jakarta-tomcat-4.0" + File.separator + "server" + File.separator + "lib");
- addJars(urls, rootPath + File.separator + "jakarta-tomcat-4.0" + File.separator + "bin");
+ addJars(urls, rootPath + File.separator + Constants.JAKARTATOMCAT4 + File.separator + "common" + File.separator + "lib");
+ addJars(urls, rootPath + File.separator + Constants.JAKARTATOMCAT4 + File.separator + "server" + File.separator + "lib");
+ addJars(urls, rootPath + File.separator + Constants.JAKARTATOMCAT4 + File.separator + "bin");
URL[] jarURLs = new URL[urls.size()];
urls.copyInto(jarURLs);
- return new CatalinaClassLoader(jarURLs);
+ CatalinaClassLoader ccl = new CatalinaClassLoader(jarURLs);
+ System.out.println("CatalinaClassLoader.loaded");
+ return ccl;
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>