Return-Path: 
 <axis-cvs-return-180-apmail-ws-axis-dev-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-axis-dev-archive@www.apache.org
Received: (qmail 91408 invoked from network); 23 Dec 2003 14:47:01 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 23 Dec 2003 14:47:01 -0000
Received: (qmail 30099 invoked by uid 500); 23 Dec 2003 14:46:53 -0000
Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org
Received: (qmail 30074 invoked by uid 500); 23 Dec 2003 14:46:53 -0000
Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:axis-cvs-help@ws.apache.org>
list-unsubscribe: <mailto:axis-cvs-unsubscribe@ws.apache.org>
list-post: <mailto:axis-cvs@ws.apache.org>
Delivered-To: mailing list axis-cvs@ws.apache.org
Received: (qmail 30061 invoked from network); 23 Dec 2003 14:46:53 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 23 Dec 2003 14:46:53 -0000
Received: (qmail 91371 invoked by uid 1203); 23 Dec 2003 14:46:57 -0000
Date: 23 Dec 2003 14:46:57 -0000
Message-ID: <20031223144657.91370.qmail@minotaur.apache.org>
From: dims@apache.org
To: ws-axis-cvs@apache.org
Subject: cvs commit: ws-axis/java .cvsignore build.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

dims        2003/12/23 06:46:57

  Modified:    java     .cvsignore build.xml
  Log:
  - build the zip file in dist and srcdist
  - ensure that the applet code is in WEB-INF/classes
  
  Revision  Changes    Path
  1.10      +1 -0      ws-axis/java/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/.cvsignore,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- .cvsignore	4 Dec 2003 20:16:59 -0000	1.9
  +++ .cvsignore	23 Dec 2003 14:46:56 -0000	1.10
  @@ -1,4 +1,5 @@
   axis-1_0
  +axis-1_2alpha
   build
   client-config.wsdd
   server-config.wsdd
  
  
  
  1.239     +15 -9     ws-axis/java/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/build.xml,v
  retrieving revision 1.238
  retrieving revision 1.239
  diff -u -r1.238 -r1.239
  --- build.xml	19 Dec 2003 10:23:57 -0000	1.238
  +++ build.xml	23 Dec 2003 14:46:56 -0000	1.239
  @@ -293,8 +293,9 @@
     <!-- =================================================================== -->
   
     <target name="applets" depends="compile">
  +    <mkdir dir="${build.webapp}/WEB-INF/classes/"/>
       <javac srcdir="${axis.home}/webapps/axis"
  -      destdir="${axis.home}/webapps/axis"
  +      destdir="${build.webapp}/WEB-INF/classes/"
         debug="${debug}"
         deprecation="${deprecation}"
         classpathref="classpath">
  @@ -402,13 +403,14 @@
     <!-- =================================================================== -->
     <!-- Creates the binary distribution                                     -->
     <!-- =================================================================== -->
  -  <target name="javadocsdist" depends="javadocs" unless="javadoc.notrequired">
  +  <target name="javadocsdist" depends="check-javadoc-needed, javadocs" unless="javadoc.notrequired">
  +    <mkdir dir="${dist.dir}/docs/apiDocs"/>
       <copy todir="${dist.dir}/docs/apiDocs">
         <fileset dir="${build.javadocs}"/>
       </copy>
     </target>
   
  -  <target name="dist" depends="compile, samples, junit"
  +  <target name="dist" depends="compile, samples, applets, javadocsdist"
       description="create the full binary distribution">
       <mkdir dir="${dist.dir}"/>
       <mkdir dir="${dist.dir}/lib"/>
  @@ -416,7 +418,6 @@
       <mkdir dir="${dist.dir}/webapps/axis"/>
       <mkdir dir="${dist.dir}/xmls"/>
       <mkdir dir="${dist.dir}/docs"/>
  -    <mkdir dir="${dist.dir}/docs/apiDocs"/>
   
       <copy todir="${dist.dir}/lib">
         <fileset dir="${build.lib}"/>
  @@ -444,19 +445,24 @@
       <copy todir="${dist.dir}/webapps/axis/WEB-INF/classes/samples">
         <fileset dir="${build.samples}"/>
       </copy>
  +    <copy todir="${dist.dir}/webapps/axis/">
  +      <fileset dir="${build.webapp}"/>
  +    </copy>
       <copy file="LICENSE" tofile="${dist.dir}/LICENSE"/>
       <copy file="README" tofile="${dist.dir}/README"/>
       <copy file="release-notes.html" tofile="${dist.dir}/release-notes.html"/>
       <copy todir="${dist.dir}/xmls">
         <fileset dir="xmls"/>
       </copy>
  -    <antcall target="javadocsdist"/>
  +    <zip destfile="${build.dir}/${name}-bin-${axis.dirname}.zip">
  +        <zipfileset prefix="${name}-${axis.dirname}" dir="${dist.dir}"/>
  +    </zip>
     </target>
   
     <!-- =================================================================== -->
     <!-- Creates the source distribution                                     -->
     <!-- =================================================================== -->
  -  <target name="srcdist" depends="javadocs"
  +  <target name="srcdist" depends="javadocsdist"
         description="Create the source distribution">
       <copy todir="${dist.dir}">
         <fileset dir=".">
  @@ -475,10 +481,10 @@
           <exclude name="**/CVS/**"/>
         </fileset>
       </copy>
  -    <copy todir="${dist.dir}/docs/apiDocs">
  -      <fileset dir="${build.javadocs}"/>
  -    </copy>
       <copy file="LICENSE" tofile="${dist.dir}/LICENSE"/>
  +    <zip destfile="${build.dir}/${name}-src-${axis.dirname}.zip">
  +        <zipfileset prefix="${name}-${axis.dirname}" dir="${dist.dir}"/>
  +    </zip>
     </target>
   
     <!-- =================================================================== -->