Author: bodewig Date: Sat Aug 26 12:44:35 2006 New Revision: 437217 URL: http://svn.apache.org/viewvc?rev=437217&view=rev Log: copy tests and documentation from core
Added: ant/antlibs/dotnet/trunk/docs/old-core.html - copied, changed from r437213, ant/core/trunk/docs/manual/OptionalTasks/dotnet.html ant/antlibs/dotnet/trunk/src/etc/testcases/WsdlToDotnet.xml - copied, changed from r437213, ant/core/trunk/src/etc/testcases/taskdefs/optional/WsdlToDotnet.xml ant/antlibs/dotnet/trunk/src/etc/testcases/old-core.xml - copied, changed from r437213, ant/core/trunk/src/etc/testcases/taskdefs/optional/dotnet.xml ant/antlibs/dotnet/trunk/src/etc/testcases/src/HelloWorld.wsdl - copied unchanged from r437213, ant/core/trunk/src/etc/testcases/taskdefs/optional/dotnet/HelloWorld.wsdl ant/antlibs/dotnet/trunk/src/etc/testcases/src/example.il - copied unchanged from r437213, ant/core/trunk/src/etc/testcases/taskdefs/optional/dotnet/example.il ant/antlibs/dotnet/trunk/src/etc/testcases/src/example2.il - copied unchanged from r437213, ant/core/trunk/src/etc/testcases/taskdefs/optional/dotnet/example2.il ant/antlibs/dotnet/trunk/src/etc/testcases/src/example3.cs - copied unchanged from r437213, ant/core/trunk/src/etc/testcases/taskdefs/optional/dotnet/example3.cs ant/antlibs/dotnet/trunk/src/etc/testcases/src/jsharp.java - copied unchanged from r437213, ant/core/trunk/src/etc/testcases/taskdefs/optional/dotnet/jsharp.java ant/antlibs/dotnet/trunk/src/etc/testcases/src/res.resources - copied unchanged from r437213, ant/core/trunk/src/etc/testcases/taskdefs/optional/dotnet/res.resources ant/antlibs/dotnet/trunk/src/etc/testcases/wsdl/ - copied from r437213, ant/core/trunk/src/etc/testcases/taskdefs/optional/wsdl/ ant/antlibs/dotnet/trunk/src/tests/junit/org/apache/ant/dotnet/compile/DotnetTest.java - copied, changed from r437213, ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/DotnetTest.java ant/antlibs/dotnet/trunk/src/tests/junit/org/apache/ant/dotnet/compile/WsdlToDotnetTest.java - copied, changed from r437213, ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java Modified: ant/antlibs/dotnet/trunk/docs/index.html Modified: ant/antlibs/dotnet/trunk/docs/index.html URL: http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/docs/index.html?rev=437217&r1=437216&r2=437217&view=diff ============================================================================== --- ant/antlibs/dotnet/trunk/docs/index.html (original) +++ ant/antlibs/dotnet/trunk/docs/index.html Sat Aug 26 12:44:35 2006 @@ -13,6 +13,9 @@ href="http://nant.sourceforge.net/">NAnt</a> or <a href="http://www.nunit.org/">NUnit</a> from within Ant.</p> + <p>The original .NET support from Ant's core has also been moved + to this library.</p> + <h2>Requirements</h2> <p>The current version requires Ant 1.7 or at least a version @@ -116,6 +119,9 @@ <h2>Tasks</h2> <ul> + <li><a href="old-core.html">The old code .NET tasks</a> + including C#, VB.NET and J# compiler tasks.</li> + <li><a href="dotnetexec.html">dotnetexec</a> - run a .NET assembly that's in your PATH. You can chose the framework that is going to be used - defaults to Mono on non-Windows platforms Copied: ant/antlibs/dotnet/trunk/docs/old-core.html (from r437213, ant/core/trunk/docs/manual/OptionalTasks/dotnet.html) URL: http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/docs/old-core.html?p2=ant/antlibs/dotnet/trunk/docs/old-core.html&p1=ant/core/trunk/docs/manual/OptionalTasks/dotnet.html&r1=437213&r2=437217&rev=437217&view=diff ============================================================================== --- ant/core/trunk/docs/manual/OptionalTasks/dotnet.html (original) +++ ant/antlibs/dotnet/trunk/docs/old-core.html Sat Aug 26 12:44:35 2006 @@ -7,12 +7,6 @@ <h1>.NET tasks</h1> <h2>Introduction</h2> - -<p><strong>These tasks are deprecated and will be removed in a future -release of Ant. They are now part of the <a -href="http://ant.apache.org/antlibs/dotnet/index.html">.NET -Antlib</a>.</strong></p> - Ant support for .NET goes back to before .NET was released, and continues to be expanded based on user demand. Users writing nothing but a .NET application, may want to look at the .NET-based Copied: ant/antlibs/dotnet/trunk/src/etc/testcases/WsdlToDotnet.xml (from r437213, ant/core/trunk/src/etc/testcases/taskdefs/optional/WsdlToDotnet.xml) URL: http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/etc/testcases/WsdlToDotnet.xml?p2=ant/antlibs/dotnet/trunk/src/etc/testcases/WsdlToDotnet.xml&p1=ant/core/trunk/src/etc/testcases/taskdefs/optional/WsdlToDotnet.xml&r1=437213&r2=437217&rev=437217&view=diff ============================================================================== --- ant/core/trunk/src/etc/testcases/taskdefs/optional/WsdlToDotnet.xml (original) +++ ant/antlibs/dotnet/trunk/src/etc/testcases/WsdlToDotnet.xml Sat Aug 26 12:44:35 2006 @@ -1,7 +1,7 @@ <?xml version="1.0"?> -<project name="wsdl-to-java-jtest" basedir="." default="init"> - +<project name="wsdl-to-java-jtest" basedir="." default="init" + xmlns:dn="antlib:org.apache.ant.dotnet"> <property environment="env"/> <property name="build.dir" location="wsdl/build"/> @@ -74,42 +74,42 @@ <target name="testNoParams"> - <wsdltodotnet/> + <dn:wsdltodotnet/> </target> <target name="testNoSrc"> - <wsdltodotnet destFile="${out.csc}"/> + <dn:wsdltodotnet destFile="${out.csc}"/> </target> <target name="testDestIsDir" depends="init"> - <wsdltodotnet destFile="${build.dir}" + <dn:wsdltodotnet destFile="${build.dir}" srcFile="${local.wsdl}"/> </target> <target name="testBothSrc" depends="init"> - <wsdltodotnet destFile="${out.csc}" + <dn:wsdltodotnet destFile="${out.csc}" srcFile="${local.wsdl}" url="${endpoint.wsdl}" /> </target> <target name="testSrcIsDir" depends="init"> - <wsdltodotnet destFile="${out.csc}" + <dn:wsdltodotnet destFile="${out.csc}" srcFile="${build.dir}" /> </target> <target name="testSrcIsMissing" depends="init"> - <wsdltodotnet destFile="${out.csc}" + <dn:wsdltodotnet destFile="${out.csc}" srcFile="${build.dir}/invalidfile.wsdl" /> </target> <target name="testLocalWsdl" depends="init"> - <wsdltodotnet destFile="${out.csc}" + <dn:wsdltodotnet destFile="${out.csc}" srcFile="${local.wsdl}" /> - <csc + <dn:csc srcDir="${src.dir}" destFile="${out.app}" targetType="${out.type}" @@ -120,11 +120,11 @@ </target> <target name="testLocalWsdlServer" depends="init"> - <wsdltodotnet destFile="${out.csc}" + <dn:wsdltodotnet destFile="${out.csc}" srcFile="${local.wsdl}" server="true" /> - <csc + <dn:csc srcDir="${src.dir}" destFile="${out.app}" targetType="${out.type}" @@ -136,7 +136,7 @@ </target> <target name="testInvalidExtraOps" depends="init"> - <wsdltodotnet destFile="${out.csc}" + <dn:wsdltodotnet destFile="${out.csc}" srcFile="${local.wsdl}" extraOptions="/newOption:not-one-known-of" /> @@ -145,30 +145,30 @@ <target name="testLocalWsdlVB" depends="init" if="vbc.found"> - <wsdltodotnet destFile="${out.vbc}" + <dn:wsdltodotnet destFile="${out.vbc}" language="VB" srcFile="${local.wsdl}" /> - <vbc + <dn:vbc srcDir="${src.dir}" destFile="${out.app}" targetType="${out.type}" references="${vb.references}" > - </vbc> + </dn:vbc> <available property="app.created" file="${out.app}"/> <fail unless="app.created">No app created</fail> </target> <target name="testLocalWsdlServerVB" depends="init" if="vbc.found"> - <wsdltodotnet destFile="${out.vbc}" + <dn:wsdltodotnet destFile="${out.vbc}" language="VB" srcFile="${local.wsdl}" server="true" /> - <vbc + <dn:vbc srcDir="${src.dir}" destFile="${out.app}" targetType="${out.type}" @@ -182,7 +182,7 @@ </target> <target name="testInvalidExtraOpsVB" depends="init"> - <wsdltodotnet destFile="${out.vbc}" + <dn:wsdltodotnet destFile="${out.vbc}" language="VB" srcFile="${local.wsdl}" extraOptions="/newOption:not-one-known-of" @@ -191,36 +191,36 @@ <target name="testideErrorsIgnoredWhenFalse" depends="init"> - <wsdltodotnet destFile="${out.csc}" + <dn:wsdltodotnet destFile="${out.csc}" srcFile="${local.wsdl}" ideErrors="false" > - </wsdltodotnet> + </dn:wsdltodotnet> </target> <target name="testSchemaMustBeSet" depends="init"> - <wsdltodotnet destFile="${out.csc}" + <dn:wsdltodotnet destFile="${out.csc}" srcFile="${local.wsdl}" > <schema/> - </wsdltodotnet> + </dn:wsdltodotnet> </target> <target name="testSchemaFileMustExist" depends="init"> - <wsdltodotnet destFile="${out.csc}" + <dn:wsdltodotnet destFile="${out.csc}" srcFile="${local.wsdl}" > <schema file="this-file-does-not-exist.xsd"/> - </wsdltodotnet> + </dn:wsdltodotnet> </target> <target name="testSchemaFileMustHaveOneOptionOnly" depends="init"> - <wsdltodotnet destFile="${out.csc}" + <dn:wsdltodotnet destFile="${out.csc}" srcFile="${local.wsdl}" > <schema file="WsdlToDotnet.xml" url="http://ant.apache.org/xml/AntSchema.xsd"/> - </wsdltodotnet> + </dn:wsdltodotnet> </target> </project> Copied: ant/antlibs/dotnet/trunk/src/etc/testcases/old-core.xml (from r437213, ant/core/trunk/src/etc/testcases/taskdefs/optional/dotnet.xml) URL: http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/etc/testcases/old-core.xml?p2=ant/antlibs/dotnet/trunk/src/etc/testcases/old-core.xml&p1=ant/core/trunk/src/etc/testcases/taskdefs/optional/dotnet.xml&r1=437213&r2=437217&rev=437217&view=diff ============================================================================== --- ant/core/trunk/src/etc/testcases/taskdefs/optional/dotnet.xml (original) +++ ant/antlibs/dotnet/trunk/src/etc/testcases/old-core.xml Sat Aug 26 12:44:35 2006 @@ -1,9 +1,10 @@ <?xml version="1.0"?> -<project name="dotnet" basedir="." default="init"> +<project name="dotnet" basedir="." default="init" + xmlns:dn="antlib:org.apache.ant.dotnet"> <property environment="env"/> - <property name="build.dir" location="dotnet/build"/> - <property name="src.dir" location="dotnet"/> + <property name="build.dir" location="build"/> + <property name="src.dir" location="src"/> <property name="out.csc" location="${src.dir}/out.cs"/> <property name="out.app" location="${build.dir}/out.exe"/> @@ -134,12 +135,12 @@ <target name="testCSC-MS" depends="validate_csc" if="csc.found"> <property name="testCSC.exe" location="${build.dir}/ExampleCsc.exe" /> - <csc + <dn:csc destFile="${testCSC.exe}" targetType="exe" srcDir="${src.dir}" > - </csc> + </dn:csc> <available property="app.created" file="${testCSC.exe}"/> <fail unless="app.created">No app ${testCSC.exe} created</fail> <exec executable="${testCSC.exe}" failonerror="true" /> @@ -149,13 +150,13 @@ <target name="testCSC-Mono" depends="validate_csc" if="mcs.found"> <property name="testCSC.exe" location="${build.dir}/ExampleCsc.exe" /> - <csc + <dn:csc destFile="${testCSC.exe}" targetType="exe" includedefaultreferences="true" srcDir="${src.dir}" > - </csc> + </dn:csc> <available property="app.created" file="${testCSC.exe}"/> <fail unless="app.created">No app ${testCSC.exe} created</fail> <exec executable="${mono.executable}" failonerror="true"> @@ -169,18 +170,18 @@ <target name="testCSCResources-MS" depends="validate_csc" if="csc.found"> <property name="testCSCRes.exe" location="${build.dir}/ExampleCscRes.exe" /> - <csc + <dn:csc destFile="${testCSCRes.exe}" targetType="exe" srcDir="${src.dir}" > <resource file="${src.dir}/res.resources"/> - </csc> + </dn:csc> <available property="app-res.created" file="${testCSCRes.exe}"/> <fail unless="app-res.created">No app ${testCSC.exe} created</fail> <exec executable="${testCSCRes.exe}" failonerror="true" /> <delete file="${testCSCRes.exe}"/> - <csc + <dn:csc destFile="${testCSCRes.exe}" targetType="exe" srcDir="${src.dir}" @@ -188,7 +189,7 @@ <resource namespace="some.namespace" embed="true"> <fileset file="${src.dir}/res.resources"/> </resource> - </csc> + </dn:csc> <available property="app-res-2.created" file="${testCSCRes.exe}"/> <fail unless="app-res-2.created">No app ${testCSC.exe} created</fail> <exec executable="${testCSCRes.exe}" failonerror="true" /> @@ -198,14 +199,14 @@ <target name="testCSCResources-Mono" depends="validate_csc" if="mcs.found"> <property name="testCSCRes.exe" location="${build.dir}/ExampleCscRes.exe" /> - <csc + <dn:csc destFile="${testCSCRes.exe}" targetType="exe" includedefaultreferences="true" srcDir="${src.dir}" > <resource file="${src.dir}/res.resources"/> - </csc> + </dn:csc> <available property="app-res.created" file="${testCSCRes.exe}"/> <fail unless="app-res.created">No app ${testCSC.exe} created</fail> <exec executable="${mono.executable}" failonerror="true"> @@ -220,13 +221,13 @@ <target name="testCSCintrinsicFileset-MS" depends="validate_csc" if="csc.found"> <property name="testCSC.exe" location="${build.dir}/ExampleCsc.exe"/> - <csc + <dn:csc destFile="${testCSC.exe}" targetType="exe" srcDir="${src.dir}" includes="**/*.cs" > - </csc> + </dn:csc> <available property="app.created" file="${testCSC.exe}"/> <fail unless="app.created">No app ${testCSC.exe} created</fail> <exec executable="${testCSC.exe}" failonerror="true" /> @@ -236,14 +237,14 @@ <target name="testCSCintrinsicFileset-Mono" depends="validate_csc" if="mcs.found"> <property name="testCSC.exe" location="${build.dir}/ExampleCsc.exe"/> - <csc + <dn:csc destFile="${testCSC.exe}" targetType="exe" srcDir="${src.dir}" includes="**/*.cs" includedefaultreferences="true" > - </csc> + </dn:csc> <available property="app.created" file="${testCSC.exe}"/> <fail unless="app.created">No app ${testCSC.exe} created</fail> <exec executable="${mono.executable}" failonerror="true"> @@ -257,25 +258,25 @@ <target name="testCSCdll-MS" depends="validate_csc" if="csc.found"> <property name="testCSC.dll" location="${build.dir}/Example2.dll" /> - <csc + <dn:csc destFile="${testCSC.dll}" targetType="library" executable="csc" > <src dir="${src.dir}" includes="example2.cs"/> - </csc> + </dn:csc> <available property="dll.created" file="${testCSC.dll}"/> <fail unless="dll.created">No file ${testCSC.dll} created</fail> <property name="testCSC2.dll" location="${build.dir}/folder with dir/Example3.dll" /> <mkdir dir="${build.dir}/folder with dir"/> - <csc + <dn:csc destFile="${testCSC2.dll}" targetType="library" executable="csc" > <src dir="${src.dir}" includes="example3.cs"/> - </csc> + </dn:csc> <available property="dll2.created" file="${testCSC2.dll}"/> <fail unless="dll2.created">No file ${testCSC2.dll} created</fail> </target> @@ -283,13 +284,13 @@ <target name="testCSCdll-Mono" depends="validate_csc" if="mcs.found"> <property name="testCSC.dll" location="${build.dir}/Example2.dll" /> - <csc + <dn:csc destFile="${testCSC.dll}" targetType="library" includedefaultreferences="true" > <src dir="${src.dir}" includes="example2.cs"/> - </csc> + </dn:csc> <available property="dll.created" file="${testCSC.dll}"/> <fail unless="dll.created">No file ${testCSC.dll} created</fail> </target> @@ -301,7 +302,7 @@ if="csc.found"> <property name="testCscReferences.exe" location="${build.dir}/ExampleCsc2.exe" /> - <csc + <dn:csc destFile="${testCscReferences.exe}" targetType="exe" > @@ -311,7 +312,7 @@ <define name="RELEASE" /> <define name="DEBUG" if="undefined.property"/> <define name="def3" unless="undefined.property"/> - </csc> + </dn:csc> <available property="refapp.created" file="${testCscReferences.exe}"/> <fail unless="refapp.created">No app ${testCscReferences.exe} created</fail> <copy file="${testCSC2.dll}" todir="${build.dir}"/> @@ -322,7 +323,7 @@ if="mcs.found"> <property name="testCscReferences.exe" location="${build.dir}/ExampleCsc2.exe" /> - <csc + <dn:csc destFile="${testCscReferences.exe}" targetType="exe" includedefaultreferences="true" @@ -332,7 +333,7 @@ <define name="RELEASE" /> <define name="DEBUG" if="undefined.property"/> <define name="def3" unless="undefined.property"/> - </csc> + </dn:csc> <available property="refapp.created" file="${testCscReferences.exe}"/> <fail unless="refapp.created">No app ${testCscReferences.exe} created</fail> <exec executable="${mono.executable}" failonerror="true"> @@ -348,12 +349,12 @@ if="ilasm.found"> <property name="testILASM.exe" location="${build.dir}/ExampleIlasm.exe" /> - <ilasm + <dn:ilasm destFile="${testILASM.exe}" targetType="exe" > <src dir="${src.dir}" includes="*.il"/> - </ilasm> + </dn:ilasm> <available property="ilasm.created" file="${testILASM.exe}"/> <fail unless="ilasm.created">No app ${testILASM.exe} created</fail> </target> @@ -375,11 +376,11 @@ <!-- not including this in the test as it creates an exe in the src dir --> <target name="testIlasmNoDestFile" depends="validate_ilasm"> - <ilasm + <dn:ilasm targetType="exe" > <src dir="${src.dir}" includes="**/*.il"/> - </ilasm> + </dn:ilasm> </target> <!-- just here to look at fileset refid conversion by hand --> @@ -392,7 +393,7 @@ <target name="testILDASM" depends="testILASM" if="ildasm.found"> <property name="testILDASM.il" location="${build.dir}/ExampleIldasm.il" /> - <ildasm + <dn:ildasm srcFile="${testILASM.exe}" destFile="${testILDASM.il}" metadata="true" @@ -406,32 +407,32 @@ <!-- this is an error --> <target name="testILDASM_empty" depends="validate_ilasm" > - <ildasm/> + <dn:ildasm/> </target> <target name="jsharp" depends="init" if="jsharp.found" > <property name="jsharp.exe" location="${build.dir}/jsharp.exe" /> - <jsharpc + <dn:jsharpc destFile="${jsharp.exe}" targetType="exe" > <src dir="${src.dir}" includes="*.java"/> - </jsharpc> + </dn:jsharpc> <exec executable="${jsharp.exe}" failonerror="true" /> </target> <target name="testCSCresponseFile" depends="validate_csc" > <property name="testCSCresponseFile.exe" location="${build.dir}/testCSCresponseFile.exe" /> - <csc + <dn:csc destFile="${testCSCresponseFile.exe}" targetType="exe" executable="${cs.compiler}" useResponseFile="true" srcDir="${src.dir}" > - </csc> + </dn:csc> <available property="app.created" file="${testCSCresponseFile.exe}"/> <fail unless="app.created">No app ${testCSCresponseFile.exe} created</fail> <delete file="${testCSCresponseFile.exe}"/> Copied: ant/antlibs/dotnet/trunk/src/tests/junit/org/apache/ant/dotnet/compile/DotnetTest.java (from r437213, ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/DotnetTest.java) URL: http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/tests/junit/org/apache/ant/dotnet/compile/DotnetTest.java?p2=ant/antlibs/dotnet/trunk/src/tests/junit/org/apache/ant/dotnet/compile/DotnetTest.java&p1=ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/DotnetTest.java&r1=437213&r2=437217&rev=437217&view=diff ============================================================================== --- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/DotnetTest.java (original) +++ ant/antlibs/dotnet/trunk/src/tests/junit/org/apache/ant/dotnet/compile/DotnetTest.java Sat Aug 26 12:44:35 2006 @@ -14,7 +14,7 @@ * limitations under the License. * */ -package org.apache.tools.ant.taskdefs.optional; +package org.apache.ant.dotnet.compile; import org.apache.tools.ant.BuildFileTest; @@ -28,7 +28,7 @@ /** * Description of the Field */ - private final static String TASKDEFS_DIR = "src/etc/testcases/taskdefs/optional/"; + private final static String TASKDEFS_DIR = "src/etc/testcases/"; /** @@ -45,7 +45,7 @@ * The JUnit setup method */ public void setUp() { - configureProject(TASKDEFS_DIR + "dotnet.xml"); + configureProject(TASKDEFS_DIR + "old-core.xml"); } Copied: ant/antlibs/dotnet/trunk/src/tests/junit/org/apache/ant/dotnet/compile/WsdlToDotnetTest.java (from r437213, ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java) URL: http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/tests/junit/org/apache/ant/dotnet/compile/WsdlToDotnetTest.java?p2=ant/antlibs/dotnet/trunk/src/tests/junit/org/apache/ant/dotnet/compile/WsdlToDotnetTest.java&p1=ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java&r1=437213&r2=437217&rev=437217&view=diff ============================================================================== --- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java (original) +++ ant/antlibs/dotnet/trunk/src/tests/junit/org/apache/ant/dotnet/compile/WsdlToDotnetTest.java Sat Aug 26 12:44:35 2006 @@ -14,10 +14,9 @@ * limitations under the License. * */ -package org.apache.tools.ant.taskdefs.optional; +package org.apache.ant.dotnet.compile; import org.apache.tools.ant.BuildFileTest; -import org.apache.tools.ant.taskdefs.optional.dotnet.WsdlToDotnet; /** * Tests the WsdlToDotnet task. @@ -29,7 +28,7 @@ /** * dir for taskdefs */ - private final static String TASKDEFS_DIR = "src/etc/testcases/taskdefs/optional/"; + private final static String TASKDEFS_DIR = "src/etc/testcases/"; /** * message from exec --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]