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/16 17:42:57 UTC
svn commit: r538632 - in /logging/log4j/branches/v1_2-branch: ./
examples/xml/ src/main/javadoc/ src/main/javadoc/org/
src/main/javadoc/org/apache/ src/main/javadoc/org/apache/log4j/
src/main/javadoc/org/apache/log4j/xml/ src/main/javadoc/org/apache/lo...
Author: carnold
Date: Wed May 16 08:42:55 2007
New Revision: 538632
URL: http://svn.apache.org/viewvc?view=rev&rev=538632
Log:
Bug 37930: Added src/main/javadoc, post release site fixup
Added:
logging/log4j/branches/v1_2-branch/src/main/javadoc/
logging/log4j/branches/v1_2-branch/src/main/javadoc/org/
logging/log4j/branches/v1_2-branch/src/main/javadoc/org/apache/
logging/log4j/branches/v1_2-branch/src/main/javadoc/org/apache/log4j/
logging/log4j/branches/v1_2-branch/src/main/javadoc/org/apache/log4j/xml/
logging/log4j/branches/v1_2-branch/src/main/javadoc/org/apache/log4j/xml/examples/
logging/log4j/branches/v1_2-branch/src/main/javadoc/org/apache/log4j/xml/examples/XMLSample.java
- copied unchanged from r538601, logging/log4j/branches/v1_2-branch/examples/xml/org/apache/log4j/xml/examples/XMLSample.java
logging/log4j/branches/v1_2-branch/src/main/javadoc/org/apache/log4j/xml/examples/sample1.xml
- copied unchanged from r538601, logging/log4j/branches/v1_2-branch/examples/xml/org/apache/log4j/xml/examples/sample1.xml
logging/log4j/branches/v1_2-branch/src/main/javadoc/org/apache/log4j/xml/examples/sample2.xml
- copied unchanged from r538601, logging/log4j/branches/v1_2-branch/examples/xml/org/apache/log4j/xml/examples/sample2.xml
logging/log4j/branches/v1_2-branch/src/main/javadoc/org/apache/log4j/xml/examples/sample3.xml
- copied unchanged from r538601, logging/log4j/branches/v1_2-branch/examples/xml/org/apache/log4j/xml/examples/sample3.xml
logging/log4j/branches/v1_2-branch/src/main/javadoc/org/apache/log4j/xml/examples/sample4.xml
- copied unchanged from r538601, logging/log4j/branches/v1_2-branch/examples/xml/org/apache/log4j/xml/examples/sample4.xml
logging/log4j/branches/v1_2-branch/src/main/javadoc/org/apache/log4j/xml/examples/sample5.xml
- copied unchanged from r538601, logging/log4j/branches/v1_2-branch/examples/xml/org/apache/log4j/xml/examples/sample5.xml
logging/log4j/branches/v1_2-branch/src/main/javadoc/org/apache/log4j/xml/log4j.dtd
- copied unchanged from r538591, logging/log4j/branches/v1_2-branch/src/main/resources/org/apache/log4j/xml/log4j.dtd
Removed:
logging/log4j/branches/v1_2-branch/examples/xml/
Modified:
logging/log4j/branches/v1_2-branch/BUILD-INFO.txt
logging/log4j/branches/v1_2-branch/build.xml
logging/log4j/branches/v1_2-branch/pom.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=538632&r1=538631&r2=538632
==============================================================================
--- logging/log4j/branches/v1_2-branch/BUILD-INFO.txt (original)
+++ logging/log4j/branches/v1_2-branch/BUILD-INFO.txt Wed May 16 08:42:55 2007
@@ -22,7 +22,5 @@
mvn install:install-file -DgroupId=javax.jms -DartifactId=jms \
-Dversion=1.1 -Dpackaging=jar -Dfile=/path/to/jms.jar
-To build the release:
-mvn site assembly:assembly
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=538632&r1=538631&r2=538632
==============================================================================
--- logging/log4j/branches/v1_2-branch/build.xml (original)
+++ logging/log4j/branches/v1_2-branch/build.xml Wed May 16 08:42:55 2007
@@ -51,6 +51,9 @@
<!-- The directory where resource files are stored. -->
<property name="resource.source.dir" value="src/main/resources/"/>
+ <!-- The directory where javadoc files are stored. -->
+ <property name="javadoc.source.dir" value="src/main/javadoc/"/>
+
<!-- The directory where the package-list file is found, ./ or -->
<!-- build/ -->
<property name="packaging.dir" value="build"/>
@@ -571,13 +574,8 @@
</javadoc>
<!-- Extra files referenced by JavaDocs -->
- <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="examples/xml/org/apache/log4j/xml/examples">
- <include name="sample*.xml" />
- <include name="XMLSample.java" />
- </fileset>
+ <copy todir="${javadoc.dest}">
+ <fileset dir="${javadoc.source.dir}"/>
</copy>
</target>
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=538632&r1=538631&r2=538632
==============================================================================
--- logging/log4j/branches/v1_2-branch/pom.xml (original)
+++ logging/log4j/branches/v1_2-branch/pom.xml Wed May 16 08:42:55 2007
@@ -197,23 +197,6 @@
<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>
- <goal>run</goal>
- </goals>
- </execution>
<execution>
<phase>test</phase>
<id>runAll</id>
@@ -231,7 +214,24 @@
<goal>run</goal>
</goals>
</execution>
-
+ <!-- release builds will put SVN tags into the SCM page, this changes it back to a branch -->
+ <execution>
+ <phase>site</phase>
+ <id>untag-site</id>
+ <configuration>
+ <tasks>
+ <taskdef name="replaceregexp"
+ classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp"/>
+ <replaceregexp file="target/site/source-repository.html"
+ match="/tags/[^ ]*"
+ replace="/branches/v1_2-branch"
+ flags="g"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
</executions>
<dependencies>
<dependency>
@@ -250,14 +250,6 @@
<version>3.8.1</version>
<scope>test</scope>
</dependency>
- <!-- Comment out following dependency on Mac OS/X -->
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.4.2</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
</dependencies>
</plugin>
<plugin>
@@ -267,7 +259,35 @@
<descriptor>src/assembly/bin.xml</descriptor>
</descriptors>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>assembly</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ <goal>javadoc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<testSourceDirectory>tests/src/java</testSourceDirectory>
<testResources>
@@ -276,6 +296,28 @@
</testResource>
</testResources>
</build>
+<profiles>
+ <profile>
+ <!-- NOTE: This will not be activated on OS X, since classes.jar
+already has the tools in it. -->
+ <id>default-tools.jar</id>
+ <activation>
+ <property>
+ <name>java.vendor</name>
+ <value>Sun Microsystems Inc.</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>sun.jdk</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.4.2</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
<repositories>
<repository>
<id>java.net</id>
@@ -322,7 +364,6 @@
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
<reportSets>
<reportSet>
<reports>
@@ -337,17 +378,17 @@
</reportSets>
</plugin>
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jxr-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <goals>site-deploy</goals>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.0-beta-2</version>
<reportSets>
<reportSet>
<reports>
@@ -362,10 +403,10 @@
</plugins>
</reporting>
<distributionManagement>
- <repository>
- <id>log4j12.builds</id>
- <url>scp://people.apache.org/www/people.apache.org/builds/logging/log4j/${project.version}/</url>
- </repository>
+ <repository>
+ <id>log4j12.builds</id>
+ <url>scp://people.apache.org/www/people.apache.org/builds/logging/log4j/${project.version}/</url>
+ </repository>
<site>
<id>log4j12.website</id>
<url>scp://people.apache.org/www/logging.apache.org/log4j/1.2/</url>
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org