diff --git a/lib/ant-antlr.jar b/lib/ant-antlr.jar index e6ac589..c07eea6 100644 Binary files a/lib/ant-antlr.jar and b/lib/ant-antlr.jar differ diff --git a/lib/ant-apache-bcel.jar b/lib/ant-apache-bcel.jar index 6821049..5b48b2b 100644 Binary files a/lib/ant-apache-bcel.jar and b/lib/ant-apache-bcel.jar differ diff --git a/lib/ant-apache-bsf.jar b/lib/ant-apache-bsf.jar index 1b0daf9..c8fc33a 100644 Binary files a/lib/ant-apache-bsf.jar and b/lib/ant-apache-bsf.jar differ diff --git a/lib/ant-apache-log4j.jar b/lib/ant-apache-log4j.jar index 32de4b0..74122c1 100644 Binary files a/lib/ant-apache-log4j.jar and b/lib/ant-apache-log4j.jar differ diff --git a/lib/ant-apache-oro.jar b/lib/ant-apache-oro.jar index a0a2435..8942473 100644 Binary files a/lib/ant-apache-oro.jar and b/lib/ant-apache-oro.jar differ diff --git a/lib/ant-apache-regexp.jar b/lib/ant-apache-regexp.jar index 2214d89..52a869d 100644 Binary files a/lib/ant-apache-regexp.jar and b/lib/ant-apache-regexp.jar differ diff --git a/lib/ant-apache-resolver.jar b/lib/ant-apache-resolver.jar index 54388ed..6303e36 100644 Binary files a/lib/ant-apache-resolver.jar and b/lib/ant-apache-resolver.jar differ diff --git a/lib/ant-apache-xalan2.jar b/lib/ant-apache-xalan2.jar new file mode 100644 index 0000000..6828b58 Binary files /dev/null and b/lib/ant-apache-xalan2.jar differ diff --git a/lib/ant-commons-logging.jar b/lib/ant-commons-logging.jar index f2eaa8a..9ee5e15 100644 Binary files a/lib/ant-commons-logging.jar and b/lib/ant-commons-logging.jar differ diff --git a/lib/ant-commons-net.jar b/lib/ant-commons-net.jar index 0208417..2e265a3 100644 Binary files a/lib/ant-commons-net.jar and b/lib/ant-commons-net.jar differ diff --git a/lib/ant-jai.jar b/lib/ant-jai.jar index 4ce81f0..20d3ee2 100644 Binary files a/lib/ant-jai.jar and b/lib/ant-jai.jar differ diff --git a/lib/ant-javamail.jar b/lib/ant-javamail.jar index 1d8a3eb..9b35767 100644 Binary files a/lib/ant-javamail.jar and b/lib/ant-javamail.jar differ diff --git a/lib/ant-jdepend.jar b/lib/ant-jdepend.jar index 4e7d2be..aca36ef 100644 Binary files a/lib/ant-jdepend.jar and b/lib/ant-jdepend.jar differ diff --git a/lib/ant-jmf.jar b/lib/ant-jmf.jar index 536d507..25fb5d5 100644 Binary files a/lib/ant-jmf.jar and b/lib/ant-jmf.jar differ diff --git a/lib/ant-jsch.jar b/lib/ant-jsch.jar index 394fdef..f29bea4 100644 Binary files a/lib/ant-jsch.jar and b/lib/ant-jsch.jar differ diff --git a/lib/ant-junit.jar b/lib/ant-junit.jar index 063cce4..236731a 100644 Binary files a/lib/ant-junit.jar and b/lib/ant-junit.jar differ diff --git a/lib/ant-launcher.jar b/lib/ant-launcher.jar index 7c8f849..08ec632 100644 Binary files a/lib/ant-launcher.jar and b/lib/ant-launcher.jar differ diff --git a/lib/ant-netrexx.jar b/lib/ant-netrexx.jar index 9f368ac..bef14db 100644 Binary files a/lib/ant-netrexx.jar and b/lib/ant-netrexx.jar differ diff --git a/lib/ant-nodeps.jar b/lib/ant-nodeps.jar index 98b5518..11eb253 100644 Binary files a/lib/ant-nodeps.jar and b/lib/ant-nodeps.jar differ diff --git a/lib/ant-stylebook.jar b/lib/ant-stylebook.jar index e78ed49..74160d7 100644 Binary files a/lib/ant-stylebook.jar and b/lib/ant-stylebook.jar differ diff --git a/lib/ant-swing.jar b/lib/ant-swing.jar index 641c5e9..28f30a4 100644 Binary files a/lib/ant-swing.jar and b/lib/ant-swing.jar differ diff --git a/lib/ant-testutil.jar b/lib/ant-testutil.jar index 10f5230..5a5c80b 100644 Binary files a/lib/ant-testutil.jar and b/lib/ant-testutil.jar differ diff --git a/lib/ant-trax.jar b/lib/ant-trax.jar index 7c4d564..2f6497c 100644 Binary files a/lib/ant-trax.jar and b/lib/ant-trax.jar differ diff --git a/lib/ant.jar b/lib/ant.jar index 7047177..85292f0 100644 Binary files a/lib/ant.jar and b/lib/ant.jar differ diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index c52a6cd..2dd6e42 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -585,6 +585,7 @@ exists or setup the property manually. For example like this: + @@ -646,6 +647,7 @@ exists or setup the property manually. For example like this: + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index d368b05..8fabbcd 100644 --- a/nbproject/genfiles.properties +++ b/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.script.CRC32=2df29bca +nbproject/build-impl.xml.data.CRC32=6aca1953 +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 diff --git a/nbproject/jax-ws.xml b/nbproject/jax-ws.xml index db76830..eb3acf8 100644 --- a/nbproject/jax-ws.xml +++ b/nbproject/jax-ws.xml @@ -10,6 +10,9 @@ net.brutex.xservices.ws.ExecuteService + + net.brutex.xservices.ws.MiscServiceImpl + false diff --git a/nbproject/jaxws-build.xml b/nbproject/jaxws-build.xml index 4abfdfd..2663cbb 100644 --- a/nbproject/jaxws-build.xml +++ b/nbproject/jaxws-build.xml @@ -1,42 +1,47 @@ - + - + --> + - - - - - - - - - - - - - - - - - - - - - - + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + - + --> + diff --git a/nbproject/project.properties b/nbproject/project.properties index 0367537..ea91f0a 100644 --- a/nbproject/project.properties +++ b/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 diff --git a/nbproject/project.xml b/nbproject/project.xml index 3bb6efe..70a1fbe 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -237,6 +237,10 @@ ${file.reference.xml-resolver-1.2.jar} WEB-INF/lib + + ${libs.metro.classpath} + WEB-INF/lib + diff --git a/src/java/net/brutex/xservices/ws/MiscServiceImpl.java b/src/java/net/brutex/xservices/ws/MiscServiceImpl.java index b1431da..a940f9f 100644 --- a/src/java/net/brutex/xservices/ws/MiscServiceImpl.java +++ b/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() { - - return null; + private ReturnCode antGetHostinfo(String hostname, String prefix) { + HostInfo info = new HostInfo(); + info.setTaskName("HostInfo"); + RunTask runner = new RunTask(info); + info.setHost(hostname); + info.setPrefix(prefix); + return runner.postTask(); } } diff --git a/web/WEB-INF/cxf-beans.xml b/web/WEB-INF/cxf-beans.xml index d52797e..517a1f3 100644 --- a/web/WEB-INF/cxf-beans.xml +++ b/web/WEB-INF/cxf-beans.xml @@ -23,4 +23,8 @@ + + diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index 0866e69..1bcb372 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -1,27 +1,37 @@ - contextConfigLocation WEB-INF/cxf-beans.xml - org.springframework.web.context.ContextLoaderListener - + + com.sun.xml.ws.transport.http.servlet.WSServletContextListener + XServices org.apache.cxf.transport.servlet.CXFServlet 1 - + + MiscServiceImpl + com.sun.xml.ws.transport.http.servlet.WSServlet + 1 + XServices /* - + + config-location + /WEB-INF/cxf-beans.xml + + + + MiscServiceImpl + /MiscServiceImpl - 30