Author: carnold
Date: Fri Jul 20 17:53:44 2007
New Revision: 558206

URL: http://svn.apache.org/viewvc?view=rev&rev=558206
Log:
Rework LS web content to use Maven

Added:
    logging/site/trunk/author/   (with props)
    logging/site/trunk/author/build.xml
      - copied, changed from r557491, logging/site/trunk/build.xml
    logging/site/trunk/author/pom.xml
      - copied, changed from r557491, logging/site/trunk/pom.xml
    logging/site/trunk/author/src/
      - copied from r557491, logging/site/trunk/src/
    logging/site/trunk/author/src/site/apt/log4j/2.0/
      - copied from r557491, logging/site/trunk/src/site/apt/sandbox/
    logging/site/trunk/author/src/site/apt/log4php/
    logging/site/trunk/author/src/site/apt/log4php/index.apt
    logging/site/trunk/author/src/site/apt/maintenance.apt
    logging/site/trunk/author/src/site/apt/site/
    logging/site/trunk/author/src/site/apt/site/binindex.apt
    logging/site/trunk/author/src/site/apt/site/bugreport.apt
    logging/site/trunk/author/src/site/resources/site/
    logging/site/trunk/author/src/site/resources/site/.htaccess
Removed:
    logging/site/trunk/author/src/site/apt/sandbox/
    logging/site/trunk/author/src/xdocs/
    logging/site/trunk/build.properties.sample
    logging/site/trunk/build.xml
    logging/site/trunk/docs/BoardReports/
    logging/site/trunk/docs/LICENSE
    logging/site/trunk/docs/css/
    logging/site/trunk/docs/images/chris.jpg
    logging/site/trunk/docs/images/paul-glezen.jpg
    logging/site/trunk/docs/images/space.gif
    logging/site/trunk/docs/site/bylaws.html
    logging/site/trunk/docs/site/cvs-repositories.html
    logging/site/trunk/docs/site/logging-site.html
    logging/site/trunk/docs/site/mailing-lists.html
    logging/site/trunk/docs/site/mission-statement.html
    logging/site/trunk/docs/site/news.html
    logging/site/trunk/docs/site/repositories.html
    logging/site/trunk/docs/site/who-we-are.html
    logging/site/trunk/lib/
    logging/site/trunk/pom.xml
    logging/site/trunk/src/
Modified:
    logging/site/trunk/author/src/site/apt/log4j/2.0/index.apt
    logging/site/trunk/author/src/site/apt/log4j/companions/index.apt
    logging/site/trunk/author/src/site/apt/log4j/index.apt
    logging/site/trunk/author/src/site/site.xml
    logging/site/trunk/author/src/site/xdoc/charter.xml
    logging/site/trunk/author/src/site/xdoc/index.xml
    logging/site/trunk/author/src/site/xdoc/news.xml

Propchange: logging/site/trunk/author/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 20 17:53:44 2007
@@ -0,0 +1 @@
+target

Copied: logging/site/trunk/author/build.xml (from r557491, logging/site/trunk/build.xml)
URL: http://svn.apache.org/viewvc/logging/site/trunk/author/build.xml?view=diff&rev=558206&p1=logging/site/trunk/build.xml&r1=557491&p2=logging/site/trunk/author/build.xml&r2=558206
==============================================================================
--- logging/site/trunk/build.xml (original)
+++ logging/site/trunk/author/build.xml Fri Jul 20 17:53:44 2007
@@ -1,79 +1,60 @@
-
-<!-- This file is an ANT build script. ANT is a Java based build tool. -->
-<!-- It is availale from http://ant.apache.org                -->
-
-
-<project name="logging-site" default="site" basedir="." >
-
-
-  <!-- The build.properties file defines the parth to local jar files -->
-  <property file="build.properties"/>
-
-  <!-- The base directory relative to which most targets are built -->
-  <property name="base" value="."/>
-
-  <!-- Destination for documentation files -->
-  <property name="docs.dest" value="./docs"/>
-
-  <!-- Source directory for xml docs -->
-  <property name="xdocs.src" value="./src/xdocs"/>
-
-  <!-- Construct classpath for building the html pages-->
-  <path id="site.classpath">
-    <fileset dir="./lib">
-      <include name="*.jar"/>
-    </fileset>
-  </path>
-
-
-  <!-- ================================================================= -->
-  <!-- Default target                                                    -->
-  <!-- ================================================================= -->
+<!--
+ 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"/>
+  <available property="svn-available" file="target/site-deploy/.svn"/>
+  
 
   <target name="usage">
     <echo>
