WebSVN – XServices – Path Comparison – /xservices Rev 177 and /xservices Rev 176

Ignore whitespace Rev 177 → Rev 176

/xservices/trunk/src/java/net/brutex/xservices/ws/rs/FileInfo.java
42,7 → 42,6
public abstract interface FileInfo {

public final static String BASE_PATH = "/FileService/";
public final static String SERVICE_NAME = "FileInfoService";

/**
* Get the file/ directory listing.

 /xservices/trunk/src/java/net/brutex/xservices/ws/rs/FileInfoImpl.java
 ,14 → 73,12
    */
   public Response getFiles(HttpHeaders h, UriInfo uriInfo, String dir, boolean withDir, boolean withFiles, int level, String search, int count, int page, boolean useCache)
   {
-        if(dir==null) {
-                dir = "c:/";
-                logger.warn("No directory specified. Default is 'c:/'.");
-                }
         isPermitted(dir);
     URI baseuri = URI.create(uriInfo.getBaseUri()+FileInfo.BASE_PATH+"getFile?file=");
+    if(dir==null) {dir = "c:/"; System.out.println("No directory specified.");}
     logger.info(String.format("Listing directory '%s'.", dir));
     if (level <= 0) level = 1;
 ,8 → 109,9
       logger.info(String.format("Returning items %s to %s from total of %s items in the list.", fromIndex, toIndex, list.size()));
       return Response.ok(sublist).build();
     } catch (CacheException e) {
-      return Response.serverError().build();
+      Response.serverError().build();
     }
+    return null;
   }
   /**
 ,14 → 254,4
         }
         return true;
 }
-//http://stackoverflow.com/questions/3758606/how-to-convert-byte-size-into-human-readable-format-in-java
-private static String humanReadableByteCount(long bytes, boolean si) {
-    int unit = si ? 1000 : 1024;
-    if (bytes < unit) return bytes + " B";
-    int exp = (int) (Math.log(bytes) / Math.log(unit));
-    String pre = (si ? "kMGTPE" : "KMGTPE").charAt(exp-1) + (si ? "" : "i");
-    return String.format("%.1f %sB", bytes / Math.pow(unit, exp), pre);
-}
 }

 /xservices/trunk/src/java/net/brutex/xservices/ws/rs/ResultType.java
 ,19 → 1,3
-/*
- *   Copyright 2014 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.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- */
 package net.brutex.xservices.ws.rs;
 import net.brutex.xservices.types.scm.ItemType;

 /xservices/trunk/src/java/net/brutex/xservices/ws/rs/FileListType.java
 ,19 → 1,3
-/*
- *   Copyright 2014 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.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- */
 package net.brutex.xservices.ws.rs;
 import javax.xml.bind.annotation.XmlElement;

/xservices/trunk/src/java/net/brutex/xservices/ws/impl/XmlServiceImpl.java
61,7 → 61,6
import org.apache.log4j.Logger;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.UnauthorizedException;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jaxen.JaxenException;
import org.jaxen.SimpleNamespaceContext;

195,7 → 194,6
}
}

@RequiresPermissions("insertNodes")
public String insertNodes(String source, String encoding, NamespaceListType nsList, String xpath, String xmlFragment) throws XServicesFault {
encoding = validateEncoding(encoding);
try {

 /xservices/trunk/src/java/net/brutex/xservices/ws/impl/StringServiceImpl.java
 ,15 → 20,12
 import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.jws.WebService;
 import net.brutex.xservices.types.StringMatchType;
 import net.brutex.xservices.types.StringReplaceType;
 import net.brutex.xservices.types.StringSplitType;
 import net.brutex.xservices.ws.StringService;
 import net.brutex.xservices.ws.XServicesFault;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.text.translate.CharSequenceTranslator;
 import org.apache.commons.lang3.text.translate.NumericEntityEscaper;
 ,12 → 96,6
                 }
                 return result;
         }
