Author: mwomack
Date: Thu Mar 2 20:09:38 2006
New Revision: 382647
URL: http://svn.apache.org/viewcvs?rev=382647&view=rev
Log:
Undoing the Version addition and build changes
Removed:
logging/log4j/trunk/src/java/org/apache/log4j/Version.java
logging/log4j/trunk/src/java/org/apache/log4j/versionInfo
logging/log4j/trunk/tests/src/java/org/apache/log4j/VersionTest.java
Modified:
logging/log4j/trunk/build.xml
logging/log4j/trunk/docs/HISTORY.txt
logging/log4j/trunk/tests/build.xml
logging/log4j/trunk/tests/src/java/org/apache/log4j/CoreTestSuite.java
Modified: logging/log4j/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/logging/log4j/trunk/build.xml?rev=382647&r1=382646&r2=382647&view=diff
==============================================================================
--- logging/log4j/trunk/build.xml (original)
+++ logging/log4j/trunk/build.xml Thu Mar 2 20:09:38 2006
@@ -21,15 +21,7 @@
<!-- The build.properties file defines the parth to local jar files -->
<property file="build.properties"/>
- <property name="version" value="1.3"/>
- <property name="apiVersion" value="1.3"/>
- <property name="milestone" value="alpha"/>
- <property name="milestoneVersion" value="8"/>
- <condition property="fullVersion"
- value="${version}-${milestone}"
- else="${version}-${milestone}-${milestoneVersion}">
- <equals arg1="${milestone}" arg2="final"/>
- </condition>
+ <property name="version" value="1.3alpha-8"/>
<property name="target" value="1.2"/>
<property name="source" value="1.3"/>
@@ -63,16 +55,16 @@
<property name="jar.dest" value="${dist.dir}/lib"/>
<!-- The jar file that the jar task will generate -->
- <property name="log4j.jar" value="log4j-${fullVersion}.jar"/>
- <property name="log4j-optional.jar"
value="log4j-optional-${fullVersion}.jar"/>
- <property name="log4j-oro.jar" value="log4j-oro-${fullVersion}.jar"/>
- <property name="log4j-xml.jar" value="log4j-xml-${fullVersion}.jar"/>
- <property name="log4j-jms.jar" value="log4j-jms-${fullVersion}.jar"/>
- <property name="log4j-smtp.jar" value="log4j-smtp-${fullVersion}.jar"/>
- <property name="log4j-db.jar" value="log4j-db-${fullVersion}.jar"/>
- <property name="log4j-nt.jar" value="log4j-nt-${fullVersion}.jar"/>
- <property name="log4j-jmx.jar" value="log4j-jmx-${fullVersion}.jar"/>
- <property name="log4j-all.jar" value="log4j-all-${fullVersion}.jar"/>
+ <property name="log4j.jar" value="log4j-${version}.jar"/>
+ <property name="log4j-optional.jar" value="log4j-optional-${version}.jar"/>
+ <property name="log4j-oro.jar" value="log4j-oro-${version}.jar"/>
+ <property name="log4j-xml.jar" value="log4j-xml-${version}.jar"/>
+ <property name="log4j-jms.jar" value="log4j-jms-${version}.jar"/>
+ <property name="log4j-smtp.jar" value="log4j-smtp-${version}.jar"/>
+ <property name="log4j-db.jar" value="log4j-db-${version}.jar"/>
+ <property name="log4j-nt.jar" value="log4j-nt-${version}.jar"/>
+ <property name="log4j-jmx.jar" value="log4j-jmx-${version}.jar"/>
+ <property name="log4j-all.jar" value="log4j-all-${version}.jar"/>
<!-- Destination for documentation files -->
@@ -318,19 +310,6 @@
<target name="build.core" depends="init, jndiCheck, jaxpCheck">
<mkdir dir="${javac.dest}/"/>
-
- <available file="org/apache/log4j/versionInfo"
- filepath="${javac.dest}"
- property="build.copyVersion"/>
- <mkdir dir="${javac.dest}/org/apache/log4j"/>
- <copy file="${BSTEM}/versionInfo" todir="${javac.dest}/org/apache/log4j">
- <filterset>
- <filter token="version" value="${version}"/>
- <filter token="apiVersion" value="${apiVersion}"/>
- <filter token="milestone" value="${milestone}"/>
- <filter token="milestoneVersion" value="${milestoneVersion}"/>
- </filterset>
- </copy>
<javac destdir="${javac.dest}"
includes="${stem}/**/*.java"
excludes="**/UnitTest*.java,
@@ -411,7 +390,7 @@
<manifest>
<section name="org/apache/log4j/">
<attribute name="Implementation-Title" value="log4j-xml"/>
- <attribute name="Implementation-Version"
value="${fullVersion}"/>
+ <attribute name="Implementation-Version" value="${version}"/>
<attribute name="Implementation-Vendor" value="Apache
Software Foundation"/>
</section>
</manifest>
@@ -444,7 +423,7 @@
<manifest>
<section name="org/apache/log4j/">
<attribute name="Implementation-Title" value="log4j-smtp"/>
- <attribute name="Implementation-Version" value="${fullVersion}"/>
+ <attribute name="Implementation-Version" value="${version}"/>
<attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
</section>
</manifest>
@@ -479,7 +458,7 @@
<manifest>
<section name="org/apache/log4j/">
<attribute name="Implementation-Title" value="log4j-oro"/>
- <attribute name="Implementation-Version" value="${fullVersion}"/>
+ <attribute name="Implementation-Version" value="${version}"/>
<attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
</section>
</manifest>
@@ -515,7 +494,7 @@
<manifest>
<section name="org/apache/log4j/">
<attribute name="Implementation-Title" value="log4j-jms"/>
- <attribute name="Implementation-Version" value="${fullVersion}"/>
+ <attribute name="Implementation-Version" value="${version}"/>
<attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
</section>
</manifest>
@@ -548,7 +527,7 @@
<manifest>
<section name="org/apache/log4j/">
<attribute name="Implementation-Title" value="log4j-jmx"/>
- <attribute name="Implementation-Version" value="${fullVersion}"/>
+ <attribute name="Implementation-Version" value="${version}"/>
<attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
</section>
</manifest>
@@ -589,7 +568,7 @@
<manifest>
<section name="org/apache/log4j/">
<attribute name="Implementation-Title" value="log4j-db"/>
- <attribute name="Implementation-Version" value="${fullVersion}"/>
+ <attribute name="Implementation-Version" value="${version}"/>
<attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
</section>
</manifest>
@@ -616,7 +595,7 @@
<manifest>
<section name="org/apache/log4j/">
<attribute name="Implementation-Title" value="log4j-nt"/>
- <attribute name="Implementation-Version"
value="${fullVersion}"/>
+ <attribute name="Implementation-Version"
value="${version}"/>
<attribute name="Implementation-Vendor" value="Apache
Software Foundation"/>
</section>
</manifest>
@@ -689,7 +668,7 @@
<manifest>
<section name="org/apache/log4j/">
<attribute name="Implementation-Title" value="log4j-optional"/>
- <attribute name="Implementation-Version" value="${fullVersion}"/>
+ <attribute name="Implementation-Version" value="${version}"/>
<attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
</section>
</manifest>
@@ -730,8 +709,7 @@
<mkdir dir="${jar.dest}/"/>
<jar jarfile="${jar.dest}/${log4j.jar}" basedir="${javac.dest}"
- includes="${stem}/versionInfo,
- ${stem}/*.class,
+ includes="${stem}/*.class,
${stem}/joran/**/*.class,
${stem}/config/*.class,
${stem}/helpers/*.class,
@@ -779,7 +757,7 @@
<attribute name="Manifest-version" value="1.0"/>
<section name="org/apache/log4j/">
<attribute name="Implementation-Title" value="log4j"/>
- <attribute name="Implementation-Version" value="${fullVersion}"/>
+ <attribute name="Implementation-Version" value="${version}"/>
<attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
</section>
</manifest>
@@ -793,14 +771,14 @@
<mkdir dir="${jar.dest}/"/>
<jar jarfile="${jar.dest}/${log4j-all.jar}" basedir="${javac.dest}"
- includes="${stem}/versionInfo,${stem}/**/*.class"
+ includes="${stem}/**/*.class"
excludes="**/UnitTest**,
${stem}/xml/test/*.class">
<manifest>
<attribute name="Manifest-version" value="1.0"/>
<section name="org/apache/log4j/">
<attribute name="Implementation-Title" value="log4j with all
features"/>
- <attribute name="Implementation-Version" value="${fullVersion}"/>
+ <attribute name="Implementation-Version" value="${version}"/>
<attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
</section>
</manifest>
@@ -887,9 +865,9 @@
author="true"
use="true"
overview="${javadoc.dest}/overview.html"
- doctitle="log4j version ${fullVersion}<br>API Specification"
- windowtitle="Log4j Version ${fullVersion}"
- header="<b>Log4j ${fullVersion}</b>"
+ doctitle="log4j version ${version}<br>API Specification"
+ windowtitle="Log4j Version ${version}"
+ header="<b>Log4j ${version}</b>"
bottom='Copyright © 2000-2006 Apache Software Foundation.
<br />
Licensed under the <a
href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version
2.0</a>.'>
<sourcepath>
@@ -932,7 +910,7 @@
<old name="Version ${reference-api.version}">
<dirset dir="${reference-api.source.dir}" includes="org/**"/>
</old>
- <new name="Version ${fullVersion}">
+ <new name="Version ${version}">
<dirset dir="${java.source.dir}" includes="org/**"/>
</new>
</jdiff>
@@ -1047,9 +1025,9 @@
<mkdir dir="${dist.images}" />
- <mkdir dir="${dist.tmp}/logging-log4j-${fullVersion}" />
+ <mkdir dir="${dist.tmp}/logging-log4j-${version}" />
- <copy todir="${dist.tmp}/logging-log4j-${fullVersion}">
+ <copy todir="${dist.tmp}/logging-log4j-${version}">
<fileset dir="${base}"
includes="src/java/**,
src/xdocs/**,
@@ -1072,15 +1050,15 @@
/>
</copy>
- <tar tarfile="${dist.images}/logging-log4j-${fullVersion}.tar.gz"
+ <tar tarfile="${dist.images}/logging-log4j-${version}.tar.gz"
basedir="${dist.tmp}"
- includes="logging-log4j-${fullVersion}/**"
+ includes="logging-log4j-${version}/**"
compression="gzip"
longfile="gnu" />
- <zip zipfile="${dist.images}/logging-log4j-${fullVersion}.zip"
+ <zip zipfile="${dist.images}/logging-log4j-${version}.zip"
basedir="${dist.tmp}"
- includes="logging-log4j-${fullVersion}/**" />
+ includes="logging-log4j-${version}/**" />
<delete dir="${dist.tmp}" />
Modified: logging/log4j/trunk/docs/HISTORY.txt
URL:
http://svn.apache.org/viewcvs/logging/log4j/trunk/docs/HISTORY.txt?rev=382647&r1=382646&r2=382647&view=diff
==============================================================================
--- logging/log4j/trunk/docs/HISTORY.txt (original)
+++ logging/log4j/trunk/docs/HISTORY.txt Thu Mar 2 20:09:38 2006
@@ -11,8 +11,6 @@
- Release of version 1.3-alpha-9
Release date: TBD
- - Bug 17862: Added a Version class to provide log4j version information.
-
January 30th, 2006
- Release of version 1.3alpha-8
Modified: logging/log4j/trunk/tests/build.xml
URL:
http://svn.apache.org/viewcvs/logging/log4j/trunk/tests/build.xml?rev=382647&r1=382646&r2=382647&view=diff
==============================================================================
--- logging/log4j/trunk/tests/build.xml (original)
+++ logging/log4j/trunk/tests/build.xml Thu Mar 2 20:09:38 2006
@@ -751,14 +751,6 @@
</junit>
</target>
- <target name="Version" depends="check, build, cleanOutputDir">
- <junit printsummary="yes" fork="yes" haltonfailure="${haltonfailure}">
- <classpath refid="tests.classpath"/>
- <formatter type="plain" usefile="false"/>
- <test name="org.apache.log4j.VersionTest" />
- </junit>
- </target>
-
<target name="build.nt.init">
<available file="${project.dist.dir}/lib/NTEventLogAppender.dll"
property="nt.dll.available"/>
<condition property="is-windows" value="true">
Modified: logging/log4j/trunk/tests/src/java/org/apache/log4j/CoreTestSuite.java
URL:
http://svn.apache.org/viewcvs/logging/log4j/trunk/tests/src/java/org/apache/log4j/CoreTestSuite.java?rev=382647&r1=382646&r2=382647&view=diff
==============================================================================
--- logging/log4j/trunk/tests/src/java/org/apache/log4j/CoreTestSuite.java
(original)
+++ logging/log4j/trunk/tests/src/java/org/apache/log4j/CoreTestSuite.java Thu
Mar 2 20:09:38 2006
@@ -34,7 +34,6 @@
*/
public static Test suite() {
TestSuite s = new TestSuite();
- s.addTestSuite(VersionTest.class);
s.addTestSuite(LoggingEventTest.class);
s.addTestSuite(org.apache.log4j.pattern.NameAbbreviatorTest.class);
s.addTestSuite(org.apache.log4j.pattern.PatternParserTest.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
