[prev in list] [next in list] [prev in thread] [next in thread]
List: log4j-dev
Subject: svn commit: r558207 - in /logging/log4j/branches/v1_2-branch: build.xml
From: carnold () apache ! org
Date: 2007-07-21 0:56:23
Message-ID: 20070721005623.EE5C81A981A () eris ! apache ! org
[Download RAW message or body]
Author: carnold
Date: Fri Jul 20 17:56:22 2007
New Revision: 558207
URL: http://svn.apache.org/viewvc?view=rev&rev=558207
Log:
Bug 37930: web site staging to SVN repo
Modified:
logging/log4j/branches/v1_2-branch/build.xml
logging/log4j/branches/v1_2-branch/pom.xml
logging/log4j/branches/v1_2-branch/src/site/apt/publications.apt
logging/log4j/branches/v1_2-branch/src/site/apt/roadmap.apt
logging/log4j/branches/v1_2-branch/src/site/site.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=558207&r1=558206&r2=558207
==============================================================================
--- logging/log4j/branches/v1_2-branch/build.xml (original)
+++ logging/log4j/branches/v1_2-branch/build.xml Fri Jul 20 17:56:22 2007
@@ -104,6 +104,12 @@
<property name="apache.javadoc_dest" value="/www/logging.apache.org/log4j/docs"/>
<!-- Apache web host -->
<property name="apache.host" value="people.apache.org"/>
+
+ <!-- destination for Maven generated documentation -->
+ <property name="svnrepo.url" value="file:///Users/curta/repos/mock"/>
+ <property name="svnsite.url" \
value="${svnrepo.url}/logging/site/trunk/docs/log4j/1.2"/> + <available \
property="svn-available" file="target/site-deploy/.svn"/> +
<!-- Construct compile classpath -->
@@ -795,6 +801,34 @@
tab="remove"
tablength="3"/>
</target>
+
+ <target name="checkout-site" unless="svn-available">
+ <exec executable="svn">
+ <arg value="co"/>
+ <arg value="${svnsite.url}"/>
+ <arg value="target/site-deploy"/>
+ </exec>
+ </target>
+
+ <target name="update-site" if="svn-available">
+ <exec executable="svn" dir="target/site-deploy" failonerror="true">
+ <arg value="update"/>
+ </exec>
+ </target>
+
+ <target name="post-site" depends="checkout-site, update-site"/>
+
+ <target name="site-deploy">
+ <!-- Add any new files (and generate innocuous warnings for the existing content) \
--> + <exec executable="csh" dir="target/site-deploy" failonerror="true">
+ <arg line='-c "svn add --force *"'/>
+ </exec>
+ <!-- requires that SVN_EDITOR, VISUAL or EDITOR being set to edit commit \
description --> + <exec executable="svn" dir="target/site-deploy" \
failonerror="true"> + <arg value="commit"/>
+ </exec>
+ </target>
+
</project>
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=558207&r1=558206&r2=558207
==============================================================================
--- logging/log4j/branches/v1_2-branch/pom.xml (original)
+++ logging/log4j/branches/v1_2-branch/pom.xml Fri Jul 20 17:56:22 2007
@@ -227,6 +227,33 @@
<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" /> + \
<replaceregexp match="-- Generated by (.*) on .*--" replace="-- Generated by \1 --" \
flags="g"> + <fileset dir="target/site/apidocs" includes="**/*.html"/>
+ </replaceregexp>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <phase>post-site</phase>
+ <id>post-site</id>
+ <configuration>
+ <tasks>
+ <ant target="post-site"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <phase>site-deploy</phase>
+ <id>site-deploy</id>
+ <configuration>
+ <tasks>
+ <ant target="site-deploy"/>
</tasks>
</configuration>
<goals>
@@ -430,7 +457,7 @@
</repository>
<site>
<id>logging.site</id>
- <url>scp://people.apache.org/www/logging.apache.org/log4j/1.2/</url>
+ <url>scp://localhost/${user.dir}/target/site-deploy</url>
</site>
</distributionManagement>
</project>
Modified: logging/log4j/branches/v1_2-branch/src/site/apt/publications.apt
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/site/apt/publications.apt?view=diff&rev=558207&r1=558206&r2=558207
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/site/apt/publications.apt (original)
+++ logging/log4j/branches/v1_2-branch/src/site/apt/publications.apt Fri Jul 20 \
17:56:22 2007 @@ -15,9 +15,7 @@
------
log4j 1.2 Publications
------
- Curt Arnold
------
- 8 May 2007
------
Modified: logging/log4j/branches/v1_2-branch/src/site/apt/roadmap.apt
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/site/apt/roadmap.apt?view=diff&rev=558207&r1=558206&r2=558207
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/site/apt/roadmap.apt (original)
+++ logging/log4j/branches/v1_2-branch/src/site/apt/roadmap.apt Fri Jul 20 17:56:22 \
2007 @@ -15,9 +15,7 @@
------
log4j 1.2 Roadmap
------
- Curt Arnold
------
- 8 May 2007
------
log4j 1.2 Roadmap
Modified: logging/log4j/branches/v1_2-branch/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/branches/v1_2-branch/src/site/site.xml?view=diff&rev=558207&r1=558206&r2=558207
==============================================================================
--- logging/log4j/branches/v1_2-branch/src/site/site.xml (original)
+++ logging/log4j/branches/v1_2-branch/src/site/site.xml Fri Jul 20 17:56:22 2007
@@ -62,12 +62,15 @@
<item name="Introduction" href="/manual.html"/>
<item name="JavaDoc" href="/apidocs/index.html"/>
<item name="Publications" href="/publications.html"/>
+ <item name="Wiki" href="http://wiki.apache.org/logging-log4j"/>
</menu>
- <menu name="Resources">
- <item name="Sandbox" href="http://logging.apache.org/sandbox"/>
- <item name="Catalog" href="http://logging.apache.org/catalog.html"/>
- <item name="Wiki" href="http://wiki.apache.org/logging-log4j"/>
+ <menu name="Apache">
+ <item name="Home" href="http://www.apache.org"/>
+ <item name="Sponsorship" \
href="http://www.apache.org/foundation/sponsorship.html"/> + <item name="Thanks" \
href="http://www.apache.org/foundation/thanks.html"/> + <item name="Conferences" \
href="http://www.apachecon.com"/> </menu>
+
</body>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic