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 ca...@apache.org on 2008/01/08 07:32:21 UTC
svn commit: r609885 - in /incubator/log4php/trunk: INSTALL NOTICE README
build.xml pom.xml src/assembly/bin.xml src/changes/changes.xml
src/site/resources/images/apache-incubator-logo.png src/site/site.xml
Author: carnold
Date: Mon Jan 7 22:32:20 2008
New Revision: 609885
URL: http://svn.apache.org/viewvc?rev=609885&view=rev
Log:
LOG4PHP-3: Update Maven assembly, site, et al
Added:
incubator/log4php/trunk/src/site/resources/images/apache-incubator-logo.png
- copied unchanged from r609765, incubator/public/trunk/site-author/images/apache-incubator-logo.png
Modified:
incubator/log4php/trunk/INSTALL
incubator/log4php/trunk/NOTICE
incubator/log4php/trunk/README
incubator/log4php/trunk/build.xml
incubator/log4php/trunk/pom.xml
incubator/log4php/trunk/src/assembly/bin.xml
incubator/log4php/trunk/src/changes/changes.xml
incubator/log4php/trunk/src/site/site.xml
Modified: incubator/log4php/trunk/INSTALL
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/INSTALL?rev=609885&r1=609884&r2=609885&view=diff
==============================================================================
--- incubator/log4php/trunk/INSTALL (original)
+++ incubator/log4php/trunk/INSTALL Mon Jan 7 22:32:20 2008
@@ -1,3 +1,17 @@
+ 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.
------------------------------------------------------------------------------
INSTALLATION
Modified: incubator/log4php/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/NOTICE?rev=609885&r1=609884&r2=609885&view=diff
==============================================================================
--- incubator/log4php/trunk/NOTICE (original)
+++ incubator/log4php/trunk/NOTICE Mon Jan 7 22:32:20 2008
@@ -1,16 +1,6 @@
- **
- ** NOTICE file corresponding to the section 4 (d) of the Apache License,
- ** Version 2.0, in this case for the Apache log4net distribution.
- **
+Apache log4php
+Copyright 2004-2007 The Apache Software Foundation
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the LICENSE files present in the root directory of this
- distribution.
-
- The names "log4php" and "Apache Software Foundation" must not be used to
- endorse or promote products derived from this software without prior
- written permission. For written permission, please contact
- apache@apache.org.
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
Modified: incubator/log4php/trunk/README
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/README?rev=609885&r1=609884&r2=609885&view=diff
==============================================================================
--- incubator/log4php/trunk/README (original)
+++ incubator/log4php/trunk/README Mon Jan 7 22:32:20 2008
@@ -1,25 +1,9 @@
-===============================================================================
- log4php
-===============================================================================
-
-Summary
-
- Log4php is a php port of the most popular java logging framework log4j
- (see http://logging.apache.org/log4j/docs for details).
-
-Installation
-
- See INSTALL file.
-
-Documentation
-
- . Main documentation in docs/
-
- . API documentation in docs/api
-
- . Log4j documentation at
- http://logging.apache.org/log4j/docs/documentation.html
-
--------------------------------------------------------------------------------
-$Revision$
--------------------------------------------------------------------------------
\ No newline at end of file
+Apache log4php is an effort undergoing incubation at The Apache
+Software Foundation (ASF), sponsored by the Logging Services Project.
+Incubation is required of all newly accepted projects until a further
+review indicates that the infrastructure, communications, and
+decision making process have stabilized in a manner consistent
+with other successful ASF projects. While incubation status
+is not necessarily a reflection of the completeness or
+stability of the code, it does indicate that the project has yet
+to be fully endorsed by the ASF.
Modified: incubator/log4php/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/build.xml?rev=609885&r1=609884&r2=609885&view=diff
==============================================================================
--- incubator/log4php/trunk/build.xml (original)
+++ incubator/log4php/trunk/build.xml Mon Jan 7 22:32:20 2008
@@ -60,7 +60,7 @@
See http://www.phpunit.de -->
<!-- TODO: change dir to "target", needs changes in some tests -->
<mkdir dir="target"/>
- <exec executable="phpunit" failonerror="true" dir="src/test/php">
+ <exec executable="PHPUnit" failonerror="true" dir="src/test/php">
<arg value="AllTests"/>
<arg value="AllTests.php"/>
</exec>
Modified: incubator/log4php/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/pom.xml?rev=609885&r1=609884&r2=609885&view=diff
==============================================================================
--- incubator/log4php/trunk/pom.xml (original)
+++ incubator/log4php/trunk/pom.xml Mon Jan 7 22:32:20 2008
@@ -35,6 +35,9 @@
<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://markmail.org/search/list:org.apache.logging.log4php-user</otherArchive>
+ </otherArchives>
</mailingList>
<mailingList>
<name>log4php-dev</name>
@@ -42,6 +45,9 @@
<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://markmail.org/search/list:org.apache.logging.log4php-dev</otherArchive>
+ </otherArchives>
</mailingList>
</mailingLists>
<licenses>
@@ -76,7 +82,7 @@
<id>compile</id>
<configuration>
<tasks>
- <ant target="compile"/>
+ <ant target="compile"/>
</tasks>
</configuration>
<goals>
@@ -88,7 +94,7 @@
<id>test-compile</id>
<configuration>
<tasks>
- <ant target="test-compile"/>
+ <ant target="test-compile"/>
</tasks>
</configuration>
<goals>
@@ -100,7 +106,7 @@
<id>test</id>
<configuration>
<tasks>
- <ant target="test"/>
+ <ant target="test"/>
</tasks>
</configuration>
<goals>
@@ -228,7 +234,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: incubator/log4php/trunk/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/assembly/bin.xml?rev=609885&r1=609884&r2=609885&view=diff
==============================================================================
--- incubator/log4php/trunk/src/assembly/bin.xml (original)
+++ incubator/log4php/trunk/src/assembly/bin.xml Mon Jan 7 22:32:20 2008
@@ -16,18 +16,20 @@
-->
<assembly>
- <id>bin</id>
+ <id>src</id>
<formats>
<format>zip</format>
<format>tar.gz</format>
</formats>
- <baseDirectory>apache-log4php-${project.version}</baseDirectory>
+ <baseDirectory>apache-log4php-${project.version}-incubating</baseDirectory>
<includeSiteDirectory>true</includeSiteDirectory>
<fileSets>
<fileSet>
<includes>
<include>LICENSE</include>
<include>NOTICE</include>
+ <include>README</include>
+ <include>INSTALL</include>
<include>build.xml</include>
<include>pom.xml</include>
<include>src/**</include>
Modified: incubator/log4php/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/changes/changes.xml?rev=609885&r1=609884&r2=609885&view=diff
==============================================================================
--- incubator/log4php/trunk/src/changes/changes.xml (original)
+++ incubator/log4php/trunk/src/changes/changes.xml Mon Jan 7 22:32:20 2008
@@ -21,8 +21,8 @@
</properties>
<body>
<release version="2.0" description="PHP 5 compatibility">
- <action type="fix">Maven 2.0 build</action>
- <action type="fix">Updated source file headers with current ASF notice</action>
+ <action type="fix" issue="LOG4PHP-3">Maven 2.0 build</action>
+ <action type="fix" issue="LOG4PHP-7">Updated source file headers with current ASF notice</action>
<action type="fix">PHP 5 compatibility modification.</action>
</release>
</body>
Modified: incubator/log4php/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/site/site.xml?rev=609885&r1=609884&r2=609885&view=diff
==============================================================================
--- incubator/log4php/trunk/src/site/site.xml (original)
+++ incubator/log4php/trunk/src/site/site.xml Mon Jan 7 22:32:20 2008
@@ -17,10 +17,15 @@
-->
<project name="log4php">
<bannerLeft>
- <name>Logging Services</name>
+ <name>Apache Logging Services Project</name>
<src>images/ls-logo.jpg</src>
<href>http://logging.apache.org/</href>
- </bannerLeft>
+ </bannerLeft>
+ <bannerRight>
+ <name>Apache Incubator</name>
+ <src>images/apache-incubator-logo.png</src>
+ <href>http://incubator.apache.org/</href>
+ </bannerRight>
<body>
<breadcrumbs>
<item name="Apache" href="http://www.apache.org/"/>