aslom 2002/12/12 07:10:15
Modified: java build.xml
java/doc RELEASE_TASKS.txt changes.html
Log:
fixed problems with "clean samples" to make sure
that required properites and META-INS is copied to build/classes
added "alldist" target that includes both binary and source distributions
added .tgz as release build besides .zip
Revision Changes Path
1.19 +97 -26 xml-axis-wsif/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.xml 12 Dec 2002 13:40:54 -0000 1.18
+++ build.xml 12 Dec 2002 15:10:15 -0000 1.19
@@ -47,7 +47,7 @@
<property name="name" value="wsif"/>
<property name="dynamic.name" value="wsif-dynamic"/>
<property name="Name" value="wsif"/>
- <property name="wsif.version" value="2.0alpha1"/>
+ <property name="wsif.version" value="2.0alpha2"/>
<property name="year-from" value="2002"/>
<property name="year-to" value="2002"/>
@@ -78,10 +78,12 @@
<property name="dist.dir" value="${build.dir}/${name}-${wsif.version}"/>
+ <property name="dist.all.file"
+ value="build/${name}-all-${wsif.version}"/>
<property name="dist.bin.file"
- value="build/${name}-bin-${wsif.version}.zip"/>
+ value="build/${name}-bin-${wsif.version}"/>
<property name="dist.src.file"
- value="${build.dir}/${name}-src-${wsif.version}.zip"/>
+ value="${build.dir}/${name}-src-${wsif.version}"/>
<property name="build.javadocs.base" value="${build.dir}/javadocs/base"/>
@@ -122,31 +124,31 @@
</target>
<target name="checkSoapRMI" unless="soaprmi.present">
- <echo message="Warning: SoapRMI dependencies were not resolved."/>
+ <echo message="Warning: SoapRMI dependencies were not resolved (see
lib/soaprmi11 on how to required jar files)."/>
</target>
<target name="checkJMS" unless="jms.present">
- <echo message="Warning: JMS dependencies were not resolved."/>
+ <echo message="Warning: JMS dependencies were not resolved (see lib/jms_api on
how to required jar files)."/>
</target>
<target name="checkEJB" unless="ejb.present">
- <echo message="Warning: EJB dependencies were not resolved."/>
+ <echo message="Warning: EJB dependencies were not resolved (see lib/j2ee on how
to download required jar files)."/>
</target>
<target name="checkApacheSOAP" unless="apachesoap.present">
- <echo message="Warning: ApacheSOAP dependencies were not resolved."/>
+ <echo message="Warning: ApacheSOAP dependencies were not resolved (see
lib/apache_soap on how to required jar files)."/>
</target>
<target name="checkApacheAxis" unless="apacheaxis.present">
- <echo message="Warning: ApacheAXIS dependencies were not resolved."/>
+ <echo message="Warning: ApacheAXIS dependencies were not resolved (see lib/axis
on how to required jar files)."/>
</target>
<target name="checkJ2C" unless="j2c.present">
- <echo message="Warning: J2C dependencies were not resolved."/>
+ <echo message="Warning: J2C dependencies were not resolved (see lib/j2ee on how
to download required jar files)."/>
</target>
<target name="checkJUnit" unless="junit.present">
- <echo message="Warning: JUnit dependencies were not resolved."/>
+ <echo message="Warning: JUnit dependencies were not resolved (see lib/junit on
how to download required jar files)."/>
</target>
<target name="checkDependencies" depends="prepare" unless="javac.notRequired">
@@ -186,6 +188,9 @@
<patternset id="samples.source.files">
<include name="**/*.java"/>
+ <exclude name="**/zipcode/**.java" unless="apachesoap.present"/>
+ <exclude name="clients/zipcode/**/*.java"/> <!-- until this sample is
migrated -->
+ <exclude name="clients/stockquote/**/*.java"/> <!-- until this sample is
migrated -->
</patternset>
<patternset id="test.source.files">
@@ -214,6 +219,16 @@
<javac srcdir="${src.dir}" destdir="${dynamic.dest}" debug="${debug}">
<patternset refid="dynamic.source.files"/>
</javac>
+
+ <copy todir="${build.dest}">
+ <fileset dir="${src.dir}">
+ <include name="**/*.properties"/>
+ <include name="client-config.wsdd" if="jms.present"/>
+ <exclude name="**/jca/*.properties"/>
+ <include name="**/META-INF/services/*"/>
+ </fileset>
+ </copy>
+
</target>
<!-- =================================================================== -->
@@ -267,14 +282,6 @@
<mkdir dir="${build.lib}"/>
- <copy todir="${build.dest}">
- <fileset dir="${src.dir}">
- <include name="**/*.properties"/>
- <include name="client-config.wsdd" if="jms.present"/>
- <exclude name="**/jca/*.properties"/>
- <include name="**/META-INF/services/*"/>
- </fileset>
- </copy>
<jar jarfile="${jar}" basedir="${build.dest}" update="true" />
@@ -289,12 +296,11 @@
<!-- =================================================================== -->
<!-- Compiles the samples -->
<!-- =================================================================== -->
- <target name="samples" depends="dynamic">
+ <target name="samples" depends="dynamic,link">
<mkdir dir="${build.samples}"/>
<javac srcdir="samples" destdir="${build.samples}"
classpath="${dynamic.dest}" debug="${debug}">
<patternset refid="samples.source.files"/>
- <exclude name="**/zipcode/**.java" unless="apachesoap.present"/>
</javac>
<copy todir="${build.samples}">
@@ -428,9 +434,13 @@
</fileset>
</copy>
+ <chmod perm="a+x" dir="${dist.dir}"
+ includes="**/*.sh" />
+
+
<fixcrlf srcdir="${dist.dir}"
eol="lf" eof="remove"
- includes="*.html,*.txt,*.sh"
+ includes="*.sh,**/*.html,**/*.txt,**/*.sh,**/java"
/>
<fixcrlf srcdir="${dist.dir}"
@@ -493,15 +503,30 @@
<!--copy file="${build.file}" tofile="${dist.dir}/${build.file}"/-->
<delete file="${dist.src.file}.zip"/>
- <zip zipfile="${dist.src.file}" basedir="${build.dir}"
+ <zip zipfile="${dist.src.file}.zip" basedir="${build.dir}"
includes="${name}-${wsif.version}/**"/>
+
+ <tar tarfile="${dist.src.file}.tar" longfile="gnu">
+
+ <tarfileset dir="${build.dir}" mode="755">
+ <include name="${name}-${wsif.version}/**/*.sh"/>
+ </tarfileset>
+ <tarfileset dir="${build.dir}" username="aslom" group="ewww">
+ <include name="${name}-${wsif.version}/**"/>
+ <exclude name="${name}-${wsif.version}/**/*.sh"/>
+ </tarfileset>
+ </tar>
+
+ <gzip zipfile="${dist.src.file}.tgz" src="${dist.src.file}.tar" />
+ <delete file="${dist.src.file}.tar"/>
+
</target>
<!-- ================================================================= -->
- <!-- Creates the binary distribution -->
+ <!-- Creates the "all inclusive" distribution -->
<!-- ================================================================= -->
- <target name="bindist" depends="srcdist">
+ <target name="alldist" depends="srcdist">
<mkdir dir="${dist.dir}/doc/api"/>
<copy todir="${dist.dir}/doc/api">
@@ -547,14 +572,60 @@
</copy>
+ <delete file="${dist.all.file}.zip"/>
+ <zip zipfile="${dist.all.file}.zip" basedir="${build.dir}"
+ includes="${name}-${wsif.version}/**"/>
+
+
+ <tar tarfile="${dist.all.file}.tar" longfile="gnu">
+
+ <tarfileset dir="${build.dir}" mode="755">
+ <include name="${name}-${wsif.version}/**/*.sh"/>
+ </tarfileset>
+ <tarfileset dir="${build.dir}" username="aslom" group="ewww">
+ <include name="${name}-${wsif.version}/**"/>
+ <exclude name="${name}-${wsif.version}/**/*.sh"/>
+ </tarfileset>
+ </tar>
+
+ <gzip zipfile="${dist.all.file}.tgz" src="${dist.all.file}.tar" />
+ <delete file="${dist.all.file}.tar"/>
+
+ </target>
+
+ <!-- ================================================================= -->
+ <!-- Creates the binary distribution (no source and tests) -->
+ <!-- ================================================================= -->
+
+ <target name="bindist" depends="alldist">
+
+ <delete dir="${dist.dir}/src"/>
+ <delete dir="${dist.dir}/test"/>
+
<delete file="${dist.bin.file}.zip"/>
- <zip zipfile="${dist.bin.file}" basedir="${build.dir}"
+ <zip zipfile="${dist.bin.file}.zip" basedir="${build.dir}"
includes="${name}-${wsif.version}/**"/>
+
+ <tar tarfile="${dist.bin.file}.tar" longfile="gnu">
+
+ <tarfileset dir="${build.dir}" mode="755">
+ <include name="${name}-${wsif.version}/**/*.sh"/>
+ </tarfileset>
+ <tarfileset dir="${build.dir}" username="aslom" group="ewww">
+ <include name="${name}-${wsif.version}/**"/>
+ <exclude name="${name}-${wsif.version}/**/*.sh"/>
+ </tarfileset>
+ </tar>
+
+ <gzip zipfile="${dist.bin.file}.tgz" src="${dist.bin.file}.tar" />
+ <delete file="${dist.bin.file}.tar"/>
+
</target>
<!-- ================================================================= -->
- <!-- Creates the binary and source distributions -->
+ <!-- Target to buoild all distributions -->
<!-- ================================================================= -->
+
<target name="dist" depends="bindist"/>
<!-- =================================================================== -->
1.7 +3 -3 xml-axis-wsif/java/doc/RELEASE_TASKS.txt
Index: RELEASE_TASKS.txt
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/doc/RELEASE_TASKS.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RELEASE_TASKS.txt 10 Dec 2002 18:37:26 -0000 1.6
+++ RELEASE_TASKS.txt 12 Dec 2002 15:10:15 -0000 1.7
@@ -10,14 +10,14 @@
baseline would be 2.0.x then if we really have something significant change the 0
TASKS:
-* get out an intial (alpha) release today!
+* DONE [alek] get out an intial (alpha) release today!
* [Jeremy Sat 11a GMT (6am EST)] fixing problem with text files marked by Eclipse
as binary in CVS
* [owen] investigate using Forrest for creating separate pages for WSIF outside Axis
* [nirmal + alek] samples and modularization
-* DONE but will need mroe work [alek] split README.html into smaller pices and make
it addressing two communities:
+* DONE [alek] but will need mroe work [alek] split README.html into smaller pices
and make it addressing two communities:
WSIF users and WSIF developers; README.html right now is kind of mixed up
* DONE [alek] simplify wsif.css
-* [alek] check in JAR files that we know WSIF works OK with LICENSE and README(and
can be checked in)
+* DONE [alek] check in JAR files that we know WSIF works OK with LICENSE and
README(and can be checked in)
* [jeremy] automatic generation of javadoc API
* get the link to the API javadoc off the home page working
* [ant] write/test sample that uses xmethods WSDL (DynamicInvoker + stub)
1.4 +15 -3 xml-axis-wsif/java/doc/changes.html
Index: changes.html
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/doc/changes.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- changes.html 10 Dec 2002 18:41:43 -0000 1.3
+++ changes.html 12 Dec 2002 15:10:15 -0000 1.4
@@ -13,9 +13,21 @@
Each release should have a separate list of changes.
Add only <b>significant</b> changes such as changing API, modifying
implementation behavior, major bug fixes (hyperlink to bugzilla), new
-functionality. Do not give <b>too detailed</b> descriptions as they belong to
-CVS commit logs :-)<a name="WSIF_"><h3>2001-12- </h3></a>
+functionality. Do not give <b>too detailed</b> descriptions as they belong to
+CVS commit logs :-)<a name="WSIF_"><h3>2002-12-</h3></a>
+
+
<ul>
+<li><b>release packaging</b>: there anow three different release builds:
+<ul>
+<li><b>src</b>: only source file (no binaries) - essentially all that is needed
+to compile WSIF if you downloaded all required jar files
+<li><b>bin</b>: only binaries: just downlaod few jar files that can not be
distributed
+and you are ready to run WSIF (no source code except for sampels)
+<li><b>all</b> = bin + src
+</ul>
+
+
<li><b>documentation changes</b>
factored out <a href="../readme.htm">readme.htm</a> into smaller pieces that are
put in doc/ (like cvs and requirements)
updated doc/ with factored out info about cvs and requirements and improved build
instructions,
