Author: ihabunek
Date: Sat Oct 8 14:46:14 2011
New Revision: 1180383
URL: http://svn.apache.org/viewvc?rev=1180383&view=rev
Log:
Site updates:
* Added Google Analytics tracking (LOG4PHP-156)
* Added privacy notice (required for GA)
* Added two images which were missing for the theme
* Minor fixes for documentation (LOG4PHP-157)
* Updated maven-site-plugin to version 3.0
Added:
logging/log4php/trunk/src/site/apt/privacy-policy.apt
logging/log4php/trunk/src/site/resources/images/collapsed.gif (with props)
logging/log4php/trunk/src/site/resources/images/expanded.gif (with props)
Modified:
logging/log4php/trunk/pom.xml
logging/log4php/trunk/src/site/apt/docs/configuration.apt
logging/log4php/trunk/src/site/site.vm
logging/log4php/trunk/src/site/site.xml
Modified: logging/log4php/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/pom.xml?rev=1180383&r1=1180382&r2=1180383&view=diff
==============================================================================
--- logging/log4php/trunk/pom.xml (original)
+++ logging/log4php/trunk/pom.xml Sat Oct 8 14:46:14 2011
@@ -290,7 +290,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.0-beta-3</version>
+ <version>3.0</version>
<configuration>
<!-- Override default rendering (only
required to add a custom footer) -->
Modified: logging/log4php/trunk/src/site/apt/docs/configuration.apt
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/apt/docs/configuration.apt?rev=1180383&r1=1180382&r2=1180383&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/apt/docs/configuration.apt (original)
+++ logging/log4php/trunk/src/site/apt/docs/configuration.apt Sat Oct 8
14:46:14 2011
@@ -156,7 +156,7 @@ log4php.appender.A1=LoggerAppenderConsol
# A1 uses PatternLayout.
log4php.appender.A1.layout=LoggerLayoutPattern
-log4php.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
+log4php.appender.A1.layout.ConversionPattern="%-4r [%t] %-5p %c %x - %m%n"
+--
Suppose we are no longer interested in seeing the output of any component
@@ -169,7 +169,7 @@ log4php.appender.A1=LoggerAppenderConsol
log4php.appender.A1.layout=LoggerLayoutPattern
# Print the date in ISO 8601 format
-log4php.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
+log4php.appender.A1.layout.ConversionPattern="%d [%t] %-5p %c - %m%n"
# Print only messages of level WARN or above in the package com.foo.
log4php.logger.com.foo=WARN
@@ -196,7 +196,7 @@ log4php.appender.stdout=LoggerAppenderCo
log4php.appender.stdout.layout=LoggerLayoutPattern
# Pattern to output the caller's file name and line number.
-log4php.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+log4php.appender.stdout.layout.ConversionPattern="%5p [%t] (%F:%L) - %m%n"
log4php.appender.R=LoggerAppenderRollingFile
log4php.appender.R.File=example.log
@@ -206,7 +206,7 @@ log4php.appender.R.MaxFileSize=100KB
log4php.appender.R.MaxBackupIndex=1
log4php.appender.R.layout=LoggerLayoutPattern
-log4php.appender.R.layout.ConversionPattern=%p %t %c - %m%n
+log4php.appender.R.layout.ConversionPattern="%p %t %c - %m%n"
+--
Calling the enhanced MyApp with the this configuration file will
Added: logging/log4php/trunk/src/site/apt/privacy-policy.apt
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/apt/privacy-policy.apt?rev=1180383&view=auto
==============================================================================
--- logging/log4php/trunk/src/site/apt/privacy-policy.apt (added)
+++ logging/log4php/trunk/src/site/apt/privacy-policy.apt Sat Oct 8 14:46:14
2011
@@ -0,0 +1,49 @@
+~~ 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.
+ ------
+ Privacy policy
+ ------
+ ------
+ ------
+
+Privacy policy
+
+ Information about your use of this website is collected using server
access logs and a tracking cookie. The
+ collected information consists of the following:
+
+ * The IP address from which you access the website;
+
+ * The type of browser and operating system you use to access our site;
+
+ * The date and time you access our site;
+
+ * The pages you visit; and
+
+ * The addresses of pages from where you followed a link to our site.
+
+ []
+
+ Part of this information is gathered using a tracking cookie set by the
+ {{{http://www.google.com/analytics/}Google Analytics}} service and
handled by Google as described in their
+ {{{http://www.google.com/privacy.html}privacy policy}}. See your
browser documentation for instructions on how to
+ disable the cookie if you prefer not to share this data with Google.
+
+ We use the gathered information to help us make our site more useful to
visitors and to better understand how
+ and when our site is used. We do not track or collect personally
identifiable information or associate gathered
+ data with any personally identifying information from other sources.
+
+ By using this website, you consent to the collection of this data in
the manner and for the purpose described
+ above.
+
\ No newline at end of file
Added: logging/log4php/trunk/src/site/resources/images/collapsed.gif
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/resources/images/collapsed.gif?rev=1180383&view=auto
==============================================================================
Binary file - no diff available.
Propchange: logging/log4php/trunk/src/site/resources/images/collapsed.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: logging/log4php/trunk/src/site/resources/images/expanded.gif
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/resources/images/expanded.gif?rev=1180383&view=auto
==============================================================================
Binary file - no diff available.
Propchange: logging/log4php/trunk/src/site/resources/images/expanded.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: logging/log4php/trunk/src/site/site.vm
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/site.vm?rev=1180383&r1=1180382&r2=1180383&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/site.vm (original)
+++ logging/log4php/trunk/src/site/site.vm Sat Oct 8 14:46:14 2011
@@ -450,6 +450,7 @@
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '$accountId']);
+ _gaq.push (['_gat._anonymizeIp']);
_gaq.push(['_trackPageview']);
(function() {
@@ -533,7 +534,7 @@
</div>
<div id="footer">
<div class="xright">
- <div class="xright">Copyright ©#copyright()#publishDate( "bottom"
$decoration.publishDate $decoration.version ) Licensed under the <a
href="http://www.apache.org/licenses/LICENSE-2.0";>Apache Software License,
Version 2.0</a>.</div><br />
+ <div class="xright">Copyright ©#copyright()#publishDate( "bottom"
$decoration.publishDate $decoration.version ) Licensed under the <a
href="http://www.apache.org/licenses/LICENSE-2.0";>Apache Software License,
Version 2.0</a>. Please read the <a
href="$relativePath/privacy-policy.html">privacy policy</a></div><br />
<div class="xright">Apache log4php, Apache, log4php, the Apache
feather logo, the Apache Logging Services project logo and the Built by Maven
logo are trademarks of The Apache Software Foundation.</div>
<div class="clear">
</div>
Modified: logging/log4php/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/site/site.xml?rev=1180383&r1=1180382&r2=1180383&view=diff
==============================================================================
--- logging/log4php/trunk/src/site/site.xml (original)
+++ logging/log4php/trunk/src/site/site.xml Sat Oct 8 14:46:14 2011
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<project name="Apache log4php"
xmlns="http://maven.apache.org/DECORATION/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
http://maven.apache.org/xsd/decoration-1.0.0.xsd";>
+<project name="Apache log4php"
xmlns="http://maven.apache.org/DECORATION/1.1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0
http://maven.apache.org/xsd/decoration-1.1.0.xsd";>
<bannerLeft>
<name>Apache Logging Services Project</name>
<src>images/ls-logo.jpg</src>
@@ -28,6 +28,8 @@
<artifactId>maven-default-skin</artifactId>
<version>1.0</version>
</skin>
+
+ <googleAnalyticsAccountId>UA-26177991-1</googleAnalyticsAccountId>
<body>
<breadcrumbs>
