Author: scamp Date: Thu Jan 6 15:24:56 2005 New Revision: 124462 URL: http://svn.apache.org/viewcvs?view=rev&rev=124462 Log: updated the build.xml for new filestructure Modified: incubator/apollo/trunk/src/site/content/tutorial/build.xml
Modified: incubator/apollo/trunk/src/site/content/tutorial/build.xml Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/tutorial/build.xml?view=diff&rev=124462&p1=incubator/apollo/trunk/src/site/content/tutorial/build.xml&r1=124461&p2=incubator/apollo/trunk/src/site/content/tutorial/build.xml&r2=124462 ============================================================================== --- incubator/apollo/trunk/src/site/content/tutorial/build.xml (original) +++ incubator/apollo/trunk/src/site/content/tutorial/build.xml Thu Jan 6 15:24:56 2005 @@ -10,13 +10,9 @@ <property name="ant.home" value="env.ANT_HOME"/> <property name="out.dir" location="generated"/> - <property name="classes.dir" location="build/classes"/> - <property name="src.dir" location="src" /> <property name="filesystem.wsdl" location="FileSystem.wsdl" /> <property name="sysprop.wsdl" location="SysProps.wsdl" /> - <property name="url" value="${base.url}/filesystem" /> - <property name="xml.basedir" location="${basedir}" /> - + <target name="init"> <available file="../../webapps/wsrf" type="dir" property="dist.wsrf.webapp.dir" value="../../webapps/wsrf" /> @@ -26,10 +22,11 @@ <fail unless="wsrf.webapp.dir" message="webapp dir ../../webapps/wsrf does not exist." /> <echo>Using webapp dir: ${wsrf.webapp.dir}</echo> - + <mkdir dir="${out.dir}/lib" /> <path id="apollo.classpath.id"> <pathelement location="${wsrf.webapp.dir}/WEB-INF/classes" /> <fileset dir="${wsrf.webapp.dir}/WEB-INF/lib" includes="*.jar" /> + <fileset dir="${out.dir}/lib" includes="*.jar" /> <pathelement location="${activation.jar}" /> <pathelement location="${mail.jar}" /> </path> @@ -44,88 +41,22 @@ <property name="tmp.dir" location="${wsrf.webapp.dir}/_tmp_" /> <mkdir dir="${tmp.dir}" /> <copy file="${filesystem.wsdl}" todir="${tmp.dir}" overwrite="true" /> - <taskdef name="wsdl2Java" classname="org.apache.ws.resource.Wsdl2JavaTask" classpath="${apollo.classpath}" /> - <wsdl2Java wsdl="${tmp.dir}/filesystem.wsdl" - outputDir="${out.dir}" + <copy file="${sysprop.wsdl}" todir="${tmp.dir}" overwrite="true" /> + <taskdef name="wsdl2Java" classname="org.apache.ws.resource.tool.Wsdl2JavaTask" classpath="${apollo.classpath}" /> + + <wsdl2Java outputDir="${out.dir}" classpath="${apollo.classpath}" debug="off" proxyHost="${http.proxyHost}" proxyPort="${http.proxyPort}" - nonProxyHosts="${http.nonProxyHosts}" /> - <copy file="${sysprop.wsdl}" todir="${tmp.dir}" overwrite="true" /> - <wsdl2Java wsdl="${tmp.dir}/SysProps.wsdl" - outputDir="${out.dir}" - classpath="${apollo.classpath}" - debug="off" - proxyHost="${http.proxyHost}" - proxyPort="${http.proxyPort}" - nonProxyHosts="${http.nonProxyHosts}" /> + nonProxyHosts="${http.nonProxyHosts}"> + <wsdls dir="${tmp.dir}"/> + </wsdl2Java> + <delete dir="${tmp.dir}" /> - </target> - - <target name="compile" - depends="init" - description="compile all classes below generated/classes directory"> - <javac srcdir="${generated.src.dir}" - destdir="${classes.dir}" - classpathref="apollo.classpath.id" - debug="on" /> - <javac srcdir="${src.dir}" - destdir="${classes.dir}" - classpathref="apollo.classpath.id" - debug="on" /> - <copy todir="${classes.dir}"> - <fileset dir="${src.dir}" excludes="**/*.java,**/package.html" /> - </copy> - </target> - - <target name="deploy" - depends="init" - description="deploys the filesystem service to the wsrf webapp"> - - <copy file="${filesystem.wsdl}" todir="${wsrf.webapp.dir}/WEB-INF/classes/wsdl" overwrite="true" verbose="true" /> - <copy file="${sysprop.wsdl}" todir="${wsrf.webapp.dir}/WEB-INF/classes/wsdl" overwrite="true" verbose="true" /> - <echo>Deploying filesystem and sysprop service classes to ${wsrf.webapp.dir}/WEB-INF/classes/...</echo> - <copy todir="${wsrf.webapp.dir}/WEB-INF/classes"> - <fileset dir="${classes.dir}" /> - </copy> - - <!-- TODO: update server-config.wsdd using WsddUpdater --> - - </target> + </target> - <target name="run" - depends="init, compile, deploy" - description="run a client test of the filesystem service"> - - <property name="xml" location="requests/GetResourceProperty_validProp.soap" /> - <antcall target="sendRequest" /> - - </target> - - <target name="sendRequest" - description="sends a request to the filesystem service"> - - <ant antfile="soapclient.xml"> - <property name="url" value="${base.url}/filesystem" /> - </ant> - - </target> - - <target name="sendSysRequest" - description="sends a request to the filesystem service"> - - <ant antfile="soapclient.xml"> - <property name="url" value="${base.url}/sysprops" /> - </ant> - - </target> - - <target name="clean" description="delete the generated source and class files"> - <delete dir="generated" /> - </target> - <target name="usage"> <java classname="org.apache.tools.ant.Main"> <arg value="-buildfile" /> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
