You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4php-dev@logging.apache.org by gr...@apache.org on 2010/05/02 22:40:19 UTC
svn commit: r940316 - in /logging/log4php/trunk: build.xml pom.xml
Author: grobmeier
Date: Sun May 2 20:40:19 2010
New Revision: 940316
URL: http://svn.apache.org/viewvc?rev=940316&view=rev
Log:
added build script to commit generated pages to site svn
Added:
logging/log4php/trunk/build.xml (with props)
Modified:
logging/log4php/trunk/pom.xml
Added: logging/log4php/trunk/build.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/build.xml?rev=940316&view=auto
==============================================================================
--- logging/log4php/trunk/build.xml (added)
+++ logging/log4php/trunk/build.xml Sun May 2 20:40:19 2010
@@ -0,0 +1,114 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project name="logging-site" default="usage" basedir="." >
+
+ <property name="svnrepo.url" value="https://svn.apache.org/repos/asf"/>
+ <property name="svnsite.url" value="${svnrepo.url}/logging/site/trunk/docs/log4php"/>
+ <available property="svn-available" file="target/site-deploy/.svn"/>
+
+
+ <target name="usage">
+ <echo>
+ This file provides services to the Maven build and is not
+ intended for independent use.
+ </echo>
+ </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="mime=html">
+ <exec executable="svn">
+ <arg value="propset"/>
+ <arg value="svn:mime-type"/>
+ <arg value="text/html"/>
+ <arg value="${src.html}"/>
+ </exec>
+ </target>
+
+ <target name="mime=css">
+ <exec executable="svn">
+ <arg value="propset"/>
+ <arg value="svn:mime-type"/>
+ <arg value="text/css"/>
+ <arg value="${src.css}"/>
+ </exec>
+ </target>
+
+ <target name="mime=jnlp">
+ <exec executable="svn">
+ <arg value="propset"/>
+ <arg value="svn:mime-type"/>
+ <arg value="application/x-java-jnlp-file"/>
+ <arg value="${src.jnlp}"/>
+ </exec>
+ </target>
+
+
+ <target name="site-deploy">
+ <!-- Add any new files (and generate innocuous warnings for the existing content) -->
+ <delete file="target/site-deploy/svn-commit.tmp~"/>
+ <exec executable="bash" dir="target/site-deploy" failonerror="true">
+ <arg line='-c "svn add --force *"'/>
+ </exec>
+ <taskdef name="foreach" classname="net.sf.antcontrib.logic.ForEach" />
+ <foreach target="mime=html" param="src.html">
+ <path>
+ <fileset dir="target/site-deploy" includes="**/*.html" />
+ </path>
+ </foreach>
+ <foreach target="mime=css" param="src.css">
+ <path>
+ <fileset dir="target/site-deploy" includes="**/*.css"/>
+ </path>
+ </foreach>
+ <foreach target="mime=jnlp" param="src.jnlp">
+ <path>
+ <fileset dir="target/site-deploy" includes="**/*.jnlp"/>
+ </path>
+ </foreach>
+ <fixcrlf srcDir="target/site-deploy" includes="**"/>
+ <!-- requires that SVN_EDITOR, VISUAL or EDITOR being set to edit commit description -->
+ <echo>Note:
+$export SVN_EDITOR=xemacs
+
+or similar must be set so that user is prompted for commit message.</echo>
+
+ <exec executable="svn" dir="target/site-deploy" failonerror="true">
+ <arg value="commit"/>
+ <arg value="-m"/>
+ <arg value="detailled log message see source svn"/>
+ </exec>
+
+ </target>
+
+</project>
+
Propchange: logging/log4php/trunk/build.xml
------------------------------------------------------------------------------
svn:executable = *
Modified: logging/log4php/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4php/trunk/pom.xml?rev=940316&r1=940315&r2=940316&view=diff
==============================================================================
--- logging/log4php/trunk/pom.xml (original)
+++ logging/log4php/trunk/pom.xml Sun May 2 20:40:19 2010
@@ -14,7 +14,8 @@
the specific language governing permissions and limitations under the
License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.log4php</groupId>
<artifactId>apache-log4php</artifactId>
@@ -65,68 +66,68 @@
<name>Apache Software Foundation</name>
<url>http://www.apache.org</url>
</organization>
-
- <developers>
- <developer>
- <name>Alvero Carrasco</name>
- <email>alvero at apache.org</email>
- </developer>
- <developer>
- <name>Knut Urdalen</name>
- <email>kurdalen at apache.org</email>
- </developer>
- <developer>
- <name>Christian Grobmeier</name>
- <email>grobmeier at apache.org</email>
- </developer>
- <developer>
- <name>Gavin McDonald </name>
- <email>gmcdonald at apache.org</email>
- </developer>
- <developer>
- <name>Christian Hammers</name>
- <email>chammers at apache.org</email>
- </developer>
- </developers>
- <contributors>
- <contributor>
- <name>Vladimir Gorej</name>
- </contributor>
- <contributor>
- <name>Ivan Habunek</name>
- </contributor>
- <contributor>
- <name>Moritz Schmidt</name>
- </contributor>
- <contributor>
- <name>Tommy Montgomery</name>
- </contributor>
- <contributor>
- <name>Florian Platzer</name>
- </contributor>
- <contributor>
- <name>Marco Vassura</name>
- </contributor>
- <contributor>
- <name>Sergio Strampelli</name>
- </contributor>
- <contributor>
- <name>Abel Gonzalez</name>
- </contributor>
- <contributor>
- <name>Domenico Lordi</name>
- </contributor>
- <contributor>
- <name>Ilker Kiris</name>
- </contributor>
- <contributor>
- <name>Blake Watters</name>
- </contributor>
- <contributor>
- <name>Simon Wiest</name>
- </contributor>
- </contributors>
-
+
+ <developers>
+ <developer>
+ <name>Alvero Carrasco</name>
+ <email>alvero at apache.org</email>
+ </developer>
+ <developer>
+ <name>Knut Urdalen</name>
+ <email>kurdalen at apache.org</email>
+ </developer>
+ <developer>
+ <name>Christian Grobmeier</name>
+ <email>grobmeier at apache.org</email>
+ </developer>
+ <developer>
+ <name>Gavin McDonald </name>
+ <email>gmcdonald at apache.org</email>
+ </developer>
+ <developer>
+ <name>Christian Hammers</name>
+ <email>chammers at apache.org</email>
+ </developer>
+ </developers>
+ <contributors>
+ <contributor>
+ <name>Vladimir Gorej</name>
+ </contributor>
+ <contributor>
+ <name>Ivan Habunek</name>
+ </contributor>
+ <contributor>
+ <name>Moritz Schmidt</name>
+ </contributor>
+ <contributor>
+ <name>Tommy Montgomery</name>
+ </contributor>
+ <contributor>
+ <name>Florian Platzer</name>
+ </contributor>
+ <contributor>
+ <name>Marco Vassura</name>
+ </contributor>
+ <contributor>
+ <name>Sergio Strampelli</name>
+ </contributor>
+ <contributor>
+ <name>Abel Gonzalez</name>
+ </contributor>
+ <contributor>
+ <name>Domenico Lordi</name>
+ </contributor>
+ <contributor>
+ <name>Ilker Kiris</name>
+ </contributor>
+ <contributor>
+ <name>Blake Watters</name>
+ </contributor>
+ <contributor>
+ <name>Simon Wiest</name>
+ </contributor>
+ </contributors>
+
<properties>
<surefire.reports>target/surefire-reports</surefire.reports>
<coverage.report>target/site/coverage-report</coverage.report>
@@ -153,124 +154,194 @@
<artifactId>saxon</artifactId>
<version>8.7</version>
</dependency>
+
+ <!-- SITE DEPENDENCIES -->
+
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b2</version>
+ </dependency>
+
</dependencies>
<executions>
- <execution>
- <id>phplint</id>
- <phase>process-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <apply executable="php">
- <arg value="-l" />
- <fileset dir="." includes="src/**/*.php" />
- </apply>
- </tasks>
- </configuration>
- </execution>
- <!--
+ <execution>
+ <id>phplint</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <apply executable="php">
+ <arg value="-l" />
+ <fileset dir="." includes="src/**/*.php" />
+ </apply>
+ </tasks>
+ </configuration>
+ </execution>
+ <!--
To create a pear package you need the following pear artifacts installed
[exec] $ sudo pear upgrade PEAR
[exec] $ sudo pear install XML_Serializer-0.19.2
[exec] $ sudo pear install - -alldeps PEAR_PackageFileManager2
-->
- <execution>
- <id>pear-package</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <delete dir="target/pear" />
- <mkdir dir="target/pear/log4php" />
- <copy file="package.php" todir="target/pear" />
- <copy file="package-config.php" todir="target/pear" />
- <copy file="src/changes/changes.xml" todir="target/pear" />
- <copy file="CHANGELOG" todir="target/pear" />
- <copy file="LICENSE" todir="target/pear" />
- <copy file="README" todir="target/pear" />
- <copy file="NOTICE" todir="target/pear" />
- <copy todir="target/pear">
- <fileset dir="src">
- <include name="examples/**/*" />
- </fileset>
- </copy>
- <copy todir="target/pear/log4php">
- <fileset dir="src/main/php">
- <include name="**/*.php" />
- <include name="**/*.dtd" />
- </fileset>
- </copy>
- <exec executable="php" dir="target/pear">
- <arg line="-d error_reporting=6143" /> <!-- E_ALL & ~E_STRICT -->
- <arg line="../../package.php" />
- </exec>
- <exec executable="pear" dir="target/pear">
- <arg line="package" />
- </exec>
- <move tofile="target/Apache_log4php-${version}-pear.tgz">
- <fileset dir="target/pear/">
- <include name="Apache_log4php-*.tgz" />
- </fileset>
- </move>
- </tasks>
- </configuration>
- </execution>
-
-
- <!--+
- | PHPDoc must be installed for this execution
- +-->
- <execution>
+ <execution>
+ <id>pear-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete dir="target/pear" />
+ <mkdir dir="target/pear/log4php" />
+ <copy file="package.php" todir="target/pear" />
+ <copy file="package-config.php" todir="target/pear" />
+ <copy file="src/changes/changes.xml" todir="target/pear" />
+ <copy file="CHANGELOG" todir="target/pear" />
+ <copy file="LICENSE" todir="target/pear" />
+ <copy file="README" todir="target/pear" />
+ <copy file="NOTICE" todir="target/pear" />
+ <copy todir="target/pear">
+ <fileset dir="src">
+ <include name="examples/**/*" />
+ </fileset>
+ </copy>
+ <copy todir="target/pear/log4php">
+ <fileset dir="src/main/php">
+ <include name="**/*.php" />
+ <include name="**/*.dtd" />
+ </fileset>
+ </copy>
+ <exec executable="php" dir="target/pear">
+ <arg line="-d error_reporting=6143" /> <!-- E_ALL & ~E_STRICT -->
+ <arg line="../../package.php" />
+ </exec>
+ <exec executable="pear" dir="target/pear">
+ <arg line="package" />
+ </exec>
+ <move tofile="target/Apache_log4php-${version}-pear.tgz">
+ <fileset dir="target/pear/">
+ <include name="Apache_log4php-*.tgz" />
+ </fileset>
+ </move>
+ </tasks>
+ </configuration>
+ </execution>
+
+ <!--+
+ | PHPDoc must be installed for this execution
+ +-->
+ <execution>
<id>phpdoc</id>
<phase>pre-site</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
-
+
+ <tasks>
+ <mkdir dir="target/site/apidocs" />
+ <exec executable="phpdoc" failonerror="true">
+ <arg value="-d" />
+ <arg value="src/main/php" />
+ <arg value="-t" />
+ <arg value="target/site/apidocs" />
+ <arg value="-o" />
+ <arg value="HTML:frames:DOM/default" />
+ <arg value="--title" />
+ <arg value="Apache log4php ${version}" />
+ </exec>
+ </tasks>
+
+ </configuration>
+ </execution>
+
+ <!--+
+ | PHPUnit (and XDebug for the coverage report) must be installed
+ | for this execution
+ +-->
+ <execution>
+ <id>test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
<tasks>
- <mkdir dir="target/site/apidocs" />
- <exec executable="phpdoc" failonerror="true">
- <arg value="-d" />
- <arg value="src/main/php" />
- <arg value="-t" />
- <arg value="target/site/apidocs" />
- <arg value="-o" />
- <arg value="HTML:frames:DOM/default" />
- <arg value="--title" />
- <arg value="Apache log4php ${version}" />
- </exec>
- </tasks>
-
+ <mkdir dir="${surefire.reports}" />
+ <mkdir dir="${coverage.report}" />
+ <exec executable="phpunit" dir="src/test/php">
+ <arg
+ line=" --log-junit ../../../${surefire.reports}/phpunit-testresults.xml" />
+ <arg line=" --coverage-html ../../../${coverage.report}" />
+ </exec>
+ <xslt in="${surefire.reports}/phpunit-testresults.xml" out="${surefire.reports}/xslt.info"
+ style="src/test/config/phpunit_to_surefire.xslt" processor="trax">
+ <param name="outputDir" expression="${surefire.reports}" />
+ </xslt>
+ </tasks>
</configuration>
</execution>
- <!--+
- | PHPUnit (and XDebug for the coverage report) must be installed for this execution
- +-->
- <execution>
- <id>test</id>
- <phase>test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <mkdir dir="${surefire.reports}" />
- <mkdir dir="${coverage.report}" />
- <exec executable="phpunit" dir="src/test/php">
- <arg line=" --log-junit ../../../${surefire.reports}/phpunit-testresults.xml" />
- <arg line=" --coverage-html ../../../${coverage.report}" />
- </exec>
- <xslt in="${surefire.reports}/phpunit-testresults.xml" out="${surefire.reports}/xslt.info" style="src/test/config/phpunit_to_surefire.xslt" processor="trax">
- <param name="outputDir" expression="${surefire.reports}" />
- </xslt>
- </tasks>
- </configuration>
- </execution>
+
+ <!--+
+ | SITE deployment tasks
+ +-->
+ <execution>
+ <phase>site</phase>
+ <id>untag-site</id>
+ <configuration>
+ <tasks>
+ <taskdef name="replaceregexp"
+ classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp"
+ classpathref="maven.plugin.classpath" />
+ <replaceregexp file="target/site/source-repository.html"
+ match="/tags/[^ ]*" replace="/trunk" flags="g" />
+
+ </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>
</plugin>
@@ -289,14 +360,14 @@
<version>0.6</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-9</version>
- <configuration>
- <goals>site assembly:assembly</goals>
- </configuration>
- </plugin>
- </plugins>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-9</version>
+ <configuration>
+ <goals>site assembly:assembly</goals>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
</dependencies>
@@ -329,29 +400,29 @@
</reportSets>
<configuration>
<issueLinkTemplate>%URL%/browse/%ISSUE%</issueLinkTemplate>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.6</version>
- <configuration>
- <excludes>
- <exclude>.buildbot-sourcedata</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- <distributionManagement>
- <site>
- <id>logging.site</id>
- <url>file:///${user.dir}/target/site-deploy</url>
- </site>
- </distributionManagement>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.6</version>
+ <configuration>
+ <excludes>
+ <exclude>.buildbot-sourcedata</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ <distributionManagement>
+ <site>
+ <id>logging.site</id>
+ <url>file:///${user.dir}/target/site-deploy</url>
+ </site>
+ </distributionManagement>
</project>