-
-    These are the targets supported by this ANT build scpript:
-
-    site     - build Logging Services web-site
+    This file provides services to the Maven build and is not
+    intended for independent use.
     </echo>
   </target>
 
-  <!-- ============================================== -->
-  <!-- Build the site files using Anakia              -->
-  <!-- ============================================== -->
-  <target name="prepareSite">
-    <available classname="org.apache.velocity.anakia.AnakiaTask"
-      property="AnakiaTask.present">
-      <classpath refid="site.classpath"/>
-    </available>
-  </target>
-
-  <target name="checkSite" depends="prepareSite" unless="AnakiaTask.present">
-    <echo>
-      AnakiaTask is not present! Please check to make sure that
-      velocity.jar is in your classpath.
-    </echo>
-  </target>
-
-  <target name="site" depends="checkSite" if="AnakiaTask.present">
-    <taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask">
-      <classpath refid="site.classpath"/>
-    </taskdef>
-
-    <anakia basedir="${xdocs.src}" destdir="${docs.dest}/"
-      extension=".html"
-      style="site.vsl"
-      projectFile="stylesheets/project.xml"
-      excludes="**/stylesheets/**"
-      includes="**/*.xml"
-      lastModifiedCheck="true"
-      templatePath="src//xdocs/stylesheets">
-    </anakia>
-
-   
-  </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>
 

Copied: logging/site/trunk/author/pom.xml (from r557491, logging/site/trunk/pom.xml)
URL: http://svn.apache.org/viewvc/logging/site/trunk/author/pom.xml?view=diff&rev=558206&p1=logging/site/trunk/pom.xml&r1=557491&p2=logging/site/trunk/author/pom.xml&r2=558206
==============================================================================
--- logging/site/trunk/pom.xml (original)
+++ logging/site/trunk/author/pom.xml Fri Jul 20 17:53:44 2007
@@ -91,7 +91,27 @@
 		<archive>http://mail-archives.apache.org/mod_mbox/logging-log4net-dev/</archive>
 		<otherArchives>
 		    <otherArchive>http://marc.info/?l=log4net-dev</otherArchive>
-		    <!-- otherArchive>http://dir.gmane.org/gmane.comp.apache.logging.log4net.devel</otherArchive -->
+		    <otherArchive>http://dir.gmane.org/gmane.comp.apache.logging.log4net.devel</otherArchive>
+		</otherArchives>
+	</mailingList>
+	<mailingList>
+		<name>log4php-user : log4php usage</name>
+		<subscribe>log4php-user-subscribe@logging.apache.org</subscribe>
+		<unsubscribe>log4php-user-unsubscribe@logging.apache.org</unsubscribe>
+		<post>log4php-user@logging.apache.org</post>
+		<archive>http://mail-archives.apache.org/mod_mbox/logging-log4php-user/</archive>
+		<otherArchives>
+			<otherArchive>http://marc.info/?l=log4php-user</otherArchive>
+		</otherArchives>
+	</mailingList>
+	<mailingList>
+		<name>log4php-dev : log4net development</name>
+		<subscribe>log4php-dev-subscribe@logging.apache.org</subscribe>
+		<unsubscribe>log4php-dev-unsubscribe@logging.apache.org</unsubscribe>
+		<post>log4php-dev@logging.apache.org</post>
+		<archive>http://mail-archives.apache.org/mod_mbox/logging-log4php-dev/</archive>
+		<otherArchives>
+		    <otherArchive>http://marc.info/?l=log4php-dev</otherArchive>
 		</otherArchives>
 	</mailingList>
 	<mailingList>
@@ -206,6 +226,28 @@
 			<role>log4j</role>
 		</roles>
     </developer>
+    <developer>
+    	<id>alvero</id>
+    	<name>Alvero Carrasco</name>
+    	<email>alvero@apache.org</email>
+		<url>http://people.apache.org/list_C.html#alvero</url>
+		<organization>ASF</organization>
+		<organizationUrl>http://www.apache.org</organizationUrl>
+		<roles>
+			<role>log4php</role>
+		</roles>
+    </developer>
+    <developer>
+    	<id>kurdalen</id>
+    	<name>Knut Urdalen</name>
+    	<email>kurdalen@apache.org</email>
+		<url>http://people.apache.org/list_U.html#kurdalen</url>
+		<organization>ASF</organization>
+		<organizationUrl>http://www.apache.org</organizationUrl>
+		<roles>
+			<role>log4php</role>
+		</roles>
+    </developer>
  </developers>
 <licenses>
 	<license>
@@ -218,7 +260,63 @@
     <name>Apache Software Foundation</name>
     <url>http://www.apache.org</url>
 </organization>
+  <scm>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/logging/site/trunk/author</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/site/trunk/author</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/logging/site/trunk/author</url>
+  </scm>
   <build>
+      <plugins>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>site</phase>
+            <id>untag-site</id>
+            <configuration>
+                <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" />
+                </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>
+            <groupId>ant</groupId>
+            <artifactId>ant-nodeps</artifactId>
+            <version>1.6.5</version>
+          </dependency>
+        </dependencies>
+      </plugin>	 
+	  </plugins>  
   </build>
   <reporting>
     <excludeDefaults>true</excludeDefaults>
@@ -229,6 +327,7 @@
         <reportSets>
           <reportSet>
             <reports>
+              <report>scm</report>
               <report>license</report>
               <report>project-team</report>
               <report>mailing-list</report>
@@ -241,7 +340,7 @@
  <distributionManagement>
     <site>
       <id>logging.site</id>
-      <url>http://people.apache.org/www/logging.apache.org/test/</url>
+      <url>scp://localhost/${user.dir}/target/site-deploy</url>
     </site>
   </distributionManagement> 
   

Modified: logging/site/trunk/author/src/site/apt/log4j/2.0/index.apt
URL: http://svn.apache.org/viewvc/logging/site/trunk/author/src/site/apt/log4j/2.0/index.apt?view=diff&rev=558206&r1=557491&r2=558206
==============================================================================
--- logging/site/trunk/author/src/site/apt/log4j/2.0/index.apt (original)
+++ logging/site/trunk/author/src/site/apt/log4j/2.0/index.apt Fri Jul 20 17:53:44 2007
@@ -13,27 +13,12 @@
 ~~ See the License for the specific language governing permissions and
 ~~ limitations under the License.
    ---
-Apache log4j 
+Apache log4j 2.0
    ---
-Curt Arnold
    ---
-2007-05-04
   ---
 
-Apache log4j
-
-  Apache log4j has three development branches: a stable branch, {{{/1.2}1.2}}, 
-  a discontinued branch, {{{/1.3}1.3}} and an experimental branch {{{/2.0}2.0}}.
-
-  Apache log4j 1.2 releases are widely deployed.  Development on the
-  1.2 branch is generally limited to bug fixing and minor enhancements.
-
-  Apache log4j 1.3 alpha releases are
-  in limited use.  Apache log4j 1.3 added many interesting
-  features, but was compatibility with log4j 1.2
-  was problematic.  Many features original developed
-  for log4j 1.3 have been back-ported as {{{/companions}companions}} 
-  for log4j 1.2.  No further development is anticipated.
+Apache log4j 2.0
 
   Apache log4j 2.0 is an experimental development branch for
   logging services designed for Java 5 and later.

Modified: logging/site/trunk/author/src/site/apt/log4j/companions/index.apt
URL: http://svn.apache.org/viewvc/logging/site/trunk/author/src/site/apt/log4j/companions/index.apt?view=diff&rev=558206&r1=557491&r2=558206
==============================================================================
--- logging/site/trunk/author/src/site/apt/log4j/companions/index.apt (original)
+++ logging/site/trunk/author/src/site/apt/log4j/companions/index.apt Fri Jul 20 17:53:44 2007
@@ -15,9 +15,7 @@
    ---
 Apache log4j companions 
    ---
-Curt Arnold
    ---
-2007-05-04
   ---
 
 Apache log4j companions

Modified: logging/site/trunk/author/src/site/apt/log4j/index.apt
URL: http://svn.apache.org/viewvc/logging/site/trunk/author/src/site/apt/log4j/index.apt?view=diff&rev=558206&r1=557491&r2=558206
==============================================================================
--- logging/site/trunk/author/src/site/apt/log4j/index.apt (original)
+++ logging/site/trunk/author/src/site/apt/log4j/index.apt Fri Jul 20 17:53:44 2007
@@ -15,15 +15,13 @@
    ---
 Apache log4j 
    ---
-Curt Arnold
    ---
-2007-05-04
   ---
 
 Apache log4j
 
-  Apache log4j has three development branches: a stable branch, {{{/1.2}1.2}}, 
-  a discontinued branch, {{{/1.3}1.3}} and an experimental branch {{{/2.0}2.0}}.
+  Apache log4j has three development branches: a stable branch, {{{1.2/index.html}1.2}}, 
+  a discontinued branch, {{{1.3/index.html}1.3}} and an experimental branch {{{2.0/index.html}2.0}}.
 
   Apache log4j 1.2 releases are widely deployed.  Development on the
   1.2 branch is generally limited to bug fixing and minor enhancements.
@@ -32,7 +30,7 @@
   in limited use.  Apache log4j 1.3 added many interesting
   features, but was compatibility with log4j 1.2
   was problematic.  Many features original developed
-  for log4j 1.3 have been back-ported as {{{/companions}companions}} 
+  for log4j 1.3 have been back-ported as {{{companions/index.html}companions}} 
   for log4j 1.2.  No further development is anticipated.
 
   Apache log4j 2.0 is an experimental development branch for

