Return-Path: 
 <cvs-return-23004-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 18381 invoked from network); 21 Apr 2005 09:42:10 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 21 Apr 2005 09:42:10 -0000
Received: (qmail 31407 invoked by uid 500); 21 Apr 2005 09:42:20 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 31337 invoked by uid 500); 21 Apr 2005 09:42:19 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 31321 invoked by uid 99); 21 Apr 2005 09:42:19 -0000
X-ASF-Spam-Status: No, hits=0.2 required=10.0
	tests=NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Thu, 21 Apr 2005 02:42:17 -0700
Received: (qmail 18327 invoked by uid 65534); 21 Apr 2005 09:42:04 -0000
Message-ID: <20050421094204.18326.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r164017 -
 /cocoon/trunk/tools/external-project-build/generic-build.xml
Date: Thu, 21 Apr 2005 09:42:04 -0000
To: cvs@cocoon.apache.org
From: reinhard@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: reinhard
Date: Thu Apr 21 02:42:01 2005
New Revision: 164017

URL: http://svn.apache.org/viewcvs?rev=3D164017&view=3Drev
Log:
fix dependencies, start with support for unit tests

Added:
    cocoon/trunk/tools/external-project-build/generic-build.xml

Added: cocoon/trunk/tools/external-project-build/generic-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/external-project-buil=
d/generic-build.xml?rev=3D164017&view=3Dauto
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/trunk/tools/external-project-build/generic-build.xml (added)
+++ cocoon/trunk/tools/external-project-build/generic-build.xml Thu Apr 21 =
02:42:01 2005
@@ -0,0 +1,265 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8" standalone=3D"yes"?>
+<!--
+  Copyright 1999-2004 The Apache Software Foundation
+
+  Licensed 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.
+-->
+<project name=3D"Cocoon build system" default=3D"cocoon:init">
+
+    <target name=3D"cocoon:core-setProperties" depends=3D"cocoon:before-se=
tProperties">
+        <!-- get the properties of properties configuration files -->
+        <property name=3D"cocoon.server" value=3D"localhost"/>
+        <property file=3D"${cocoon.server}.build.properties"/>
+
+        <property file=3D"project.properties"/>
+
+        <!-- conditions depending on property values -->
+        <property name=3D"cocoon.container.use" value=3D"false"/>
+        <property name=3D"cocoon.classesToJAR" value=3D"false"/>
+        <condition property=3D"cocoon.cond.container.use">
+          <istrue value=3D"${cocoon.container.use}"/>
+        </condition>
+        <condition property=3D"cocoon.cond.webapp.in.context">
+          <equals arg1=3D"${cocoon.webapp.path}" arg2=3D""/>
+        </condition>          =20
+        <condition property=3D"cocoon.cond.classesToJAR">
+          <and>
+              <istrue value=3D"${cocoon.cond.webapp.in.context}"/>
+              <istrue value=3D"${cocoon.classesToJAR}"/>
+          </and>
+        </condition>
+
+        <!-- repository directory structure -->
+        <property name=3D"cocoon.rep.cocoon.dir" value=3D"${cocoon.rep}/co=
coon/${cocoon.version}"/>
+        <property name=3D"cocoon.rep.cocoon.webapp.dir" value=3D"${cocoon.=
rep.cocoon.dir}/webapp"/>
+        <property name=3D"cocoon.rep.cocoon.lib.dir" value=3D"${cocoon.rep=
.cocoon.dir}/webapp/WEB-INF/lib"/>
+        <property name=3D"cocoon.rep.cocoon.classes.dir" value=3D"${cocoon=
.rep.cocoon.dir}/webapp/WEB-INF/classes"/>
+        <property name=3D"cocoon.rep.cocoon.db.dir" value=3D"${cocoon.rep.=
cocoon.webapp.dir}/WEB-INF/db"/>
+        <property name=3D"cocoon.rep.container.dir" value=3D"${cocoon.rep}=
/container/${cocoon.container.version}"/>
+    =09
+		<!-- container properties -->
+        <property file=3D"${cocoon.rep.container.dir}/server.properties"/>
+        =09
+        <!-- target directory structure -->
+        <property name=3D"cocoon.build.dir" value=3D"build"/>
+        <property name=3D"cocoon.build.java" value=3D"${cocoon.build.dir}/=
java"/>  =20
+        <property name=3D"cocoon.build.java.classes" value=3D"${cocoon.bui=
ld.java}/classes"/>          =20
+        <property name=3D"cocoon.build.junit" value=3D"${cocoon.build.dir}=
/test/junit"/>   =20
+        <property name=3D"cocoon.build.junit.classes" value=3D"${cocoon.bu=
ild.junit}/classes"/>                    =20
+        <property name=3D"cocoon.build.junit.output" value=3D"${cocoon.bui=
ld.junit}/output"/>        =20
+        <property name=3D"cocoon.build.htmlunit" value=3D"${cocoon.build.d=
ir}/test/htmlunit"/>      =20
+        <property name=3D"cocoon.build.htmlunit.classes" value=3D"${cocoon=
.build.htmlunit}/classes"/>           =20
+        <property name=3D"cocoon.build.htmlunit.output" value=3D"${cocoon.=
build.htmlunit}/output"/>                   =20
+        <property name=3D"cocoon.build.webapp.war.dir" value=3D"${cocoon.b=
uild.dir}/${cocoon.server}_webapp"/>
+        <property name=3D"cocoon.build.webapp.dir" value=3D"${cocoon.build=
.dir}/${cocoon.server}_webapp/ROOT"/>
+        <property name=3D"cocoon.build.container.dir" value=3D"${cocoon.bu=
ild.dir}/${cocoon.server}_container"/>
+
+        <!-- local directories -->
+        <property name=3D"cocoon.local.webapp.dir" value=3D"webapp"/>
+        <property name=3D"cocoon.local.src.dir" value=3D"java"/>
+        <property name=3D"cocoon.local.junit.dir" value=3D"test/junit"/>  =20
+        <property name=3D"cocoon.local.lib.dir" value=3D"lib"/>
+        <property name=3D"cocoon.local.conf.dir" value=3D"conf"/>
+
+        <!-- default values for compiler settings -->
+        <property name=3D"cocoon.compiler" value=3D"modern"/>
+        <property name=3D"cocoon.compiler.debug" value=3D"on"/>
+        <property name=3D"cocoon.compiler.optimize" value=3D"on"/>
+        <property name=3D"cocoon.compiler.deprecation" value=3D"off"/>
+        <property name=3D"cocoon.compiler.nowarn" value=3D"on"/>
+        <property name=3D"cocoon.compiler.source.vm" value=3D"1.3"/>
+        <property name=3D"cocoon.compiler.target.vm" value=3D"1.3"/>
+    =20
+        <!-- classpaths -->
+        <path id=3D"cocoon:classpath">
+            <fileset dir=3D"${cocoon.rep.cocoon.lib.dir}">
+                <include name=3D"*.jar" />
+            </fileset>
+            <fileset dir=3D"${cocoon.local.lib.dir}">
+                <include name=3D"*.jar" />
+            </fileset>
+            <dirset dir=3D"${cocoon.rep.cocoon.classes.dir}" />
+        </path>
+    </target>
+
+    <target name=3D"cocoon:init" depends=3D"cocoon:setProperties, cocoon:s=
etFilters">
+        <!-- global filters -->
+        <filter token=3D"cocoon.filter.webapp.path" value=3D"${cocoon.weba=
pp.path}"/>
+    </target>
+
+    <target name=3D"cocoon:core-webapp" depends=3D"cocoon:before-webapp">
+        <mkdir dir=3D"${cocoon.build.webapp.dir}"/>
+
+        <!-- copy Cocoon -->
+        <copy todir=3D"${cocoon.build.webapp.dir}">
+            <fileset dir=3D"${cocoon.rep.cocoon.webapp.dir}">
+                <include name=3D"WEB-INF/**"/>
+            </fileset>
+        </copy>
+
+        <!-- copy local resources if the application runs *within* the ser=
vlet context -->
+        <antcall target=3D"cocoon:copyWebapp"/>
+
+        <copy todir=3D"${cocoon.build.webapp.dir}" filtering=3D"on">
+            <fileset dir=3D"${cocoon.local.webapp.dir}">
+                <include name=3D"sitemap.xmap"/>
+            </fileset>
+        </copy>
+
+        <!-- customize Cocoon -->
+        <copy todir=3D"${cocoon.build.webapp.dir}/WEB-INF/xconf" filtering=
=3D"on" overwrite=3D"true">
+            <fileset dir=3D"${cocoon.local.conf.dir}">
+                <include name=3D"*xconf"/>
+            </fileset>
+        </copy>
+
+        <!-- add own Java classes -->
+        <antcall target=3D"cocoon:compile"/>
+        <antcall target=3D"cocoon:classesToJAR"/>
+
+        <!-- copy local libraries -->
+        <copy todir=3D"${cocoon.build.webapp.dir}/WEB-INF/lib" filtering=
=3D"off">
+            <fileset dir=3D"${cocoon.local.lib.dir}"/>
+        </copy>
+    </target>
+   =20
+    <target name=3D"cocoon:copyWebapp" if=3D"cocoon.cond.webapp.in.context=
">
+        <echo message=3D".... copyWebapp"/>
+        <copy todir=3D"${cocoon.build.webapp.dir}" filtering=3D"off">
+            <fileset dir=3D"${cocoon.local.webapp.dir}">
+                <exclude name=3D"sitemap.xmap"/>
+            </fileset>
+        </copy>     =20
+    </target>
+
+    <target name=3D"cocoon:classesToJAR" if=3D"cocoon.cond.classesToJAR">
+        <zip destfile=3D"${cocoon.build.webapp.dir}/WEB-INF/lib/_project.j=
ar">
+            <fileset dir=3D"${cocoon.build.webapp.dir}/WEB-INF/classes"/>
+        </zip>
+        <delete dir=3D"${cocoon.build.webapp.dir}/WEB-INF/classes"/>
+    </target>
+
+    <target name=3D"cocoon:core-war" depends=3D"cocoon:before-war">
+        <zip destfile=3D"${cocoon.build.webapp.war.dir}/ROOT.war">
+            <fileset dir=3D"${cocoon.build.webapp.dir}"/>
+        </zip>
+    </target>
+
+    <target name=3D"cocoon:core-container" depends=3D"cocoon:before-contai=
ner">
+        <ant antfile=3D"${cocoon.rep.container.dir}/container-build.xml"
+            target=3D"cocoon:create" inheritall=3D"true"/>
+    </target>
+
+    <target name=3D"cocoon:core-run" depends=3D"cocoon:before-run">
+        <ant antfile=3D"${cocoon.rep.container.dir}/container-build.xml"
+            target=3D"cocoon:run" inheritall=3D"true"/>     =20
+    </target>
+
+    <target name=3D"cocoon:core-stop" depends=3D"cocoon:init, cocoon:befor=
e-stop">
+        <ant antfile=3D"${cocoon.rep.container.dir}/container-build.xml"
+            target=3D"cocoon:stop" inheritall=3D"true"/>
+    </target>
+   =20
+    <target name=3D"cocoon:core-compile" depends=3D"cocoon:before-compile">
+        <!-- TODO support more than one directory with Java classes -->
+        <mkdir dir=3D"${cocoon.build.java}"/>
+        <mkdir dir=3D"${cocoon.build.java.classes}"/>  =20
+        <mkdir dir=3D"${cocoon.build.webapp.dir}/WEB-INF/classes"/>
+        <copy todir=3D"${cocoon.build.java.classes}" filtering=3D"on">
+            <fileset dir=3D"${cocoon.local.src.dir}">
+                <exclude name=3D"**/*.java"/>
+                <exclude name=3D"**/.svn"/>  =20
+            </fileset>
+        </copy>
+        <javac classpathref=3D"cocoon:classpath"
+               compiler=3D"${cocoon.compiler}"
+               nowarn=3D"${cocoon.compiler.nowarn}"
+               source=3D"${cocoon.compiler.source.vm}"
+               target=3D"${cocoon.compiler.target.vm}"
+               deprecation=3D"${cocoon.compiler.deprecation}"
+               optimize=3D"${cocoon.compiler.optimize}"
+               debug=3D"${cocoon.compiler.debug}"
+               destdir=3D"${cocoon.build.java.classes}"
+               srcdir=3D"${cocoon.local.src.dir}" />
+        <copy todir=3D"${cocoon.build.webapp.dir}/WEB-INF/classes" filteri=
ng=3D"off">
+            <fileset dir=3D"${cocoon.build.java.classes}">
+                <exclude name=3D"**/*.java"/>
+                <exclude name=3D"**/.svn"/>  =20
+            </fileset>
+        </copy>
+    </target>
+
+    <target name=3D"cocoon:core-clean" depends=3D"cocoon:before-clean">
+        <delete includeEmptyDirs=3D"true">
+          <fileset dir=3D"${cocoon.build.dir}">
+              <include name=3D"*_container/**"/>
+              <include name=3D"*_webapp/**"/>
+          </fileset>
+        </delete>
+    </target>
+
+    <target name=3D"cocoon:core-clean-all" depends=3D"cocoon:before-clean-=
all">
+        <delete dir=3D"${cocoon.build.dir}"/>
+    </target>
+
+    <!-- interception targets -->
+    <target name=3D"cocoon:before-setProperties"/>
+    <target name=3D"cocoon:after-setProperties" depends=3D"cocoon:core-set=
Properties"/>
+    <target name=3D"cocoon:before-webapp" depends=3D"cocoon:init"/>
+    <target name=3D"cocoon:after-webapp" depends=3D"cocoon:core-webapp"/>
+    <target name=3D"cocoon:before-war" depends=3D"cocoon:webapp"/>
+    <target name=3D"cocoon:after-war" depends=3D"cocoon:core-war"/>
+    <target name=3D"cocoon:before-container" depends=3D"cocoon:init"/>
+    <target name=3D"cocoon:after-container" depends=3D"cocoon:core-contain=
er"/>
+    <target name=3D"cocoon:before-run" depends=3D"cocoon:init"/>
+    <target name=3D"cocoon:after-run" depends=3D"cocoon:core-run"/>
+    <target name=3D"cocoon:before-stop" depends=3D"cocoon:init"/>
+    <target name=3D"cocoon:after-stop" depends=3D"cocoon:core-stop"/>
+    <target name=3D"cocoon:before-compile" depends=3D"cocoon:init" if=3D"c=
ocoon.cond.webapp.in.context"/>
+    <target name=3D"cocoon:after-compile" depends=3D"cocoon:core-compile" =
if=3D"cocoon.cond.webapp.in.context"/>
+    <target name=3D"cocoon:before-clean" depends=3D"cocoon:init"/>
+    <target name=3D"cocoon:after-clean" depends=3D"cocoon:core-clean"/>
+    <target name=3D"cocoon:before-clean-all" depends=3D"cocoon:init"/>
+    <target name=3D"cocoon:after-clean-all" depends=3D"cocoon:core-clean-a=
ll"/>
+
+    <!-- public available targets=20
+         DO NOT OVERRIDE THEM but use the before/after/core targets for th=
is purpose
+    -->
+    <target name=3D"cocoon:container" depends=3D"cocoon:after-container" d=
escription=3D"screate a container (uses the property 'container.version')"/>
+    <target name=3D"cocoon:webapp" depends=3D"cocoon:after-webapp" descrip=
tion=3D"create the web application"/>
+    <target name=3D"cocoon:war" depends=3D"cocoon:after-war" description=
=3D"create a web archive (WAR)"/>
+    <target name=3D"cocoon:run" depends=3D"cocoon:after-run" description=
=3D"run the container (currently it only works on windows boxes)"/>
+    <target name=3D"cocoon:stop" depends=3D"cocoon:after-stop" description=
=3D"run the container (currently it only works on windows boxes)"/>
+    <target name=3D"cocoon:compile" depends=3D"cocoon:after-compile" descr=
iption=3D"Compile Java classes" if=3D"cocoon.cond.webapp.in.context"/>
+    <target name=3D"cocoon:clean" depends=3D"cocoon:after-clean" descripti=
on=3D"clean webapps and container"/>
+    <target name=3D"cocoon:clean-all" depends=3D"cocoon:after-clean-all" d=
escription=3D"clean *everything* in the build dir"/>
+
+	<!-- short versions for public cocoon:* targets - as these are very commo=
n names they might be
+	     overriden in a custom project build file -->
+    <target name=3D"container" depends=3D"cocoon:container" if=3D"cond.con=
tainer.use" description=3D"short version for cocoon:container"/>
+    <target name=3D"webapp" depends=3D"cocoon:webapp" description=3D"short=
 version for cocoon:webapp"/>
+    <target name=3D"war" depends=3D"cocoon:war" description=3D"short versi=
on for cocoon:war"/>
+    <target name=3D"run" depends=3D"cocoon:run" description=3D"short versi=
on for cocoon:run"/>
+    <target name=3D"stop" depends=3D"cocoon:stop" description=3D"short ver=
sion for cocoon:stop"/>
+    <target name=3D"compile" depends=3D"cocoon:compile" description=3D"sho=
rt version for cocoon:compile" if=3D"cocoon.cond.webapp.in.context"/>
+    <target name=3D"clean" depends=3D"cocoon:clean" description=3D"short v=
ersion for cocoon:clean"/>
+    <target name=3D"clean-all" depends=3D"cocoon:clean-all" description=3D=
"short version for cocoon:clean-all"/>=09
+=09
+    <!-- internally available targets -->
+    <target name=3D"cocoon:setProperties" depends=3D"cocoon:after-setPrope=
rties"/>
+
+    <!-- empty targets to be overriden -->
+    <target name=3D"cocoon:setFilters"/>
+    <target name=3D"cocoon:complete-ant"/>
+
+</project>
\ No newline at end of file