Author: carnold
Date: Fri Feb 22 07:47:45 2008
New Revision: 630227
URL: http://svn.apache.org/viewvc?rev=630227&view=rev
Log:
LOGCXX-62: log4cxx 0.10.0 release prep
Added:
logging/log4cxx/trunk/src/site/resources/.htaccess
Modified:
logging/log4cxx/trunk/build.xml
logging/log4cxx/trunk/pom.xml
logging/log4cxx/trunk/src/site/apt/building/ant.apt
logging/log4cxx/trunk/src/site/apt/building/autotools.apt
logging/log4cxx/trunk/src/site/apt/building/maven.apt
logging/log4cxx/trunk/src/site/apt/building/xcode.apt
Modified: logging/log4cxx/trunk/build.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/build.xml?rev=630227&r1=630226&r2=630227&view=diff
==============================================================================
--- logging/log4cxx/trunk/build.xml (original)
+++ logging/log4cxx/trunk/build.xml Fri Feb 22 07:47:45 2008
@@ -101,12 +101,7 @@
<property name="with-ODBC" value="no"/>
-<property name="apache.mirror" value="http://archive.apache.org/dist"/>
-
-<property name="apache.dist" value="http://archive.apache.org/dist"/>
-<!-- property name="apache.doc_dest" value="/www/logging.apache.org/log4cxx"/
-->
-<property name="apache.doc_dest"
value="/home/${apache.user}/public_html/test"/>
-
+<property name="svnsite.url"
value="https://svn.apache.org/repos/asf/logging/site/trunk/docs/log4cxx"/>
@@ -1099,7 +1094,6 @@
</antcall>
<antcall target="build-projects-xcode">
</antcall>
- <taskdef name="foreach" classname="net.sf.antcontrib.logic.ForEach" />
<replaceregexp flags="ig"
match="ADD LINK32 .*/NOLOGO"
@@ -1121,11 +1115,15 @@
replace="..\\\\..\\\\apr-util\\\\xml\\\\expat\\\\lib\\\\xml.dsp">
<fileset dir="${target.dir}" includes="**/*.dsw"/>
</replaceregexp>
- <!-- drop our build path out of library search path -->
- <replace dir="${target.dir}" includes="**/*.pbxproj">
- <replacetoken><string>debug/shared</string></replacetoken>
- <replacevalue></replacevalue>
- </replace>
+ <!-- drop library search path -->
+ <replaceregexp flags="g"
+ match="<string>[\./]*/usr/lib</string>"
+ replace="">
+ <fileset dir="${target.dir}" includes="**/*.pbxproj"/>
+ </replaceregexp>
+ <replace dir="${target.dir}" includes="**/*.pbxproj"
+ token="/usr/include/apr-1.0"
+ value="/usr/include/apr-1"/>
<replace dir="${target.dir}/site" includes="**/*.html">
<replacetoken><html</replacetoken>
<replacevalue><!--
Modified: logging/log4cxx/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/pom.xml?rev=630227&r1=630226&r2=630227&view=diff
==============================================================================
--- logging/log4cxx/trunk/pom.xml (original)
+++ logging/log4cxx/trunk/pom.xml Fri Feb 22 07:47:45 2008
@@ -242,7 +242,7 @@
<distributionManagement>
<site>
<id>logging.site</id>
- <url>scp://localhost/${user.dir}/target/site-deploy</url>
+ <url>file:///${user.dir}/target/site-deploy</url>
</site>
</distributionManagement>
</project>
Modified: logging/log4cxx/trunk/src/site/apt/building/ant.apt
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/apt/building/ant.apt?rev=630227&r1=630226&r2=630227&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/site/apt/building/ant.apt (original)
+++ logging/log4cxx/trunk/src/site/apt/building/ant.apt Fri Feb 22 07:47:45 2008
@@ -41,8 +41,10 @@
Building and testing log4cxx on a Unix platform with packaged APR and
APR-Util.
+----+
- sudo apt-get install libapr1-dev libaprutil1-dev ant ant-optional
liblog4j1.2-java # or platform equivalent
- export
CLASSPATH=/home/myself/cpptasks-1.0b5/cpptasks.jar:/home/myself/ant-contrib/ant-contrib-1.0b3.jar
+ sudo apt-get install libapr1.0-dev libaprutil1.0-dev \
+ ant ant-optional liblog4j1.2-java
+ export CLASSPATH=~/cpptasks/cpptasks-1.0b5.jar: \
+ ~/ant-contrib/ant-contrib-1.0b3.jar
cd apache-log4cxx-0.10.0
ant
+----+
@@ -50,8 +52,9 @@
Building and testing log4cxx on a Unix platform with APR and APR-Util built
from source.
+----+
- sudo apt-get install ant ant-optional liblog4j1.2-java # or platform
equivalent
- export
CLASSPATH=/home/myself/cpptasks-1.0b5/cpptasks.jar:/home/myself/ant-contrib/ant-contrib-1.0b3.jar
+ sudo apt-get install ant ant-optional liblog4j1.2-java
+ export CLASSPATH=~/cpptasks/cpptasks-1.0b5.jar: \
+ ~/ant-contrib/ant-contrib-1.0b3.jar
tar -xvzf apr-1.2.12.tar.gz
mv apr-1.2.12 apr
tar -xvzf apr-util-1.2.12.tar.gz
@@ -64,7 +67,7 @@
+----+
set PATH=\apache-ant-1.7.0\bin;%PATH%
- set CLASSPATH=\cpptasks-1.0b5\cpptasks.jar;\ant-contrib\ant-contrib-1.0b3.jar
+ set CLASSPATH=\cpptasks\cpptasks-1.0b5.jar;\ant-contrib\ant-contrib-1.0b3.jar
tar -xvzf apr-1.2.12.tar.gz
rename apr-1.2.12 apr
tar -xvzf apr-util-1.2.12.tar.gz
Modified: logging/log4cxx/trunk/src/site/apt/building/autotools.apt
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/apt/building/autotools.apt?rev=630227&r1=630226&r2=630227&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/site/apt/building/autotools.apt (original)
+++ logging/log4cxx/trunk/src/site/apt/building/autotools.apt Fri Feb 22
07:47:45 2008
@@ -23,7 +23,7 @@
* Quick start:
+------------+
- sudo apt-get install libapr1-dev libaprutil1-dev # or platform equivalent
+ sudo apt-get install libapr1.0-dev libaprutil1.0-dev
cd apache-log4cxx-0.10.0
./autoconf.sh
./configure
@@ -103,7 +103,8 @@
make install
cd ../apache-log4cxx-0.10.0
./autogen.sh
-./configure --with-apr=/usr/local --with-apr-util=/usr/local
--with-logchar=wchar_t
+./configure --with-apr=/usr/local \
+ --with-apr-util=/usr/local --with-logchar=wchar_t
make install
+----+
Modified: logging/log4cxx/trunk/src/site/apt/building/maven.apt
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/apt/building/maven.apt?rev=630227&r1=630226&r2=630227&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/site/apt/building/maven.apt (original)
+++ logging/log4cxx/trunk/src/site/apt/building/maven.apt Fri Feb 22 07:47:45
2008
@@ -39,7 +39,7 @@
Building and testing log4cxx on a Unix platform with packaged APR and
APR-Util.
+----+
- sudo apt-get install libapr1-dev libaprutil1-dev doxygen # or platform
equivalent
+ sudo apt-get install libapr1.0-dev libaprutil1.0-dev doxygen
cd apache-log4cxx-0.10.0
export PATH=/home/myself/maven-2.0.8/bin:$PATH
mvn package
@@ -92,4 +92,4 @@
See the {{{ant.html}Apache Ant build}} for platform specific notes.
-
\ No newline at end of file
+
Modified: logging/log4cxx/trunk/src/site/apt/building/xcode.apt
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/apt/building/xcode.apt?rev=630227&r1=630226&r2=630227&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/site/apt/building/xcode.apt (original)
+++ logging/log4cxx/trunk/src/site/apt/building/xcode.apt Fri Feb 22 07:47:45
2008
@@ -40,15 +40,14 @@
(test suite and implementation in one project) in Xcode and address issues
described below.
- Select the executable in Groups & Files and press Info and
+ Select the executable in Groups & Files and press Info and:
* In the General pane, set Working Directory to Custom with path
"../src/test/resources".
+
* In the Arguments pane, add following key value pairs to "Variables to be
set in the environment":
TOTO=wonderful, key1=value1 and key2=value2.
- Individual tests can be specified by specifying the test name in
- "Arguments to be passed on launch" Specifying "-v" as an argument
- will run the tests in a verbose mode.
+ * In the Arguments pane, add "-v" for verbose output, or individual test
names in "Arguments to be passed on launch".
*Issues
@@ -77,4 +76,4 @@
and drop on the "Link Binary with Libraries" folder
under Targets.
- See issue {{{http://issues.apache.org/jira/browse/LOGCXX-245}LOGCXX-245}}
for further information.
\ No newline at end of file
+ See issue {{{http://issues.apache.org/jira/browse/LOGCXX-245}LOGCXX-245}}
for further information.
Added: logging/log4cxx/trunk/src/site/resources/.htaccess
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/site/resources/.htaccess?rev=630227&view=auto
==============================================================================
--- logging/log4cxx/trunk/src/site/resources/.htaccess (added)
+++ logging/log4cxx/trunk/src/site/resources/.htaccess Fri Feb 22 07:47:45 2008
@@ -0,0 +1,29 @@
+# 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.
+
+<IfModule mod_rewrite.c>
+ RewriteEngine on
+ #
+ # rewrite site requests to equivalent new URLs
+ #
+ RewriteRule ^contributing\.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 ^ChangeLog$
http://logging.apache.org/log4cxx/changes-report.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]
+ RewriteRule ^manual\.html/(.*)$ http://logging.apache.org/log4cxx/apidocs/$1
[R=permanent,L]
+</IfModule>
