Return-Path: 
 <commits-return-6782-apmail-lenya-commits-archive=lenya.apache.org@lenya.apache.org>
Delivered-To: apmail-lenya-commits-archive@www.apache.org
Received: (qmail 85061 invoked from network); 24 May 2005 22:45:22 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 24 May 2005 22:45:22 -0000
Received: (qmail 66850 invoked by uid 500); 24 May 2005 22:45:21 -0000
Delivered-To: apmail-lenya-commits-archive@lenya.apache.org
Received: (qmail 66811 invoked by uid 500); 24 May 2005 22:45:20 -0000
Mailing-List: contact commits-help@lenya.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@lenya.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@lenya.apache.org>
List-Post: <mailto:commits@lenya.apache.org>
List-Id: <commits.lenya.apache.org>
Reply-To: dev@lenya.apache.org
Delivered-To: mailing list commits@lenya.apache.org
Received: (qmail 66797 invoked by uid 99); 24 May 2005 22:45:20 -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; Tue, 24 May 2005 15:45:20 -0700
Received: (qmail 85002 invoked by uid 65534); 24 May 2005 22:45:19 -0000
Message-ID: <20050524224519.85001.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r178305 - in /lenya/trunk/src: resources/javadoc.css
 targets/docs-build.xml targets/ide-build.xml targets/init-build.xml
 targets/properties-build.xml
Date: Tue, 24 May 2005 22:45:18 -0000
To: commits@lenya.apache.org
From: gregor@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: gregor
Date: Tue May 24 15:45:17 2005
New Revision: 178305

URL: http://svn.apache.org/viewcvs?rev=3D178305&view=3Drev
Log:
No longer call init twice, do not call cocoon resources to webapp

Added:
    lenya/trunk/src/resources/javadoc.css
      - copied unchanged from r178190, lenya/trunk/src/webapp/resources/css=
/javadoc.css
Modified:
    lenya/trunk/src/targets/docs-build.xml
    lenya/trunk/src/targets/ide-build.xml
    lenya/trunk/src/targets/init-build.xml
    lenya/trunk/src/targets/properties-build.xml

Modified: lenya/trunk/src/targets/docs-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/docs-build.xml?r=
ev=3D178305&r1=3D178304&r2=3D178305&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
--- lenya/trunk/src/targets/docs-build.xml (original)
+++ lenya/trunk/src/targets/docs-build.xml Tue May 24 15:45:17 2005
@@ -52,7 +52,7 @@
              windowtitle=3D"${Name} API - Version ${version}"
              doctitle=3D"${Name}"
              bottom=3D"Copyright &#169; ${year} Apache Software Foundation=
. All Rights Reserved."
-             stylesheetfile=3D"${resource.dir}/javadoc.css"
+             stylesheetfile=3D"${src.resource.dir}/javadoc.css"
              source=3D"1.4">
       <!-- sources -->
       <sourcepath>

Modified: lenya/trunk/src/targets/ide-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/ide-build.xml?re=
v=3D178305&r1=3D178304&r2=3D178305&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
--- lenya/trunk/src/targets/ide-build.xml (original)
+++ lenya/trunk/src/targets/ide-build.xml Tue May 24 15:45:17 2005
@@ -67,7 +67,7 @@
     <property name=3D"libs" refid=3D"libs"/>
=20
     <!-- expand properties in the template file -->
-    <copy file=3D"src/resources/dev/eclipse/classpath-tmpl.xml"
+    <copy file=3D"${src.resource.dir}/dev/eclipse/classpath-tmpl.xml"
           tofile=3D"${build.temp}/classpath-temp.xml"
           filtering=3D"yes"
           overwrite=3D"yes">
@@ -95,12 +95,12 @@
     <!-- now build the .classpath file -->
     <xslt in=3D"${build.temp}/classpath-temp.xml" out=3D"${basedir}/.class=
path"
           processor=3D"trax"
-          style=3D"src/resources/dev/eclipse/make-classpath.xsl">
+          style=3D"${src.resource.dir}/dev/eclipse/make-classpath.xsl">
        <param name=3D"exportlib" expression=3D"${ide.eclipse.export.libs}"=
/>
     </xslt>
=20
     <!-- copy the project file (expand version) -->
-    <copy file=3D"src/resources/dev/eclipse/project"
+    <copy file=3D"${src.resource.dir}/dev/eclipse/project"
           tofile=3D"${basedir}/.project"
           overwrite=3D"yes">
     </copy>

Modified: lenya/trunk/src/targets/init-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/init-build.xml?r=
ev=3D178305&r1=3D178304&r2=3D178305&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
--- lenya/trunk/src/targets/init-build.xml (original)
+++ lenya/trunk/src/targets/init-build.xml Tue May 24 15:45:17 2005
@@ -45,7 +45,7 @@
   </target>
=20
   <!-- Build Cocoon with our properties -->
-  <target name=3D"build-cocoon" depends=3D"init" unless=3D"cocoon.build.we=
bapp.dir.exists">
+  <target name=3D"build-cocoon" unless=3D"cocoon.build.webapp.dir.exists">
     <copy todir=3D"${cocoon.src.dir}" filtering=3D"off">
       <fileset dir=3D"${src.cocoon.properties.dir}"/>
     </copy>
@@ -56,6 +56,7 @@
   <target name=3D"prepare-cocoon" depends=3D"check-cocoon" unless=3D"gump.=
skipcocoonbuild">
     <copy todir=3D"${build.webapp}" filtering=3D"off">
       <fileset dir=3D"${cocoon.webapp.dir}">
+        <exclude name=3D"resources/**"/>
         <exclude name=3D"*.xml"/>
         <exclude name=3D"*.xslt"/>
         <exclude name=3D"test-suite/**"/>

Modified: lenya/trunk/src/targets/properties-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/properties-build=
.xml?rev=3D178305&r1=3D178304&r2=3D178305&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
--- lenya/trunk/src/targets/properties-build.xml (original)
+++ lenya/trunk/src/targets/properties-build.xml Tue May 24 15:45:17 2005
@@ -101,7 +101,7 @@
   -->
   <property name=3D"src.webapp.dir" value=3D"src/webapp"/>
   <property name=3D"tools.tasks.dest" value=3D"tools/anttasks"/>
-  <property name=3D"resource.dir"  value=3D"${src.webapp.dir}/resources/cs=
s"/>
+  <property name=3D"src.resource.dir"  value=3D"src/resources"/>
   <!-- cocoon build properties directory -->
   <property name=3D"src.cocoon.properties.dir" value=3D"src/cocoon"/>
   <!-- hsqldb database config files directory -->



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org