Fix Ant library to be correctly included in project

git-svn-id: https://brutex.net/svn/xservices/trunk@8 e7e49efb-446e-492e-b9ec-fcafc1997a86

nbproject/build-impl.xml

@@ -562,9 +562,9 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.commons-net-2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.commons-net-ftp-2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jakarta-oro-2.0.8.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${libs.ApacheAnt.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.java-unrar-0.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.commons-logging-api-1.0.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.ant.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
@@ -603,9 +603,9 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.commons-net-2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.commons-net-ftp-2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jakarta-oro-2.0.8.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${libs.ApacheAnt.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.java-unrar-0.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.commons-logging-api-1.0.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.ant.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
     </target>
     <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
         <delete dir="${build.web.dir}/WEB-INF/lib"/>

nbproject/genfiles.properties

@@ -1,9 +1,9 @@
-build.xml.data.CRC32=7ba4ef3e
+build.xml.data.CRC32=3e1c9fec
 build.xml.script.CRC32=d8ac74c8
 build.xml.stylesheet.CRC32=c0ebde35@1.21.1.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=7ba4ef3e
+nbproject/build-impl.xml.data.CRC32=3e1c9fec
-nbproject/build-impl.xml.script.CRC32=67947c0e
+nbproject/build-impl.xml.script.CRC32=b2fcc720
 nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.1.1
 nbproject/jaxws-build.xml.stylesheet.CRC32=83928735

nbproject/jax-ws.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jax-ws xmlns="http://www.netbeans.org/ns/jax-ws/1">
   <services>
-    <service name="ExecuteService">
-      <implementation-class>net.brutex.xservices.ws.ExecuteService</implementation-class>
-    </service>
     <service name="ArchiveService">
       <implementation-class>net.brutex.xservices.ws.ArchiveService</implementation-class>
     </service>
     <service name="FileService">
       <implementation-class>net.brutex.xservices.ws.FileService</implementation-class>
     </service>
+    <service name="ExecuteService">
+      <implementation-class>net.brutex.xservices.ws.ExecuteService</implementation-class>
+    </service>
   </services>
   <clients/>
   <jsr109>false</jsr109>

nbproject/jaxws-build.xml

@@ -19,11 +19,6 @@
             <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
         </taskdef>
     </target>
-    <target name="wsgen-ExecuteService" depends="wsgen-init">
-        <wsgen sourcedestdir="${build.generated.sources.dir}/jax-ws" resourcedestdir="${build.generated.sources.dir}/jax-ws/resources/" destdir="${build.generated.sources.dir}/jax-ws" verbose="true" xendorsed="true" keep="true" genwsdl="true" sei="net.brutex.xservices.ws.ExecuteService">
-            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
-        </wsgen>
-    </target>
     <target name="wsgen-ArchiveService" depends="wsgen-init">
         <wsgen sourcedestdir="${build.generated.sources.dir}/jax-ws" resourcedestdir="${build.generated.sources.dir}/jax-ws/resources/" destdir="${build.generated.sources.dir}/jax-ws" verbose="true" xendorsed="true" keep="true" genwsdl="true" sei="net.brutex.xservices.ws.ArchiveService">
             <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
@@ -34,6 +29,11 @@
             <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
         </wsgen>
     </target>
+    <target name="wsgen-ExecuteService" depends="wsgen-init">
+        <wsgen sourcedestdir="${build.generated.sources.dir}/jax-ws" resourcedestdir="${build.generated.sources.dir}/jax-ws/resources/" destdir="${build.generated.sources.dir}/jax-ws" verbose="true" xendorsed="true" keep="true" genwsdl="true" sei="net.brutex.xservices.ws.ExecuteService">
+            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
+        </wsgen>
+    </target>
     <!--
                 ===================
                 JAX-WS WSIMPORT SECTION

nbproject/project.properties

@@ -45,6 +45,7 @@ file.reference.ant-swing.jar=lib/ant-swing.jar
 file.reference.ant-testutil.jar=lib/ant-testutil.jar
 file.reference.ant-trax.jar=lib/ant-trax.jar
 file.reference.ant-weblogic.jar=lib/ant-weblogic.jar
+file.reference.ant.jar=lib\\ant.jar
 file.reference.commons-logging-api-1.0.4.jar=lib/commons-logging-api-1.0.4.jar
 file.reference.commons-net-2.0.jar=lib/commons-net-2.0.jar
 file.reference.commons-net-ftp-2.0.jar=lib/commons-net-ftp-2.0.jar
@@ -96,9 +97,9 @@ javac.classpath=\
     ${file.reference.commons-net-2.0.jar}:\
     ${file.reference.commons-net-ftp-2.0.jar}:\
     ${file.reference.jakarta-oro-2.0.8.jar}:\
-    ${libs.ApacheAnt.classpath}:\
     ${file.reference.java-unrar-0.3.jar}:\
-    ${file.reference.commons-logging-api-1.0.4.jar}
+    ${file.reference.commons-logging-api-1.0.4.jar}:\
+    ${file.reference.ant.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true

nbproject/project.xml

@@ -145,10 +145,6 @@
                     <file>${file.reference.jakarta-oro-2.0.8.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
-                <library dirs="200">
-                    <file>${libs.ApacheAnt.classpath}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
                 <library dirs="200">
                     <file>${file.reference.java-unrar-0.3.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
@@ -157,6 +153,10 @@
                     <file>${file.reference.commons-logging-api-1.0.4.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library dirs="200">
+                    <file>${file.reference.ant.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
             </web-module-libraries>
             <web-module-additional-libraries/>
             <source-roots>

web/WEB-INF/sun-jaxws.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <endpoints version="2.0" xmlns="http://java.sun.com/xml/ns/jax-ws/ri/runtime">
-  <endpoint implementation="net.brutex.xservices.ws.ExecuteService" name="ExecuteService" url-pattern="/ExecuteService"/>
   <endpoint implementation="net.brutex.xservices.ws.ArchiveService" name="ArchiveService" url-pattern="/ArchiveService"/>
   <endpoint implementation="net.brutex.xservices.ws.FileService" name="FileService" url-pattern="/FileService"/>
+  <endpoint implementation="net.brutex.xservices.ws.ExecuteService" name="ExecuteService" url-pattern="/ExecuteService"/>
 </endpoints>

web/WEB-INF/web.xml

@@ -3,11 +3,6 @@
     <listener>
         <listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>
     </listener>
-    <servlet>
-        <servlet-name>ExecuteService</servlet-name>
-        <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
     <servlet>
         <servlet-name>ArchiveService</servlet-name>
         <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
@@ -18,10 +13,11 @@
         <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
-    <servlet-mapping>
+    <servlet>
         <servlet-name>ExecuteService</servlet-name>
-        <url-pattern>/ExecuteService</url-pattern>
+        <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
-    </servlet-mapping>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
     <servlet-mapping>
         <servlet-name>ArchiveService</servlet-name>
         <url-pattern>/ArchiveService</url-pattern>
@@ -30,6 +26,10 @@
         <servlet-name>FileService</servlet-name>
         <url-pattern>/FileService</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ExecuteService</servlet-name>
+        <url-pattern>/ExecuteService</url-pattern>
+    </servlet-mapping>
     <session-config>
         <session-timeout>
             30