-  @Override
-        public String removeCRLF(String paramString) throws XServicesFault {
-                String value = paramString.replaceAll("[\r\n]", "");
-                return value;
-        }
   private int getFlags(String flags) {
     int allflags = 0;

 /xservices/trunk/src/java/net/brutex/xservices/ws/impl/ExecuteServiceImpl.java
 ,6 → 17,8
 package net.brutex.xservices.ws.impl;
 import java.io.File;
+import java.util.UUID;
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
 import javax.jws.WebService;
 ,6 → 25,7
 import net.brutex.xservices.types.HostConnection;
 import net.brutex.xservices.types.ReturnCode;
 import net.brutex.xservices.util.BrutexNamespaces;
+import net.brutex.xservices.util.JobWrapper;
 import net.brutex.xservices.util.RunTask;
 import net.brutex.xservices.ws.ExecuteService;
 import net.brutex.xservices.ws.XServicesFault;
 ,6 → 37,16
 import org.apache.tools.ant.types.Commandline;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;
+import org.quartz.JobBuilder;
+import org.quartz.JobDetail;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.Trigger;
+import static org.quartz.TriggerBuilder.*;
+import static org.quartz.SimpleScheduleBuilder.*;
+import org.quartz.TriggerUtils;
+import org.quartz.impl.StdSchedulerFactory;
+import org.quartz.impl.triggers.SimpleTriggerImpl;
 /**
  *

/xservices/trunk/src/java/net/brutex/xservices/ws/XmlService.java
27,7 → 27,6
import net.brutex.xservices.types.ant.FileResource;

import org.apache.cxf.annotations.WSDLDocumentation;
import org.apache.shiro.authz.annotation.RequiresPermissions;

/**
* @author Brian Rosenberger, bru(at)brutex.de
42,7 → 41,6
public static final String PARAM_XPATH = "xpath";
public static final String PARAM_XML = "xmldata";

@RequiresPermissions("insertNodes")
@WebMethod(operationName="insertNodes")
@WSDLDocumentation("Insert an XML fragment into an XML document given as string.")
public abstract String insertNodes(

 /xservices/trunk/src/java/net/brutex/xservices/ws/StringService.java
 ,10 → 75,4
                   @WebParam(name="delimiter") @XmlElement(required=true) String delimiter)
         throws XServicesFault;
-  @WebMethod(operationName="removeCRLF")
-  @WSDLDocumentation("Remove any line feed and/ or carriage return characters")
-  public abstract String removeCRLF(
-                  @WebParam(name="string") @XmlElement(required=true) String paramString)
-        throws XServicesFault;
 }

/xservices/trunk/src/java/net/brutex/xservices/ws/ArchiveService.java
1,5 → 1,5
/*
g * Copyright 2010 Brian Rosenberger (Brutex Network)
* Copyright 2010 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.

/xservices/trunk/src/java/net/brutex/xservices/security/XmlServicePermission.java
File deleted

Property changes:
Deleted: svn:mime-type
-text/plain
\ No newline at end of property

 /xservices/trunk/src/java/net/brutex/xservices/security/PermissionResolver.java
 ,12 → 16,8
 package net.brutex.xservices.security;
-import net.brutex.xservices.ws.XmlService;
-import net.brutex.xservices.ws.rs.FileInfo;
 import org.apache.log4j.Logger;
 import org.apache.shiro.authz.Permission;
-import org.apache.shiro.authz.permission.InvalidPermissionStringException;
 /**
  * @author Brian Rosenberger, bru(at)brutex.de
 ,31 → 26,10
 public class PermissionResolver implements org.apache.shiro.authz.permission.PermissionResolver {
         final Logger logger = Logger.getLogger(PermissionResolver.class);
-        private final String DELIMITER = "||";
         @Override
         public Permission resolvePermission(String permissionString) {
-                logger.debug(String.format("Trying to examine new Permission '%s'", permissionString));
-                if(! permissionString.contains(DELIMITER)) {
-                        logger.error(String.format("Permission '%s' is missing permission class.", permissionString));
-                        throw new InvalidPermissionStringException(String.format("Permission '%s' is missing permission class.", permissionString), permissionString);
-                }
-                int delimiterIndex = permissionString.indexOf(DELIMITER);
-                String value = permissionString.substring(0, delimiterIndex);
-                delimiterIndex = delimiterIndex + DELIMITER.length();
-                switch (value) {
-                case XmlService.SERVICE_NAME:
-                        logger.debug(String.format("Found '%s' as permission class.", value));
-                        return new XmlServicePermission(permissionString.substring( delimiterIndex ));
-                case FileInfo.SERVICE_NAME:
-                        logger.debug(String.format("Found '%s' as permission class.", value));
-                        return new DirectoryPermission(permissionString.substring( delimiterIndex ));
-                default:
-                        logger.warn(String.format("Permission class '%s' is not defined.", value));
-                        throw new InvalidPermissionStringException(String.format("Permission class '%s' is not defined.", value), permissionString);
-                }
+                logger.debug(String.format("Creating new Permission '%s'", permissionString));
+                return new DirectoryPermission(permissionString);
         }
 }

/xservices/trunk/src/java/net/brutex/xservices/security/DirectoryPermission.java
30,7 → 30,6
private final String path;

public DirectoryPermission(String antlikepath) {
logger.debug(String.format("Creating permission for path '%s'", antlikepath));
path = antlikepath;
}

 /xservices/trunk/test/FileRest-soapui-project.xml
 ,10 → 1,2
 <?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project name="FileRest" soapui-version="5.0.0" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" resourceRoot="" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:RestService" wadlVersion="http://wadl.dev.java.net/2009/02" name="FileRest" type="rest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache/><con:endpoints><con:endpoint>http://localhost:8080/XServices/fileinfo</con:endpoint></con:endpoints><con:resource name="getFiles" path="/FileService/getFiles"><con:settings/><con:parameters><con:parameter required="true"><con:name>directory</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>includeDirectories</con:name><con:value/><con:style>QUERY</con:style><con:type xmlns:xs="http://www.w3.org/2001/XMLSchema">xs:boolean</con:type><con:default/><con:option>0</con:option><con:option>1</con:option><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>depth</con:name><con:value/><con:style>QUERY</con:style><con:type xmlns:xs="http://www.w3.org/2001/XMLSchema">xs:int</con:type><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>includeFiles</con:name><con:value/><con:style>QUERY</con:style><con:type xmlns:xs="http://www.w3.org/2001/XMLSchema">xs:boolean</con:type><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>search</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>itemsPerPage</con:name><con:value/><con:style>QUERY</con:style><con:type xmlns:xs="http://www.w3.org/2001/XMLSchema">xs:int</con:type><con:default/><con:description xsi:nil="true"/></con:parameter><con:parameter><con:name>usecache</con:name><con:value/><con:style>QUERY</con:style><con:type xmlns:xs="http://www.w3.org/2001/XMLSchema">xs:boolean</con:type><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Method 1" method="GET"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="FAULT"><con:mediaType xsi:nil="true"/><con:status>401</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/xml</con:mediaType><con:status>200</con:status><con:params/><con:element>fileInfoTypes</con:element></con:representation><con:representation type="FAULT"><con:mediaType xsi:nil="true"/><con:status>401</con:status><con:params/><con:element>data</con:element></con:representation><con:representation type="FAULT"><con:mediaType xsi:nil="true"/><con:status>401</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080/XServices/fileinfo</con:endpoint><con:request/><con:originalUri>http://localhost/XServices/fileinfo/FileService/getFiles</con:originalUri><con:credentials><con:username>admin</con:username><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters>
-  <con:entry key="search" value="*.txt"/>
-  <con:entry key="includeFiles" value="1"/>
-  <con:entry key="directory" value="c:/temp"/>
-  <con:entry key="usecache" value="0"/>
-  <con:entry key="itemsPerPage" value="50"/>
-  <con:entry key="depth" value="2"/>
-  <con:entry key="includeDirectories" value="0"/>
-</con:parameters><con:parameterOrder><con:entry>directory</con:entry><con:entry>includeDirectories</con:entry><con:entry>depth</con:entry><con:entry>includeFiles</con:entry><con:entry>search</con:entry><con:entry>itemsPerPage</con:entry><con:entry>usecache</con:entry></con:parameterOrder></con:request></con:method></con:resource><con:resource name="getFile" path="/FileService/getFile"><con:settings/><con:parameters><con:parameter><con:name>file</con:name><con:value/><con:style>QUERY</con:style><con:default/><con:description xsi:nil="true"/></con:parameter></con:parameters><con:method name="Method 1" method="GET"><con:settings/><con:parameters/><con:representation type="FAULT"><con:mediaType>text/html;charset=utf-8</con:mediaType><con:status>401</con:status><con:params/><con:element>html</con:element></con:representation><con:representation type="RESPONSE"><con:mediaType>text/plain</con:mediaType><con:status>200</con:status><con:params/><con:element>data</con:element></con:representation><con:request name="Request 1" mediaType="application/json"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:endpoint>http://localhost:8080/XServices/fileinfo</con:endpoint><con:request/><con:originalUri>http://localhost/XServices/fileinfo/FileService/getFile</con:originalUri><con:credentials><con:username>admin</con:username><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:parameters><entry key="file" value="c:/temp/test.txt" xmlns="http://eviware.com/soapui/config"/></con:parameters><con:parameterOrder><con:entry>file</con:entry></con:parameterOrder></con:request></con:method></con:resource></con:interface><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
+<con:soapui-project name="FileRest" soapui-version="4.5.1" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" resourceRoot="" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:properties/><con:wssContainer/><con:sensitiveInformation/></con:soapui-project>

 /xservices/trunk/test/ExecuteService-soapui-project.xml
 ,5 → 1,5
 <?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project name="ExecuteService" soapui-version="5.0.0" abortOnError="false" runType="SEQUENTIAL" resourceRoot="" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="ExecuteServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}ExecuteServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/ExecuteService?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/ExecuteService?wsdl"><con:part><con:url>http://localhost:8080/XServices/ExecuteService?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="ExecuteService" targetNamespace="http://ws.xservices.brutex.net" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:ns1="http://schemas.xmlsoap.org/soap/http">
+<con:soapui-project name="ExecuteService" soapui-version="4.5.1" abortOnError="false" runType="SEQUENTIAL" resourceRoot="" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="ExecuteServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}ExecuteServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/ExecuteService?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/ExecuteService?wsdl"><con:part><con:url>http://localhost:8080/XServices/ExecuteService?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="ExecuteService" targetNamespace="http://ws.xservices.brutex.net" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:ns1="http://schemas.xmlsoap.org/soap/http">
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://ws.xservices.brutex.net" xmlns:xs="http://www.w3.org/2001/XMLSchema">
       <xs:element name="antProperty" type="tns:antProperty"/>
 ,7 → 388,7
          <timeout>15000</timeout>
       </ws:runCommand>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:credentials><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/ExecuteService/runCommand"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="runCommandAsync" bindingOperationName="runCommandAsync" type="Request-Response" outputName="runCommandAsyncResponse" inputName="runCommandAsync" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/ExecuteService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
+</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/ExecuteService/runCommand"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="runCommandAsync" bindingOperationName="runCommandAsync" type="Request-Response" outputName="runCommandAsyncResponse" inputName="runCommandAsync" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/ExecuteService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
    <soapenv:Header/>
    <soapenv:Body>
       <ws:runCommandAsync>
 ,4 → 496,4
          <timeout>?</timeout>
       </ws:telnet>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/ExecuteService/telnet"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/></con:soapui-project>
+</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/ExecuteService/telnet"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project>

 /xservices/trunk/test/XmlServices-soapui-project.xml
 ,5 → 1,5
 <?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project activeEnvironment="Default" name="XmlServices" resourceRoot="" soapui-version="5.0.0" abortOnError="false" runType="SEQUENTIAL" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="XmlServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}XmlServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/XmlService?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/XmlService?wsdl"><con:part><con:url>http://localhost:8080/XServices/XmlService?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="XmlService" targetNamespace="http://ws.xservices.brutex.net" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:ns1="http://schemas.xmlsoap.org/soap/http">
+<con:soapui-project activeEnvironment="Default" name="XmlServices" resourceRoot="" soapui-version="4.5.1" abortOnError="false" runType="SEQUENTIAL" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="XmlServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}XmlServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/XmlService?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/XmlService?wsdl"><con:part><con:url>http://localhost:8080/XServices/XmlService?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="XmlService" targetNamespace="http://ws.xservices.brutex.net" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:ns1="http://schemas.xmlsoap.org/soap/http">
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://ws.xservices.brutex.net" xmlns:xs="http://www.w3.org/2001/XMLSchema">
       <xs:element name="insertNodes" type="tns:insertNodes"/>
 ,7 → 435,7
          <xpath>*/bx:note/ns:heading/text()</xpath>
       </ws:selectXPath>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:credentials><con:selectedAuthProfile>Basic</con:selectedAuthProfile><con:addedBasicAuthenticationTypes>Basic</con:addedBasicAuthenticationTypes><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/XmlService/selectXPath"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="setAttribute" bindingOperationName="setAttribute" type="Request-Response" outputName="setAttributeResponse" inputName="setAttribute" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/XmlService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
+</soapenv:Envelope>]]></con:request><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/XmlService/selectXPath"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="setAttribute" bindingOperationName="setAttribute" type="Request-Response" outputName="setAttributeResponse" inputName="setAttribute" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/XmlService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
    <soapenv:Header/>
    <soapenv:Body>
       <ws:setAttribute>
 ,4 → 523,4
          <xmldata><![CDATA[<name>Meyer</name><age>45</age><!--edited here-->]]]]>><![CDATA[</xmldata>
       </ws:replaceNodes>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:credentials><con:username>admin</con:username><con:password/><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/XmlService/replaceNodes"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/></con:soapui-project>
+</soapenv:Envelope>]]></con:request><con:credentials><con:username>admin</con:username><con:password/><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/XmlService/replaceNodes"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project>

 /xservices/trunk/test/DateService-soapui-project.xml
 ,5 → 1,5
 <?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project name="DateService" resourceRoot="" soapui-version="5.0.0" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.actions.iface.tools.soapui.TestRunnerAction@values-local"><![CDATA[<xml-fragment xmlns:con="http://eviware.com/soapui/config">
