You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2004/10/06 17:41:45 UTC
cvs commit: jakarta-tomcat-connectors/util/loader/org/apache/tomcat/util/loader Loader.java Module.java
costin 2004/10/06 08:41:44
Modified: util build.xml
util/loader/org/apache/tomcat/util/loader Loader.java
Module.java
Log:
A bit of cleanup. The lib dir and the checked in binaries are long gone.
Avoid creation of loader dir if loader is not used/compiled.
Revision Changes Path
1.30 +3 -3 jakarta-tomcat-connectors/util/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- build.xml 6 Oct 2004 05:16:06 -0000 1.29
+++ build.xml 6 Oct 2004 15:41:44 -0000 1.30
@@ -18,8 +18,8 @@
<property name="puretls.lib" location="${puretls.home}"/>
<property name="puretls.jar" location="${puretls.lib}/puretls.jar"/>
- <property name="commons-logging.jar" location="../lib/commons-logging.jar" />
- <property name="jmx.jar" location="../lib/mx4j.jar" />
+ <property name="commons-logging.jar" location="${base.path}/commons-logging-1.0.4/commons-logging.jar" />
+ <property name="jmx.jar" location="${base.path}/mx4j-2.0.1/lib/mx4j.jar" />
<property name="tomcat-util.lib" value="${tomcat-util.build}/lib" />
<property name="tomcat-util.jar" value="${tomcat-util.lib}/tomcat-util.jar" />
<property name="tomcat-loader.jar" value="${tomcat-util.lib}/tomcat-loader.jar" />
@@ -48,7 +48,6 @@
<target name="build-prepare" depends="detect">
<mkdir dir="${tomcat-util.build}"/>
<mkdir dir="${tomcat-util.build}/classes"/>
- <mkdir dir="${tomcat-util.build}/loader"/>
<mkdir dir="${tomcat-util.lib}"/>
</target>
@@ -105,6 +104,7 @@
</target>
<target name="tomcat-loader.jar" depends="build-prepare">
+ <mkdir dir="${tomcat-util.build}/loader"/>
<javac srcdir="loader"
destdir="${tomcat-util.build}/loader"
deprecation="${compile.deprecation}"
1.2 +7 -0 jakarta-tomcat-connectors/util/loader/org/apache/tomcat/util/loader/Loader.java
Index: Loader.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/loader/org/apache/tomcat/util/loader/Loader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Loader.java 6 Oct 2004 05:00:04 -0000 1.1
+++ Loader.java 6 Oct 2004 15:41:44 -0000 1.2
@@ -489,6 +489,13 @@
return result;
}
+ void notifyModuleStart(Module module) {
+ if(listener!=null) listener.moduleStart(module);
+ }
+
+ void notifyModuleStop(Module module) {
+ listener.moduleStop(module);
+ }
/** Add a module listener.
*
1.2 +2 -2 jakarta-tomcat-connectors/util/loader/org/apache/tomcat/util/loader/Module.java
Index: Module.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/util/loader/org/apache/tomcat/util/loader/Module.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Module.java 6 Oct 2004 05:00:04 -0000 1.1
+++ Module.java 6 Oct 2004 15:41:44 -0000 1.2
@@ -182,7 +182,7 @@
classLoader.start();
- getRepository().getLoader().listener.moduleStart(this);
+ getRepository().getLoader().notifyModuleStart(this);
} catch (Throwable t) {
log( "LifecycleException ", t );
@@ -204,7 +204,7 @@
//if (DEBUG)
log("stop()", null);
- getRepository().getLoader().listener.moduleStop(this);
+ getRepository().getLoader().notifyModuleStop(this);
started = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org