moving log4j-1.2.8.jar

Eddie O'Neil 29 Oct 2004 20:20:30 -0000

All--

For those of you who have IDE projects setup and use hard-refs to the JAR files that are available in Beehive's SVN repo, the change below moved the log4j JAR that we use.

It used to be located in installed/jakarta-log4j-1.2.8/dist/lib, and this was created from a .zip file that was extracted during the build. Now, the .zip file has been deleted and the JAR is checked in directly at:

  external/log4j/log4j-1.2.8.jar

In addition, I also checked in the Servlet 2.4 / JSP 2.0 JARs into external/servlet and reference those at build time, which breaks the build's dependence on having Tomcat checked in.

  Please change your references accordingly.

  Let me know if you've got any questions.

Thanks!

Eddie

-------- Original Message -------- Subject: svn commit: rev 55739 - in incubator/beehive/trunk: . external/log4j external/servlet test/ant Date: 27 Oct 2004 21:08:35 -0000 From: [EMAIL PROTECTED] Reply-To: Beehive Dev <beehive-dev@incubator.apache.org> To: [EMAIL PROTECTED]

Author: ekoneil
Date: Wed Oct 27 14:08:35 2004
New Revision: 55739

Added: incubator/beehive/trunk/external/log4j/log4j-1.2.8.jar (contents, props changed) incubator/beehive/trunk/external/servlet/ incubator/beehive/trunk/external/servlet/jsp-api-2.0.jar (contents, props changed) incubator/beehive/trunk/external/servlet/servlet-api-2.4.jar (contents, props changed) Removed: incubator/beehive/trunk/external/log4j/jakarta-log4j-1.2.8.zip Modified: incubator/beehive/trunk/beehive.properties incubator/beehive/trunk/build.xml incubator/beehive/trunk/test/ant/runTomcatCore.xml Log: Build work to:

- break the build dependency on the presence of a Tomcat installation
- remove the log4j .zip file and replace with the log4j JAR file

This will help in building Beehive and then runing the tests on any container.

BB: self
DRT: Beehive pass

Modified: incubator/beehive/trunk/beehive.properties
==============================================================================
--- incubator/beehive/trunk/beehive.properties  (original)
+++ incubator/beehive/trunk/beehive.properties  Wed Oct 27 14:08:35 2004
@@ -18,9 +18,11 @@

 tomcat.dir=${os.CATALINA_HOME}
 ant.dir=${os.ANT_HOME}
-log4j.dir=${beehive.installed.dir}/jakarta-log4j-1.2.8

 ant.jar=${ant.dir}/lib/ant.jar
+tools.jar=${os.JAVA_HOME}/lib/tools.jar
+
+log4j.dir=${beehive.installed.dir}/jakarta-log4j-1.2.8

 #
 # While still in the Workshop source tree, these reference
@@ -30,17 +32,14 @@
 # that are installed in the build (or by Maven) from
 # the various installers.
 #
-catalina-ant.jar=${tomcat.dir}/server/lib/catalina-ant.jar
-log4j.jar=${log4j.dir}/dist/lib/log4j-1.2.8.jar
-servlet24.jar=${tomcat.dir}/common/lib/servlet-api.jar
-jsp20.jar=${tomcat.dir}/common/lib//jsp-api.jar
+log4j.jar=${beehive.external.dir}/log4j/log4j-1.2.8.jar
+servlet24.jar=${beehive.external.dir}/servlet/servlet-api-2.4.jar
+jsp20.jar=${beehive.external.dir}/servlet/jsp-api-2.0.jar
 jsr173.jar=${beehive.installed.dir}/jsr173/jsr173_1.0_api.jar
 junit.jar=${beehive.external.dir}/junit/junit.jar
 velocity14.jar=${beehive.external.dir}/velocity/velocity-1.4.jar
 velocitydep14.jar=${beehive.external.dir}/velocity/velocity-dep-1.4.jar
-tools.jar=${os.JAVA_HOME}/lib/tools.jar
 derby.jar=${beehive.external.dir}/derby/derby_46005.jar