Added: logging/site/trunk/author/src/site/apt/log4php/index.apt
URL: http://svn.apache.org/viewvc/logging/site/trunk/author/src/site/apt/log4php/index.apt?view=auto&rev=558206
==============================================================================
--- logging/site/trunk/author/src/site/apt/log4php/index.apt (added)
+++ logging/site/trunk/author/src/site/apt/log4php/index.apt Fri Jul 20 17:53:44 2007
@@ -0,0 +1,22 @@
+~~ 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.
+   ---
+log4php
+   ---
+   ---
+   ---
+
+   {{{http://incubator.apache.org/log4php}log4php}} is a logging framework for PHP 
+   currently undergoing incubation at the Apache Software Foundation.

Added: logging/site/trunk/author/src/site/apt/maintenance.apt
URL: http://svn.apache.org/viewvc/logging/site/trunk/author/src/site/apt/maintenance.apt?view=auto&rev=558206
==============================================================================
--- logging/site/trunk/author/src/site/apt/maintenance.apt (added)
+++ logging/site/trunk/author/src/site/apt/maintenance.apt Fri Jul 20 17:53:44 2007
@@ -0,0 +1,42 @@
+~~ 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.
+   ---
+Website Maintenance 
+   ---
+   ---
+   ---
+
+Website Maintenance
+
+   All Logging Services content is generated by Maven 2.0.  The site project
+   contains generic Logging Services content.  Content for a specific
+   product (for example, log4cxx) is contained within the source repository
+   for that product.  
+   
+   Running "mvn site" will generate the web content in target/site.  Running "mvn site-deploy" 
+   generate the site and commit the changes to the Apache Subversion repository.  The SVN_EDITOR
+   environment variable must be set to allow the user to provide an appropriate commit message.
+   
+   The staged content can be reviewed by browsing
+   {{{https://svn.apache.org/repos/asf/logging/site/trunk/docs}http://svn.apache.org/repos/asf/logging/site/trunk/docs}}.
+
+   To publish the staged content:
+ 
++--
+ssh -l username people.apache.org
+cd /www/logging.apache.org
+svn update
++--  
+   
\ No newline at end of file

Added: logging/site/trunk/author/src/site/apt/site/binindex.apt
URL: http://svn.apache.org/viewvc/logging/site/trunk/author/src/site/apt/site/binindex.apt?view=auto&rev=558206
==============================================================================
--- logging/site/trunk/author/src/site/apt/site/binindex.apt (added)
+++ logging/site/trunk/author/src/site/apt/site/binindex.apt Fri Jul 20 17:53:44 2007
@@ -0,0 +1,24 @@
+~~ 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.
+   ---
+Downloads
+   ---
+   ---
+   ---
+
+Downloads
+ 
+  Release Downloads have moved to individual project pages: {{{log4j/1.2/download.html}log4j 1.2}}, 
+  {{{log4j/1.3/download.html}log4j 1.3}}, {{{chainsaw/download.html}chainsaw}}, {{{log4cxx/download.html}log4cxx}}.

Added: logging/site/trunk/author/src/site/apt/site/bugreport.apt
URL: http://svn.apache.org/viewvc/logging/site/trunk/author/src/site/apt/site/bugreport.apt?view=auto&rev=558206
==============================================================================
--- logging/site/trunk/author/src/site/apt/site/bugreport.apt (added)
+++ logging/site/trunk/author/src/site/apt/site/bugreport.apt Fri Jul 20 17:53:44 2007
@@ -0,0 +1,24 @@
+~~ 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.
+   ---
+Issue Tracking
+   ---
+   ---
+   ---
+
+Issue Tracking
+ 
+   Chainsaw, log4j and the log4j companions currently use {{{http://issues.apache.org/bugzilla}Bugzilla}}
+   and log4cxx, log4net and log4php use {{{http://issues.apache.org/jira}JIRA}}.
\ No newline at end of file

Added: logging/site/trunk/author/src/site/resources/site/.htaccess
URL: http://svn.apache.org/viewvc/logging/site/trunk/author/src/site/resources/site/.htaccess?view=auto&rev=558206
==============================================================================
--- logging/site/trunk/author/src/site/resources/site/.htaccess (added)
+++ logging/site/trunk/author/src/site/resources/site/.htaccess Fri Jul 20 17:53:44 2007
@@ -0,0 +1,28 @@
+# 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 request for logging-site.html to ../maintenance.html
+  #
+  RewriteRule ^logging-site\.html$ ../maintenance.html
+  RewriteRule ^mailing-lists\.html$ ../mail-lists.html
+  RewriteRule ^who-we-are\.html$ ../team-list.html
+  RewriteRule ^cvs-repositories\.html$ ../repositories.html
+  RewriteRule ^bylaws\.html$ ../guidelines.html
+  RewriteRule ^mission-statement\.html$ ../charter.html
+  RewriteRule ^news\.html$ ../news.html
+</IfModule>

Modified: logging/site/trunk/author/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/site/trunk/author/src/site/site.xml?view=diff&rev=558206&r1=557491&r2=558206
==============================================================================
--- logging/site/trunk/author/src/site/site.xml (original)
+++ logging/site/trunk/author/src/site/site.xml Fri Jul 20 17:53:44 2007
@@ -32,7 +32,7 @@
 	   <item name="News" href="/news.html"/>
 	   <item name="Charter" href="/charter.html"/>
 	   <item name="Guidelines" href="/guidelines.html"/>
-	   <item name="PMC" href="/team-list.html"/>
+	   <item name="Team" href="/team-list.html"/>
 	   <item name="Mailing List" href="/mail-lists.html"/>
 	   <item name="License" href="/license.html"/>
 	</menu>
@@ -46,21 +46,34 @@
 			<item name="2.0" href="/log4j/2.0/index.html"/>
 			<item name="companions" collapse="false">
 				<item name="component" href="/log4j/companions/component/index.html"/>
-				<item name="filters" href="/log4j/companions/filters/index.html"/>
-				<item name="logmf" href="/log4j/companions/logmf/index.html"/>
-				<item name="logsf" href="/log4j/companions/logsf/index.html"/>
-				<item name="pattern layout" href="/log4j/companions/pattern-layout/index.html"/>
+				<item name="extras" href="/log4j/companions/extras/index.html"/>
 				<item name="receivers" href="/log4j/companions/receivers/index.html"/>
-				<item name="rolling" href="/log4j/companions/rolling/index.html"/>
+				<item name="zeroconf" href="/log4j/companions/zeroconf/index.html"/>
 			</item>
 		</item>
 	   <item name="log4net" href="/log4net"/>
 	</menu>
 	
-	<menu name="Resources">
-		<item name="Sandbox" href="/sandbox"/>
+	<menu name="Incubations">
+	   <item name="log4php" href="http://incubator.apache.org/log4php/index.html"/>
+	</menu>
+	
+	<menu name="Documentation">
 		<item name="Catalog" href="/catalog.html"/>
 		<item name="Wiki" href="http://wiki.apache.org/logging"/>
 	</menu>
+	
+	<menu name="Website">
+		<item name="Maintenance" href="/maintenance.html"/>
+		<item name="Repository" href="/source-repository.html"/>
+	</menu>
+	
+	<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>

Modified: logging/site/trunk/author/src/site/xdoc/charter.xml
URL: http://svn.apache.org/viewvc/logging/site/trunk/author/src/site/xdoc/charter.xml?view=diff&rev=558206&r1=557491&r2=558206
==============================================================================
--- logging/site/trunk/author/src/site/xdoc/charter.xml (original)
+++ logging/site/trunk/author/src/site/xdoc/charter.xml Fri Jul 20 17:53:44 2007
@@ -19,7 +19,6 @@
 <document>
   <properties>
     <title>Charter of the Logging Services PMC</title>
-    <author email="carnold@apache.org">Curt Arnold</author>
   </properties>
   <body>
 				<section name="Charter of the Logging Services PMC">

Modified: logging/site/trunk/author/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/site/trunk/author/src/site/xdoc/index.xml?view=diff&rev=558206&r1=557491&r2=558206
==============================================================================
--- logging/site/trunk/author/src/site/xdoc/index.xml (original)
+++ logging/site/trunk/author/src/site/xdoc/index.xml Fri Jul 20 17:53:44 2007
@@ -19,7 +19,6 @@
 <document>
   <properties>
     <title>Welcome to Apache Logging Services</title>
-    <author email="carnold@apache.org">Curt Arnold</author>
   </properties>
   <body>
 				<section name="Welcome to Apache Logging Services">
@@ -27,9 +26,10 @@
 	  to the logging of application behavior and released at no charge
 	  to the public.</p>
 	  
-	  <p>The products of the Apache Logging Services Project included three logging frameworks: <a href="/log4j">log4j</a>
-	  for Java, <a href="/log4cxx">log4cxx</a> for C++ and <a href="/log4net">log4net</a> for the Microsoft .NET framework
-	  and a log viewer and analysis tool: <a href="/chainsaw">Chainsaw</a>.</p> 
+	  <p>The products of the Apache Logging Services Project included three logging frameworks: <a href="log4j/index.html">log4j</a>
+	  for Java, <a href="log4cxx/index.html">log4cxx</a> for C++ and <a href="log4net/index.html">log4net</a> for the Microsoft .NET framework
+	  and a log viewer and analysis tool: <a href="chainsaw/index.html">Chainsaw</a>.</p>
+	  <p>Apache Logging Services is also sponsoring the incubation of <a href="http://incubator.apache.org/log4php">log4php</a>.</p> 
 				</section>
 			<div id="apachecon">
 				<iframe src="http://www.apache.org/ads/buttonbar.html"

Modified: logging/site/trunk/author/src/site/xdoc/news.xml
URL: http://svn.apache.org/viewvc/logging/site/trunk/author/src/site/xdoc/news.xml?view=diff&rev=558206&r1=557491&r2=558206
==============================================================================
--- logging/site/trunk/author/src/site/xdoc/news.xml (original)
+++ logging/site/trunk/author/src/site/xdoc/news.xml Fri Jul 20 17:53:44 2007
@@ -32,6 +32,12 @@
 
 <section name="News">
 
+<hr noshade="noshade" size="1"/>
+
+<h3>4 July 2007 - log4php incubation restarted.</h3>
+
+ <p>The log4php incubation has restarted with a new development team, see <a href="http://incubator.apache.org/log4php">http://incubator.apache.org/log4php</a>.</p>
+
 
 <hr noshade="noshade" size="1"/>
 
@@ -55,7 +61,7 @@
 queue becomes full, SyslogAppender can now accept a port specification, 
 SMTPAppender supports cc and bcc addresses and password authentication
 and many other bugs were resolved.
-For more details, see <a href="http://logging.apache.org/log4j/docs/download.html">
+For more details, see <a href="http://logging.apache.org/log4j/1.2/download.html">
 http://logging.apache.org/log4j/docs/download.html</a>. 
 </p>