+<con:soapui-project name="DateService" resourceRoot="" soapui-version="4.0.1.1" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.actions.iface.tools.soapui.TestRunnerAction@values-local"><![CDATA[<xml-fragment xmlns:con="http://eviware.com/soapui/config">
   <con:entry key="Global Properties" value=""/>
   <con:entry key="TestSuite" value="Basic Call Tests"/>
   <con:entry key="Report to Generate" value=""/>
 ,4 → 879,4
          <unit>seconds</unit>
       </ws:dateAdd>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="SOAP Response"/><con:assertion type="Schema Compliance"><con:configuration/></con:assertion><con:assertion type="SOAP Fault Assertion"/><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:loadTest name="Basic Load"><con:settings><con:setting id="HttpSettings@close-connections">false</con:setting></con:settings><con:threadCount>30</con:threadCount><con:startDelay>0</con:startDelay><con:sampleInterval>250</con:sampleInterval><con:calculateTPSOnTimePassed>true</con:calculateTPSOnTimePassed><con:resetStatisticsOnThreadCountChange>true</con:resetStatisticsOnThreadCountChange><con:historyLimit>-1</con:historyLimit><con:testLimit>180</con:testLimit><con:limitType>TIME</con:limitType><con:loadStrategy><con:type>Burst</con:type><con:config><burstDelay>60000</burstDelay><burstDuration>10000</burstDuration></con:config></con:loadStrategy><con:assertion type="Step Status" name="Step Status"/><con:maxAssertionErrors>100</con:maxAssertionErrors><con:cancelExcessiveThreads>true</con:cancelExcessiveThreads><con:strategyInterval>500</con:strategyInterval></con:loadTest><con:properties/></con:testCase><con:properties/></con:testSuite><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/></con:soapui-project>
+</soapenv:Envelope>]]></con:request><con:assertion type="SOAP Response"/><con:assertion type="Schema Compliance"><con:configuration/></con:assertion><con:assertion type="SOAP Fault Assertion"/><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:loadTest name="Basic Load"><con:settings><con:setting id="HttpSettings@close-connections">false</con:setting></con:settings><con:threadCount>30</con:threadCount><con:startDelay>0</con:startDelay><con:sampleInterval>250</con:sampleInterval><con:calculateTPSOnTimePassed>true</con:calculateTPSOnTimePassed><con:resetStatisticsOnThreadCountChange>true</con:resetStatisticsOnThreadCountChange><con:historyLimit>-1</con:historyLimit><con:testLimit>180</con:testLimit><con:limitType>TIME</con:limitType><con:loadStrategy><con:type>Burst</con:type><con:config><burstDelay>60000</burstDelay><burstDuration>10000</burstDuration></con:config></con:loadStrategy><con:assertion type="Step Status" name="Step Status"/><con:maxAssertionErrors>100</con:maxAssertionErrors><con:cancelExcessiveThreads>true</con:cancelExcessiveThreads><con:strategyInterval>500</con:strategyInterval></con:loadTest><con:properties/></con:testCase><con:properties/></con:testSuite><con:properties/><con:wssContainer/></con:soapui-project>

 /xservices/trunk/test/JobServices-soapui-project.xml
 ,5 → 1,5
 <?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project name="JobServices" resourceRoot="" soapui-version="5.0.0" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="JobServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}JobServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/JobService?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/JobService?wsdl"><con:part><con:url>http://localhost:8080/XServices/JobService?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="JobService" targetNamespace="http://ws.xservices.brutex.net" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:ns1="http://schemas.xmlsoap.org/soap/http">
+<con:soapui-project name="JobServices" resourceRoot="" soapui-version="4.5.1" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="JobServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}JobServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/JobServices?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/JobServices?wsdl"><con:part><con:url>http://localhost:8080/XServices/JobServices?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="JobService" targetNamespace="http://ws.xservices.brutex.net" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://ws.xservices.brutex.net" xmlns:xs="http://www.w3.org/2001/XMLSchema">
       <xs:element name="deleteJob" type="tns:deleteJob"/>
 ,6 → 8,8
       <xs:element name="getJobResponse" type="tns:getJobResponse"/>
       <xs:element name="getJobs" type="tns:getJobs"/>
       <xs:element name="getJobsResponse" type="tns:getJobsResponse"/>
+      <xs:element name="getStatistics" type="tns:getStatistics"/>
+      <xs:element name="getStatisticsResponse" type="tns:getStatisticsResponse"/>
       <xs:element name="scheduleJob" type="tns:scheduleJob"/>
       <xs:element name="scheduleJobResponse" type="tns:scheduleJobResponse"/>
       <xs:complexType name="getJobs">
 ,6 → 38,34
           <xs:element minOccurs="0" name="return" type="tns:scheduledJob"/>
         </xs:sequence>
       </xs:complexType>
+      <xs:complexType name="getStatistics">
+        <xs:sequence/>
+      </xs:complexType>
+      <xs:complexType name="getStatisticsResponse">
+        <xs:sequence>
+          <xs:element minOccurs="0" name="return" type="tns:schedulerStatisticsType"/>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="schedulerStatisticsType">
+        <xs:sequence>
+          <xs:element minOccurs="0" name="calendarNames">
+            <xs:simpleType>
+              <xs:list itemType="xs:string"/>
+            </xs:simpleType>
+          </xs:element>
+          <xs:element name="executedJobs" type="xs:int"/>
+          <xs:element minOccurs="0" name="runningSince" type="tns:DateInfoType"/>
+          <xs:element name="threadPoolSize" type="xs:int"/>
+          <xs:element minOccurs="0" name="version" type="xs:string"/>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="DateInfoType">
+        <xs:sequence>
+          <xs:element minOccurs="0" name="iso8601date" type="xs:dateTime"/>
+          <xs:element minOccurs="0" name="rfc822date" type="xs:string"/>
+          <xs:element name="timestamp" type="xs:long"/>
+        </xs:sequence>
+      </xs:complexType>
       <xs:complexType name="deleteJob">
         <xs:sequence>
           <xs:element name="id" type="xs:string"/>
 ,7 → 84,6
           <xs:element minOccurs="0" name="return" type="xs:string"/>
         </xs:sequence>
       </xs:complexType>
-      <xs:element name="XServicesFault" type="tns:XServicesFault"/>
       <xs:complexType name="XServicesFault">
         <xs:sequence>
           <xs:element name="faultstring" nillable="true" type="xs:string"/>
 ,6 → 93,7
           <xs:element name="jvmruntime" nillable="true" type="xs:string"/>
         </xs:sequence>
       </xs:complexType>
+      <xs:element name="XServicesFault" type="tns:XServicesFault"/>
     </xs:schema>
   </wsdl:types>
   <wsdl:message name="scheduleJob">
 ,6 → 111,9
   <wsdl:message name="getJobs">
     <wsdl:part element="tns:getJobs" name="parameters"></wsdl:part>
   </wsdl:message>
+  <wsdl:message name="getStatisticsResponse">
+    <wsdl:part element="tns:getStatisticsResponse" name="parameters"></wsdl:part>
+  </wsdl:message>
   <wsdl:message name="getJobsResponse">
     <wsdl:part element="tns:getJobsResponse" name="parameters"></wsdl:part>
   </wsdl:message>
 ,6 → 123,9
   <wsdl:message name="deleteJobResponse">
     <wsdl:part element="tns:deleteJobResponse" name="parameters"></wsdl:part>
   </wsdl:message>
+  <wsdl:message name="getStatistics">
+    <wsdl:part element="tns:getStatistics" name="parameters"></wsdl:part>
+  </wsdl:message>
   <wsdl:message name="XServicesFault">
     <wsdl:part element="tns:XServicesFault" name="XServicesFault"></wsdl:part>
   </wsdl:message>
 ,6 → 142,12
       <wsdl:output message="tns:getJobResponse" name="getJobResponse"></wsdl:output>
       <wsdl:fault message="tns:XServicesFault" name="XServicesFault"></wsdl:fault>
     </wsdl:operation>
