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/14 23:07:54 UTC
svn commit: r537977 - in /logging/log4j/branches/v1_2-branch: ./
src/main/java/org/apache/log4j/lf5/config/
src/main/java/org/apache/log4j/lf5/viewer/images/
src/main/java/org/apache/log4j/net/test/
src/main/java/org/apache/log4j/performance/ src/main/...
Author: carnold
Date: Mon May 14 14:07:53 2007
New Revision: 537977
URL: http://svn.apache.org/viewvc?view=rev&rev=537977
Log:
Bug 37930: Maven built jar should now be equiv with ant built jar
Added:
logging/log4j/branches/v1_2-branch/src/main/resources/
logging/log4j/branches/v1_2-branch/src/main/resources/META-INF/
logging/log4j/branches/v1_2-branch/src/main/resources/META-INF/LICENSE
- copied unchanged from r537920, logging/log4j/branches/v1_2-branch/LICENSE
logging/log4j/branches/v1_2-branch/src/main/resources/META-INF/NOTICE
- copied unchanged from r537920, logging/log4j/branches/v1_2-branch/NOTICE
logging/log4j/branches/v1_2-branch/src/main/resources/org/
logging/log4j/branches/v1_2-branch/src/main/resources/org/apache/
logging/log4j/branches/v1_2-branch/src/main/resources/org/apache/log4j/
logging/log4j/branches/v1_2-branch/src/main/resources/org/apache/log4j/lf5/
logging/log4j/branches/v1_2-branch/src/main/resources/org/apache/log4j/lf5/config/
- copied from r537960, logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/lf5/config/
logging/log4j/branches/v1_2-branch/src/main/resources/org/apache/log4j/lf5/viewer/
logging/log4j/branches/v1_2-branch/src/main/resources/org/apache/log4j/lf5/viewer/images/
- copied from r537960, logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/lf5/viewer/images/
logging/log4j/branches/v1_2-branch/src/main/resources/org/apache/log4j/xml/
logging/log4j/branches/v1_2-branch/src/main/resources/org/apache/log4j/xml/log4j.dtd
- copied unchanged from r537960, logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/xml/log4j.dtd
logging/log4j/branches/v1_2-branch/src/performance/
logging/log4j/branches/v1_2-branch/src/performance/java/
logging/log4j/branches/v1_2-branch/src/performance/java/org/
logging/log4j/branches/v1_2-branch/src/performance/java/org/apache/
logging/log4j/branches/v1_2-branch/src/performance/java/org/apache/log4j/
logging/log4j/branches/v1_2-branch/src/performance/java/org/apache/log4j/performance/
- copied from r537960, logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/performance/
Removed:
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/lf5/config/
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/lf5/viewer/images/
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/net/test/
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/performance/
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/varia/test/
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/xml/examples/
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/xml/log4j.dtd
logging/log4j/branches/v1_2-branch/src/main/java/org/apache/log4j/xml/test/
Modified:
logging/log4j/branches/v1_2-branch/build.xml
logging/log4j/branches/v1_2-branch/pom.xml
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=537977&r1=537976&r2=537977
==============================================================================
--- logging/log4j/branches/v1_2-branch/build.xml (original)
+++ logging/log4j/branches/v1_2-branch/build.xml Mon May 14 14:07:53 2007
@@ -45,9 +45,12 @@
<property name="deprecation" value="on"/>
- <!-- The directory where source files are stored. -->
+ <!-- The directory where java source files are stored. -->
<property name="java.source.dir" value="src/main/java/"/>
+ <!-- The directory where resource files are stored. -->
+ <property name="resource.source.dir" value="src/main/resources/"/>
+
<!-- The directory where the package-list file is found, ./ or -->
<!-- build/ -->
<property name="packaging.dir" value="build"/>
@@ -92,7 +95,7 @@
<!-- Directory for temporary files. -->
<property name="dist.tmp" value="${dist.dir}/tmp"/>
- <property name="javac.source" value="1.1"/>
+ <property name="javac.source" value="1.2"/>
<property name="javac.target" value="1.1"/>
<!-- destination for generated documentation on Apache web host -->
@@ -111,6 +114,7 @@
<pathelement location="${jmx.jar}"/>
<pathelement location="${jmx-extra.jar}"/>
<pathelement location="${jndi.jar}"/>
+ <pathelement location="${javaee-api.jar}"/>
</path>
<!-- Construct classpath for building the html pages-->
@@ -163,6 +167,7 @@
<classpath>
<pathelement location="${jmx.jar}"/>
<pathelement location="${jmx-extra.jar}"/>
+ <pathelement location="${javaee-api.jar}"/>
</classpath>
</available>
</and>
@@ -176,7 +181,8 @@
<target name="jmsCheck">
<available classname="javax.jms.Message" property="jms-present">
<classpath>
- <pathelement location="${jms.jar}"/>
+ <pathelement location="${jms.jar}"/>
+ <pathelement location="${javaee-api.jar}"/>
</classpath>
</available>
</target>
@@ -192,9 +198,10 @@
</target>
<target name="javamailCheck">
- <available classname="javax.mail.Message" property="javamail-present">
+ <available classname="javax.mail.MessageAware" property="javamail-present">
<classpath>
- <pathelement location="${javamail.jar}"/>
+ <pathelement location="${javamail.jar}"/>
+ <pathelement location="${javaee-api.jar}"/>
</classpath>
</available>
</target>
@@ -242,8 +249,8 @@
</javac>
<copy todir="${javac.dest}">
- <fileset dir="${java.source.dir}" includes="${stem}/lf5/**/*.properties"/>
- <fileset dir="${java.source.dir}" includes="${stem}/lf5/viewer/images/*"/>
+ <fileset dir="${resource.source.dir}" includes="${stem}/lf5/**/*.properties"/>
+ <fileset dir="${resource.source.dir}" includes="${stem}/lf5/viewer/images/*"/>
</copy>
</target>
@@ -290,7 +297,7 @@
classpath="${classpath}">
<classpath refid="compile.classpath"/>
</javac>
- <copy file="${BSTEM}/xml/log4j.dtd" tofile="${javac.dest}/${stem}/xml/log4j.dtd" />
+ <copy file="${resource.source.dir}/${stem}/xml/log4j.dtd" tofile="${javac.dest}/${stem}/xml/log4j.dtd" />
</target>
<target name="build.javamail" depends="init, javamail"
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=537977&r1=537976&r2=537977
==============================================================================
--- logging/log4j/branches/v1_2-branch/pom.xml (original)
+++ logging/log4j/branches/v1_2-branch/pom.xml Mon May 14 14:07:53 2007
@@ -98,8 +98,19 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.3</source>
- <target>1.2</target>
+ <source>1.2</source>
+ <target>1.1</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
</configuration>
</plugin>
</plugins>
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org