diff --git a/org.idempiere.webservices/.classpath b/org.idempiere.webservices/.classpath
index 6f33b3cfd4..9c65023a14 100644
--- a/org.idempiere.webservices/.classpath
+++ b/org.idempiere.webservices/.classpath
@@ -1,25 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/idempiere-xmlbeans-1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-osgi-extender-1.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-aop-3.0.7.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/commons-logging-1.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/aopalliance-1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/xmlbeans-2.5.0.jar" sourcepath="E:/spring/xmlbeans-2.5.0-source.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/cxf-rt-frontend-jaxws-2.6.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/stax2-api-3.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/xmlschema-core-2.0.3.jar" sourcepath="E:/spring/xmlschema-core-2.0.3-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/cxf-2.6.2.jar" sourcepath="E:/bizzidium/apache-cxf-2.6.2-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/neethi-3.0.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/wsdl4j-1.6.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-expression-3.0.7.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-asm-3.0.7.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-core-3.0.7.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-beans-3.0.7.RELEASE.jar" sourcepath="E:/spring/spring-beans-3.0.7.RELEASE-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-context-3.0.7.RELEASE.jar"/>
-	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-web-3.0.7.RELEASE.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="WEB-INF/src"/>
-	<classpathentry kind="output" path="WEB-INF/classes/"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/axis.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/commons-discovery-0.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/idempiere-xmlbeans-1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-osgi-extender-1.2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-aop-3.0.7.RELEASE.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/aopalliance-1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/xmlbeans-2.5.0.jar" sourcepath="E:/spring/xmlbeans-2.5.0-source.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/cxf-rt-frontend-jaxws-2.6.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/stax2-api-3.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/xmlschema-core-2.0.3.jar" sourcepath="E:/spring/xmlschema-core-2.0.3-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/cxf-2.6.2.jar" sourcepath="E:/bizzidium/apache-cxf-2.6.2-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/neethi-3.0.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/wsdl4j-1.6.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-expression-3.0.7.RELEASE.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-asm-3.0.7.RELEASE.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-core-3.0.7.RELEASE.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-beans-3.0.7.RELEASE.jar" sourcepath="E:/spring/spring-beans-3.0.7.RELEASE-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-context-3.0.7.RELEASE.jar"/>
+	<classpathentry exported="true" kind="lib" path="WEB-INF/lib/spring-web-3.0.7.RELEASE.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="WEB-INF/src"/>
+	<classpathentry kind="output" path="WEB-INF/classes/"/>
+</classpath>
diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF
index 18e31ba641..d56077c437 100644
--- a/org.idempiere.webservices/META-INF/MANIFEST.MF
+++ b/org.idempiere.webservices/META-INF/MANIFEST.MF
@@ -5,9 +5,21 @@ Bundle-SymbolicName: org.idempiere.webservices;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.idempiere.webservices.Activator
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: javax.servlet;version="3.0.0",
+Import-Package: javax.activation;version="1.1.1",
+ javax.mail.internet;version="1.4.5",
+ javax.servlet;version="3.0.0",
  javax.servlet.http;version="3.0.0",
+ javax.xml.rpc;version="1.1.0.v20110517",
+ javax.xml.rpc.encoding;version="1.1.0.v20110517",
+ javax.xml.rpc.handler;version="1.1.0.v20110517",
+ javax.xml.rpc.handler.soap;version="1.1.0.v20110517",
+ javax.xml.rpc.holders;version="1.1.0.v20110517",
+ javax.xml.rpc.server;version="1.1.0.v20110517",
+ javax.xml.rpc.soap;version="1.1.0.v20110517",
+ javax.xml.soap;version="1.3.0",
  org.apache.commons.codec.binary;version="1.3.0",
+ org.apache.commons.logging;version="1.1.1",
+ org.apache.commons.logging.impl;version="1.1.1",
  org.osgi.framework;version="1.6.0"
 Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
  org.adempiere.report.jasper.library;bundle-version="1.0.0",
@@ -30,12 +42,133 @@ Bundle-ClassPath: .,
  WEB-INF/lib/cxf-rt-frontend-jaxws-2.6.1.jar,
  WEB-INF/lib/xmlbeans-2.5.0.jar,
  WEB-INF/lib/aopalliance-1.0.jar,
