From 43dc5c30e468a92b25e11516c89b3255bee195f5 Mon Sep 17 00:00:00 2001
From: Brian Rosenberger <bru@brutex.de>
Date: Sat, 31 Dec 2011 13:42:51 +0000
Subject: [PATCH] Changed MiscService to return dedicated type for getHostinfo
 operation

git-svn-id: https://brutex.net/svn/xservices/trunk@78 e7e49efb-446e-492e-b9ec-fcafc1997a86
---
 .../net/brutex/xservices/ws/MiscService.java  | 15 +++++-
 .../xservices/ws/impl/MiscServiceImpl.java    | 48 ++++++++++---------
 2 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/src/java/net/brutex/xservices/ws/MiscService.java b/src/java/net/brutex/xservices/ws/MiscService.java
index 3dad615..b84d5e4 100644
--- a/src/java/net/brutex/xservices/ws/MiscService.java
+++ b/src/java/net/brutex/xservices/ws/MiscService.java
@@ -20,9 +20,12 @@ import javax.jws.WebParam;
 import javax.jws.WebService;
 import net.brutex.xservices.types.FileSetResource;
 import net.brutex.xservices.types.HostConnection;
+import net.brutex.xservices.types.HostinfoType;
 import net.brutex.xservices.types.MailMimeType;
 import net.brutex.xservices.types.ReturnCode;
 import net.brutex.xservices.util.BrutexNamespaces;
+
+import org.apache.cxf.aegis.type.java5.XmlElement;
 import org.apache.cxf.annotations.WSDLDocumentation;
 import org.apache.cxf.annotations.WSDLDocumentationCollection;
 
@@ -43,8 +46,8 @@ public interface MiscService {
      */
     @WebMethod(operationName = "getHostinfo")
     @WSDLDocumentation(value = "Get information about a host.")
-    public ReturnCode getHostinfo(
-    		@WebParam(name = "hostname") String hostname);
+    public HostinfoType getHostinfo(
+    		@WebParam(name = "hostname") @XmlElement(minOccurs="1", nillable=false ) String hostname);
 
     /**
      *
@@ -132,4 +135,12 @@ public interface MiscService {
     @WSDLDocumentation(value = "Get XService information.")
     public ReturnCode getInfo();
     
+    /**
+     * Generate a UUID
+     * @return new UUID
+     */
+    @WebMethod(operationName = "generateUUID")
+    @WSDLDocumentation(value = "Generate a UUID.")
+    public String generateUUID();
+    
 }
diff --git a/src/java/net/brutex/xservices/ws/impl/MiscServiceImpl.java b/src/java/net/brutex/xservices/ws/impl/MiscServiceImpl.java
index 4321610..9078566 100644
--- a/src/java/net/brutex/xservices/ws/impl/MiscServiceImpl.java
+++ b/src/java/net/brutex/xservices/ws/impl/MiscServiceImpl.java
@@ -18,10 +18,12 @@ package net.brutex.xservices.ws.impl;
 
 import java.util.Enumeration;
 import java.util.Properties;
+import java.util.UUID;
 
 import javax.jws.WebService;
 import net.brutex.xservices.types.FileSetResource;
 import net.brutex.xservices.types.HostConnection;
+import net.brutex.xservices.types.HostinfoType;
 import net.brutex.xservices.types.MailMimeType;
 import net.brutex.xservices.types.ReturnCode;
 import net.brutex.xservices.util.BrutexNamespaces;
@@ -38,17 +40,24 @@ import org.apache.tools.ant.taskdefs.email.EmailTask;
  * 
  * @author Brian Rosenberger, bru@brutex.de
  */
-@WebService(
-		targetNamespace = BrutexNamespaces.WS_XSERVICES, 
-		endpointInterface = "net.brutex.xservices.ws.MiscService", 
-		serviceName = "MiscService"
-			)
+@WebService(targetNamespace = BrutexNamespaces.WS_XSERVICES, endpointInterface = "net.brutex.xservices.ws.MiscService", serviceName = "MiscService")
 public class MiscServiceImpl implements MiscService {
 
-	public ReturnCode getHostinfo(String hostname) {
-		return antGetHostinfo(hostname, null);
+	public HostinfoType getHostinfo(String hostname) {
+		HostInfo info = new HostInfo();
+		info.setTaskName("HostInfo");
+		RunTask runner = new RunTask(info);
+		info.setHost(hostname);
+		// info.setPrefix(prefix);
+		ReturnCode ret = runner.postTask();
+		HostinfoType infotype = new HostinfoType(
+				ret.getProperty("NAME"),
+				ret.getProperty("DOMAIN"), 
+				ret.getProperty("ADDR4"),
+				ret.getProperty("ADDR6"));
+		return infotype;
 	}
-	
+
 	public ReturnCode getInfo() {
 		ReturnCode r = new ReturnCode();
 		r.returnCode = 0;
@@ -56,20 +65,20 @@ public class MiscServiceImpl implements MiscService {
 		Properties props = System.getProperties();
 
 		// Enumerate all system properties
+		@SuppressWarnings("unchecked")
 		Enumeration<String> e = (Enumeration<String>) props.propertyNames();
-		for (; e.hasMoreElements(); ) {
-		    // Get property name
-		    String propName = (String)e.nextElement();
+		for (; e.hasMoreElements();) {
+			// Get property name
+			String propName = (String) e.nextElement();
 
-		    // Get property value
-		    String propValue = (String)props.get(propName);
-		    r.stdOut = r.stdOut + propName + ": " + propValue + "\n";
+			// Get property value
+			String propValue = (String) props.get(propName);
+			r.stdOut = r.stdOut + propName + ": " + propValue + "\n";
 		}
 
 		return r;
 	}
 
-
 	public ReturnCode sendMailSimple(HostConnection mailhost, String from,
 			String tolist, String subject, String message) {
 		return sendMail(from, from, tolist, "", "", subject, message,
@@ -98,13 +107,8 @@ public class MiscServiceImpl implements MiscService {
 		return sleep(0, minutes, seconds, 0);
 	}
 
-	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();
+	public String generateUUID() {
+		return UUID.randomUUID().toString();
 	}
 
 	private ReturnCode sendMail(String from, String replyto, String tolist,