Added several projects to "who uses log4php" section. Improved guidelines for submitting patches.
git-svn-id: https://svn.apache.org/repos/asf/logging/log4php/trunk@1231061 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/site/apt/contributingpatches.apt b/src/site/apt/contributingpatches.apt
index 440026b..93c9a5b 100644
--- a/src/site/apt/contributingpatches.apt
+++ b/src/site/apt/contributingpatches.apt
@@ -44,13 +44,17 @@
* don't use vertical alignement
- * brackets are on the same line as the method signature
+ * keep brackets on the same line as the method signature
- * brackets are on the same line as control statements
+ * keep brackets on the same line as control statements
- * always brackets for control statements
+ * always use brackets for control statements
- * don't use _ in variablenames
+ * use lowerCamelCase for naming methods and variables
+
+ * don't use underscores (_)
+
+ []
* Tabs not spaces
@@ -65,8 +69,9 @@
* Test cases
- Classes needs to be tested with PHPUnit. If you are not familiar with the principles
- of regression testing, then the JUnit or even the PHPUnit site has some good articles.
+ Classes needs to be tested with {{{https://github.com/sebastianbergmann/phpunit/}PHPUnit}}. If
+ you are not familiar with the principles of regression testing, then the
+ {{{http://www.phpunit.de/manual/3.6/en/}PHPUnit manual}} is a good place to start.
Before you submit your patch, please do a clean build of the full distribution and
run the unit tests (this can be done with <<<maven test>>>. This ensures that
@@ -78,7 +83,7 @@
* Creating a patch
- The Apache log4php source code repository holds the current source. Currently SVN is beeing used.
+ The Apache log4php {{{./source-repository.html}source code repository}} holds the current source.
Please create your patch against the latest revision of the files in the source code
repository since this makes the job of applying the patch much easier.
@@ -95,13 +100,13 @@
Try to give your patch files meaningful names. This makes it easier for
developers who need to apply a number of different patches.
-* S ubmitting a patch
+* Submitting a patch
- There are two ways to go to submit a patch:
-
- * Add the patch as an attachment to a bug report. log4php uses JIRA. Create a new bug
- report if necessary.
+ The preffered way of submitting a patch is by attaching it to a bug report in the project's
+ {{{http://logging.apache.org/log4php/issue-tracking.html} issue tracker}}. Create a new bug
+ report if necessary.
- * Mail the JIRA issue number to the dev mailing list. The email subject should describe
- what the patch does and should be prefixed by [PATCH]. Make sure that it's clear
- which component the patch is for.
+ Please make sure to mark "Grant license to ASF for inclusion in ASF works" when attaching
+ the patch. This means you agree with providing us with the code contained in the patch
+ under the {{{http://www.apache.org/licenses/LICENSE-2.0}Apache licence}}.
+
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index b8a66b5..2203536 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -59,7 +59,9 @@
The Apache log4php project
- Apache log4php\u2122 is an open source project at the {{{http://www.apache.org}Apache Software Foundation}}, a part the {{{http://logging.apache.org}Apache Logging Services}} project.
+ Apache log4php\u2122 is an open source project at the
+ {{{http://www.apache.org}Apache Software Foundation}}, a part the
+ {{{http://logging.apache.org}Apache Logging Services}} project.
Apache log4php\u2122 graduated in March 2010.
@@ -71,23 +73,32 @@
* {{{http://cmsmadesimple.org}CMS Made Simple}} - an open source (GPL) CMS
+ * {{{http://marcelog.github.com/Ding/}Ding}} - a dependency injection, AOP, and MVC container, with features
+ similar to the Spring Framework
+
* {{{http://sourceforge.net/projects/helpzilla/}Helpzilla}} - interactive solutions for customer care
- * {{{http://www.imento.dk}Imento}} - A danish company which uses log4php in their commercial
+ * {{{http://www.imento.dk}Imento}} - a danish company which uses log4php in their commercial
MVC framework
* {{{http://www.paloose.org}Paloose}} - a simplified version of Cocoon using PHP
- * {{{http://piwi.googlecode.com/}PIWI Framework}} - A framework for quick website building and
+ * {{{http://marcelog.github.com/PAMI/}PAMI}} / {{{http://marcelog.github.com/PAGI/}PAGI}} - OOP clients for the
+ Asterisk Manager Protocol and the Asterisk Gateway Protocol, implemented in PHP.
+
+ * {{{http://piwi.googlecode.com/}PIWI Framework}} - a framework for quick website building and
PHP Dependency Injection similar to Apache Cocoon and Apache Forrest.
- * {{{http://code.google.com/p/scalr/}Scalr}} - a fully redundant, self-curing and self-scaling hosting environment using Amazon's EC2
+ * {{{http://code.google.com/p/scalr/}Scalr}} - a fully redundant, self-curing and self-scaling hosting environment
+ using Amazon's EC2
- * {{{http://www.sitesupra.com/}SiteSupra}} - enterprise PHP platform
+ * {{{http://www.sitesupra.com/}SiteSupra}} - an enterprise PHP platform
* {{{http://www.sugarcrm.com}SugarCRM}} - low-cost customer relationship management solutions
* {{{http://www.vtiger.com}vtiger}} - an open source CRM
+ []
+
If you think that you should be on this list, please let us know by sending a
message to the {{{./mail-lists.html}log4php user lists}}.
