You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by ca...@apache.org on 2007/05/15 22:51:39 UTC
svn commit: r538313 - in /logging/log4j/branches/v1_2-branch: ./ bin/ build/
docs/ examples/xml/ examples/xml/org/ examples/xml/org/apache/
examples/xml/org/apache/log4j/ examples/xml/org/apache/log4j/xml/
examples/xml/org/apache/log4j/xml/examples/ pa...
Author: carnold
Date: Tue May 15 13:51:38 2007
New Revision: 538313
URL: http://svn.apache.org/viewvc?view=rev&rev=538313
Log:
Bug 37930: Remove obsolete files, Maven refinement
Added:
logging/log4j/branches/v1_2-branch/examples/xml/
logging/log4j/branches/v1_2-branch/examples/xml/org/
logging/log4j/branches/v1_2-branch/examples/xml/org/apache/
logging/log4j/branches/v1_2-branch/examples/xml/org/apache/log4j/
logging/log4j/branches/v1_2-branch/examples/xml/org/apache/log4j/xml/
logging/log4j/branches/v1_2-branch/examples/xml/org/apache/log4j/xml/examples/
- copied from r537976, logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/xml/examples/
Removed:
logging/log4j/branches/v1_2-branch/bin/
logging/log4j/branches/v1_2-branch/build/
logging/log4j/branches/v1_2-branch/docs/
logging/log4j/branches/v1_2-branch/packaging/
logging/log4j/branches/v1_2-branch/src/xdocs/
Modified:
logging/log4j/branches/v1_2-branch/BUILD-INFO.txt
logging/log4j/branches/v1_2-branch/build.properties.sample
logging/log4j/branches/v1_2-branch/build.xml
logging/log4j/branches/v1_2-branch/pom.xml
logging/log4j/branches/v1_2-branch/src/assembly/bin.xml
Modified: logging/log4j/branches/v1_2-branch/BUILD-INFO.txt
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/BUILD-INFO.txt?view=diff&rev=538313&r1=538312&r2=538313
==============================================================================
--- logging/log4j/branches/v1_2-branch/BUILD-INFO.txt (original)
+++ logging/log4j/branches/v1_2-branch/BUILD-INFO.txt Tue May 15 13:51:38 2007
@@ -1,39 +1,8 @@
This is the build information for the current log4j release. It contains the
versions of tools and jars used to build this version of the log4j library.
-Ant - v1.6.5; Available from http://ant.apache.org
-JDK - jdk1.3.1_16; Available from http://java.sun.com/j2se/1.3/index.jsp
+Maven - 2.0.6; Available from http://maven.apache.org
+MinGW - MinGW-3.1.0-1.exe; Available from http://mingw.sourceforge.net/downloads.html (used to build NTEventLogAppender.dll)
+JDK - jdk1.3.1_18; Available from http://java.sun.com/products/archive/
+Windows 2000 SP4
-
-External jar dependencies - These projects were used in compiling the log4j
-classes. The locations of their jars can be set in the build.properties file,
-a sample of which can be duplicated from the file build.properties.sample.
-
-XML (jaxp.jaxp.jar) - Crimson 1.1.3; Available from
- http://xml.apache.org/crimson/
-
-Java Mail (javamail.jar) - v1.3.2; Available from
- http://java.sun.com/products/javamail/
-
-JavaBeans Activation Framework (activation.jar) - v1.0.2; Available from
- http://java.sun.com/products/javabeans/jaf/index.jsp
-
-JMS (jms.jar) - v1.1; Available from
- http://java.sun.com/products/jms/docs.html
-
-JMX (jmx.jar, jmx-extra.jar) - v1.2; Available from
- http://java.sun.com/products/JavaManagement/index.jsp
-
-JNDI (jndi.jar) - v1.2.1; Available from
- http://java.sun.com/products/jndi/downloads/
-
-
-External jar dependencies for unit tests - These jars are used as part of the
-unit testing.
-
-JUnit - v3.8.1; Available from http://junit.org
-
-Jakarta ORO (jakarta.oro.jar) - v2.0.8;
- Available from http://jakarta.apache.org/oro/
-
-Clover (clover.jar) - v1.3.8; Available from http://www.cenqua.com/clover/
Modified: logging/log4j/branches/v1_2-branch/build.properties.sample
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/build.properties.sample?view=diff&rev=538313&r1=538312&r2=538313
==============================================================================
--- logging/log4j/branches/v1_2-branch/build.properties.sample (original)
+++ logging/log4j/branches/v1_2-branch/build.properties.sample Tue May 15 13:51:38 2007
@@ -14,6 +14,14 @@
# limitations under the License.
#
#
+
+#
+# Providing a build.properties file is no longer
+# necessary for an Ant build as long as one Maven build
+# has previously been performed.
+#
+
+
# base location of support directories
#
lib.home.dir=/java
Modified: logging/log4j/branches/v1_2-branch/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/build.xml?view=diff&rev=538313&r1=538312&r2=538313
==============================================================================
--- logging/log4j/branches/v1_2-branch/build.xml (original)
+++ logging/log4j/branches/v1_2-branch/build.xml Tue May 15 13:51:38 2007
@@ -117,11 +117,6 @@
<pathelement location="${javaee-api.jar}"/>
</path>
- <!-- Construct classpath for building the html pages-->
- <path id="site.classpath">
- <pathelement location="${velocity.jar}"/>
- <pathelement location="${jdom.jar}"/>
- </path>
<!-- ================================================================= -->
<!-- Default target -->
@@ -576,10 +571,10 @@
</javadoc>
<!-- Extra files referenced by JavaDocs -->
- <copy file="${java.source.dir}/org/apache/log4j/xml/log4j.dtd"
+ <copy file="${resource.source.dir}/org/apache/log4j/xml/log4j.dtd"
tofile="${javadoc.dest}/org/apache/log4j/xml/log4j.dtd" />
<copy todir="${javadoc.dest}/org/apache/log4j/xml/examples">
- <fileset dir="${java.source.dir}/org/apache/log4j/xml/examples">
+ <fileset dir="examples/xml/org/apache/log4j/xml/examples">
<include name="sample*.xml" />
<include name="XMLSample.java" />
</fileset>
@@ -644,81 +639,14 @@
</target>
<!-- ============================================== -->
- <!-- Build the site files using Anakia -->
+ <!-- Build the site files using Maven -->
<!-- ============================================== -->
- <target name="prepareSite">
- <available classname="org.apache.velocity.anakia.AnakiaTask"
- property="AnakiaTask.present">
- <classpath refid="site.classpath"/>
- </available>
- </target>
-
- <target name="checkSite" depends="prepareSite" unless="AnakiaTask.present">
- <fail>
- AnakiaTask is not present! Please check to make sure that
- velocity.jar is in your classpath.
- </fail>
- </target>
-
- <target name="clean-site">
- <delete>
- <fileset dir="${docs.dest}" includes="**/*.html">
- <exclude name="FAQ.html"/>
- <exclude name="TROUBLESHOOT.html"/>
- <exclude name="manual.html"/>
- <exclude name="overview.html"/>
- </fileset>
- </delete>
- </target>
-
- <target name="site" depends="checkSite" if="AnakiaTask.present">
- <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask">
- <classpath refid="site.classpath"/>
- </taskdef>
-
- <mkdir dir="${docs.dest}/css"/>
- <copy file="docs/css/site.css" tofile="${docs.dest}/css/site.css"/>
-
- <anakia basedir="${xdocs.src}" destdir="${docs.dest}/"
- extension=".html"
- style="site.vsl"
- projectFile="stylesheets/project.xml"
- excludes="**/stylesheets/**, empty.xml"
- includes="**/*.xml"
- lastModifiedCheck="true"
- templatePath="${xdocs.src}/stylesheets">
- </anakia>
-
+ <target name="site">
+ <exec executable="mvn">
+ <arg value="site"/>
+ </exec>
</target>
-<target name="deploy-site" depends="javadoc" description="Deploy log4j documentation">
- <fail unless="apache.user">-Dapache.user=USERNAME must be specified.</fail>
- <tar destfile="${packaging.dir}/apache-log4j12-site.tar.gz" compression="gzip">
- <tarfileset dir="${javadoc.dest}" prefix="api-${version}"/>
- </tar>
- <exec executable="scp" dir="${packaging.dir}">
- <arg value="apache-log4j12-site.tar.gz"/>
- <arg value="${apache.user}@${apache.host}:"/>
- </exec>
- <exec executable="ssh">
- <arg value="-l"/>
- <arg value="${apache.user}"/>
- <arg value="${apache.host}"/>
- <arg value="tar"/>
- <arg value="--directory=${apache.javadoc_dest}"/>
- <arg value="-xvzf"/>
- <arg value="apache-log4j12-site.tar.gz"/>
- </exec>
- <exec executable="ssh">
- <arg value="-l"/>
- <arg value="${apache.user}"/>
- <arg value="${apache.host}"/>
- <arg value="chmod"/>
- <arg value="-R"/>
- <arg value="g+w"/>
- <arg value="${apache.javadoc_dest}"/>
- </exec>
-</target>
<!-- ================================================================= -->
<!-- Build a complete distribution. Results go to ${dist.images} -->
@@ -799,71 +727,6 @@
<delete dir="${dist.tmp}" />
</target>
- <!-- This target will be incorporated init dist for the next release
- currently it will repackage a previously built release -->
- <target name="maven-package" depends="jar" description="Prepares a Maven package">
- <mkdir dir="${dist.dir}/poms"/>
- <copy tofile="${dist.dir}/poms/log4j-${version}.pom" file="pom.xml"/>
- <mkdir dir="${dist.dir}/licenses"/>
- <copy todir="${dist.dir}/licenses" file="LICENSE"/>
-
- <checksum forceOverwrite="yes" fileext=".md5">
- <fileset dir="${jar.dest}" includes="${jar.filename} ${sources-jar.filename}"/>
- </checksum>
- <checksum forceOverwrite="yes" fileext=".md5">
- <fileset dir="${dist.dir}" includes="poms/log4j-${version}.pom licenses/LICENSE"/>
- </checksum>
- <checksum forceOverwrite="yes" fileext=".sha1" algorithm="SHA">
- <fileset dir="${jar.dest}" includes="${jar.filename} ${sources-jar.filename}"/>
- </checksum>
- <checksum forceOverwrite="yes" fileext=".sha1" algorithm="SHA">
- <fileset dir="${dist.dir}" includes="poms/log4j-${version}.pom licenses/LICENSE"/>
- </checksum>
- <mkdir dir="${dist.images}"/>
- <!-- Does not include PGP signatures to allow for review prior to publication -->
- <tar tarfile="${dist.images}/apache-log4j-${version}-maven.tar.gz"
- compression="gzip">
- <tarfileset dir="${dist.dir}" includes="poms/* licenses/*" excludes="**/*.asc"/>
- <tarfileset dir="${jar.dest}" includes="${jar.filename} ${jar.filename}.*" prefix="jars" excludes="**/*.asc"/>
- <tarfileset dir="${jar.dest}" includes="${sources-jar.filename} ${sources-jar.filename}.*" prefix="java-sources" excludes="**/*.asc"/>
- </tar>
-
- <exec executable="gpg" dir="${jar.dest}">
- <arg value="--armor"/>
- <arg value="--output"/>
- <arg value="${jar.filename}.asc"/>
- <arg value="--detach-sig"/>
- <arg value="${jar.filename}"/>
- </exec>
- <exec executable="gpg" dir="${jar.dest}">
- <arg value="--armor"/>
- <arg value="--output"/>
- <arg value="${sources-jar.filename}.asc"/>
- <arg value="--detach-sig"/>
- <arg value="${sources-jar.filename}"/>
- </exec>
- <exec executable="gpg" dir="${dist.dir}/poms">
- <arg value="--armor"/>
- <arg value="--output"/>
- <arg value="log4j-${version}.pom.asc"/>
- <arg value="--detach-sig"/>
- <arg value="log4j-${version}.pom"/>
- </exec>
- <exec executable="gpg" dir="${dist.dir}/licenses">
- <arg value="--armor"/>
- <arg value="--output"/>
- <arg value="LICENSE.asc"/>
- <arg value="--detach-sig"/>
- <arg value="LICENSE"/>
- </exec>
- <tar tarfile="${dist.images}/apache-log4j-${version}-maven-pgpsigs.tar.gz"
- compression="gzip">
- <tarfileset dir="${dist.dir}" includes="poms/*.asc licenses/*.asc"/>
- <tarfileset dir="${jar.dest}" includes="${jar.filename}.asc" prefix="jars"/>
- <tarfileset dir="${jar.dest}" includes="${sources-jar.filename}.asc" prefix="java-sources"/>
- </tar>
-
- </target>
<!-- ================================================================= -->
<!-- Build a complete distribution for release. -->
@@ -894,7 +757,6 @@
classname="org.apache.log4j.net.SMTPAppender"
classpath="${jar.dest}/${jar.filename}"/>
<fail unless="javamail-found" message="JAVAMAIL was not found."/>
- <antcall target="maven-package"/>
<checksum forceOverwrite="yes" fileext=".md5">
<fileset dir="${dist.images}" includes="apache-log4j-${version}.tar.gz apache-log4j-${version}.zip"/>
</checksum>
Modified: logging/log4j/branches/v1_2-branch/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/pom.xml?view=diff&rev=538313&r1=538312&r2=538313
==============================================================================
--- logging/log4j/branches/v1_2-branch/pom.xml (original)
+++ logging/log4j/branches/v1_2-branch/pom.xml Tue May 15 13:51:38 2007
@@ -23,7 +23,7 @@
<artifactId>log4j</artifactId>
<packaging>jar</packaging>
<name>Apache Log4j</name>
- <version>1.2.15</version>
+ <version>1.2.15-SNAPSHOT</version>
<properties>
<currentVersion>1.2.15</currentVersion>
</properties>
@@ -81,16 +81,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -201,6 +191,23 @@
<configuration>
<tasks>
<delete dir="tests/output"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <!-- Copy log4j.dtd and xml samples to Javadoc -->
+ <execution>
+ <phase>site</phase>
+ <id>javadoc_xml</id>
+ <configuration>
+ <tasks>
+ <copy todir="target/site/apidocs/org/apache/log4j/xml">
+ <fileset file="src/main/resources/org/apache/log4j/xml/log4j.dtd"/>
+ <fileset dir="examples/xml/org/apache/log4j/xml"
+ includes="examples/sample*.xml, examples/XMLSample.java"/>
+ </copy>
</tasks>
</configuration>
<goals>
Modified: logging/log4j/branches/v1_2-branch/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/assembly/bin.xml?view=diff&rev=538313&r1=538312&r2=538313
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/assembly/bin.xml (original)
+++ logging/log4j/branches/v1_2-branch/src/assembly/bin.xml Tue May 15 13:51:38 2007
@@ -29,7 +29,6 @@
<include>*.txt</include>
<include>*.sample</include>
<include>*.xml</include>
- <include>*.rdf</include>
<include>INSTALL</include>
<include>KEYS</include>
<include>LICENSE</include>
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org