- WEB-INF/lib/commons-logging-1.1.1.jar,
- WEB-INF/lib/idempiere-xmlbeans-1.0.jar
-Export-Package: org.compiere.model,
+ WEB-INF/lib/idempiere-xmlbeans-1.0.jar,
+ WEB-INF/lib/axis.jar,
+ WEB-INF/lib/commons-discovery-0.5.jar
+Export-Package: javax.wsdl,
+ javax.wsdl.extensions,
+ javax.wsdl.extensions.http,
+ javax.wsdl.extensions.mime,
+ javax.wsdl.extensions.schema,
+ javax.wsdl.extensions.soap,
+ javax.wsdl.extensions.soap12,
+ javax.wsdl.factory,
+ javax.wsdl.xml,
+ org.apache.axis,
+ org.apache.axis.attachments,
+ org.apache.axis.client,
+ org.apache.axis.client.async,
+ org.apache.axis.collections,
+ org.apache.axis.components.compiler,
+ org.apache.axis.components.encoding,
+ org.apache.axis.components.image,
+ org.apache.axis.components.jms,
+ org.apache.axis.components.logger,
+ org.apache.axis.components.net,
+ org.apache.axis.components.script,
+ org.apache.axis.components.threadpool,
+ org.apache.axis.components.uuid,
+ org.apache.axis.configuration,
+ org.apache.axis.constants,
+ org.apache.axis.deployment.wsdd,
+ org.apache.axis.deployment.wsdd.providers,
+ org.apache.axis.description,
+ org.apache.axis.encoding,
+ org.apache.axis.encoding.ser,
+ org.apache.axis.encoding.ser.castor,
+ org.apache.axis.handlers,
+ org.apache.axis.handlers.http,
+ org.apache.axis.handlers.soap,
+ org.apache.axis.holders,
+ org.apache.axis.i18n,
+ org.apache.axis.management,
+ org.apache.axis.management.jmx,
+ org.apache.axis.message,
+ org.apache.axis.monitor,
+ org.apache.axis.providers,
+ org.apache.axis.providers.java,
+ org.apache.axis.schema,
+ org.apache.axis.security,
+ org.apache.axis.security.servlet,
+ org.apache.axis.security.simple,
+ org.apache.axis.server,
+ org.apache.axis.session,
+ org.apache.axis.soap,
+ org.apache.axis.strategies,
+ org.apache.axis.transport.http,
+ org.apache.axis.transport.java,
+ org.apache.axis.transport.jms,
+ org.apache.axis.transport.local,
+ org.apache.axis.transport.mail,
+ org.apache.axis.types,
+ org.apache.axis.utils,
+ org.apache.axis.utils.bytecode,
+ org.apache.axis.utils.cache,
+ org.apache.axis.wsdl,
+ org.apache.axis.wsdl.fromJava,
+ org.apache.axis.wsdl.gen,
+ org.apache.axis.wsdl.symbolTable,
+ org.apache.axis.wsdl.toJava,
+ org.apache.commons.discovery,
+ org.apache.commons.discovery.ant,
+ org.apache.commons.discovery.jdk,
+ org.apache.commons.discovery.log,
+ org.apache.commons.discovery.resource,
+ org.apache.commons.discovery.resource.classes,
+ org.apache.commons.discovery.resource.names,
+ org.apache.commons.discovery.tools,
+ org.apache.xmlbeans,
+ org.apache.xmlbeans.impl.common,
+ org.apache.xmlbeans.impl.config,
+ org.apache.xmlbeans.impl.inst2xsd,
+ org.apache.xmlbeans.impl.inst2xsd.util,
+ org.apache.xmlbeans.impl.jam,
+ org.apache.xmlbeans.impl.jam.annotation,
+ org.apache.xmlbeans.impl.jam.internal,
+ org.apache.xmlbeans.impl.jam.internal.classrefs,
+ org.apache.xmlbeans.impl.jam.internal.elements,
+ org.apache.xmlbeans.impl.jam.internal.javadoc,
+ org.apache.xmlbeans.impl.jam.internal.parser,
+ org.apache.xmlbeans.impl.jam.internal.reflect,
+ org.apache.xmlbeans.impl.jam.mutable,
+ org.apache.xmlbeans.impl.jam.provider,
+ org.apache.xmlbeans.impl.jam.visitor,
+ org.apache.xmlbeans.impl.jam.xml,
+ org.apache.xmlbeans.impl.piccolo.io,
+ org.apache.xmlbeans.impl.piccolo.util,
+ org.apache.xmlbeans.impl.piccolo.xml,
+ org.apache.xmlbeans.impl.regex,
+ org.apache.xmlbeans.impl.richParser,
+ org.apache.xmlbeans.impl.schema,
+ org.apache.xmlbeans.impl.soap,
+ org.apache.xmlbeans.impl.store,
+ org.apache.xmlbeans.impl.tool,
+ org.apache.xmlbeans.impl.util,
+ org.apache.xmlbeans.impl.validator,
+ org.apache.xmlbeans.impl.values,
+ org.apache.xmlbeans.impl.xb.ltgfmt,
+ org.apache.xmlbeans.impl.xb.ltgfmt.impl,
+ org.apache.xmlbeans.impl.xb.substwsdl,
+ org.apache.xmlbeans.impl.xb.substwsdl.impl,
+ org.apache.xmlbeans.impl.xb.xmlconfig,
+ org.apache.xmlbeans.impl.xb.xmlconfig.impl,
+ org.apache.xmlbeans.impl.xb.xmlschema,
+ org.apache.xmlbeans.impl.xb.xmlschema.impl,
+ org.apache.xmlbeans.impl.xb.xsdownload,
+ org.apache.xmlbeans.impl.xb.xsdownload.impl,
+ org.apache.xmlbeans.impl.xb.xsdschema,
+ org.apache.xmlbeans.impl.xb.xsdschema.impl,
+ org.apache.xmlbeans.impl.xpathgen,
+ org.apache.xmlbeans.impl.xsd2inst,
+ org.apache.xmlbeans.soap,
+ org.apache.xmlbeans.xml.stream,
+ org.apache.xmlbeans.xml.stream.events,
+ org.apache.xmlbeans.xml.stream.utils,
+ org.compiere.model,
  org.idempiere.adInterface.x10,
  org.idempiere.adInterface.x10.impl,
  org.idempiere.adinterface,
  org.idempiere.webservices,