+    <wsdl:operation name="getStatistics">
+      <wsdl:documentation>Get scheduler statistics</wsdl:documentation>
+      <wsdl:input message="tns:getStatistics" name="getStatistics"></wsdl:input>
+      <wsdl:output message="tns:getStatisticsResponse" name="getStatisticsResponse"></wsdl:output>
+      <wsdl:fault message="tns:XServicesFault" name="XServicesFault"></wsdl:fault>
+    </wsdl:operation>
     <wsdl:operation name="deleteJob">
       <wsdl:documentation>Delete a scheduled job.</wsdl:documentation>
       <wsdl:input message="tns:deleteJob" name="deleteJob"></wsdl:input>
 ,12 → 175,12
         <soap:fault name="XServicesFault" use="literal"/>
       </wsdl:fault>
     </wsdl:operation>
-    <wsdl:operation name="deleteJob">
+    <wsdl:operation name="getJob">
       <soap:operation soapAction="" style="document"/>
-      <wsdl:input name="deleteJob">
+      <wsdl:input name="getJob">
         <soap:body use="literal"/>
       </wsdl:input>
-      <wsdl:output name="deleteJobResponse">
+      <wsdl:output name="getJobResponse">
         <soap:body use="literal"/>
       </wsdl:output>
       <wsdl:fault name="XServicesFault">
 ,12 → 187,12
         <soap:fault name="XServicesFault" use="literal"/>
       </wsdl:fault>
     </wsdl:operation>
-    <wsdl:operation name="getJob">
+    <wsdl:operation name="getStatistics">
       <soap:operation soapAction="" style="document"/>
-      <wsdl:input name="getJob">
+      <wsdl:input name="getStatistics">
         <soap:body use="literal"/>
       </wsdl:input>
-      <wsdl:output name="getJobResponse">
+      <wsdl:output name="getStatisticsResponse">
         <soap:body use="literal"/>
       </wsdl:output>
       <wsdl:fault name="XServicesFault">
 ,6 → 199,18
         <soap:fault name="XServicesFault" use="literal"/>
       </wsdl:fault>
     </wsdl:operation>
+    <wsdl:operation name="deleteJob">
+      <soap:operation soapAction="" style="document"/>
+      <wsdl:input name="deleteJob">
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="deleteJobResponse">
+        <soap:body use="literal"/>
+      </wsdl:output>
+      <wsdl:fault name="XServicesFault">
+        <soap:fault name="XServicesFault" use="literal"/>
+      </wsdl:fault>
+    </wsdl:operation>
     <wsdl:operation name="scheduleJob">
       <soap:operation soapAction="" style="document"/>
       <wsdl:input name="scheduleJob">
 ,15 → 226,15
   </wsdl:binding>
   <wsdl:service name="JobService">
     <wsdl:port binding="tns:JobServiceSoapBinding" name="JobServiceImplPort">
-      <soap:address location="http://localhost:8080/XServices/JobService"/>
+      <soap:address location="http://localhost:8080/XServices/JobServices"/>
     </wsdl:port>
   </wsdl:service>
-</wsdl:definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://localhost:8080/XServices/JobService</con:endpoint><con:endpoint>http://localhost:8080/XServices/JobServices</con:endpoint></con:endpoints><con:operation isOneWay="false" action="" name="getJobs" bindingOperationName="getJobs" type="Request-Response" outputName="getJobsResponse" inputName="getJobs" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/JobService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
+</wsdl:definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://localhost:8080/XServices/JobServices</con:endpoint></con:endpoints><con:operation isOneWay="false" action="" name="getJobs" bindingOperationName="getJobs" type="Request-Response" outputName="getJobsResponse" inputName="getJobs" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/JobServices</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
    <soapenv:Header/>
    <soapenv:Body>
       <ws:getJobs/>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/JobService/getJobs"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="getJob" bindingOperationName="getJob" type="Request-Response" outputName="getJobResponse" inputName="getJob" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/JobService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/JobService/getJobs"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="getJob" bindingOperationName="getJob" type="Request-Response" outputName="getJobResponse" inputName="getJob" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/JobServices</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
    <soapenv:Header/>
    <soapenv:Body>
       <ws:getJob>
 ,31 → 241,41
          <id>6b3da1f0-ff1c-4422-b2ce-17a6d1c2a990</id>
       </ws:getJob>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/JobService/getJob"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="scheduleJob" bindingOperationName="scheduleJob" type="Request-Response" outputName="scheduleJobResponse" inputName="scheduleJob" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/JobService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/JobService/getJob"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="scheduleJob" bindingOperationName="scheduleJob" type="Request-Response" outputName="scheduleJobResponse" inputName="scheduleJob" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/JobServices</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
    <soapenv:Header/>
    <soapenv:Body>
       <ws:scheduleJob>
          <job>
-            <name/>
+            <name></name>
             <datetime>2012-05-14T07:52:00+02:00</datetime>
-         </job>
-      </ws:scheduleJob>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/JobService/scheduleJob"/><con:wsrmConfig version="1.2"/></con:call><con:call name="Request 2"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/JobService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <ws:scheduleJob>
-         <job>
-            <name>Hello World 2</name>
             <!--Optional:-->
