forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From che...@apache.org
Subject svn commit: rev 9958 - in xml/forrest/trunk: . src/core/targets
Date Sat, 10 Apr 2004 11:02:14 GMT
Author: cheche
Date: Sat Apr 10 04:02:11 2004
New Revision: 9958

Modified:
   xml/forrest/trunk/src/core/targets/webapp.xml
   xml/forrest/trunk/status.xml
Log:
Stop overwriting skinconf and cocoon.xconf on webapp target,
Libs were not copied 



Modified: xml/forrest/trunk/src/core/targets/webapp.xml
==============================================================================
--- xml/forrest/trunk/src/core/targets/webapp.xml	(original)
+++ xml/forrest/trunk/src/core/targets/webapp.xml	Sat Apr 10 04:02:11 2004
@@ -92,13 +92,22 @@
       <fileset dir="${classes-dir}"/>
     </copy>
   
-    <copy todir="${project.webapp}/WEB-INF">
+    <copy todir="${project.webapp}/WEB-INF/lib">
     <!-- Note: no overwriting, so user's libs and classes get preference -->
-      <fileset dir="${forrest.home}/context/WEB-INF">
-        <include name="lib/**"/>
-        <include name="classes/**"/>
+      <fileset dir="${forrest.home}/lib/core">
+        <include name="**.jar"/>
+      </fileset>
+      <fileset dir="${forrest.home}/lib/optional">
+        <include name="**.jar"/>
+      </fileset>
+      <fileset dir="${forrest.home}/lib/endorsed">
+        <include name="**.jar"/>
       </fileset>
     </copy>
+    
+    <copy toDir="${project.webapp}/WEB-INF/classes">
+      <fileset dir="${forrest.home}/context/WEB-INF/classes"/>
+    </copy>
 
     <!-- Copy XML jars if not running JDK 1.4 (where they're built-in) -->
     <available property="jdk1.4+" classname="java.lang.CharSequence"/>
@@ -225,12 +234,6 @@
       </fileset>
     </copy>
     
-    <!-- copy skinconf -->
-    <copy toDir="${project.webapp}" 
-      overwrite="true"
-      failonerror="false"
-      file="${skinconf}"/>
-    
     <!-- copy Schemas -->
     <copy toDir="${project.webapp}/resources"
       overwrite="true"
@@ -254,10 +257,10 @@
     <filter token="project.images-dir" value="resources/images"/>
     <filter token="local-catalog" value="resources/schema/catalog.xcat"/>
       
-    <copy tofile="${project.webapp}/WEB-INF/cocoon.xconf" 
+    <!--copy tofile="${project.webapp}/WEB-INF/cocoon.xconf" 
       filtering="true" 
       overwrite="true"
-      file="${forrest.home}/context/WEB-INF/cocoon-live.xconf" />
+      file="${forrest.home}/context/WEB-INF/cocoon-live.xconf" -->
     
     <loadfile  property="webapp-generated-message" 
       srcFile="${forrest.home}/var/webapp-generated-message.txt">
@@ -280,4 +283,4 @@
       </fileset>
     </copy>
   </target>
-</project>
\ No newline at end of file
+</project>

Modified: xml/forrest/trunk/status.xml
==============================================================================
--- xml/forrest/trunk/status.xml	(original)
+++ xml/forrest/trunk/status.xml	Sat Apr 10 04:02:11 2004
@@ -44,6 +44,9 @@
 
   <changes>
     <release version="0.6-dev" date="unreleased">
+      <action dev="JJP" type="fix" context="core" >
+	Stop ovewriting skinconf and cocoon.xconf on webapp target
+        Libs were not copied on the webapp target
       <action dev="JJP" type="add" context="core" >
         Move context targets from forrest.build.xml to targets/context
         Use skinconf DTD.

Mime
View raw message