Return-Path: 
 <cvs-return-23508-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 16063 invoked from network); 6 Jun 2005 22:52:53 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 6 Jun 2005 22:52:53 -0000
Received: (qmail 91300 invoked by uid 500); 6 Jun 2005 22:52:51 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 91224 invoked by uid 500); 6 Jun 2005 22:52:51 -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>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 91211 invoked by uid 99); 6 Jun 2005 22:52:51 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,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; Mon, 06 Jun 2005 15:52:50 -0700
Received: (qmail 15885 invoked by uid 65534); 6 Jun 2005 22:52:35 -0000
Message-ID: <20050606225235.15884.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r185085 - /cocoon/trunk/tools/targets/init-build.xml
Date: Mon, 06 Jun 2005 22:52:34 -0000
To: cvs@cocoon.apache.org
From: nicolaken@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: nicolaken
Date: Mon Jun  6 15:52:33 2005
New Revision: 185085

URL: http://svn.apache.org/viewcvs?rev=3D185085&view=3Drev
Log:
Getting ready to support the Maven Artifact Task alongside
the usual system.

NOTE: the Maven task is still not included.

Modified:
    cocoon/trunk/tools/targets/init-build.xml

Modified: cocoon/trunk/tools/targets/init-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/targets/init-build.xm=
l?rev=3D185085&r1=3D185084&r2=3D185085&view=3Ddiff
=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/targets/init-build.xml (original)
+++ cocoon/trunk/tools/targets/init-build.xml Mon Jun  6 15:52:33 2005
@@ -106,50 +106,80 @@
     <!-- Alias for the loglevel -->
     <property name=3D"loglevel" value=3D"${build.webapp.loglevel}"/>
=20
-    <!-- Set classpath -->
-    <path id=3D"classpath">
-      <fileset dir=3D"${lib.local}">
-        <include name=3D"*.jar"/>
-      </fileset>
-      <fileset dir=3D"${lib}">
-        <include name=3D"*.jar"/>
-      </fileset>
-      <fileset dir=3D"${lib.endorsed}">
-        <include name=3D"*.jar"/>
-      </fileset>
-      <fileset dir=3D"${lib.core}">
-        <include name=3D"*.jar"/>
-      </fileset>
-      <!-- Currently, we have no JVM dependent libraries
-        <fileset dir=3D"${lib.core}/jvm${target.vm}">
-          <include name=3D"*.jar"/>
-        </fileset>
-      -->
-      <path location=3D"${build.mocks}"/>
-      <path location=3D"${build.dest}"/>
-    </path>
-
-    <!-- Set classpath for tests -->
-    <path id=3D"test.classpath">
-      <path refid=3D"classpath"/>
-      <pathelement location=3D"${build.dest}" />
-       <!-- FIXME Resolver tests depend on deprecated stuff -->
-      <pathelement location=3D"${build.deprecated}" />
-      <pathelement location=3D"${build.test}" />
-      <fileset dir=3D"${tools.lib}">
-        <include name=3D"*.jar"/>
-      </fileset>
-    </path>
-   =20
-    <!-- Set classpath for building ant tasks -->
-    <path id=3D"tasks.classpath">
-      <path refid=3D"classpath"/>
-      <fileset dir=3D"${tools.lib}">
-        <include name=3D"*.jar"/>
-      </fileset>
-      <path location=3D"${tools.tasks.dest}"/>
-    </path>
+    <!-- Ant-Contrib tasks -->
+    <taskdef resource=3D"net/sf/antcontrib/antcontrib.properties">
+      <classpath>
+        <pathelement location=3D"tools/lib/ant-contrib-0.6.jar"/>
+      </classpath>     =20
+    </taskdef>
=20
+    <!-- By default use the libs in SVN -->
+    <property name=3D"m2jars" value=3D"false"/>
+   =20
+    <if>
+      <istrue value=3D"${m2jars}"/>
+      <then>
+        <echo>   !!! Using Maven Artifact Task !!!</echo>
+        <echo>  !!!   Still needs to be coded   !!!</echo>
+        <path id=3D"classpath">
+        </path>
+        <path id=3D"test.classpath">
+        </path>       =20
+        <path id=3D"task.classpath">
+        </path>       =20
+       </then>
+     </if>
+    =20
+    <if>
+      <isfalse value=3D"${m2jars}"/>
+      <then>
+        <!-- Set classpath -->
+        <path id=3D"classpath">
+          <fileset dir=3D"${lib.local}">
+            <include name=3D"*.jar"/>
+          </fileset>
+          <fileset dir=3D"${lib}">
+            <include name=3D"*.jar"/>
+          </fileset>
+          <fileset dir=3D"${lib.endorsed}">
+            <include name=3D"*.jar"/>
+          </fileset>
+          <fileset dir=3D"${lib.core}">
+            <include name=3D"*.jar"/>
+          </fileset>
+          <!-- Currently, we have no JVM dependent libraries
+            <fileset dir=3D"${lib.core}/jvm${target.vm}">
+              <include name=3D"*.jar"/>
+            </fileset>
+          -->
+          <path location=3D"${build.mocks}"/>
+          <path location=3D"${build.dest}"/>
+        </path>
+   =20
+        <!-- Set classpath for tests -->
+        <path id=3D"test.classpath">
+          <path refid=3D"classpath"/>
+          <pathelement location=3D"${build.dest}" />
+           <!-- FIXME Resolver tests depend on deprecated stuff -->
+          <pathelement location=3D"${build.deprecated}" />
+          <pathelement location=3D"${build.test}" />
+          <fileset dir=3D"${tools.lib}">
+            <include name=3D"*.jar"/>
+          </fileset>
+        </path>
+       =20
+        <!-- Set classpath for building ant tasks -->
+        <path id=3D"tasks.classpath">
+          <path refid=3D"classpath"/>
+          <fileset dir=3D"${tools.lib}">
+            <include name=3D"*.jar"/>
+          </fileset>
+          <path location=3D"${tools.tasks.dest}"/>
+        </path>
+
+       </then>
+     </if>
+    =20
     <!-- compile the ant tasks -->
     <mkdir dir=3D"${tools.tasks.dest}"/>
     <javac srcdir=3D"${tools.tasks.src}"
@@ -191,13 +221,6 @@
            source=3D"1.4"
            target=3D"1.4"
            nowarn=3D"on"/>
-
-    <!-- Ant-Contrib tasks -->
-    <taskdef resource=3D"net/sf/antcontrib/antcontrib.properties">
-      <classpath>
-        <pathelement location=3D"tools/lib/ant-contrib-0.6.jar"/>
-      </classpath>     =20
-    </taskdef>
=20
 <!-- =3D=3D=3D Preparation Targets =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 -->
=20