Return-Path: 
 <svn-return-2353-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 40030 invoked from network); 18 May 2005 08:35:05 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 18 May 2005 08:35:05 -0000
Received: (qmail 73065 invoked by uid 500); 18 May 2005 08:31:01 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 72920 invoked by uid 500); 18 May 2005 08:30:58 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 72794 invoked by uid 99); 18 May 2005 08:30:57 -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; Wed, 18 May 2005 01:30:56 -0700
Received: (qmail 38329 invoked by uid 65534); 18 May 2005 08:30:29 -0000
Message-ID: <20050518083029.38328.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r170726 - /forrest/trunk/etc/cocoon_upgrade/build.xml
Date: Wed, 18 May 2005 08:30:29 -0000
To: svn@forrest.apache.org
From: cheche@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: cheche
Date: Wed May 18 01:30:28 2005
New Revision: 170726

URL: http://svn.apache.org/viewcvs?rev=3D170726&view=3Drev
Log:
local-build-cocoon --> build-cocoon target


Modified:
    forrest/trunk/etc/cocoon_upgrade/build.xml

Modified: forrest/trunk/etc/cocoon_upgrade/build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/etc/cocoon_upgrade/build.x=
ml?rev=3D170726&r1=3D170725&r2=3D170726&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
--- forrest/trunk/etc/cocoon_upgrade/build.xml (original)
+++ forrest/trunk/etc/cocoon_upgrade/build.xml Wed May 18 01:30:28 2005
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project default=3D"local-build-cocoon" basedir=3D"." name=3D"import-cocoo=
n">
+<project default=3D"build-cocoon" basedir=3D"." name=3D"import-cocoon">
=20
   <!-- =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
        Import latest version of cocoon
@@ -27,21 +27,43 @@
        <property environment=3D"env" />
        <property name=3D"cocoon.home"    location=3D"${env.COCOON_HOME}" />
        <property name=3D"cocoon.version" value=3D"2.2.0-dev"/>
-       <property name=3D"cocoon.revision" value=3D"-r170580"/>
+       <property name=3D"cocoon.revision" value=3D"-r170045"/>
        <property name=3D"forrest.home"   location=3D"${env.FORREST_HOME}" =
/>
   </target>
=20
   <target name=3D"import-cocoon-xconf" depends=3D"init">
+     <!-- FIXME: This needs more testing  do not use it yet-->
      <xslt force=3D"true" in=3D"${cocoon.home}/src/webapp/WEB-INF/xconf/co=
coon-core.xconf" out=3D"${forrest.home}/main/webapp/WEB-INF/xconf/forrest-c=
ore.xconf" style=3D"./upgrade-cocoon-xconf.xsl" >
        <outputproperty name=3D"indent" value=3D"yes"/>
     </xslt>
   </target>
+<target name=3D"copy-optional-libs" depends=3D"init">
+     <!-- FIXME:  jing-*.jar comes from iso-relax.sf.net -->
+     <copy todir=3D"${forrest.home}/lib/core" >
+        <fileset dir=3D"${cocoon.home}/lib/optional">
+          <include name=3D"batik-all-*.jar"/>
+          <include name=3D"fop-*.jar"/>
+          <include name=3D"lucene-*.jar"/>
+          <include name=3D"jtidy-*.jar"/>
+          <include name=3D"nekopull-*.jar"/>
+        </fileset>
+     </copy>
+  </target>
+<target name=3D"copy-plugins-libs" depends=3D"init">
+     <copy todir=3D"${forrest.home}/plugins/org.apache.forrest.plugin.inpu=
t=2Ewiki/lib" >
+     <fileset dir=3D"${cocoon.home}/lib/optional" includes=3D"chaperon-*.j=
ar" />
+     </copy>
+     <copy todir=3D"${forrest.home}/plugins/org.apache.forrest.plugin.inpu=
t=2Edtdx/lib" >
+     <fileset dir=3D"${cocoon.home}/lib/optional" includes=3D"nekodtd-*.ja=
r" />
+     </copy>
+  </target>
+
   <target name=3D"copy-endorsed-libs" depends=3D"init">
      <copy todir=3D"${forrest.home}/lib/endorsed" preservelastmodified=3D"=
true" >
         <fileset dir=3D"${cocoon.home}/lib/endorsed" includes=3D"*.jar"/>
      </copy>
   </target>
-  <target name=3D"local-build-cocoon" depends=3D"init">
+  <target name=3D"build-cocoon" depends=3D"init">
      <copy todir=3D"${cocoon.home}">
         <fileset dir=3D"." includes=3D"local.*.properties"/>
      </copy>