-            <description>Some description</description>
-            <datetime>2014-08-21T09:53:00+02:00</datetime>
-            <!--Optional:-->
-            <script>System.out.println("Hello World");</script>
+            <script><![CDATA[
+java.lang.System.out.println("hm")
+java.lang.System.out.println("hm")
+java.lang.System.out.println("hm")
+java.lang.System.out.println("hm")
+java.lang.System.out.println("hm")
+java.lang.System.out.println("hm")
+java.lang.System.out.println("hm")
+java.lang.System.out.println("hm")
+java.lang.System.out.println("hm")
+java.lang.System.out.println("hm")
+java.lang.System.out.println("hm")
+java.lang.System.out.println("hm")
+java.lang.System.out.println("hm")
+java.lang.System.out.println("hm")
+java.lang.System.out.println("hm")
+java.lang.System.out.println("hm")
+java.lang.System.out.println("hm")
+]]]]>><![CDATA[</script>
          </job>
       </ws:scheduleJob>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/JobService/scheduleJob"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="deleteJob" bindingOperationName="deleteJob" type="Request-Response" outputName="deleteJobResponse" inputName="deleteJob" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/JobService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/JobService/scheduleJob"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="deleteJob" bindingOperationName="deleteJob" type="Request-Response" outputName="deleteJobResponse" inputName="deleteJob" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/JobServices</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
    <soapenv:Header/>
    <soapenv:Body>
       <ws:deleteJob>
 ,4 → 282,9
          <id>6b3da1f0-ff1c-4422-b2ce-17a6d1c2a990</id>
       </ws:deleteJob>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/JobService/deleteJob"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/></con:soapui-project>
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/JobService/deleteJob"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="getStatistics" bindingOperationName="getStatistics" type="Request-Response" outputName="getStatisticsResponse" inputName="getStatistics" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/JobServices</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
+   <soapenv:Header/>
+   <soapenv:Body>
+      <ws:getStatistics/>
+   </soapenv:Body>
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/JobService/getStatistics"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project>

 /xservices/trunk/test/FileService-soapui-project.xml
 ,5 → 1,5
 <?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project name="FileServices" soapui-version="5.0.0" abortOnError="false" runType="SEQUENTIAL" resourceRoot="" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="FileServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}FileServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/FileService?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/FileService?wsdl"><con:part><con:url>http://localhost:8080/XServices/FileService?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="FileService" targetNamespace="http://ws.xservices.brutex.net" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<con:soapui-project name="FileServices" soapui-version="4.5.1" abortOnError="false" runType="SEQUENTIAL" resourceRoot="" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="FileServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}FileServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/FileService?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/FileService?wsdl"><con:part><con:url>http://localhost:8080/XServices/FileService?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="FileService" targetNamespace="http://ws.xservices.brutex.net" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <wsdl:documentation>/*
 *   Copyright 2010 Brian Rosenberger (Brutex Network)
 *
 ,4 → 934,4
          </file>
       </ws:encodeFile>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/FileService/encodeFile"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/><con:sensitiveInformation/></con:soapui-project>
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/FileService/encodeFile"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/><con:sensitiveInformation/></con:soapui-project>

 /xservices/trunk/test/MailService-soapui-project.xml
 ,5 → 1,5
 <?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project name="MailService" resourceRoot="" soapui-version="5.0.0" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="MailServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}MailServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/MailService?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/MailService?wsdl"><con:part><con:url>http://localhost:8080/XServices/MailService?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="MailService" targetNamespace="http://ws.xservices.brutex.net" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<con:soapui-project name="MailService" resourceRoot="" soapui-version="4.5.1" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="MailServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}MailServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/MailService?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/MailService?wsdl"><con:part><con:url>http://localhost:8080/XServices/MailService?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="MailService" targetNamespace="http://ws.xservices.brutex.net" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <wsdl:types>
     <xs:schema elementFormDefault="unqualified" targetNamespace="http://ws.xservices.brutex.net" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
       <xs:element name="antProperty" type="tns:antProperty"/>
 ,4 → 315,4
          </attachments>
       </ws:sendMailSimpleWithAttachment>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/MailService/sendMailSimpleWithAttachment"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/></con:soapui-project>
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/MailService/sendMailSimpleWithAttachment"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project>

 /xservices/trunk/test/StringService-soapui-project.xml
 ,80 → 1,9
 <?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project name="StringService" resourceRoot="" soapui-version="5.0.0" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="StringServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}StringServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/StringService?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/StringService?wsdl"><con:part><con:url>http://localhost:8080/XServices/StringService?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="StringService" targetNamespace="http://ws.xservices.brutex.net" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:ns1="http://schemas.xmlsoap.org/soap/http">
+<con:soapui-project name="StringService" resourceRoot="" soapui-version="4.5.1" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="StringServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}StringServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/StringService?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/StringService?wsdl"><con:part><con:url>http://localhost:8080/XServices/StringService?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="StringService" targetNamespace="http://ws.xservices.brutex.net" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://ws.xservices.brutex.net" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:element name="encodeToXMLEntities" type="tns:encodeToXMLEntities"/>
-      <xs:element name="encodeToXMLEntitiesResponse" type="tns:encodeToXMLEntitiesResponse"/>
-      <xs:element name="matchRegEx" type="tns:matchRegEx"/>
-      <xs:element name="matchRegExResponse" type="tns:matchRegExResponse"/>
-      <xs:element name="removeCRLF" type="tns:removeCRLF"/>
-      <xs:element name="removeCRLFResponse" type="tns:removeCRLFResponse"/>
       <xs:element name="replaceRegEx" type="tns:replaceRegEx"/>
       <xs:element name="replaceRegExResponse" type="tns:replaceRegExResponse"/>
-      <xs:element name="splitString" type="tns:splitString"/>
-      <xs:element name="splitStringResponse" type="tns:splitStringResponse"/>
-      <xs:complexType name="removeCRLF">
-        <xs:sequence>
-          <xs:element name="string" type="xs:string"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="removeCRLFResponse">
-        <xs:sequence>
-          <xs:element minOccurs="0" name="return" type="xs:string"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="matchRegEx">
-        <xs:sequence>
-          <xs:element minOccurs="0" name="string" type="xs:string"/>
-          <xs:element minOccurs="0" name="search" type="xs:string"/>
-          <xs:element minOccurs="0" name="regexflags" type="xs:string"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="matchRegExResponse">
-        <xs:sequence>
-          <xs:element minOccurs="0" name="return" type="tns:stringMatchType"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="stringMatchType">
-        <xs:sequence>
-          <xs:element maxOccurs="unbounded" minOccurs="0" name="stringlist" nillable="true" type="tns:stringMatchDetails"/>
-          <xs:element name="size" type="xs:int"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="stringMatchDetails">
-        <xs:sequence>
-          <xs:element name="startPosition" type="xs:long"/>
-          <xs:element name="endPosition" type="xs:long"/>
-          <xs:element minOccurs="0" name="content" type="xs:string"/>
-          <xs:element minOccurs="0" name="group" type="xs:string"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="splitString">
-        <xs:sequence>
-          <xs:element name="string" type="xs:string"/>
-          <xs:element name="delimiter" type="xs:string"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="splitStringResponse">
-        <xs:sequence>
-          <xs:element minOccurs="0" name="return" type="tns:stringSplitType"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="stringSplitType">
-        <xs:sequence>
-          <xs:element maxOccurs="unbounded" minOccurs="0" name="stringlist" nillable="true" type="xs:string"/>
-          <xs:element name="size" type="xs:int"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="encodeToXMLEntities">
-        <xs:sequence>
-          <xs:element name="string" type="xs:string"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="encodeToXMLEntitiesResponse">
-        <xs:sequence>
-          <xs:element minOccurs="0" name="return" type="xs:string"/>
-        </xs:sequence>
-      </xs:complexType>
       <xs:complexType name="replaceRegEx">
         <xs:sequence>
           <xs:element minOccurs="0" name="string" type="xs:string"/>
 ,7 → 23,6
           <xs:element name="count" type="xs:int"/>
         </xs:sequence>
       </xs:complexType>
-      <xs:element name="XServicesFault" type="tns:XServicesFault"/>
       <xs:complexType name="XServicesFault">
         <xs:sequence>
           <xs:element name="faultstring" nillable="true" type="xs:string"/>
 ,20 → 32,9
           <xs:element name="jvmruntime" nillable="true" type="xs:string"/>
         </xs:sequence>
       </xs:complexType>
+      <xs:element name="XServicesFault" type="tns:XServicesFault"/>
     </xs:schema>
   </wsdl:types>
-  <wsdl:message name="encodeToXMLEntitiesResponse">
-    <wsdl:part element="tns:encodeToXMLEntitiesResponse" name="parameters"></wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="removeCRLFResponse">
-    <wsdl:part element="tns:removeCRLFResponse" name="parameters"></wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="encodeToXMLEntities">
-    <wsdl:part element="tns:encodeToXMLEntities" name="parameters"></wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="splitString">
-    <wsdl:part element="tns:splitString" name="parameters"></wsdl:part>
-  </wsdl:message>
   <wsdl:message name="replaceRegExResponse">
     <wsdl:part element="tns:replaceRegExResponse" name="parameters"></wsdl:part>
   </wsdl:message>
 ,46 → 41,10
   <wsdl:message name="replaceRegEx">
     <wsdl:part element="tns:replaceRegEx" name="parameters"></wsdl:part>
   </wsdl:message>
-  <wsdl:message name="matchRegEx">
-    <wsdl:part element="tns:matchRegEx" name="parameters"></wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="splitStringResponse">
-    <wsdl:part element="tns:splitStringResponse" name="parameters"></wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="matchRegExResponse">
-    <wsdl:part element="tns:matchRegExResponse" name="parameters"></wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="removeCRLF">
-    <wsdl:part element="tns:removeCRLF" name="parameters"></wsdl:part>
-  </wsdl:message>
   <wsdl:message name="XServicesFault">
     <wsdl:part element="tns:XServicesFault" name="XServicesFault"></wsdl:part>
   </wsdl:message>
   <wsdl:portType name="StringService">
-    <wsdl:operation name="removeCRLF">
-      <wsdl:documentation>Remove any line feed and/ or carriage return characters</wsdl:documentation>
-      <wsdl:input message="tns:removeCRLF" name="removeCRLF"></wsdl:input>
-      <wsdl:output message="tns:removeCRLFResponse" name="removeCRLFResponse"></wsdl:output>
-      <wsdl:fault message="tns:XServicesFault" name="XServicesFault"></wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="matchRegEx">
-      <wsdl:documentation>Match text based data</wsdl:documentation>
-      <wsdl:input message="tns:matchRegEx" name="matchRegEx"></wsdl:input>
-      <wsdl:output message="tns:matchRegExResponse" name="matchRegExResponse"></wsdl:output>
-      <wsdl:fault message="tns:XServicesFault" name="XServicesFault"></wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="splitString">
-      <wsdl:documentation>Split a string into tokens</wsdl:documentation>
-      <wsdl:input message="tns:splitString" name="splitString"></wsdl:input>
-      <wsdl:output message="tns:splitStringResponse" name="splitStringResponse"></wsdl:output>
-      <wsdl:fault message="tns:XServicesFault" name="XServicesFault"></wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="encodeToXMLEntities">
-      <wsdl:documentation>Match text based data</wsdl:documentation>
-      <wsdl:input message="tns:encodeToXMLEntities" name="encodeToXMLEntities"></wsdl:input>
-      <wsdl:output message="tns:encodeToXMLEntitiesResponse" name="encodeToXMLEntitiesResponse"></wsdl:output>
-      <wsdl:fault message="tns:XServicesFault" name="XServicesFault"></wsdl:fault>
-    </wsdl:operation>
     <wsdl:operation name="replaceRegEx">
       <wsdl:documentation>Store text based data</wsdl:documentation>
       <wsdl:input message="tns:replaceRegEx" name="replaceRegEx"></wsdl:input>
 ,54 → 54,6
   </wsdl:portType>
   <wsdl:binding name="StringServiceSoapBinding" type="tns:StringService">
     <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="matchRegEx">
-      <soap:operation soapAction="" style="document"/>
-      <wsdl:input name="matchRegEx">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="matchRegExResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="XServicesFault">
-        <soap:fault name="XServicesFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="removeCRLF">
-      <soap:operation soapAction="" style="document"/>
-      <wsdl:input name="removeCRLF">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="removeCRLFResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="XServicesFault">
-        <soap:fault name="XServicesFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="splitString">
-      <soap:operation soapAction="" style="document"/>
-      <wsdl:input name="splitString">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="splitStringResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="XServicesFault">
-        <soap:fault name="XServicesFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-    <wsdl:operation name="encodeToXMLEntities">
-      <soap:operation soapAction="" style="document"/>
-      <wsdl:input name="encodeToXMLEntities">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="encodeToXMLEntitiesResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="XServicesFault">
-        <soap:fault name="XServicesFault" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
     <wsdl:operation name="replaceRegEx">
       <soap:operation soapAction="" style="document"/>
       <wsdl:input name="replaceRegEx">
 ,40 → 76,10
    <soapenv:Header/>
    <soapenv:Body>
       <ws:replaceRegEx>
-         </ws:replaceRegEx>
+         <string>Hallo Welt</string>
+         <search>W.*</search>
+         <replace>Brian</replace>
+         <regexflags>ig</regexflags>
+      </ws:replaceRegEx>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/StringService/replaceRegEx"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="matchRegEx" bindingOperationName="matchRegEx" type="Request-Response" outputName="matchRegExResponse" inputName="matchRegEx" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/StringService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <ws:matchRegEx>
-         </ws:matchRegEx>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/StringService/matchRegEx"/></con:call></con:operation><con:operation isOneWay="false" action="" name="splitString" bindingOperationName="splitString" type="Request-Response" outputName="splitStringResponse" inputName="splitString" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/StringService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <ws:splitString>
-         <string>Hier
-         is
-         some
-         text.</string>
-         <delimiter>&#10;</delimiter>
-      </ws:splitString>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/StringService/splitString"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="encodeToXMLEntities" bindingOperationName="encodeToXMLEntities" type="Request-Response" outputName="encodeToXMLEntitiesResponse" inputName="encodeToXMLEntities" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/StringService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <ws:encodeToXMLEntities>
-         <string>?</string>
-      </ws:encodeToXMLEntities>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/StringService/encodeToXMLEntities"/></con:call></con:operation><con:operation isOneWay="false" action="" name="removeCRLF" bindingOperationName="removeCRLF" type="Request-Response" outputName="removeCRLFResponse" inputName="removeCRLF" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/StringService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
-   <soapenv:Header/>
-   <soapenv:Body>
-      <ws:removeCRLF>
-         <string>Hi&#13;er
-         is
-         some
-         text</string>
-      </ws:removeCRLF>
-   </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/StringService/removeCRLF"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/></con:soapui-project>
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/StringService/replaceRegEx"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project>

 /xservices/trunk/test/MiscService-soapui-project.xml
 ,5 → 1,5
 <?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project name="MiscService" resourceRoot="" soapui-version="5.0.0" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="MiscServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}MiscServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/MiscService?WSDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/MiscService?WSDL"><con:part><con:url>http://localhost:8080/XServices/MiscService?WSDL</con:url><con:content><![CDATA[<wsdl:definitions name="MiscService" targetNamespace="http://ws.xservices.brutex.net" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<con:soapui-project name="MiscService" resourceRoot="" soapui-version="4.5.1" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="MiscServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}MiscServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/MiscService?WSDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/MiscService?WSDL"><con:part><con:url>http://localhost:8080/XServices/MiscService?WSDL</con:url><con:content><![CDATA[<wsdl:definitions name="MiscService" targetNamespace="http://ws.xservices.brutex.net" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <wsdl:types>
     <xs:schema elementFormDefault="unqualified" targetNamespace="http://ws.xservices.brutex.net" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
       <xs:element name="antProperty" type="tns:antProperty"/>
 ,4 → 277,4
    <soapenv:Body>
       <ws:getMemory/>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:assertion type="SOAP Response"/><con:assertion type="Schema Compliance"><con:configuration/></con:assertion><con:assertion type="SOAP Fault Assertion"/><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:properties/></con:testSuite><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/></con:soapui-project>
+</soapenv:Envelope>]]></con:request><con:assertion type="SOAP Response"/><con:assertion type="Schema Compliance"><con:configuration/></con:assertion><con:assertion type="SOAP Fault Assertion"/><con:credentials><con:authType>Global HTTP Settings</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508"/><con:wsrmConfig version="1.2"/></con:request></con:config></con:testStep><con:properties/></con:testCase><con:properties/></con:testSuite><con:properties/><con:wssContainer/></con:soapui-project>

 /xservices/trunk/test/FileServiceMTOM-soapui-project.xml
 ,5 → 1,5
 <?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project name="FileServiceMTOM" resourceRoot="" soapui-version="5.0.0" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="FileServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}FileServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/FileServiceMTOM?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/FileServiceMTOM?wsdl"><con:part><con:url>http://localhost:8080/XServices/FileServiceMTOM?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="FileService" targetNamespace="http://ws.xservices.brutex.net" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<con:soapui-project name="FileServiceMTOM" resourceRoot="" soapui-version="4.5.1" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="FileServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}FileServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/FileServiceMTOM?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/FileServiceMTOM?wsdl"><con:part><con:url>http://localhost:8080/XServices/FileServiceMTOM?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="FileService" targetNamespace="http://ws.xservices.brutex.net" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://ws.xservices.brutex.net" xmlns:xs="http://www.w3.org/2001/XMLSchema">
       <xs:element name="antProperty" type="tns:antProperty"/>
 ,7 → 441,7
       <soap:address location="http://localhost:8080/XServices/FileServiceMTOM"/>
     </wsdl:port>
   </wsdl:service>