+ org.idempiere.webservices.client,
  org.idempiere.webservices.fault
 Web-ContextPath: ADInterface
diff --git a/org.idempiere.webservices/Notes/HowToAcceptSelfSignedCertificate b/org.idempiere.webservices/Notes/HowToAcceptSelfSignedCertificate
new file mode 100644
index 0000000000..5bd3e16936
--- /dev/null
+++ b/org.idempiere.webservices/Notes/HowToAcceptSelfSignedCertificate
@@ -0,0 +1,2 @@
+From http://wiki.apache.org/ws/FrontPage/Axis/SslUnsignedCertificate
+-Daxis.socketSecureFactory=org.apache.axis.components.net.SunFakeTrustSocketFactory
diff --git a/org.idempiere.webservices/build.properties b/org.idempiere.webservices/build.properties
index bbba7c0c61..8e20228574 100644
--- a/org.idempiere.webservices/build.properties
+++ b/org.idempiere.webservices/build.properties
@@ -19,11 +19,12 @@ bin.includes = META-INF/,\
                WEB-INF/lib/cxf-rt-frontend-jaxws-2.6.1.jar,\
                WEB-INF/lib/xmlbeans-2.5.0.jar,\
                WEB-INF/lib/aopalliance-1.0.jar,\
-               WEB-INF/lib/commons-logging-1.1.1.jar,\
                WEB-INF/lib/spring-aop-3.0.7.RELEASE.jar,\
                WEB-INF/lib/spring-osgi-extender-1.2.1.jar,\
                WEB-INF/lib/idempiere-xmlbeans-1.0.jar,\
-               plugin.xml
+               plugin.xml,\
+               WEB-INF/lib/axis.jar,\
+               WEB-INF/lib/commons-discovery-0.5.jar
 src.includes = WEB-INF/classes/,\
                WEB-INF/lib/,\
                WEB-INF/web.xml,\