Author: ips Date: Thu Jan 6 13:58:05 2005 New Revision: 124457 URL: http://svn.apache.org/viewcvs?view=rev&rev=124457 Log: now has only one output option (-o)
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2JavaTask.java incubator/apollo/trunk/src/site/content/tutorial/build.xml Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2JavaTask.java Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2JavaTask.java?view=diff&rev=124457&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2JavaTask.java&r1=124456&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2JavaTask.java&r2=124457 ============================================================================== --- incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2JavaTask.java (original) +++ incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2JavaTask.java Thu Jan 6 13:58:05 2005 @@ -46,20 +46,14 @@ } private List m_wsdls = new ArrayList(); - private File m_jarOutputDir; - private File m_srcOutputDir; + private File m_outputDir; private Path m_classpath; private Boolean m_verbose; private Boolean m_debug; - public void setSrcOutputDir( File srcOutputDir ) + public void setOutputDir( File outputDir ) { - m_srcOutputDir = srcOutputDir; - } - - public void setJarOutputDir( File jarOutputDir ) - { - m_jarOutputDir = jarOutputDir; + m_outputDir = outputDir; } /** @@ -231,10 +225,9 @@ options.setDebug( m_debug.booleanValue() ); } - - Wsdl2Java wsdl2Java = new Wsdl2Java( (File[]) m_wsdls.toArray( new File[0] ), m_srcOutputDir, m_jarOutputDir, options ); try { + Wsdl2Java wsdl2Java = new Wsdl2Java( (File[]) m_wsdls.toArray( new File[0] ), m_outputDir, options ); wsdl2Java.generate(); } catch ( Exception e ) 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=124457&p1=incubator/apollo/trunk/src/site/content/tutorial/build.xml&r1=124456&p2=incubator/apollo/trunk/src/site/content/tutorial/build.xml&r2=124457 ============================================================================== --- incubator/apollo/trunk/src/site/content/tutorial/build.xml (original) +++ incubator/apollo/trunk/src/site/content/tutorial/build.xml Thu Jan 6 13:58:05 2005 @@ -9,9 +9,8 @@ <!-- workaround for those IDEs that dont set ant.home as per the ant script --> <property name="ant.home" value="env.ANT_HOME"/> - <property name="generated.src.dir" location="build/src"/> + <property name="out.dir" location="generated"/> <property name="classes.dir" location="build/classes"/> - <property name="jar.dir" location="build/output"/> <property name="src.dir" location="src" /> <property name="filesystem.wsdl" location="FileSystem.wsdl" /> <property name="sysprop.wsdl" location="SysProps.wsdl" /> @@ -24,8 +23,7 @@ <condition property="wsrf.webapp.dir" value="${dist.wsrf.webapp.dir}"> <isset property="dist.wsrf.webapp.dir"/> </condition> - - + <fail unless="wsrf.webapp.dir" message="webapp dir ../../webapps/wsrf does not exist." /> <echo>Using webapp dir: ${wsrf.webapp.dir}</echo> @@ -48,8 +46,7 @@ <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" - srcOutputDir="${generated.src.dir}" - jarOutputDir="${jar.dir}" + outputDir="${out.dir}" classpath="${apollo.classpath}" debug="off" proxyHost="${http.proxyHost}" @@ -57,13 +54,12 @@ nonProxyHosts="${http.nonProxyHosts}" /> <copy file="${sysprop.wsdl}" todir="${tmp.dir}" overwrite="true" /> <wsdl2Java wsdl="${tmp.dir}/SysProps.wsdl" - srcOutputDir="${generated.src.dir}" - jarOutputDir="${jar.dir}" - classpath="${apollo.classpath}" - debug="off" - proxyHost="${http.proxyHost}" - proxyPort="${http.proxyPort}" - nonProxyHosts="${http.nonProxyHosts}" /> + outputDir="${out.dir}" + classpath="${apollo.classpath}" + debug="off" + proxyHost="${http.proxyHost}" + proxyPort="${http.proxyPort}" + nonProxyHosts="${http.nonProxyHosts}" /> <delete dir="${tmp.dir}" /> </target> @@ -112,18 +108,20 @@ description="sends a request to the filesystem service"> <ant antfile="soapclient.xml"> - <property name="url" value="${base.url}/filesystem" /> + <property name="url" value="${base.url}/filesystem" /> </ant> </target> + <target name="sendSysRequest" - description="sends a request to the filesystem service"> + description="sends a request to the filesystem service"> - <ant antfile="soapclient.xml"> - <property name="url" value="${base.url}/sysprops" /> - </ant> + <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> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