-</wsdl:definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://localhost:8080/XServices/FileService</con:endpoint><con:endpoint>http://localhost:8080/XServices/FileServiceMTOM</con:endpoint></con:endpoints><con:operation isOneWay="false" action="" name="basename" bindingOperationName="basename" type="Request-Response" outputName="basenameResponse" inputName="basename" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/FileServiceMTOM</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
+</wsdl:definitions>]]></con:content><con:type>http://schemas.xmlsoap.org/wsdl/</con:type></con:part></con:definitionCache><con:endpoints><con:endpoint>http://localhost:8080/XServices/FileServiceMTOM</con:endpoint><con:endpoint>http://localhost:8080/XServices/FileService</con:endpoint></con:endpoints><con:operation isOneWay="false" action="" name="basename" bindingOperationName="basename" type="Request-Response" outputName="basenameResponse" inputName="basename" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings><con:setting id="com.eviware.soapui.impl.wsdl.WsdlRequest@request-headers">&lt;xml-fragment/></con:setting></con:settings><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/XServices/FileServiceMTOM</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
    <soapenv:Header/>
    <soapenv:Body>
       <ws:basename>
 ,4 → 642,4
          </file>
       </ws:uploadFile>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/FileService/uploadFile"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/></con:soapui-project>
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/FileService/uploadFile"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project>

 /xservices/trunk/test/StoreService-soapui-project.xml
 ,5 → 1,5
 <?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project name="StoreService" resourceRoot="" soapui-version="5.0.0" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="StorageServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}StorageServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/StorageServices?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/StorageServices?wsdl"><con:part><con:url>http://localhost:8080/XServices/StorageServices?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="StorageService" targetNamespace="http://ws.xservices.brutex.net" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<con:soapui-project name="StoreService" resourceRoot="" soapui-version="4.5.1" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="StorageServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}StorageServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/XServices/StorageServices?wsdl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/XServices/StorageServices?wsdl"><con:part><con:url>http://localhost:8080/XServices/StorageServices?wsdl</con:url><con:content><![CDATA[<wsdl:definitions name="StorageService" targetNamespace="http://ws.xservices.brutex.net" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <wsdl:types>
     <xs:schema attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://ws.xservices.brutex.net" xmlns:xs="http://www.w3.org/2001/XMLSchema">
       <xs:element name="createCollection" type="tns:createCollection"/>
 ,4 → 243,4
          <event>?</event>
       </ws:deliverCollection>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/StorageService/deliverCollection"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/></con:soapui-project>
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/StorageService/deliverCollection"/><con:wsrmConfig version="1.2"/></con:call></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project>

 /xservices/trunk/test/ArchiveService-soapui-project.xml
 ,5 → 1,5
 <?xml version="1.0" encoding="UTF-8"?>