-
 xbean.jar=${beehive.external.dir}/xmlbeans/apache-xbean.jar

 #
@@ -60,4 +59,4 @@
 dist.name=${dist.base.name}${beehive.version}
 dist.name.src=${dist.name}-src
 dist.dir=${dist.base.dir}/${dist.name}
-dist.docs.dir=${beehive.dir}/build/dist-docs
+dist.docs.dir=${beehive.dir}/build/dist-docs
\ No newline at end of file

Modified: incubator/beehive/trunk/build.xml
==============================================================================
--- incubator/beehive/trunk/build.xml   (original)
+++ incubator/beehive/trunk/build.xml   Wed Oct 27 14:08:35 2004
@@ -10,11 +10,9 @@

<property name="tomcat.installer" location="${beehive.external.dir}/tomcat/jakarta-tomcat-5.0.25.zip"/> - <property name="log4j.installer" location="${beehive.external.dir}/log4j/jakarta-log4j-1.2.8.zip"/> <property name="ant.installer" location="${beehive.external.dir}/ant/apache-ant-1.6.2-bin.zip"/> <property name="jsr173.installer" location="${beehive.external.dir}/xmlbeans/jsr173_api.jar"/>

- <target name="bootstrap" depends="ensure.proxysettings" description="Install external dependencies to the installed/ directory"> <antcall target="install.deps"/> <ant dir="test/ant" antfile="runTomcat.xml" target="reset.config"/> @@ -80,7 +78,6 @@ <target name="install.deps" description="Ensure that the external dependencies (Tomcat, etc) have been installed locally"> <antcall target="ensure.ant"/> <antcall target="ensure.tomcat"/> - <antcall target="ensure.log4j"/> <antcall target="ensure.jsr173"/> </target>

@@ -105,24 +102,6 @@ <echo>Unzipping Tomcat to directory: ${beehive.installed.dir} from installer ${tomcat.installer}</echo> <unzip src="${tomcat.installer}" dest="${beehive.installed.dir}"/> <chmod dir="${tomcat.dir}/bin" perm="755" includes="**/*.sh"/> - </target> - -  -  -  -  -  - - <target name="ensure.log4j"> - <echo>Ensuring Log4J present in directory: ${beehive.installed.dir}</echo> - <available file="${log4j.dir}" type="dir" property="log4j.present"/> - <echo>log4j.present: ${log4j.present}</echo> - <antcall target="unzip.log4j"/> - </target> - - <target name="unzip.log4j" unless="log4j.present"> - <echo>Unzipping Log4J to directory: ${beehive.installed.dir} from installer ${log4j.installer}</echo> - <unzip src="${log4j.installer}" dest="${beehive.installed.dir}"/> </target>

     <!-- ============================================= -->

Added: incubator/beehive/trunk/external/log4j/log4j-1.2.8.jar
==============================================================================
Binary file. No diff available.

Added: incubator/beehive/trunk/external/servlet/jsp-api-2.0.jar
==============================================================================
Binary file. No diff available.

Added: incubator/beehive/trunk/external/servlet/servlet-api-2.4.jar
==============================================================================
Binary file. No diff available.

Modified: incubator/beehive/trunk/test/ant/runTomcatCore.xml ============================================================================== --- incubator/beehive/trunk/test/ant/runTomcatCore.xml (original) +++ incubator/beehive/trunk/test/ant/runTomcatCore.xml Wed Oct 27 14:08:35 2004 @@ -9,6 +9,8 @@ --> <project name="Beehive/RunTomcatTasks" default="usage" basedir=".">

+ <property name="catalina-ant.jar" location="${tomcat.home}/server/lib/catalina-ant.jar"/> + <target name="deploy" description="Deploy a webapp to a running Tomcat server"> <fail unless="context.path" message="Can't deploy webapp; the value ${context.path} was unspecified"/> <fail unless="webapp.dir" message="Can't deploy webapp; the value ${webapp.dir} was unspecified"/>

moving log4j-1.2.8.jar

Reply via email to