Author: carnold
Date: Fri Feb 22 23:11:44 2008
New Revision: 630402
URL: http://svn.apache.org/viewvc?rev=630402&view=rev
Log:
log4cxx 0.10.0-rc2 prep
Modified:
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/pom.xml
logging/log4cxx/trunk/src/ant/find-apr-util.xml
logging/log4cxx/trunk/src/ant/find-apr.xml
logging/log4cxx/trunk/src/site/resources/.htaccess
Modified: logging/log4cxx/trunk/build.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?rev=630402&r1=630401&r2=630402&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Fri Feb 22 23:11:44 2008
@@ -78,7 +78,7 @@
<property name="tests.resources.dir" location="${tests.dir}/resources"/>
<property name="tests.output.dir" location="${tests.resources.dir}/output"/>
<property name="m2_repo" location="${user.home}/.m2/repository"/>
-<property name="log4j.version" value="1.2.15"/>
+<property name="log4j.version" value="1.2.14"/>
<available property="log4j.jar"
value="/usr/share/java/log4j-1.2.jar"
file="/usr/share/java/log4j-1.2.jar"/>
@@ -87,7 +87,6 @@
<property name="doxygen.exe" value="doxygen"/>
-<property name="enable_dot" value="YES"/>
<property name="lib.name" value="log4cxx"/>
<property name="lib.prefix" value=""/>
@@ -1071,7 +1070,6 @@
<replace file="${target.dir}/Doxyfile">
<replacefilter token="@VERSION@" value="${version}"/>
<replacefilter token="@base_dir@" value="${base.dir}"/>
- <replacefilter token="@enable_dot@" value="${enable_dot}"/>
<replacefilter token="@manual_dest@"
value="${base.dir}/target/site/apidocs"/>
</replace>
<mkdir dir="target/site/apidocs"/>
@@ -1084,7 +1082,19 @@
*/
/* Minimal replacement for GPL'd doxygen.css */
</echo>
-
+ <echo file="${target.dir}/site/apidocs/tabs.css">
+/*
+&license;
+*/
+/* Minimal replacement for GPL'd tabs.css */
+DIV.tabs {
+ display : none ;
+}
+</echo>
+ <!-- fix for issue http://jira.codehaus.org/browse/MSKINS-2 -->
+ <replace file="${target.dir}/site/css/maven-theme.css"
+ token="font-size: normal;"
+ value="font-size: medium;"/>
</target>
Modified: logging/log4cxx/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/pom.xml?rev=630402&r1=630401&r2=630402&view=diff
==============================================================================
--- logging/log4cxx/trunk/pom.xml (original)
+++ logging/log4cxx/trunk/pom.xml Fri Feb 22 23:11:44 2008
@@ -3,7 +3,7 @@
<groupId>log4cxx</groupId>
<artifactId>apache-log4cxx</artifactId>
<packaging>pom</packaging>
- <version>0.10.1-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<name>Apache log4cxx</name>
<description>Logging framework for C++.</description>
<url>http://logging.apache.org:80/log4cxx</url>
@@ -204,7 +204,7 @@
<plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
- <goals>site-deploy</goals>
+ <goals>site-deploy assembly:assembly</goals>
</configuration>
</plugin>
<plugin>
@@ -228,4 +228,4 @@
<url>file:///${user.dir}/target/site-deploy</url>
</site>
</distributionManagement>
-</project>
\ No newline at end of file
+</project>
Modified: logging/log4cxx/trunk/src/ant/find-apr-util.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/find-apr-util.xml?rev=630402&r1=630401&r2=630402&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/find-apr-util.xml (original)
+++ logging/log4cxx/trunk/src/ant/find-apr-util.xml Fri Feb 22 23:11:44 2008
@@ -22,9 +22,18 @@
</condition>
<condition property="apr-util.src.dir" value="${apr-util.dir}">
<available file="${apr-util.dir}/${apr-util.sample.c}"/>
- </condition>
- <condition property="apr-util.src.dir" value="../apr-util">
- <available file="../apr-util/${apr-util.sample.c}"/>
+ </condition>
+ <property name="apr-util.cwd.parent" location=".."/>
+ <condition property="apr-util.src.dir"
value="${apr-util.cwd.parent}/apr-util">
+ <available
file="${apr-util.cwd.parent}/apr-util/${apr-util.sample.c}"/>
+ </condition>
+ <property name="apr-util.cwd.grand" location="../.."/>
+ <condition property="apr-util.src.dir"
value="${apr-util.cwd.grand}/apr-util">
+ <available
file="${apr-util.cwd.grand}/apr-util/${apr-util.sample.c}"/>
+ </condition>
+ <property name="apr-util.cwd.great" location="../../.."/>
+ <condition property="apr-util.src.dir"
value="${apr-util.cwd.great}/apr-util">
+ <available
file="${apr-util.cwd.great}/apr-util/${apr-util.sample.c}"/>
</condition>
</target>
@@ -310,4 +319,4 @@
apr-util.lib.suffix=${apr-util.lib.suffix}
apr-util.lib.type=${apr-util.lib.type}
</echo>
-</target>
\ No newline at end of file
+</target>
Modified: logging/log4cxx/trunk/src/ant/find-apr.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/ant/find-apr.xml?rev=630402&r1=630401&r2=630402&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/ant/find-apr.xml (original)
+++ logging/log4cxx/trunk/src/ant/find-apr.xml Fri Feb 22 23:11:44 2008
@@ -22,9 +22,18 @@
</condition>
<condition property="apr.src.dir" value="${apr.dir}">
<available file="${apr.dir}/${apr.sample.c}"/>
- </condition>
- <condition property="apr.src.dir" value="../apr">
- <available file="../apr/${apr.sample.c}"/>
+ </condition>
+ <property name="apr.cwd.parent" location=".."/>
+ <condition property="apr.src.dir" value="${apr.cwd.parent}/apr">
+ <available file="${apr.cwd.parent}/apr/${apr.sample.c}"/>
+ </condition>
+ <property name="apr.cwd.grand" location="../.."/>
+ <condition property="apr.src.dir" value="${apr.cwd.grand}/apr">
+ <available file="${apr.cwd.grand}/apr/${apr.sample.c}"/>
+ </condition>
+ <property name="apr.cwd.great" location="../../.."/>
+ <condition property="apr.src.dir" value="${apr.cwd.great}/apr">
+ <available file="${apr.cwd.great}/apr/${apr.sample.c}"/>
</condition>
</target>
@@ -310,4 +319,4 @@
apr.lib.suffix=${apr.lib.suffix}
apr.lib.type=${apr.lib.type}
</echo>
-</target>
\ No newline at end of file
+</target>
Modified: logging/log4cxx/trunk/src/site/resources/.htaccess
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/resources/.htaccess?rev=630402&r1=630401&r2=630402&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/site/resources/.htaccess (original)
+++ logging/log4cxx/trunk/src/site/resources/.htaccess Fri Feb 22 23:11:44 2008
@@ -19,9 +19,13 @@
# rewrite site requests to equivalent new URLs
#
RewriteRule ^contributing\.html$
http://logging.apache.org/log4cxx/issue-tracking.html [R=permanent,L]
+ RewriteRule ^roadmap\.html$
http://logging.apache.org/log4cxx/issue-tracking.html [R=permanent,L]
RewriteRule ^support\.html$ http://logging.apache.org/log4cxx/index.html
[R=permanent,L]
RewriteRule ^team\.html$ http://logging.apache.org/team-list.html
[R=permanent,L]
+ RewriteRule ^performance\.html$ http://logging.apache.org/log4cxx/index.html
[R=permanent,L]
RewriteRule ^ChangeLog$
http://logging.apache.org/log4cxx/changes-report.html [R=permanent,L]
+ RewriteRule ^news$ http://logging.apache.org/log4cxx/changes-report.html
[R=permanent,L]
+ RewriteRule ^manual\.html$ http://logging.apache.org/log4cxx/index.html
[R=permanent,L]
RewriteRule ^manual/index\.html$
http://logging.apache.org/log4cxx/manual.html [R=permanent,L]
RewriteRule ^manual/(.*)$ http://logging.apache.org/log4cxx/apidocs/$1
[R=permanent,L]
RewriteRule ^manual\.html/index\.html$
http://logging.apache.org/log4cxx/manual.html [R=permanent,L]
