Arbeitsstand Anfang Februar

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

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

@@ -51,7 +51,6 @@ public interface FileService {
 
 	final String OPERATION_BASENAME ="basename";
 	final String OPERATION_DOWNLOADFILE ="downloadFile";
-	final String OPERATION_ENCODEFILE= "encodeFile";
 	final String OPERATION_UPLOADFILE ="uploadFile";
 	final String OPERATION_COPY ="copy";
 	final String OPERATION_COPYFILE ="copyFile";
@@ -90,16 +89,6 @@ public interface FileService {
 	public abstract AttachmentType downloadFile(
 			@WebParam(name = FileResource.XML_NAME) FileResource res) throws XServicesFault;
 	
-	/**
-	 * @param res
-	 * @return Encodes a file
-	 * @throws XServicesFault 
-	 */
-	@WSDLDocumentation(XServicesDocumentation.SERVICE_OPERATION_ENCODEFILE)
-	@WebMethod(operationName = OPERATION_ENCODEFILE)
-	public abstract byte[] encodeFile(
-			@WebParam(name = FileResource.XML_NAME) FileResource res) throws XServicesFault;
-	
 	/**
 	 * @param file
 	 * @return The file name of the file that has been uploaded.
@@ -171,6 +160,7 @@ public interface FileService {
 	 * @param file
 	 * @param encoding
 	 * @param append
+	 * @param create 
 	 * @return
 	 * @throws XServicesFault 
 	 */
@@ -180,7 +170,8 @@ public interface FileService {
 			@WebParam(name = "message") @XmlElement(required=true) String message,
 			@WebParam(name = PARAM_FILE) @XmlElement(required=true) String file,
 			@WebParam(name = PARAM_ENCODING) String encoding,
-			@WebParam(name = "append") boolean append) throws XServicesFault;
+			@WebParam(name = "append") boolean append,
+			@WebParam(name = "create") boolean create) throws XServicesFault;
 
 	/**
 	 * Changes the owner of a file or all files inside specified directories. 

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

@@ -24,7 +24,6 @@ import javax.jws.WebService;
 import javax.xml.bind.annotation.XmlElement;
 
 import net.brutex.xservices.types.ScheduledJob;
-import net.brutex.xservices.types.SchedulerStatisticsType;
 import net.brutex.xservices.util.BrutexNamespaces;
 
 import org.apache.cxf.annotations.WSDLDocumentation;
@@ -43,7 +42,7 @@ public interface JobService {
 	final String OPERATION_SCHEDULEJOB = "scheduleJob";
 	final String OPERATION_GETJOB = "getJob";
 	final String OPERATION_DELETEJOB = "deleteJob";
-	final String OPERATION_GETSTATISTICS = "getStatistics";
+	
 	final String PARAM_JOB = "job";
 	
 	
@@ -93,12 +92,6 @@ public interface JobService {
 	public abstract void deleteJob(
 			@WebParam(name="id") @XmlElement(required=true) String uuid) throws XServicesFault;
 	
-	/**
+	
-	 * Get statisctis about the scheduler
-	 * @throws XServicesFault 
-	 */
-	@WebMethod(operationName=OPERATION_GETSTATISTICS)
-	@WSDLDocumentation(value="Get scheduler statistics")
-	public abstract SchedulerStatisticsType getStatistics() throws XServicesFault;
 	
 }

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

@@ -1,5 +1,5 @@
 /*
- *   Copyright 2010 Brian Rosenberger (Brutex Network)
+ *   Copyright 2013 Brian Rosenberger (Brutex Network)
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ import net.brutex.xservices.types.MailMimeType;
 import net.brutex.xservices.types.ReturnCode;
 import net.brutex.xservices.types.RuntimeInfoType;
 import net.brutex.xservices.types.ant.FileSetResource;
-import net.brutex.xservices.util.BrutexNamespaces;
 
 import org.apache.cxf.aegis.type.java5.XmlElement;
 import org.apache.cxf.aegis.type.java5.XmlReturnType;
@@ -36,58 +35,29 @@ import org.apache.cxf.annotations.WSDLDocumentation;
  * @author Brian Rosenberger, bru@brutex.de
  * @since 0.4.0
  */
-@WebService(targetNamespace = BrutexNamespaces.WS_XSERVICES)
+@WebService(targetNamespace = net.brutex.xservices.util.BrutexNamespaces.WS_XSERVICES)
 @WSDLDocumentation("Various service operations.")
 public interface MiscService {
 
 	 public static final String OPERATION_GETMEMORY = "getMemory";
 
-	/**
+	  @WebMethod(operationName="getHostinfo")
-	 * Get IP address from host name.
+	  @WSDLDocumentation("Get information about a host.")
-	 * 
+	  public abstract HostinfoType getHostinfo(@WebParam(name="hostname") @XmlElement(minOccurs="1", nillable=false) String paramString);
-     * @param hostname
-     * @return ReturnCode
-     */
-    @WebMethod(operationName = "getHostinfo")
-    @WSDLDocumentation(value = "Get information about a host.")
-    public HostinfoType getHostinfo(
-    		@WebParam(name = "hostname") @XmlElement(minOccurs="1", nillable=false ) String hostname);
 
+	  @WebMethod(operationName="sleep")
+	  @WSDLDocumentation("Delay request response a specified duration.")
+	  public abstract ReturnCode sleep(@WebParam(name="minutes") int paramInt1, @WebParam(name="seconds") int paramInt2);
 
-    /**
+	  @WebMethod(operationName="getInfo")
-     * Delay execution for a given time.
+	  @WSDLDocumentation("Get XService information.")
-     * 
+	  public abstract ReturnCode getInfo();
-     * @param minutes
-     * @param seconds
-     * @return ReturnCode
-     */
-    @WebMethod(operationName = "sleep")
-    @WSDLDocumentation(value = "Delay request response a specified duration.")
-    public ReturnCode sleep(
-    		@WebParam(name = "minutes") int minutes,
-            @WebParam(name = "seconds") int seconds);
 
+	  @WebMethod(operationName="generateUUID")
+	  @WSDLDocumentation("Generate a UUID.")
+	  public abstract String generateUUID();
 
-    /**
+	  @WebMethod(operationName="getMemory")
-     * @return ReturnCode
+	  @WSDLDocumentation("Get memory and processor information")
-     */
+	  public abstract RuntimeInfoType getMemory();
-    @WebMethod(operationName = "getInfo")
-    @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();
-    
-    /**
-     * Get Memory information
-     */
-    @WebMethod(operationName = MiscService.OPERATION_GETMEMORY)
-    @WSDLDocumentation(value = "Get memory and processor information")
-    public RuntimeInfoType getMemory();
-     
 }