On Jul 5, 2007, at 4:01 AM, Knut Urdalen wrote:
Curt Arnold wrote:
Eventually, we will need to replace the old ASF copyright text
with the current license text and rearrange the directory
structure to align with Maven. However, I would like to avoid
clobbering any big pending changes that you might have in your
local copies. If you have big uncommitted changes, speak up.
Otherwise I'll likely run copy2license on the code tomorrow and
make some directory moves.
I have the PHP 5 port on my hard drive waiting to commit (including
examples for most appenders). I would like to rearrange the
directory structure and get the right code in place.
I'll hold off until after you made your commits.
Could you describe the changes that you have made in your local copy
and/or provide a diff file? Are they all syntactical changes or did
you make syntax and functional changes and they are currently mixed.
If so, then it may be good to try to separate them into separate bug
reports and separate commits.
The content of the src/log4php and src/php5/log4php are very
similar in content. The src/php5/log4php contains additional
visibility qualifiers (protected and the like) and a few minor
code changes. Looks like that was a little in-project branch of
the code base. Continued PHP 4 development seems of little
interest, so I was thinking that the branches should be merged.
What I was anticipating was:
Run copy2license.pl to change the source headers.
Move src/log4php to src/main/php
Tag a last PHP 4 version which could serve as the base for a PHP 4
branch if one is ever desired.
Patch src/main/php so that it is equivalent (other than white-
space issues) with src/php5/log4php.
Remove src/php5/log4php
Yes, I don't want to have php4 and php5 directories. Is "src/main/
php" required for the maven layout? Else I would prefer to just
keep "src".
It is not essential that you follow the Maven standard directory
structure, but it is very beneficial and simpler to follow the
standard layout. The standard directory structure for Maven projects
is described at http://maven.apache.org/guides/introduction/
introduction-to-the-standard-directory-layout.html.
I'd think we'd end up with the follow structure:
LICENSE
NOTICE
src
assembly - assembly descriptors (describes what goes in
distribution .tar.gz and .zip's)
changes/changes.xml - change log
main - all source files needed to produce the log4php library/
module/whatever
php - all PHP source files for module
resources - all non-PHP source files for module
site - all source files for documentation and website
apt - all APT sources
fml - all FAQ ML sources
resources - all images, etc
xdoc - all xdoc sources
test - all source files for unit tests
target - build directory, not in SVN
Don't make any directory moves in your initial commit. I'd expect to
make the moves at the same time setting up the Maven build file.
