Updated Apache Ant libraries to Ant 1.8.0

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

nbproject/build-impl.xml

@@ -585,6 +585,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jettison-1.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jsr311-api-1.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.xml-resolver-1.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${libs.metro.classpath}" 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>
@@ -646,6 +647,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jettison-1.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jsr311-api-1.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.xml-resolver-1.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${libs.metro.classpath}" 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=be8df95d
+build.xml.data.CRC32=6aca1953
 build.xml.script.CRC32=d8ac74c8
 build.xml.stylesheet.CRC32=c0ebde35@1.21.2.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=be8df95d
+nbproject/build-impl.xml.data.CRC32=6aca1953
-nbproject/build-impl.xml.script.CRC32=2df29bca
+nbproject/build-impl.xml.script.CRC32=a300afa5
 nbproject/build-impl.xml.stylesheet.CRC32=b139b33b@1.21.2.1
 nbproject/jaxws-build.xml.stylesheet.CRC32=83928735

nbproject/jax-ws.xml

@@ -10,6 +10,9 @@
     <service name="ExecuteService">
       <implementation-class>net.brutex.xservices.ws.ExecuteService</implementation-class>
     </service>
+    <service name="MiscServiceImpl">
+      <implementation-class>net.brutex.xservices.ws.MiscServiceImpl</implementation-class>
+    </service>
   </services>
   <clients/>
   <jsr109>false</jsr109>

nbproject/jaxws-build.xml

@@ -1,42 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
         *** GENERATED FROM jax-ws.xml - DO NOT EDIT !                             ***
         *** TO MODIFY wsimport options USE Web Service node -> Edit WS Attributes ***
         *** TO CHANGE TARGETS GENERATED TO jaxws-build.xml COPY THOSE             ***
         *** TARGETS TO ../build.xml AND MODIFY THAT FILE INSTEAD                  ***
 
-        -->
+        -->
-<project xmlns:xalan="http://xml.apache.org/xslt" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:jaxws="http://www.netbeans.org/ns/jax-ws/1">
+<project xmlns:xalan="http://xml.apache.org/xslt" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:jaxws="http://www.netbeans.org/ns/jax-ws/1">
     <!--
                 ===================
                 JAX-WS WSGEN SECTION
                 ===================
-            -->
+            -->
-    <target name="wsgen-init" depends="init, -do-compile">
+    <target name="wsgen-init" depends="init, -do-compile">
-        <mkdir dir="${build.generated.sources.dir}/jax-ws/resources/"/>
+        <mkdir dir="${build.generated.sources.dir}/jax-ws/resources/"/>
-        <mkdir dir="${build.classes.dir}"/>
+        <mkdir dir="${build.classes.dir}"/>
-        <taskdef name="wsgen" classname="com.sun.tools.ws.ant.WsGen">
+        <taskdef name="wsgen" classname="com.sun.tools.ws.ant.WsGen">
-            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
+            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
-        </taskdef>
+        </taskdef>
-    </target>
+    </target>
-    <target name="wsgen-ArchiveService" depends="wsgen-init">
+    <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">
+        <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}"/>
+            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
-        </wsgen>
+        </wsgen>
-    </target>
+    </target>
-    <target name="wsgen-FileService" depends="wsgen-init">
+    <target name="wsgen-FileService" 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.FileService">
+        <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.FileService">
-            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
+            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
-        </wsgen>
+        </wsgen>
-    </target>
+    </target>
-    <target name="wsgen-ExecuteService" depends="wsgen-init">
+    <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">
+        <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}"/>
+            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
-        </wsgen>
+        </wsgen>
-    </target>
+    </target>
+    <target name="wsgen-MiscServiceImpl" 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.MiscServiceImpl">
+            <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
+        </wsgen>
+    </target>
     <!--
                 ===================
                 JAX-WS WSIMPORT SECTION
                 ===================
-            -->
+            -->
-</project>
+</project>

nbproject/project.properties

@@ -138,7 +138,8 @@ javac.classpath=\
     ${file.reference.axiom-impl-1.2.7.jar}:\
     ${file.reference.jettison-1.2.jar}:\
     ${file.reference.jsr311-api-1.0.jar}:\
-    ${file.reference.xml-resolver-1.2.jar}
+    ${file.reference.xml-resolver-1.2.jar}:\
+    ${libs.metro.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true

nbproject/project.xml

@@ -237,6 +237,10 @@
                     <file>${file.reference.xml-resolver-1.2.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library dirs="200">
+                    <file>${libs.metro.classpath}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
             </web-module-libraries>
             <web-module-additional-libraries/>
             <source-roots>

src/java/net/brutex/xservices/ws/MiscServiceImpl.java

@@ -18,6 +18,8 @@ package net.brutex.xservices.ws;
 
 import javax.jws.WebService;
 import net.brutex.xservices.types.ReturnCode;
+import net.brutex.xservices.util.RunTask;
+import org.apache.tools.ant.taskdefs.HostInfo;
 
 /**
  *
@@ -28,12 +30,16 @@ serviceName="MiscService")
 public class MiscServiceImpl implements MiscService {
 
     public ReturnCode getHostinfo(String hostname) {
-        throw new UnsupportedOperationException("Not supported yet.");
+        return antGetHostinfo(hostname, "");
     }
 
-    private ReturnCode antGetHostinfo() {
+    private ReturnCode antGetHostinfo(String hostname, String prefix) {
-        
+        HostInfo info = new HostInfo();
-        return null;
+        info.setTaskName("HostInfo");
+        RunTask runner = new RunTask(info);
+        info.setHost(hostname);
+        info.setPrefix(prefix);
+        return runner.postTask();
     }
 
 }

web/WEB-INF/cxf-beans.xml

@@ -23,4 +23,8 @@
     <jaxws:endpoint id="executeservice"
                     implementor="net.brutex.xservices.ws.ExecuteService"
                     address="/ExecuteService"/>
+                    
+    <jaxws:endpoint id="miscservice"
+                    implementor="net.brutex.xservices.ws.MiscServiceImpl"
+                    address="/MiscService"/>
 </beans>

web/WEB-INF/web.xml

@@ -1,27 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-    
     <context-param>
         <param-name>contextConfigLocation</param-name>
         <param-value>WEB-INF/cxf-beans.xml</param-value>
     </context-param>
-
     <listener>
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
     </listener>
-
+    <listener>
+        <listener-class>com.sun.xml.ws.transport.http.servlet.WSServletContextListener</listener-class>
+    </listener>
     <servlet>
         <servlet-name>XServices</servlet-name>
         <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
-
+    <servlet>
+        <servlet-name>MiscServiceImpl</servlet-name>
+        <servlet-class>com.sun.xml.ws.transport.http.servlet.WSServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
     <servlet-mapping>
         <servlet-name>XServices</servlet-name>
         <url-pattern>/*</url-pattern>
-
+        <init-param>
+            <param-name>config-location</param-name>
+            <param-value>/WEB-INF/cxf-beans.xml</param-value>
+        </init-param>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>MiscServiceImpl</servlet-name>
+        <url-pattern>/MiscServiceImpl</url-pattern>
     </servlet-mapping>
-
     <session-config>
         <session-timeout>
             30