Author: mrdon
Date: Sun Feb 27 17:36:42 2005
New Revision: 155656

URL: http://svn.apache.org/viewcvs?view=rev&rev=155656
Log:
 * Changed dist directory to be WEB-INF/dist
 * Removed jdbc jar references
 * Updated version to 1.3
 * Changed servlet jar reference to default to relative location when installed
   on Tomcat 4.1+

Modified:
    struts/apps/trunk/blank/build.xml

Modified: struts/apps/trunk/blank/build.xml
URL: 
http://svn.apache.org/viewcvs/struts/apps/trunk/blank/build.xml?view=diff&r1=155655&r2=155656
==============================================================================
--- struts/apps/trunk/blank/build.xml (original)
+++ struts/apps/trunk/blank/build.xml Sun Feb 27 17:36:42 2005
@@ -2,17 +2,14 @@
 
 
     <!-- Local system paths -->
-    <property name="servlet.jar" value="/javasoft/lib/servlet.jar"/>
-    <property name="jdbc20ext.jar" value="/javasoft/lib/jdbc2_0-stdext.jar"/>
-        <!-- NOTE: If "dist" target is used, a local
-             "projects/lib" directory will be utilized or created -->
-    <property name="distpath.project" value="/projects/lib"/>
+    <property name="servlet.jar" value="../../common/lib/servlet-api.jar"/>
+    <property name="distpath.project" value="dist"/>
 
 
     <!-- Project settings -->
     <property name="project.title" value="Jakarta Struts Blank "/>
     <property name="project.distname" value="blank"/>
-    <property name="project.version" value="1.1"/>
+    <property name="project.version" value="1.3"/>
 
 
     <!-- Path settings -->
@@ -20,11 +17,12 @@
     <property name="doc.src" value="./src/java"/>
 
 
-    <!-- classpath for Struts 1.1 -->
+    <!-- classpath for Struts 1.3 -->
     <path id="compile.classpath">
         <pathelement path ="lib/commons-beanutils.jar"/>
         <pathelement path ="lib/commons-digester.jar"/>
         <pathelement path ="lib/struts.jar"/>
+        <pathelement path ="${servlet.jar}"/>
         <pathelement path ="classes"/>
         <pathelement path ="${classpath}"/>
     </path>
@@ -73,7 +71,7 @@
         <mkdir dir="./doc/api"/>
         <javadoc sourcepath="./src/java"
             destdir="./doc/api"
-            classpath="${servlet.jar}:${jdbc20ext.jar}"
+            classpath="${servlet.jar}"
             packagenames="*"
             author="false"
             private="true"
@@ -105,10 +103,11 @@
 
       <war
         basedir="../"
-        warfile="${distpath.project}/${project.distname}.war"
+        warfile="../../${project.distname}.war"
         webxml="web.xml">
-        <exclude name="${distpath.project}/${project.distname}.war"/>
+        <exclude name="**/${distpath.project}/**"/>
        </war>
+      <move file="../../${project.distname}.war" 
tofile="${distpath.project}/${project.distname}.war" />
 
     </target>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to