You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by ni...@apache.org on 2004/10/31 22:14:03 UTC
svn commit: rev 56151 - in forrest/trunk: . etc etc/applied_patches etc/cocoon_upgrade forrestcore forrestcore/etc forrestcore/lib forrestcore/src/core forrestcore/src/core/bin forrestcore/tools/ant forrestcore/tools/dtdconverters forrestcore/tools/jetty forrestcore/tools/targets lib lib/core lib/endorsed lib/optional tools/ant tools/ant/bin tools/ant/lib tools/dtdconverters tools/jetty tools/targets
Author: nicolaken
Date: Sun Oct 31 13:14:02 2004
New Revision: 56151
Added:
forrest/trunk/etc/
- copied from rev 56137, forrest/trunk/forrestcore/etc/
forrest/trunk/etc/README.txt
- copied unchanged from rev 56150, forrest/trunk/forrestcore/etc/README.txt
forrest/trunk/etc/RELEASE-NOTES-0.2.1.txt
- copied unchanged from rev 56150, forrest/trunk/forrestcore/etc/RELEASE-NOTES-0.2.1.txt
forrest/trunk/etc/RELEASE-NOTES-0.2.txt
- copied unchanged from rev 56150, forrest/trunk/forrestcore/etc/RELEASE-NOTES-0.2.txt
forrest/trunk/etc/RELEASE-NOTES-0.3-dev.txt
- copied unchanged from rev 56150, forrest/trunk/forrestcore/etc/RELEASE-NOTES-0.3-dev.txt
forrest/trunk/etc/RELEASE-NOTES-0.3.txt
- copied unchanged from rev 56150, forrest/trunk/forrestcore/etc/RELEASE-NOTES-0.3.txt
forrest/trunk/etc/RELEASE-NOTES-0.4.txt
- copied unchanged from rev 56150, forrest/trunk/forrestcore/etc/RELEASE-NOTES-0.4.txt
forrest/trunk/etc/RELEASE-NOTES-0.5.1-RC1.txt
- copied unchanged from rev 56150, forrest/trunk/forrestcore/etc/RELEASE-NOTES-0.5.1-RC1.txt
forrest/trunk/etc/RELEASE-NOTES-0.5.1.txt
- copied unchanged from rev 56150, forrest/trunk/forrestcore/etc/RELEASE-NOTES-0.5.1.txt
forrest/trunk/etc/RELEASE-NOTES-0.5.txt
- copied unchanged from rev 56150, forrest/trunk/forrestcore/etc/RELEASE-NOTES-0.5.txt
forrest/trunk/etc/RELEASE-NOTES-0.6.txt
- copied unchanged from rev 56150, forrest/trunk/forrestcore/etc/RELEASE-NOTES-0.6.txt
forrest/trunk/etc/RELEASE_PROCESS.txt
- copied unchanged from rev 56150, forrest/trunk/forrestcore/etc/RELEASE_PROCESS.txt
forrest/trunk/etc/announcement-0.6.txt
- copied unchanged from rev 56150, forrest/trunk/forrestcore/etc/announcement-0.6.txt
forrest/trunk/etc/applied_patches/
- copied from rev 56150, forrest/trunk/forrestcore/etc/applied_patches/
forrest/trunk/etc/cocoon_upgrade/
- copied from rev 56150, forrest/trunk/forrestcore/etc/cocoon_upgrade/
forrest/trunk/etc/docs-review.txt
- copied unchanged from rev 56150, forrest/trunk/forrestcore/etc/docs-review.txt
forrest/trunk/etc/new-skinconf-forrest-site.xml
- copied unchanged from rev 56150, forrest/trunk/forrestcore/etc/new-skinconf-forrest-site.xml
forrest/trunk/etc/pdf_images.txt
- copied unchanged from rev 56150, forrest/trunk/forrestcore/etc/pdf_images.txt
forrest/trunk/etc/relicense-jars.txt
- copied unchanged from rev 56150, forrest/trunk/forrestcore/etc/relicense-jars.txt
forrest/trunk/etc/relicense-tree.txt
- copied unchanged from rev 56150, forrest/trunk/forrestcore/etc/relicense-tree.txt
forrest/trunk/etc/relicense.txt
- copied unchanged from rev 56150, forrest/trunk/forrestcore/etc/relicense.txt
forrest/trunk/lib/
- copied from rev 56137, forrest/trunk/forrestcore/lib/
forrest/trunk/lib/core/
- copied from rev 56150, forrest/trunk/forrestcore/lib/core/
forrest/trunk/lib/endorsed/
- copied from rev 56150, forrest/trunk/forrestcore/lib/endorsed/
forrest/trunk/lib/optional/
- copied from rev 56150, forrest/trunk/forrestcore/lib/optional/
forrest/trunk/tools/ant/
- copied from rev 56137, forrest/trunk/forrestcore/tools/ant/
forrest/trunk/tools/ant/bin/
- copied from rev 56150, forrest/trunk/forrestcore/tools/ant/bin/
forrest/trunk/tools/ant/lib/
- copied from rev 56150, forrest/trunk/forrestcore/tools/ant/lib/
forrest/trunk/tools/dtdconverters/
- copied from rev 56137, forrest/trunk/forrestcore/tools/dtdconverters/
forrest/trunk/tools/dtdconverters/README.txt
- copied unchanged from rev 56150, forrest/trunk/forrestcore/tools/dtdconverters/README.txt
forrest/trunk/tools/dtdconverters/dtdx.dtd
- copied unchanged from rev 56150, forrest/trunk/forrestcore/tools/dtdconverters/dtdx.dtd
forrest/trunk/tools/dtdconverters/dtdx2dtd.xsl
- copied unchanged from rev 56150, forrest/trunk/forrestcore/tools/dtdconverters/dtdx2dtd.xsl
forrest/trunk/tools/jetty/
- copied from rev 56137, forrest/trunk/forrestcore/tools/jetty/
forrest/trunk/tools/jetty/jetty-4.2.19.jar
- copied unchanged from rev 56150, forrest/trunk/forrestcore/tools/jetty/jetty-4.2.19.jar
forrest/trunk/tools/jetty/servlet-2.3.jar
- copied unchanged from rev 56150, forrest/trunk/forrestcore/tools/jetty/servlet-2.3.jar
forrest/trunk/tools/targets/
- copied from rev 56137, forrest/trunk/forrestcore/tools/targets/
forrest/trunk/tools/targets/patch.xml
- copied unchanged from rev 56150, forrest/trunk/forrestcore/tools/targets/patch.xml
Removed:
forrest/trunk/forrestcore/etc/
forrest/trunk/forrestcore/lib/
forrest/trunk/forrestcore/tools/ant/
forrest/trunk/forrestcore/tools/dtdconverters/
forrest/trunk/forrestcore/tools/jetty/
forrest/trunk/forrestcore/tools/targets/
Modified:
forrest/trunk/ (props changed)
forrest/trunk/forrestcore/build.bat
forrest/trunk/forrestcore/build.sh
forrest/trunk/forrestcore/build.xml
forrest/trunk/forrestcore/src/core/bin/forrest
forrest/trunk/forrestcore/src/core/bin/forrest.bat
forrest/trunk/forrestcore/src/core/forrest.build.xml
Log:
Modified: forrest/trunk/forrestcore/build.bat
==============================================================================
--- forrest/trunk/forrestcore/build.bat (original)
+++ forrest/trunk/forrestcore/build.bat Sun Oct 31 13:14:02 2004
@@ -14,7 +14,7 @@
rem limitations under the License.
set OLD_ANT_HOME=%ANT_HOME%
-set ANT_HOME=tools\ant
+set ANT_HOME=..\tools\ant
set OLD_CLASSPATH=%CLASSPATH%
set CLASSPATH=
Modified: forrest/trunk/forrestcore/build.sh
==============================================================================
--- forrest/trunk/forrestcore/build.sh (original)
+++ forrest/trunk/forrestcore/build.sh Sun Oct 31 13:14:02 2004
@@ -35,7 +35,7 @@
export CLASSPATH
echo "Using classpath: $CLASSPATH"
-"$PWD/./tools/ant/bin/ant" -logger org.apache.tools.ant.NoBannerLogger -emacs $@
+"$PWD/../tools/ant/bin/ant" -logger org.apache.tools.ant.NoBannerLogger -emacs $@
unset CLASSPATH
Modified: forrest/trunk/forrestcore/build.xml
==============================================================================
--- forrest/trunk/forrestcore/build.xml (original)
+++ forrest/trunk/forrestcore/build.xml Sun Oct 31 13:14:02 2004
@@ -33,15 +33,15 @@
<property name="forrest.version" value="0.7-dev"/>
<property name="java.dir" location="src/java"/>
- <property name="plugins.dir" location="plugins"/>
- <property name="build.dir" location="build"/>
+ <property name="plugins.dir" location="../plugins"/>
+ <property name="build.dir" location="../build"/>
<property name="build.docs" location="${build.dir}/docs"/>
<property name="build.classes" location="${build.dir}/classes"/>
<property name="dist.dir" location="${build.dir}/dist" />
<property name="dist-shbat.dir" location="${dist.dir}/shbat" />
- <property name="tools.dir" location="tools"/>
+ <property name="tools.dir" location="../tools"/>
<property name="tools.jar" location="${java.home}/../lib/tools.jar"/>
<available file="${tools.jar}" property="tools.jar.present"/>
@@ -69,7 +69,7 @@
<mkdir dir="${build.dir}"/>
<path id="classpath">
- <fileset dir="lib" includes="**/*.jar"/>
+ <fileset dir="../lib" includes="**/*.jar"/>
<fileset dir="${tools.dir}/jetty" includes="servlet*.jar"/>
<pathelement location="${tools.jar}"/>
</path>
Modified: forrest/trunk/forrestcore/src/core/bin/forrest
==============================================================================
--- forrest/trunk/forrestcore/src/core/bin/forrest (original)
+++ forrest/trunk/forrestcore/src/core/bin/forrest Sun Oct 31 13:14:02 2004
@@ -59,7 +59,7 @@
# Save old ANT_HOME
OLD_ANT_HOME="$ANT_HOME"
unset ANT_HOME
-ANT_HOME="$FORREST_HOME/../../tools/ant"
+ANT_HOME="$FORREST_HOME/../../../tools/ant"
# ----- Set Up The Runtime Classpath ------------------------------------------
Modified: forrest/trunk/forrestcore/src/core/bin/forrest.bat
==============================================================================
--- forrest/trunk/forrestcore/src/core/bin/forrest.bat (original)
+++ forrest/trunk/forrestcore/src/core/bin/forrest.bat Sun Oct 31 13:14:02 2004
@@ -33,7 +33,7 @@
rem ----- Save old ANT_HOME --------------------------------------------
set OLD_ANT_HOME=%ANT_HOME%
-set ANT_HOME=%FORREST_HOME%\..\..\tools\ant
+set ANT_HOME=%FORREST_HOME%\..\..\..\tools\ant
rem ----- Save and set CLASSPATH --------------------------------------------
set OLD_CLASSPATH=%CLASSPATH%
Modified: forrest/trunk/forrestcore/src/core/forrest.build.xml
==============================================================================
--- forrest/trunk/forrestcore/src/core/forrest.build.xml (original)
+++ forrest/trunk/forrestcore/src/core/forrest.build.xml Sun Oct 31 13:14:02 2004
@@ -30,15 +30,15 @@
<property name="forrest.home" location="${basedir}" />
<property name="forrest.root-dir" location="${forrest.home}/../.."/>
- <property name="forrest.lib-dir" location="${forrest.root-dir}/lib"/>
+ <property name="forrest.lib-dir" location="${forrest.root-dir}/../lib"/>
<property name="forrest.core.lib-dir" location="${forrest.lib-dir}/core"/>
<property name="forrest.endorsed.lib-dir" location="${forrest.lib-dir}/endorsed"/>
<property name="forrest.optional.lib-dir" location="${forrest.lib-dir}/optional"/>
- <property name="forrest.ant.lib-dir" location="${forrest.root-dir}/tools/ant/lib"/>
- <property name="forrest.jetty.lib-dir" location="${forrest.root-dir}/tools/jetty"/>
+ <property name="forrest.ant.lib-dir" location="${forrest.root-dir}/../tools/ant/lib"/>
+ <property name="forrest.jetty.lib-dir" location="${forrest.root-dir}/../tools/jetty"/>
- <property name="forrest.build.lib-dir" location="${forrest.root-dir}/build"/>
+ <property name="forrest.build.lib-dir" location="${forrest.root-dir}/../build"/>
<import file="targets/validate.xml"/>
<import file="targets/webapp.xml"/>
@@ -98,7 +98,7 @@
<!-- people should use forrest.properties to override following defaults -->
<property name="forrest.skins-dir" location="${forrest.home}/context/skins"/>
- <property name="forrest.plugins-dir" location="${forrest.home}/../../plugins"/>
+ <property name="forrest.plugins-dir" location="${forrest.home}/../../../build/plugins"/>
<property name="project.site-dir" location="${project.build-dir}/site" />
<property name="project.war" location="${project.build-dir}/${project.name}.war" />
<property name="project.webapp" location="${project.build-dir}/webapp" />
Re: svn commit: rev 56151 - in forrest/trunk: . etc etc/applied_patches etc/cocoon_upgrade forrestcore forrestcore/etc forrestcore/lib forrestcore/src/core forrestcore/src/core/bin forrestcore/tools/ant forrestcore/tools/dtdconverters forrestcore/too
Posted by Diwaker Gupta <di...@gmail.com>.
> That means _moving_ legal, lib, etc and tools in the base Forrest dir.
> I'm also getting ready to move the bin dir in the root (as already
> discussed).
I don't know if you're planning to fix this, but the current build.xml
is broken:
<snip>
<property name="build.dir" location="../build"/>
</snip>
$ ./build.sh
BUILD FAILED
/home/diwaker/software/forrest/forrestcore/build.xml:52:
/home/diwaker/software/forrest/build/build.number doesn't exist and
new file can't be created.
Manually creating the build directory fixes this. A better solution of
course is to create the directory if it doesn't exist. The <mkdir>
target is already there, but it gets called *after* the <buildnumber>
target, which obviously fails since the directory doesn't exist yet.
This fixes it:
Index: build.xml
===================================================================
--- build.xml (revision 56161)
+++ build.xml (working copy)
@@ -49,6 +49,8 @@
<property name="forrestbot.dir" location="../tools/forrestbot"/>
+ <mkdir dir="${build.dir}"/>
+
<buildnumber file="${build.dir}/build.number"/>
<echo>
--------------------------------------------------------------
@@ -66,8 +68,6 @@
--------------------------------------------------------------
</echo>
- <mkdir dir="${build.dir}"/>
-
<path id="classpath">
<fileset dir="../lib" includes="**/*.jar"/>
<fileset dir="${tools.dir}/jetty" includes="servlet*.jar"/>
--
Diwaker Gupta
http://resolute.ucsd.edu/diwaker
Re: svn commit: rev 56151 - in forrest/trunk: . etc etc/applied_patches
etc/cocoon_upgrade forrestcore forrestcore/etc forrestcore/lib forrestcore/src/core
forrestcore/src/core/bin forrestcore/tools/ant forrestcore/tools/dtdconverters
forrestcore/tools/jetty forrestcore/tools/targets lib lib/core lib/endorsed
lib/optional tools/ant tools/ant/bin tools/ant/lib tools/dtdconverters
tools/jetty tools/targets
Posted by Nicola Ken Barozzi <ni...@apache.org>.
Dave Brondsema wrote:
> Nicola Ken Barozzi wrote:
...
>> Are the other moves not ok? IMHO they are a natural part of the
>> restructure we voted, that's why I'm doing it.
>
> Nobody mentioned legal, lib, etc, or ant in the restructuring threads.
> I had understood the restructuring to be so that our subprojects could
> be independent of each other
I disagree in part. See below.
> , and your changes are reverting that. As a
> TLP we can be composed solely of related subprojects (like XML or
> Jakarta does) with no master project.
Again I disagree. Jakarta and XML are an old example of umbrella project
that is being abandoned. Forrest for example is not under XML anymore.
> Some advantages to this would be:
> * seperate, smaller releases (we can still do one giant release if we want)
> * you can check out just "forrestcore" from SVN or just "forrestbot" for
> example, and keep the others at a stable release
> * easier to manage jar dependencies (what if subprojects need different
> versions?)
You can still do the above. What of the current move makes the above
impossible?
(Note that the change is not complete, and I still have to put in the
code to have each subproject explicity define the jars needed)
> * common files at the top of our SVN tree instead of within subprojects
> can be confusing, especially if they don't relate to some subprojects
Do you refer to etc only or also other parts?
> Disadvantages:
> * some jar files will be duplicated within subprojects
> * some subprojects do depend on files from forrestcore. Using
> $FORREST_HOME to locate it should work, but might be a pain sometimes.
My reasoning was to eliminate these disadvantages, and on the fact that
we had said that we wanted a single bin dir with a single forrest script.
I'm sorry that I am causing confusion, probably we have not been clear
enough in defining all the moves to do. I'm sure that in a couple of
mails we can have the best solution.
--
Nicola Ken Barozzi nicolaken@apache.org
- verba volant, scripta manent -
(discussions get forgotten, just code remains)
---------------------------------------------------------------------
Re: svn commit: rev 56151 - in forrest/trunk: . etc etc/applied_patches
etc/cocoon_upgrade forrestcore forrestcore/etc forrestcore/lib forrestcore/src/core
forrestcore/src/core/bin forrestcore/tools/ant forrestcore/tools/dtdconverters
forrestcore/tools/jetty forrestcore/tools/targets lib lib/core lib/endorsed
lib/optional tools/ant tools/ant/bin tools/ant/lib tools/dtdconverters
tools/jetty tools/targets
Posted by Dave Brondsema <da...@brondsema.net>.
Nicola Ken Barozzi wrote:
> Dave Brondsema wrote:
>
>> nicolaken@apache.org wrote:
>>
>>> Author: nicolaken
>>> Date: Sun Oct 31 13:14:02 2004
>>> New Revision: 56151
>>>
>>> Added:
>>> forrest/trunk/etc/
>>> - copied from rev 56137, forrest/trunk/forrestcore/etc/
>>
>>
>>> forrest/trunk/lib/
>>> - copied from rev 56137, forrest/trunk/forrestcore/lib/
>>
>>
>>> forrest/trunk/tools/ant/
>>> - copied from rev 56137, forrest/trunk/forrestcore/tools/ant/
>>
>>
>> ... etc
>>
>> Care to explain what you're doing, and why?
>
>
> Sorry, I tried to do only one commit for all but had problems. It's part
> of this commit:
>
> "Move global-needed resources in the base forrest directory."
>
> That means _moving_ legal, lib, etc and tools in the base Forrest dir.
I didn't realize that comment was the key to all this. I now understand
why you're doing it, but I'm not sure I agree. See below..
> I'm also getting ready to move the bin dir in the root (as already
> discussed).
There's more than one way to do this :-) I think forrestcore/bin would
hold the shell scripts and we can keep most other files where there are.
Again, see below..
>
> It shows a "copy" but there is also a "delete" after that.
Yeah, that's what a "move" equates to.
>> The move of 'legal' you made earlier is okay, I suppose.
>
>
> Are the other moves not ok? IMHO they are a natural part of the
> restructure we voted, that's why I'm doing it.
Nobody mentioned legal, lib, etc, or ant in the restructuring threads.
I had understood the restructuring to be so that our subprojects could
be independent of each other, and your changes are reverting that. As a
TLP we can be composed solely of related subprojects (like XML or
Jakarta does) with no master project. Some advantages to this would be:
* seperate, smaller releases (we can still do one giant release if we want)
* you can check out just "forrestcore" from SVN or just "forrestbot" for
example, and keep the others at a stable release
* easier to manage jar dependencies (what if subprojects need different
versions?)
* common files at the top of our SVN tree instead of within subprojects
can be confusing, especially if they don't relate to some subprojects
Disadvantages:
* some jar files will be duplicated within subprojects
* some subprojects do depend on files from forrestcore. Using
$FORREST_HOME to locate it should work, but might be a pain sometimes.
--
Dave Brondsema : dave@brondsema.net
http://www.splike.com : programming
http://csx.calvin.edu : student org
http://www.brondsema.net : personal
Re: svn commit: rev 56151 - in forrest/trunk: . etc etc/applied_patches
etc/cocoon_upgrade forrestcore forrestcore/etc forrestcore/lib forrestcore/src/core
forrestcore/src/core/bin forrestcore/tools/ant forrestcore/tools/dtdconverters
forrestcore/tools/jetty forrestcore/tools/targets lib lib/core lib/endorsed
lib/optional tools/ant tools/ant/bin tools/ant/lib tools/dtdconverters
tools/jetty tools/targets
Posted by Nicola Ken Barozzi <ni...@apache.org>.
Dave Brondsema wrote:
> nicolaken@apache.org wrote:
>
>> Author: nicolaken
>> Date: Sun Oct 31 13:14:02 2004
>> New Revision: 56151
>>
>> Added:
>> forrest/trunk/etc/
>> - copied from rev 56137, forrest/trunk/forrestcore/etc/
>
>> forrest/trunk/lib/
>> - copied from rev 56137, forrest/trunk/forrestcore/lib/
>
>> forrest/trunk/tools/ant/
>> - copied from rev 56137, forrest/trunk/forrestcore/tools/ant/
>
> ... etc
>
> Care to explain what you're doing, and why?
Sorry, I tried to do only one commit for all but had problems. It's part
of this commit:
"Move global-needed resources in the base forrest directory."
That means _moving_ legal, lib, etc and tools in the base Forrest dir.
I'm also getting ready to move the bin dir in the root (as already
discussed).
It shows a "copy" but there is also a "delete" after that.
> The move of 'legal' you made earlier is okay, I suppose.
Are the other moves not ok? IMHO they are a natural part of the
restructure we voted, that's why I'm doing it.
--
Nicola Ken Barozzi nicolaken@apache.org
- verba volant, scripta manent -
(discussions get forgotten, just code remains)
---------------------------------------------------------------------
Re: svn commit: rev 56151 - in forrest/trunk: . etc etc/applied_patches
etc/cocoon_upgrade forrestcore forrestcore/etc forrestcore/lib forrestcore/src/core
forrestcore/src/core/bin forrestcore/tools/ant forrestcore/tools/dtdconverters
forrestcore/tools/jetty forrestcore/tools/targets lib lib/core lib/endorsed
lib/optional tools/ant tools/ant/bin tools/ant/lib tools/dtdconverters tools/jetty
tools/targets
Posted by Dave Brondsema <da...@brondsema.net>.
nicolaken@apache.org wrote:
> Author: nicolaken
> Date: Sun Oct 31 13:14:02 2004
> New Revision: 56151
>
> Added:
> forrest/trunk/etc/
> - copied from rev 56137, forrest/trunk/forrestcore/etc/
> forrest/trunk/lib/
> - copied from rev 56137, forrest/trunk/forrestcore/lib/
> forrest/trunk/tools/ant/
> - copied from rev 56137, forrest/trunk/forrestcore/tools/ant/
... etc
Care to explain what you're doing, and why?
The move of 'legal' you made earlier is okay, I suppose.
--
Dave Brondsema : dave@brondsema.net
http://www.splike.com : programming
http://csx.calvin.edu : student org
http://www.brondsema.net : personal