aslom 2002/12/11 20:39:55
Modified: java build.bat build.sh build.xml classpath.bat
classpath.csh classpath.sh
java/doc build.htm samples.html
java/samples/simplesoap/client/dynamic README.html
java/samples/simplesoap/client/stub README.html
Log:
preparing for alpha build: updated build.xml, docs, and scripts
Revision Changes Path
1.2 +2 -1 xml-axis-wsif/java/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/build.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.bat 14 Oct 2002 16:55:42 -0000 1.1
+++ build.bat 12 Dec 2002 04:39:54 -0000 1.2
@@ -45,3 +45,4 @@
echo "location of the Java Virtual Machine you want to use."
:end
+
1.2 +2 -1 xml-axis-wsif/java/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/build.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.sh 14 Oct 2002 16:55:42 -0000 1.1
+++ build.sh 12 Dec 2002 04:39:54 -0000 1.2
@@ -31,3 +31,4 @@
CMD="$JAVA $OPTS -classpath $LOCALCLASSPATH org.apache.tools.ant.Main $@ -buildfile
build.xml"
echo $CMD
$CMD
+
1.17 +113 -41 xml-axis-wsif/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 7 Dec 2002 12:33:57 -0000 1.16
+++ build.xml 12 Dec 2002 04:39:54 -0000 1.17
@@ -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="1.2"/>
+ <property name="wsif.version" value="2.0alpha1"/>
<property name="year-from" value="2002"/>
<property name="year-to" value="2002"/>
@@ -73,8 +73,8 @@
<property name="jar" value="${build.dir}/lib/${name}.jar"/>
<property name="jar_complete"
value="${build.dir}/lib/${name}-all-${wsif.version}.jar"/>
- <property name="wsdl4j_jar" value="lib/wsdl4j.jar"/>
- <property name="qname_jar" value="lib/qname.jar"/>
+ <!--property name="wsdl4j_jar" value="lib/wsdl4j.jar"/-->
+ <!--property name="qname_jar" value="lib/qname.jar"/-->
<property name="dist.dir" value="${build.dir}/${name}-${wsif.version}"/>
@@ -415,71 +415,143 @@
<target name="prepare-dist" depends="compile, link, javadocsIfRequired, samples">
<delete dir="${dist.dir}"/>
<mkdir dir="${dist.dir}"/>
- <mkdir dir="${dist.dir}/doc"/>
- <mkdir dir="${dist.dir}/doc/api"/>
- <mkdir dir="${dist.dir}/lib"/>
- <mkdir dir="${dist.dir}/samples"/>
- <copy todir="${dist.dir}/doc/api">
- <fileset dir="${build.javadocs}"/>
+ <copy todir="${dist.dir}">
+ <fileset dir=".">
+ <include name="*.xml"/>
+ <include name="*.txt"/>
+ <include name="*.html"/>
+ <include name="*.htm"/>
+ <include name="*.bat"/>
+ <include name="*.sh"/>
+ <include name="*.csh"/>
+ </fileset>
</copy>
+ <fixcrlf srcdir="${dist.dir}"
+ eol="lf" eof="remove"
+ includes="*.html,*.txt,*.sh"
+ />
+
+ <fixcrlf srcdir="${dist.dir}"
+ eol="crlf"
+ includes="*.bat"
+ />
+
+ <mkdir dir="${dist.dir}/test"/>
+ <copy todir="${dist.dir}/test">
+ <fileset dir="test">
+ <include name="**"/>
+ <exclude name="**/.#*"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${dist.dir}/samples"/>
<copy todir="${dist.dir}/samples">
- <fileset dir="${build.samples}">
+ <fileset dir="samples">
<include name="**"/>
<exclude name="**/.#*"/>
</fileset>
</copy>
- <!--<copy todir="${dist.dir}/doc">
+
+ <mkdir dir="${dist.dir}/src"/>
+ <copy todir="${dist.dir}/src">
+ <fileset dir="${src.dir}">
+ <include name="org/**"/>
+ <include name="META-INF/**"/>
+ <exclude name="**/.#*"/>
+ </fileset>
+ </copy>
+
+ <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"/>
</fileset>
</copy>
- <copy file="README.html" tofile="${dist.dir}/README.html"/> -->
- </target>
-
- <!-- ================================================================= -->
- <!-- Creates the binary distribution -->
- <!-- ================================================================= -->
- <target name="bindist" depends="prepare-dist">
- <copy todir="${dist.dir}/lib" file="${jar}"/>
- <copy todir="${dist.dir}/lib" file="${wsdl4j_jar}"/>
- <copy todir="${dist.dir}/lib" file="${qname_jar}"/>
- <antcall target="bindist_j2c"/>
- <zip zipfile="${dist.bin.file}" basedir="${build.dir}"
- includes="${name}-${wsif.version}/**"/>
- </target>
+
+ <mkdir dir="${dist.dir}/lib"/>
+ <copy todir="${dist.dir}/lib">
+ <fileset dir="lib">
+ <include name="**/README.txt"/>
+ <include name="**/*.bat"/>
+ </fileset>
+ </copy>
- <!-- =================================================================== -->
- <!-- Copy j2c jar if needed -->
- <!-- =================================================================== -->
- <target name="bindist_j2c" if="j2c.present">
- <copy todir="${dist.dir}/lib" file="${j2c.jar}"/>
</target>
+
<!-- =================================================================== -->
<!-- Creates the source distribution -->
<!-- =================================================================== -->
- <target name="srcdist" depends="prepare">
- <delete dir="${dist.dir}"/>
+ <target name="srcdist" depends="prepare-dist">
+ <!--copy file="${build.file}" tofile="${dist.dir}/${build.file}"/-->
- <copy todir="${dist.dir}/src">
- <fileset dir="${src.dir}">
- <include name="org/**"/>
- <include name="META-INF/**"/>
- <exclude name="**/.#*"/>
- </fileset>
+ <delete file="${dist.src.file}.zip"/>
+ <zip zipfile="${dist.src.file}" basedir="${build.dir}"
+ includes="${name}-${wsif.version}/**"/>
+
+ </target>
+
+ <!-- ================================================================= -->
+ <!-- Creates the binary distribution -->
+ <!-- ================================================================= -->
+ <target name="bindist" depends="srcdist">
+
+ <mkdir dir="${dist.dir}/doc/api"/>
+ <copy todir="${dist.dir}/doc/api">
+ <fileset dir="${build.javadocs}"/>
</copy>
- <copy file="${build.file}" tofile="${dist.dir}/${build.file}"/>
- <zip zipfile="${dist.src.file}" basedir="${build.dir}"
+ <mkdir dir="${dist.dir}/${build.dir}/lib"/>
+ <copy todir="${dist.dir}/${build.dir}/lib" file="${jar}"/>
+ <copy todir="${dist.dir}/${build.dir}/lib" file="${j2c.jar}"/>
+
+ <!--copy todir="${dist.dir}/lib" file="${wsdl4j_jar}"/-->
+ <!--copy todir="${dist.dir}/lib" file="${qname_jar}"/-->
+
+ <mkdir dir="${dist.dir}/${build.samples}"/>
+ <copy todir="${dist.dir}/${build.samples}">
+ <fileset dir="${build.samples}">
+ <include name="**"/>
+ <exclude name="**/.#*"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${dist.dir}/lib">
+ <fileset dir="lib">
+ <include name="ant/*"/>
+ <include name="apache_soap/*"/>
+ <include name="axis/*"/>
+ <include name="commons_discovery/*"/>
+ <include name="commons_logging/*"/>
+ <include name="jaxrpc/*"/>
+ <include name="jms_api/*"/>
+ <include name="junit/*"/>
+ <include name="log4j/*"/>
+ <include name="saaj/*"/>
+ <include name="soaprmi11/*"/>
+ <include name="wsdl4j/*"/>
+ <include name="xerces2/*"/>
+ </fileset>
+ </copy>
+
+
+ <delete file="${dist.bin.file}.zip"/>
+ <zip zipfile="${dist.bin.file}" basedir="${build.dir}"
includes="${name}-${wsif.version}/**"/>
-
</target>
+
+ <!-- ================================================================= -->
+ <!-- Creates the binary and source distributions -->
+ <!-- ================================================================= -->
+ <target name="dist" depends="bindist"/>
<!-- =================================================================== -->
<!-- Cleans everything -->
1.3 +21 -7 xml-axis-wsif/java/classpath.bat
Index: classpath.bat
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/classpath.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- classpath.bat 25 Nov 2002 06:29:12 -0000 1.2
+++ classpath.bat 12 Dec 2002 04:39:54 -0000 1.3
@@ -19,6 +19,8 @@
for %%i in (lib\jms_api\*.jar) do call lib\ant\lcp.bat %%i
+for %%i in (lib\j2ee\*.jar) do call lib\ant\lcp.bat %%i
+
for %%i in (lib\apache_soap\*.jar) do call lib\ant\lcp.bat %%i
for %%i in (lib\javamail\*.jar) do call lib\ant\lcp.bat %%i
for %%i in (lib\activation\*.jar) do call lib\ant\lcp.bat %%i
@@ -31,7 +33,6 @@
for %%i in (lib\soaprmi11\*.jar) do call lib\ant\lcp.bat %%i
-set LOCALCLASSPATH=build\classes;build\samples;build\tests;%LOCALCLASSPATH%
if "%1" == "build" goto build_classpath
if "%1" == "run" goto run_classpath
@@ -39,15 +40,18 @@
REM otherwise set user classpath
-set CLASSPATH=%LOCALCLASSPATH%
+REM set CLASSPATH=%LOCALCLASSPATH%
-if "%1" == "quiet" goto end
+REM if "%1" == "quiet" goto end
-echo %CLASSPATH%
+REM echo %CLASSPATH%
+REM goto end
+
+goto run_classpath
-goto end
+REM --------------------------
:clean_classpath
set CLASSPATH=
set LOCALCLASSPATH=
@@ -59,24 +63,34 @@
goto end
+REM ------------------------
:build_classpath
for %%i in (lib\ant\*.jar) do call lib\ant\lcp.bat %%i
if exist %JAVA_HOME%\lib\tools.jar set
LOCALCLASSPATH=%LOCALCLASSPATH%;%JAVA_HOME%\lib\tools.jar
goto extra_args
+
+REM -----------------------
:run_classpath
-set
LOCALCLASSPATH=build\api;build\classes;build\samples;build\tests;%LOCALCLASSPATH%
+REM set
LOCALCLASSPATH=build\api;build\classes;build\samples;build\tests;%LOCALCLASSPATH%
+set LOCALCLASSPATH=build\classes;build\samples;build\tests;%LOCALCLASSPATH%
+for %%i in (build\lib\*.jar) do call lib\ant\lcp.bat %%i
-:extra_args
+:extra_args
+if not "%1" == "" goto set_classpath
+if not "%1" == "set" goto set_classpath
if not "%2" == "set" goto check_echo
+:set_classpath
+
set CLASSPATH=%LOCALCLASSPATH%
:check_echo
+if "%1" == "quiet" goto end
if "%2" == "quiet" goto end
if "%3" == "quiet" goto end
1.2 +1 -0 xml-axis-wsif/java/classpath.csh
Index: classpath.csh
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/classpath.csh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- classpath.csh 14 Oct 2002 16:55:42 -0000 1.1
+++ classpath.csh 12 Dec 2002 04:39:54 -0000 1.2
@@ -3,6 +3,7 @@
# source classpath.csh
#
# written by Aleksander Slominski [http://www.extreme.indiana.edu/~aslom]
+#
setenv CLASSPATH `$PWD/classpath.sh $*`
echo $CLASSPATH
1.3 +9 -2 xml-axis-wsif/java/classpath.sh
Index: classpath.sh
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/classpath.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- classpath.sh 25 Nov 2002 06:29:12 -0000 1.2
+++ classpath.sh 12 Dec 2002 04:39:54 -0000 1.3
@@ -26,6 +26,10 @@
LOCALCLASSPATH=`echo lib/jms_api/*.jar | tr ' ' ':'`:$LOCALCLASSPATH
fi
+if [ ! "`echo lib/j2ee/*.jar`" = "lib/j2ee/*.jar" ] ; then
+ LOCALCLASSPATH=`echo lib/j2ee/*.jar | tr ' ' ':'`:$LOCALCLASSPATH
+fi
+
if [ ! "`echo lib/xerces2/*.jar`" = "lib/xerces2/*.jar" ] ; then
LOCALCLASSPATH=`echo lib/xerces2/*.jar | tr ' ' ':'`:$LOCALCLASSPATH
@@ -64,7 +68,6 @@
LOCALCLASSPATH=`echo lib/soaprmi11/*.jar | tr ' ' ':'`:$LOCALCLASSPATH
fi
-LOCALCLASSPATH=build/classes:build/samples:build/tests:$LOCALCLASSPATH
if [ "$1" = "build" ] ; then
LOCALCLASSPATH=`echo lib/ant/*.jar | tr ' ' ':'`:$LOCALCLASSPATH
@@ -77,7 +80,11 @@
elif [ ! "$2" = "quiet" ] ; then
echo $LOCALCLASSPATH
fi
-else
+else
+ LOCALCLASSPATH=build/classes:build/samples:build/tests:$LOCALCLASSPATH
+ if [ ! "`echo build/lib/*.jar`" = "build/lib/*.jar" ] ; then
+ LOCALCLASSPATH=`echo build/lib/*.jar | tr ' ' ':'`:$LOCALCLASSPATH
+ fi
if [ "$1" = "run" ] ; then
if [ "$2" = "set" ] ; then
CLASSPATH=$LOCALCLASSPATH
1.5 +30 -29 xml-axis-wsif/java/doc/build.htm
Index: build.htm
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/doc/build.htm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.htm 10 Dec 2002 18:41:43 -0000 1.4
+++ build.htm 12 Dec 2002 04:39:55 -0000 1.5
@@ -22,25 +22,16 @@
<h2>How to build?</h2>
-<p>If you use ANT directly then make sure to put all required JAR files on
-CLASSPATH and call ANT script, there are following important targets: <b>clean</b>
-will clean build directory, <b>compile </b>(or no target) will do do compilation
-and <b>all</b> will clean, compile and generate JAR file for WSIF.</p>
-
-<p>There is also available set of scripts to make building easier if you copy
-required JAR files (including your preferred version of ANT) into
-<a href="../lib">lib/
-subdirectories</a> and set JAVA_HOME. Then <b>build.bat</b> on Windows or <b>
-build.sh</b> on UNIX will automatically pick up all jar files from lib/
-subdirectories and call ANT to build WSIF. You can pass parameter to build
-scripts and they will passed to ANT when building.</p>
-
-<h2>Building WSIF directly using ANT</h2>
-<ul>
- <li>Obtain all the necessary jar files as listed in the prerequisites.
- </li><li>Set required environment variables, including,
- JAVA_HOME, ANT_HOME.
- </li><li>From the root directory of wsif (where build.xml is located), run
+<p>There are two possibilities: use your preferred verion of ANT but you are
+responsible for setting CLASSPATH or use provided scripts that automate building
+and CLASSPATH setting.</p>
+
+<h2>Building WSIF using ANT</h2>
+<p>Obtain all the necessary jar files as listed in the
+<a href="requirements.html">prerequisites</a>. </p>
+<p>Set required environment variables, including,
+ JAVA_HOME, ANT_HOME. </p>
+<p>From the root directory of wsif (where build.xml is located), run </p>
<pre>ant -Dwsif.build.classpath=<classpath> <target></pre>
<p>where <classpath> contains the location of the preequisite JAR files<br>
<br>
@@ -56,16 +47,26 @@
</li><li><b>clean</b>: Removes built files.
</li><li><b>all</b>: Cleans, creates source and binary distribution
zip files.
- </li></ul>
-</li></ul>
-
-<p> </p>
-
-<h2>Building tests?</h2>
-
-
+ </li><li><b>tests</b>: Build tests</li></ul>
-<p>Use <b>tests</b> target from build.xml and use ANT or build script.</p>
+<h2>Building WSIF by using provided scripts and JAR files</h2>
+<p>You should download binary distribution or checkout code from CVS (lib
+subdirectory must contain needed jar files)</p>
+<p>Most of necessary jar files is already included in lib directory. You will
+only need to download <b>activation.jar</b> and put it into <b>lib/activation</b>
+(<a href="../lib/activation/README.txt">see README</a>), <b>mail.jar</b> and put
+it into <b>lib/javamail</b> (<a href="../lib/javamail/README.txt">see
+README</a>) and <b>optionally</b> j2ee.jar or other jar file with J2EE APIs (<a
href="../lib/j2ee/README.txt">see
+README</a>) to compile EJB and JCA providers (all of those files must be
+downloaded separately as they can not be distributed).</p>
+
+<p>Then use <b>build script</b> (./build.sh on UNIX or build.bat on Windows) to
+rebuilt WSIF (see list of targets above).</p>
+
+<p>If you want just to run samples you can simply call <b>classpath script</b>
+(on Windows use classpath.bat on UNIX use source classpath.csh if you use TCSH
+or source classpath.sh if you use BASH) and you will have all required jar files
+on CLASSPATH.</p>
<hr width="100%">
<address>$Id$ </address>
1.4 +14 -5 xml-axis-wsif/java/doc/samples.html
Index: samples.html
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/doc/samples.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- samples.html 11 Dec 2002 20:42:16 -0000 1.3
+++ samples.html 12 Dec 2002 04:39:55 -0000 1.4
@@ -11,7 +11,18 @@
Web Services Invocation Framework:<br>
Samples</h1>
<p>The WSIF distribution comes with a set of sample clients that demonstrate WSIF
features. This document describes the features demonstrated by each sample, along with
a guide to running them.</p>
-<p>The samples are present under the samples directory of your WSIF installation.
Each sample resides in its own directory. Within each sample directory, you will find
the following files (here, <em>SampleName</em> is the name of the sample):
+<p>Before you run samples you need to make sure that you have required JAR files
+and set CLASSPATH to contain both WSIF jar files and required JAR files. If you
+use binary distribution of WSIF most of JAR files is already provided and
+classpath script can be used to set CLASSPATH. You will only need to
+download <b>activation.jar</b> and put it into <b>lib/activation</b> (<a
href="../lib/activation/README.txt">see
+README</a>), <b>mail.jar</b> and put it into <b>lib/javamail</b> (<a
href="../lib/javamail/README.txt">see
+README</a>) and <b>optionally</b> j2ee.jar or other jar file with J2EE APIs (<a
href="../lib/j2ee/README.txt">see
+README</a>) to compile EJB and JCA providers (all of those files must be
+downloaded separately as they can not be distributed). To run samples you can
+simply call <b>classpath script</b> (on Windows use classpath.bat on UNIX use
+source classpath.csh if you use TCSH or source classpath.sh if you use BASH) and
+you will have all required jar files on CLASSPATH.<p>The samples are present under
the samples directory of your WSIF installation. Each sample resides in its own
directory. Within each sample directory, you will find the following files (here,
<em>SampleName</em> is the name of the sample):
<ul>
<li><tt>SampleName.wsdl</tt>: WSDL file for sample</li>
<li><tt>README.html</tt>: README file describing the sample, what WSIF features
it demonstrates, and how to run it.</li>
@@ -63,7 +74,7 @@
<td><a href="../samples/multibinding/README.html">The Sample README</a></td>
</tr>
<tr>
- <td>How to customise WSIF to select between bindings using your own
heuristics</td>
+ <td>How to customize WSIF to select between bindings using your own
heuristics</td>
<td>The samples/customfactory directory under your WSIF installation</td>
<td><a href="../samples/customfactory/README.html">The Sample README</a></td>
</tr>
@@ -107,6 +118,4 @@
<!-- <p><a name="deployingejb"><b>Deploying EJB services</b>:</p> -->
<!-- <p><a name="deployingjava"><b>Deploying Java services</b>:</p> -->
<!-- <p><a name="deployingjms"><b>Deploying JMS services</b>:</p> -->
-<!-- <p><a name="deployingjca"><b>Deploying JCA services</b>:</p> -->
-
-
+<!-- <p><a name="deployingjca"><b>Deploying JCA services</b>:</p> -->
\ No newline at end of file
1.3 +2 -2 xml-axis-wsif/java/samples/simplesoap/client/dynamic/README.html
Index: README.html
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/samples/simplesoap/client/dynamic/README.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.html 11 Dec 2002 20:36:14 -0000 1.2
+++ README.html 12 Dec 2002 04:39:55 -0000 1.3
@@ -21,6 +21,6 @@
<li>JAR files required by Axis - log4j.jar, commons-logging.jar,
commons-discovery.jar, jaxrpc.jar, saaj.jar</li>
</ul>
</p>
-<p>After you have set up the CLASSPATH in your environment, to invoke this sample
using WSIF's DII, run the DynamicInvoker class. Specify as command line arguments the
location of the WSDL file for the stockquote sample followed by the operation you wish
to invoke and the symbol for the company whose stockquote you are interested in. For
example, <br><tt>java samples.clients.DynamicInvoker
samples/simplesoap/StockquoteSOAP.wsdl getQuote IBM</tt></p>
+<p>After you have set up the CLASSPATH in your environment, to invoke this sample
using WSIF's DII, run the DynamicInvoker class. Specify as command line arguments the
location of the WSDL file for the stockquote sample followed by the operation you wish
to invoke and the symbol for the company whose stockquote you are interested in. For
example, <br><tt>java clients.DynamicInvoker samples/simplesoap/StockquoteSOAP.wsdl
getQuote IBM</tt></p>
<hr width="100%">
-</body></html>
+</body></html>
\ No newline at end of file
1.3 +1 -1 xml-axis-wsif/java/samples/simplesoap/client/stub/README.html
Index: README.html
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/samples/simplesoap/client/stub/README.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.html 11 Dec 2002 20:36:14 -0000 1.2
+++ README.html 12 Dec 2002 04:39:55 -0000 1.3
@@ -27,4 +27,4 @@
<tt>java org.apache.axis.wsdl.WSDL2Java ../../StockquoteSOAP.wsdl</tt><br>
After the tool finished running, we deleted all the generated files except
<tt>NetXmethodsServicesStockquoteStockQuotePortType.java</tt> (this is the java
interface corresponding to the port type and is all that is required by WSIF).</p>
<hr width="100%">
-</body></html>
+</body></html>
\ No newline at end of file
