Here is what the changes would entail. Are we all +1?
It is only a commit away, unless someone has some serious
objections I want to get this done ASAP. Please vote.
? jakarta-news.xml
? jms1.0.2b
? logkit.diff
? lib/jms.jar
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-logkit/build.xml,v
retrieving revision 1.85
diff -u -b -r1.85 build.xml
--- build.xml 23 Jan 2003 09:08:44 -0000 1.85
+++ build.xml 31 Jan 2003 16:29:31 -0000
@@ -85,8 +85,7 @@
<property name="servlet.jar" value="${lib.dir}/servlet.jar"/>
<property name="mail.jar" value="${lib.dir}/mail.jar"/>
- <property name="jakarta-site.dir" value="../jakarta-site"/>
- <property name="framework.jar"
value="../jakarta-avalon/build/lib/avalon-framework.jar"/>
+ <property name="jakarta-site.dir" value="../jakarta-avalon-site"/>
<path id="project.class.path">
<pathelement path="${java.class.path}" />
@@ -169,12 +168,6 @@
</target>
- <target name="import-framework-jar" if="avalon-framework-jar.relatively-present"
depends="optional-tests" description="Imports the Avalon Framework jar if required">
-
- <copy file="${framework.jar}" todir="${lib.dir}"/>
-
- </target>
-
<target name="optional-tests" description="Tests for classes missing to the
environment">
@@ -182,13 +175,6 @@
classname="javax.servlet.ServletContext"
classpathref="project.class.path" />
- <available property="avalon-framework-jar.relatively-present"
- file="${framework.jar}"/>
-
- <available property="avalon-framework.present"
- classname="org.apache.avalon.framework.CascadingThrowable"
- classpathref="project.class.path" />
-
<available property="javax.sql.present"
classname="javax.sql.DataSource"
classpathref="project.class.path" />
@@ -260,20 +246,7 @@
</antcall>
</target>
- <target name="framework-warn" unless="avalon-framework.present">
- <echo>**********************************************</echo>
- <echo>*</echo>
- <echo>* Optional classes from Avalon's framework subproject</echo>
- <echo>* are missing. Logkit should build without them.</echo>
- <echo>*</echo>
- <echo>* Run the build target import-framework-jar and it will</echo>
- <echo>* get the framework jar from a relative directory if there.</echo>
- <echo>*</echo>
- <echo>***********************************************</echo>
- <echo/>
- </target>
-
- <target name="optional-warnings"
depends="jms-warn,framework-warn,sql-warn,servlet-warn,mail-warn,log4j-warn">
+ <target name="optional-warnings"
+depends="jms-warn,sql-warn,servlet-warn,mail-warn,log4j-warn">
</target>
<!-- Prepares the build directory -->
@@ -298,8 +271,6 @@
unless="servlet.present"/>
<exclude name="org/apache/log/output/net/SMTPOutputLogTarget.java"
unless="javax.mail.present"/>
- <exclude name="org/apache/log/format/AvalonFormatter.java"
- unless="avalon-framework.present"/>
<exclude name="org/apache/log/output/db/**"
unless="javax.sql.present"/>
<exclude name="org/apache/log/output/jms/**"
@@ -405,8 +376,6 @@
unless="servlet.present"/>
<exclude name="org/apache/log/output/net/SMTPOutputLogTarget.java"
unless="javax.mail.present"/>
- <exclude name="org/apache/log/format/AvalonFormatter.java"
- unless="avalon-framework.present"/>
<exclude name="org/apache/log/output/db/**"
unless="javax.sql.present"/>
<exclude name="org/apache/log/output/jms/**"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
