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/07/21 03:03:56 UTC

svn commit: r558217 - in /logging/log4j/companions/zeroconf/trunk: build.xml pom.xml src/site/apt/roadmap.apt

Author: carnold
Date: Fri Jul 20 18:03:55 2007
New Revision: 558217

URL: http://svn.apache.org/viewvc?view=rev&rev=558217
Log:
Bug 37930: web site staging to SVN repo

Modified:
    logging/log4j/companions/zeroconf/trunk/build.xml
    logging/log4j/companions/zeroconf/trunk/pom.xml
    logging/log4j/companions/zeroconf/trunk/src/site/apt/roadmap.apt

Modified: logging/log4j/companions/zeroconf/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/zeroconf/trunk/build.xml?view=diff&rev=558217&r1=558216&r2=558217
==============================================================================
--- logging/log4j/companions/zeroconf/trunk/build.xml (original)
+++ logging/log4j/companions/zeroconf/trunk/build.xml Fri Jul 20 18:03:55 2007
@@ -55,6 +55,10 @@
     <property name="javac.target" value="1.1"/>   
     <property name="javac.deprecation" value="true"/>
     <property name="javac.debug" value="true"/>
+	
+    <property name="svnrepo.url" value="https://svn.apache.org/repos/asf"/>
+	<property name="svnsite.url" value="${svnrepo.url}/logging/site/trunk/docs/log4j/companions/zeroconf"/>
+	<available property="svn-available" file="target/site-deploy/.svn"/>	
        
     <target name="init"/>
     
@@ -119,5 +123,33 @@
     	    <formatter type="plain" usefile="false"/>
     	</junit>
     </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/companions/zeroconf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/companions/zeroconf/trunk/pom.xml?view=diff&rev=558217&r1=558216&r2=558217
==============================================================================
--- logging/log4j/companions/zeroconf/trunk/pom.xml (original)
+++ logging/log4j/companions/zeroconf/trunk/pom.xml Fri Jul 20 18:03:55 2007
@@ -114,12 +114,39 @@
                 <tasks>
                     <taskdef name="replaceregexp" classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp" />                
                    <replaceregexp file="target/site/source-repository.html" match="/tags/[^ ]*" replace="/trunk" 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>
+              <goal>run</goal>
+            </goals>
+          </execution>		  
         </executions>
        <dependencies>
           <dependency>
@@ -242,7 +269,7 @@
     </repository>
     <site>
       <id>logging.site</id>
-      <url>scp://people.apache.org/www/logging.apache.org/log4j/companions/zeroconf</url>
+      <url>scp://localhost/${user.dir}/target/site-deploy</url>
     </site>
   </distributionManagement> 
 </project>

Modified: logging/log4j/companions/zeroconf/trunk/src/site/apt/roadmap.apt
URL: http://svn.apache.org/viewvc/logging/log4j/companions/zeroconf/trunk/src/site/apt/roadmap.apt?view=diff&rev=558217&r1=558216&r2=558217
==============================================================================
--- logging/log4j/companions/zeroconf/trunk/src/site/apt/roadmap.apt (original)
+++ logging/log4j/companions/zeroconf/trunk/src/site/apt/roadmap.apt Fri Jul 20 18:03:55 2007
@@ -15,9 +15,7 @@
  ------
  apache-log4j-zeroconf Roadmap
  ------
- Curt Arnold
  ------
- 28 June 2007
  ------
 
 apache-log4j-zeroconf Roadmap



---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org