diff --git a/cli/hsadmin.properties b/cli/hsadmin.properties
new file mode 100644
index 0000000..785c811
--- /dev/null
+++ b/cli/hsadmin.properties
@@ -0,0 +1,5 @@
+backendURL=https://config.hostsharing.net:443/hsar/backend
+;xmlrpcURL=https://config.hostsharing.net:443/hsar/xmlrpc/hsadmin
+;loginURL=https://login.hostsharing.net:443/cas/v1/tickets
+xmlrpcURL=http://localhost:8080/cust-webapp/xmlrpc/hsadmin
+loginURL=TestUmgebung
diff --git a/cli/src/main/java/de/hsadmin/jscli/RpcClient.java b/cli/src/main/java/de/hsadmin/jscli/RpcClient.java
index 268c70e..833975d 100644
--- a/cli/src/main/java/de/hsadmin/jscli/RpcClient.java
+++ b/cli/src/main/java/de/hsadmin/jscli/RpcClient.java
@@ -76,7 +76,8 @@ public class RpcClient {
 			return list;
 		} catch (XmlRpcException e) {
 			final String message = e.getLocalizedMessage();
-			final int messageStartIndex = message.lastIndexOf("Exception:") + 10;
+			final int lastIndexOfException = message.lastIndexOf("Exception:");
+			final int messageStartIndex = lastIndexOfException > 0 ? lastIndexOfException + 10 : 0;
 			throw new JSCliException(message.substring(messageStartIndex).trim());
 		}
 	}
diff --git a/cust-services/.classpath b/cust-services/.classpath
deleted file mode 100644
index f619a53..0000000
--- a/cust-services/.classpath
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/cust-services/.gitignore b/cust-services/.gitignore
index b83d222..e774414 100644
--- a/cust-services/.gitignore
+++ b/cust-services/.gitignore
@@ -1 +1,13 @@
-/target/
+*.class
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+/target
+/.settings
+/.classpath
+/.project
diff --git a/cust-services/pom.xml b/cust-services/pom.xml
index 91bce4f..7b7d422 100644
--- a/cust-services/pom.xml
+++ b/cust-services/pom.xml
@@ -48,8 +48,14 @@
 		</dependency>
 	</dependencies>
 	<build>
-		<finalName>xmlrpc-webapp</finalName>
+		<finalName>cust-webapp</finalName>
 		<plugins>
+			<plugin>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<archiveClasses>true</archiveClasses>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.openejb.maven</groupId>
 				<artifactId>tomee-maven-plugin</artifactId>
diff --git a/cust-services/src/main/resources/META-INF/persistence.xml b/cust-services/src/main/resources/META-INF/persistence.xml
new file mode 100644
index 0000000..3b7dc51
--- /dev/null
+++ b/cust-services/src/main/resources/META-INF/persistence.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="2.0" 
+		xmlns="http://java.sun.com/xml/ns/persistence" 
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+		xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+    <persistence-unit name="hsar">
+    	<jta-data-source>HsarDataSource</jta-data-source>
+		<class>de.hsadmin.bo.customer.Contact</class> 
+		<class>de.hsadmin.bo.customer.Customer</class> 
+		<class>de.hsadmin.bo.customer.SEPADirectDebit</class> 
+		<class>de.hsadmin.bo.database.Database</class> 
+		<class>de.hsadmin.bo.database.DatabaseUser</class> 
+		<class>de.hsadmin.bo.database.MySqlDatabase</class> 
+		<class>de.hsadmin.bo.database.MySqlUser</class> 
+		<class>de.hsadmin.bo.database.PgSqlDatabase</class> 
+		<class>de.hsadmin.bo.database.PgSqlUser</class> 
+		<class>de.hsadmin.bo.domain.Domain</class> 
+		<class>de.hsadmin.bo.domain.DomainOption</class> 
+		<class>de.hsadmin.bo.domain.EMailAddress</class> 
+		<class>de.hsadmin.bo.pac.BaseComponent</class> 
+		<class>de.hsadmin.bo.pac.BasePac</class> 
+		<class>de.hsadmin.bo.pac.Component</class> 
+		<class>de.hsadmin.bo.pac.EMailAlias</class> 
+		<class>de.hsadmin.bo.pac.Hive</class> 
+		<class>de.hsadmin.bo.pac.INetAddress</class> 
+		<class>de.hsadmin.bo.pac.Pac</class> 
+		<class>de.hsadmin.bo.pac.PacComponent</class> 
+		<class>de.hsadmin.bo.pac.UnixUser</class> 
+    </persistence-unit>
+</persistence>
\ No newline at end of file
diff --git a/cust-services/src/main/resources/org/apache/xmlrpc/webserver/XmlRpcServlet.properties b/cust-services/src/main/resources/org/apache/xmlrpc/webserver/XmlRpcServlet.properties
new file mode 100644
index 0000000..f5864b8
--- /dev/null
+++ b/cust-services/src/main/resources/org/apache/xmlrpc/webserver/XmlRpcServlet.properties
@@ -0,0 +1,6 @@
+customer=de.hsadmin.service.customer.CustomerRemote
+contact=de.hsadmin.service.customer.ContactRemote
+mandat=de.hsadmin.service.customer.SEPADirectDebitRemote
+hive=de.hsadmin.service.pac.HiveRemote
+pac=de.hsadmin.service.pac.PacRemote
+property=de.hsadmin.service.property.PropertyRemote
\ No newline at end of file