-<con:soapui-project name="ArchiveService" resourceRoot="" soapui-version="5.0.0" abortOnError="false" runType="SEQUENTIAL" activeEnvironment="Default" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="ArchiveServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}ArchiveServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/xservices/ArchiveService?WSDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/xservices/ArchiveService?WSDL"><con:part><con:url>http://localhost:8080/xservices/ArchiveService?WSDL</con:url><con:content><![CDATA[<wsdl:definitions name="ArchiveService" targetNamespace="http://ws.xservices.brutex.net" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<con:soapui-project name="ArchiveService" resourceRoot="" soapui-version="3.6.1" abortOnError="false" runType="SEQUENTIAL" xmlns:con="http://eviware.com/soapui/config"><con:settings/><con:interface xsi:type="con:WsdlInterface" wsaVersion="NONE" name="ArchiveServiceSoapBinding" type="wsdl" bindingName="{http://ws.xservices.brutex.net}ArchiveServiceSoapBinding" soapVersion="1_1" anonymous="optional" definition="http://localhost:8080/xservices/ArchiveService?WSDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><con:settings/><con:definitionCache type="TEXT" rootPart="http://localhost:8080/xservices/ArchiveService?WSDL"><con:part><con:url>http://localhost:8080/xservices/ArchiveService?WSDL</con:url><con:content><![CDATA[<wsdl:definitions name="ArchiveService" targetNamespace="http://ws.xservices.brutex.net" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://ws.xservices.brutex.net" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <wsdl:types>
     <xs:schema elementFormDefault="unqualified" targetNamespace="http://ws.xservices.brutex.net" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
       <xs:element name="FileResourceType" type="tns:fileResource"/>
 ,7 → 501,7
          <destdir>c:\temp</destdir>
       </ws:unrar>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:credentials><con:authType>No Authorization</con:authType></con:credentials><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/ArchiveService/unrar"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="untar" bindingOperationName="untar" type="Request-Response" outputName="untarResponse" inputName="untar" receivesAttachments="false" sendsAttachments="false"><con:settings/></con:operation><con:operation isOneWay="false" action="" name="unzip" bindingOperationName="unzip" type="Request-Response" outputName="unzipResponse" inputName="unzip" receivesAttachments="false" sendsAttachments="false"><con:settings/></con:operation><con:operation isOneWay="false" action="" name="zip" bindingOperationName="zip" type="Request-Response" outputName="zipResponse" inputName="zip" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/xservices/ArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/ArchiveService/unrar"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="untar" bindingOperationName="untar" type="Request-Response" outputName="untarResponse" inputName="untar" receivesAttachments="false" sendsAttachments="false"><con:settings/></con:operation><con:operation isOneWay="false" action="" name="unzip" bindingOperationName="unzip" type="Request-Response" outputName="unzipResponse" inputName="unzip" receivesAttachments="false" sendsAttachments="false"><con:settings/></con:operation><con:operation isOneWay="false" action="" name="zip" bindingOperationName="zip" type="Request-Response" outputName="zipResponse" inputName="zip" receivesAttachments="false" sendsAttachments="false" anonymous="optional"><con:settings/><con:call name="Request 1"><con:settings/><con:encoding>UTF-8</con:encoding><con:endpoint>http://localhost:8080/xservices/ArchiveService</con:endpoint><con:request><![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ws="http://ws.xservices.brutex.net">
    <soapenv:Header/>
    <soapenv:Body>
       <ws:zip>
 ,4 → 518,4
          <compresslevel>?</compresslevel>
       </ws:zip>
    </soapenv:Body>
-</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/ArchiveService/zip"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="zipFromArchive" bindingOperationName="zipFromArchive" type="Request-Response" outputName="zipFromArchiveResponse" inputName="zipFromArchive" receivesAttachments="false" sendsAttachments="false"><con:settings/></con:operation></con:interface><con:properties/><con:wssContainer/><con:oAuth2ProfileContainer/></con:soapui-project>
+</soapenv:Envelope>]]></con:request><con:jmsConfig JMSDeliveryMode="PERSISTENT"/><con:jmsPropertyConfig/><con:wsaConfig mustUnderstand="NONE" version="200508" action="http://ws.xservices.brutex.net/ArchiveService/zip"/><con:wsrmConfig version="1.2"/></con:call></con:operation><con:operation isOneWay="false" action="" name="zipFromArchive" bindingOperationName="zipFromArchive" type="Request-Response" outputName="zipFromArchiveResponse" inputName="zipFromArchive" receivesAttachments="false" sendsAttachments="false"><con:settings/></con:operation></con:interface><con:properties/><con:wssContainer/></con:soapui-project>

 /xservices/trunk/BruteXServices_User_Guide.html
 ,0 → 1,207
