hughesj     2003/01/22 09:01:23

  Modified:    java     build.xml
               java/lib/j2ee README.txt
  Log:
  Merge RC2 branch back into trunk
  
  Revision  Changes    Path
  1.27      +8 -6      xml-axis-wsif/java/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/build.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- build.xml 13 Jan 2003 17:23:09 -0000      1.26
  +++ build.xml 22 Jan 2003 17:01:22 -0000      1.27
  @@ -48,7 +48,7 @@
       <property name="name" value="wsif"/>
       <property name="dynamic.name" value="wsif-dynamic"/>
       <property name="Name" value="wsif"/>
  -    <property name="wsif.version" value="2.0rc1_2"/>
  +    <property name="wsif.version" value="2.0rc3"/>
       <property name="year-from" value="2002"/>
       <property name="year-to" value="2002"/>
   
  @@ -312,7 +312,7 @@
         <fileset dir="${samples.dir}">    
         </fileset>
       </copy>
  -    <!--antcall target="samples_j2c"/-->
  +    <antcall target="samples_j2c"/>
     </target>
   
     <!-- =================================================================== -->
  @@ -497,10 +497,12 @@
       <mkdir dir="${dist.dir}/doc"/>
       <copy todir="${dist.dir}/doc">
         <fileset dir="${docs.dir}">
  -        <include name="*.txt"/>
  -        <include name="*.css"/>
  -        <include name="*.html"/>
  -        <include name="*.htm"/>
  +        <include name="**/*.txt"/>
  +        <include name="**/*.css"/>
  +        <include name="**/*.html"/>
  +        <include name="**/*.htm"/>
  +        <include name="**/*.gif"/>
  +        <include name="**/*.jpg"/>
         </fileset>
       </copy>
   
  
  
  
  1.2       +3 -0      xml-axis-wsif/java/lib/j2ee/README.txt
  
  Index: README.txt
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/lib/j2ee/README.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- README.txt        12 Dec 2002 04:36:08 -0000      1.1
  +++ README.txt        22 Jan 2003 17:01:23 -0000      1.2
  @@ -4,3 +4,6 @@
   
   For example see: http://java.sun.com/j2ee/download.html
   and put j2ee.jar here
  +
  +NOTE: to compile JCA sample it is required to use J2EE 1.3.1
  +and not newer 1.4 as there were incompatible changes.
  
  
  


Reply via email to