+<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>User Guide</title><meta content="DocBook XSL-NS Stylesheets V1.76.1" name="generator"><meta name="description" content="Abstract In complex IT environments it is necessary to integrate different information systems with each other, exchange data between tools and automate actions and function calls depending on events arising from user interaction. To meet the requirements of integration building usually means to implement APIs and to create tool-to-tool bridges. Web Services can help to clean up bridges into interfaces as well as to abstract functions from their underlying platform and implementation. These are the major goals of the loosely coupled integration strategy which is in turn one essential idea of a service-oriented architecture (SOA). provide a low level set of functions and web services. These can be orchestrated into services and used in business processes which make up the execution part of a SOA environment. is an add-on to XBridgeNG 2.0. It runs standalone or in combination with XBridgeNG. Pure XBridgeNG has two components: XML Schema for item based data types (e.g. tickets from a bug tracker system or a database record) Set of Apache Ant tasks to function as a bridge between the XBridgeNG XML format at legacy 3rd party software (e.g. HP Quality Center, Serena TeamTrack, ...) The add Web Services (SOAP) wrapper around Apache Ant tasks (since XBridgeNG 2.0) The current focus is on file-based operations. do not contain an integration server or a process execution engine."></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" title="User Guide"><div class="titlepage"><div><div><h1 class="title"><a name="N2000B"></a>User Guide</h1></div><div><div class="author"><h3 class="author"><span class="firstname">Brian</span> <span class="surname">Rosenberger</span></h3><code class="email">&lt;<a class="email" href="mailto:bru@brutex.de">bru@brutex.de</a>&gt;</code></div></div><div><p class="copyright">Copyright &copy; 2010 </p></div><div><div class="legalnotice" title="Legal Notice"><a name="N2002F"></a>
+                        <p>
+                                The copyright holders make no representation about the
+                                suitability of
+                                this document for any purpose. It is provided
+                                <span class="quote">&ldquo;<span class="quote">as is</span>&rdquo;</span>
+                                without expressed or implied warranty.
+                        </p>
+                </div></div><div><div class="legalnotice" title="Legal Notice"><a name="N20038"></a>
+                        <p>Apache Tomcat and Apache Ant are trademarks of the Apache
+                                Software Foundation.</p>
+                </div></div><div><p class="pubdate">1997</p></div><div><div class="abstract" title="Abstract"><p class="title"><b>Abstract</b></p>
+                        <p>In complex IT environments it is necessary to integrate
+                                different information systems with each other, exchange data
+                                between
+                                tools and automate actions and function calls depending
+                                on events
+                                arising from user interaction. To meet the requirements
+                                of
+                                integration building usually means to implement APIs and to
+                                create
+                                tool-to-tool bridges. Web Services can help to clean up
+                                bridges into
+                                interfaces as well as to abstract functions from
+                                their underlying
+                                platform and implementation.</p>
+                        <p>These are the major goals of the loosely coupled
+                                integration
+                                strategy which is in turn one essential idea of a
+                                service-oriented
+                                architecture (SOA).</p>
+                        <p>provide a low level set of functions and web services.
+                                These can
+                                be orchestrated into services and used in business
+                                processes which
+                                make up the execution part of a SOA
+                                environment.</p>
+                        <p>is an add-on to XBridgeNG 2.0. It runs standalone or in
+                                combination with XBridgeNG. Pure XBridgeNG has two
+                                components:</p>
+                        <p>
+                                </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
+                                                <p>XML Schema for item based data types (e.g. tickets
+                                                        from a bug
+                                                        tracker system or a database record)</p>
+                                        </li><li class="listitem">
+                                                <p>Set of Apache Ant tasks to function as a bridge
+                                                        between the
+                                                        XBridgeNG XML format at legacy 3rd party
+                                                        software (e.g. HP Quality
+                                                        Center, Serena TeamTrack,
+                                                        ...)</p>
+                                        </li><li class="listitem">
+                                                <p>The add Web Services (SOAP) wrapper around Apache Ant
+                                                        tasks
+                                                        (since XBridgeNG 2.0)</p>
+                                        </li></ul></div><p>
+                        </p>
+                        <p>The current focus is on file-based operations. do not
+                                contain an
+                                integration server or a process execution
+                                engine.</p>
+                </div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="#N2006C">1. Getting started</a></span></dt><dd><dl><dt><span class="sect1"><a href="#N20076">Prerequisites</a></span></dt><dt><span class="sect1"><a href="#N20085">Installation</a></span></dt><dd><dl><dt><span class="sect2"><a href="#N20090">Securing with Basic Authentication</a></span></dt><dt><span class="sect2"><a href="#N2009F">Limit access to</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#N200B8">2. Available Services</a></span></dt><dd><dl><dt><span class="section"><a href="#N200C2">ArchiveServices</a></span></dt><dt><span class="section"><a href="#N200CB"></a></span></dt><dd><dl><dt><span class="section"><a href="#N200CD">ExecuteServices</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#N20139">3. XML Types</a></span></dt><dd><dl><dt><span class="section"><a href="#N20143">AntProperty type</a></span></dt></dl></dd></dl></div><div class="list-of-tables"><p><b>List of Tables</b></p><dl><dt>2.1. <a href="#N200E4">runCommand input parameters</a></dt></dl></div>
+        <div class="chapter" title="Chapter&nbsp;1.&nbsp;Getting started"><div class="titlepage"><div><div><h2 class="title"><a name="N2006C"></a>Chapter&nbsp;1.&nbsp;Getting started</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#N20076">Prerequisites</a></span></dt><dt><span class="sect1"><a href="#N20085">Installation</a></span></dt><dd><dl><dt><span class="sect2"><a href="#N20090">Securing with Basic Authentication</a></span></dt><dt><span class="sect2"><a href="#N2009F">Limit access to</a></span></dt></dl></dd></dl></div>
+                <p>This chapter describes the installation.</p>
+                <div class="sect1" title="Prerequisites"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="N20076"></a>Prerequisites</h2></div></div></div>
+                        <p>tbd.</p>
+                        <p>Sun Java SE 1.6.0</p>
+                        <p>Apache Tomcat 6</p>
+                </div>
+                <div class="sect1" title="Installation"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="N20085"></a>Installation</h2></div></div></div>
+                        <p>tbd.</p>
+                        <p>In short: Deploy .WAR file to Apache Tomcat</p>
+                        <div class="sect2" title="Securing with Basic Authentication"><div class="titlepage"><div><div><h3 class="title"><a name="N20090"></a>Securing with Basic Authentication</h3></div></div></div>
+                                <p>There is a quick guide explaining Basic Authentication
+                                        for
+                                        Tomcat here:</p>
+                                <p>
+                                        <a class="ulink" href="http://oreilly.com/pub/a/java/archive/tomcat-tips.html?page=1" target="_top">http://oreilly.com/pub/a/java/archive/tomcat-tips.html?page=1</a>
+                                </p>
+                        </div>
+                        <div class="sect2" title="Limit access to"><div class="titlepage"><div><div><h3 class="title"><a name="N2009F"></a>Limit access to</h3></div></div></div>
+                                <p>Sometimes you'll only want to restrict access to to
+                                        only
+                                        specified host names or IP addresses. This way, only
+                                        clients at
+                                        those specified addresses can use the web services.
+                                        Tomcat provides
+                                        two configuration values for that:
+                                        RemoteHostValve and
+                                        RemoteAddrValve.</p>
+                                <p>These Valves allow you to filter requests by host name or
+                                        by IP
+                                        address, and to allow or deny hosts that match. The
+                                        example below
+                                        restricts access to the ArchiveService from any
+                                        machine that is not
+                                        the local host.</p>
+                                <pre class="programlisting">&lt;Context
+                                        path="/XService/ArchiveService" ...&gt; &lt;Valve
+                                        className="org.apache.catalina.valves.RemoteAddrValve"
+                                        allow="127.0.0.1" deny=""/&gt; &lt;/Context&gt;</pre>
+                                <p>If no allow pattern is given, then patterns that match
+                                        the deny
+                                        attribute patterns will be rejected, and all others
+                                        will be allowed.
+                                        Similarly, if no deny pattern is given,
+                                        patterns that match the
+                                        allow attribute will be allowed, and
+                                        all others will be denied.
+                                </p>
+                                <p>The &lt;context&gt; element must be placed into the
+                                        server.xml
+                                        file (into &lt;engine&gt;&lt;host&gt;).</p>
+                        </div>
+                </div>
+        </div>
+        <div class="chapter" title="Chapter&nbsp;2.&nbsp;Available Services"><div class="titlepage"><div><div><h2 class="title"><a name="N200B8"></a>Chapter&nbsp;2.&nbsp;Available Services</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#N200C2">ArchiveServices</a></span></dt><dt><span class="section"><a href="#N200CB"></a></span></dt><dd><dl><dt><span class="section"><a href="#N200CD">ExecuteServices</a></span></dt></dl></dd></dl></div>
+                <p>List of available web services and their operations.</p>
+                <div class="section" title="ArchiveServices"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="N200C2"></a>ArchiveServices</h2></div></div></div>
+                        <p>The ArchiveService bundles file packing operations. Its
+                                WSDL is
+                                located at
+                                http://server:port/XServices/ArchiveService?wsdl</p>
+                </div>
+                <div class="section"><div class="titlepage"></div>
+                <div class="section" title="ExecuteServices"><div class="titlepage"><div><div><h3 class="title"><a name="N200CD"></a>ExecuteServices</h3></div></div></div>
+        <p>The ExecuteService bundles local and remote command
+                execution
+                operations. Its WSDL is located at
+                http://server:port/XServices/ExecuteService?wsdl</p>
+        <div class="section" title="runCommand"><div class="titlepage"><div><div><h4 class="title"><a name="N200D6"></a>runCommand</h4></div></div></div>
+                <p>Run an executable with arguments on the server providing
+                        the
+                        web
+                        service. The command is run within the environment and
+                        under the
+                        user
+                        privileges of the user who is running the Tomcat
+                        Server.</p>
+                <div class="section"><div class="titlepage"><div><div><h5 class="title"><a name="N200DE"></a></h5></div></div></div>
+                        <p></p>
+                        <div class="table"><a name="N200E4"></a><p class="title"><b>Table&nbsp;2.1.&nbsp;runCommand input parameters</b></p><div class="table-contents">
+                                <table summary="runCommand input parameters" border="1"><colgroup><col class="parameter"><col class="type"><col class="required"><col class="description"></colgroup><thead><tr><th>parameter</th><th>type</th><th>required</th><th>description</th></tr></thead><tbody><tr><td>executable</td><td>String</td><td>Yes</td><td>Command to be run. The command may be
+                                                                specified with full
+                                                                path using forward slash
+                                                                "/" as path separator.
+                                                                        </td></tr><tr><td>argline</td><td>String</td><td>No</td><td>Any command line arguments</td></tr></tbody></table>
+                        </div></div><br class="table-break">
+                        <p></p>
+                </div>
+        </div>
+</div>
+                        </div>
+        </div>
+        <div class="chapter" title="Chapter&nbsp;3.&nbsp;XML Types"><div class="titlepage"><div><div><h2 class="title"><a name="N20139"></a>Chapter&nbsp;3.&nbsp;XML Types</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#N20143">AntProperty type</a></span></dt></dl></div>
+                <p>This chapter bundles the documentation for common xml types
+                        used
+                        by XServices web service.</p>
+                <div class="section" title="AntProperty type"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="N20143"></a>AntProperty type</h2></div></div></div>
+                        <p>The AntProperty type defines a list of key/value pairs.</p>
+                        <p>
+                                The defining Java class is
+                                <a class="ulink" href="javadoc/net/brutex/xservices/types/AntProperty.html" target="_top">
+                                        <code class="classname">net.brutex.xservices.types.AntProperty</code>
+                                </a>
+                                .
+                        </p>
+                        <pre class="programlisting">
+&lt;xs:complexType name="antProperty"&gt;
+   &lt;xs:sequence&gt;
+      &lt;xs:element name="name" type="xs:string"/&gt;
+      &lt;xs:element name="value" type="xs:string"/&gt;
+   &lt;/xs:sequence&gt;
+&lt;/xs:complexType&gt;
+                        </pre>
+                        <pre class="programlisting">
+&lt;AntProperty&gt;
+    &lt;name&gt;key2&lt;/name&gt;
+    &lt;value&gt;value2&lt;/value&gt;
+&lt;/AntProperty&gt;
+                        </pre>
+                </div>
+        </div>
+</div></body></html>
 Property changes:
 Added: svn:mime-type
 +text/plain
 \ No newline at end of property

Subversion Repositories XServices

Compare Revisions

Ignore whitespace Rev 177 → Rev 176