Index: branches/OKBJavaConnector/pom.xml
===================================================================
--- branches/OKBJavaConnector/pom.xml	(revision 5761)
+++ branches/OKBJavaConnector/pom.xml	(revision 5762)
@@ -39,6 +39,6 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
+					<source>1.6</source>
+					<target>1.6</target>
 				</configuration>
 			</plugin>
Index: branches/OKBJavaConnector/src/main/java/com/heuristiclab/okb/wsclient/admin/AdministrationService.java
===================================================================
--- branches/OKBJavaConnector/src/main/java/com/heuristiclab/okb/wsclient/admin/AdministrationService.java	(revision 5761)
+++ branches/OKBJavaConnector/src/main/java/com/heuristiclab/okb/wsclient/admin/AdministrationService.java	(revision 5762)
@@ -44,5 +44,5 @@
 
     public AdministrationService(WebServiceFeature... features) {
-        super(__getWsdlLocation(), ADMINISTRATIONSERVICE_QNAME, features);
+        super(__getWsdlLocation(), ADMINISTRATIONSERVICE_QNAME); //, features);
     }
 
@@ -52,5 +52,5 @@
 
     public AdministrationService(URL wsdlLocation, WebServiceFeature... features) {
-        super(wsdlLocation, ADMINISTRATIONSERVICE_QNAME, features);
+        super(wsdlLocation, ADMINISTRATIONSERVICE_QNAME); //, features);
     }
 
@@ -60,5 +60,5 @@
 
     public AdministrationService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
-        super(wsdlLocation, serviceName, features);
+        super(wsdlLocation, serviceName); //, features);
     }
 
Index: branches/OKBJavaConnector/src/main/resources/AdministrationService.svc.xml
===================================================================
--- branches/OKBJavaConnector/src/main/resources/AdministrationService.svc.xml	(revision 5761)
+++ branches/OKBJavaConnector/src/main/resources/AdministrationService.svc.xml	(revision 5762)
@@ -1236,5 +1236,7 @@
 							</X509Certificate>
 						</X509Data>
-					</KeyInfo>
+				<!--  another possiblitlity to configure truststore
+				<sc:TrustStore wspp:visibility="private" location="C:\Users\HolperM\workspace\OKBJavaConnector\target\classes\okbkeystore.jks" type="JKS" storepass="okb123" peeralias="okb"/>
+				 -->					</KeyInfo>
 				</Identity>
 			</wsa10:EndpointReference>
@@ -1265,4 +1267,5 @@
 					<sc:CallbackHandler default="okbtester" name="passwordHandler" />
 				</sc:CallbackHandlerConfiguration>
+				 <!--  using truststore handler to hide password -->
 				<sc:TrustStore xmlns:sc="http://schemas.sun.com/2006/03/wss/client"
 					wspp:visibility="private"
Index: branches/OKBJavaConnector/src/main/resources/AuthenticationService.svc.xml
===================================================================
--- branches/OKBJavaConnector/src/main/resources/AuthenticationService.svc.xml	(revision 5761)
+++ branches/OKBJavaConnector/src/main/resources/AuthenticationService.svc.xml	(revision 5762)
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?><wsdl:definitions name="AuthenticationService" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://tempuri.org/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsp1="http://www.w3.org/ns/ws-policy" xmlns:sc="http://schemas.sun.com/2006/03/wss/client" xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"><wsdl:types><xsd:schema targetNamespace="http://tempuri.org/Imports"><xsd:import schemaLocation="http://services.heuristiclab.com/OKB.SPR-3.3/AuthenticationService.svc?xsd=xsd0" namespace="http://tempuri.org/"/><xsd:import schemaLocation="http://services.heuristiclab.com/OKB.SPR-3.3/AuthenticationService.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/"/><xsd:import schemaLocation="http://services.heuristiclab.com/OKB.SPR-3.3/AuthenticationService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Authentication.DataTransfer"/></xsd:schema></wsdl:types><wsdl:message name="IAuthenticationService_GetUser_InputMessage"><wsdl:part name="parameters" element="tns:GetUser"/></wsdl:message><wsdl:message name="IAuthenticationService_GetUser_OutputMessage"><wsdl:part name="parameters" element="tns:GetUserResponse"/></wsdl:message><wsdl:message name="IAuthenticationService_GetUsers_InputMessage"><wsdl:part name="parameters" element="tns:GetUsers"/></wsdl:message><wsdl:message name="IAuthenticationService_GetUsers_OutputMessage"><wsdl:part name="parameters" element="tns:GetUsersResponse"/></wsdl:message><wsdl:portType name="IAuthenticationService"><wsdl:operation name="GetUser"><wsdl:input wsaw:Action="http://tempuri.org/IAuthenticationService/GetUser" message="tns:IAuthenticationService_GetUser_InputMessage"/><wsdl:output wsaw:Action="http://tempuri.org/IAuthenticationService/GetUserResponse" message="tns:IAuthenticationService_GetUser_OutputMessage"/></wsdl:operation><wsdl:operation name="GetUsers"><wsdl:input wsaw:Action="http://tempuri.org/IAuthenticationService/GetUsers" message="tns:IAuthenticationService_GetUsers_InputMessage"/><wsdl:output wsaw:Action="http://tempuri.org/IAuthenticationService/GetUsersResponse" message="tns:IAuthenticationService_GetUsers_OutputMessage"/></wsdl:operation></wsdl:portType><wsdl:binding name="AuthenticationService" type="tns:IAuthenticationService"><wsp1:PolicyReference URI="#AuthenticationServicePolicy"/>
     <soap12:binding transport="http://schemas.xmlsoap.org/soap/http"/><wsdl:operation name="GetUser"><soap12:operation soapAction="http://tempuri.org/IAuthenticationService/GetUser" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation><wsdl:operation name="GetUsers"><soap12:operation soapAction="http://tempuri.org/IAuthenticationService/GetUsers" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation></wsdl:binding><wsdl:binding name="JavaAuthenticationService" type="tns:IAuthenticationService"><soap12:binding transport="http://schemas.xmlsoap.org/soap/http"/><wsdl:operation name="GetUser"><soap12:operation soapAction="http://tempuri.org/IAuthenticationService/GetUser" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation><wsdl:operation name="GetUsers"><soap12:operation soapAction="http://tempuri.org/IAuthenticationService/GetUsers" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation></wsdl:binding><wsdl:service name="AuthenticationService"><wsdl:port name="AuthenticationService" binding="tns:AuthenticationService"><soap12:address location="http://services.heuristiclab.com/OKB.SPR-3.3/AuthenticationService.svc"/><wsa10:EndpointReference><wsa10:Address>http://services.heuristiclab.com/OKB.SPR-3.3/AuthenticationService.svc</wsa10:Address><Identity xmlns="http://schemas.xmlsoap.org/ws/2006/02/addressingidentity"><KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><X509Data><X509Certificate>MIICJjCCAY+gAwIBAgIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFADAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMB4XDTEwMDUxMTExMTQwMloXDTM5MTIzMTIzNTk1OVowJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqtugcJsHO5PuFt9Ki0No/hSJxC+Qbh+qKQ2Ogkpa7bd8UEv2p64b6W390IISw1SDc3B5M2z5pv0oLhuBfOUCwesTvrSWjr0aNIhCuYN3N9O7zCK7uxScJPzoaZREOSdYWw4C98ziZa1pYLakVcQrVXRd166CPQXLTrdTZHir/XsCAwEAAaNZMFcwVQYDVR0BBE4wTIAQo24HWHeI+SYFLidVqPxsa6EmMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb22CEAiSx5DYQSGBTvbSokDrWCowDQYJKoZIhvcNAQEEBQADgYEAG/9sZNrkGnevLIUj5f7osVoLxSPFpMTkwaKTi2i7Q8cAnmd5llR3VfVZ4sR7U4bm5xAVwIWDgkEiF1rULlxVjvoB92Mo00SWOZE5l8rrwUU59/7KOUq0O0XZZvYX+hOWFV97QowMu8m1Mmg1JEH5h+b5r4L6TM0X7CdaoZ1KSYk=</X509Certificate></X509Data></KeyInfo></Identity></wsa10:EndpointReference></wsdl:port><wsdl:port name="JavaAuthenticationService" binding="tns:JavaAuthenticationService"><soap12:address location="http://services.heuristiclab.com/OKB.SPR-3.3/AuthenticationService.svc/Java"/><wsa10:EndpointReference><wsa10:Address>http://services.heuristiclab.com/OKB.SPR-3.3/AuthenticationService.svc/Java</wsa10:Address><Identity xmlns="http://schemas.xmlsoap.org/ws/2006/02/addressingidentity"><KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><X509Data><X509Certificate>MIICJjCCAY+gAwIBAgIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFADAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMB4XDTEwMDUxMTExMTQwMloXDTM5MTIzMTIzNTk1OVowJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqtugcJsHO5PuFt9Ki0No/hSJxC+Qbh+qKQ2Ogkpa7bd8UEv2p64b6W390IISw1SDc3B5M2z5pv0oLhuBfOUCwesTvrSWjr0aNIhCuYN3N9O7zCK7uxScJPzoaZREOSdYWw4C98ziZa1pYLakVcQrVXRd166CPQXLTrdTZHir/XsCAwEAAaNZMFcwVQYDVR0BBE4wTIAQo24HWHeI+SYFLidVqPxsa6EmMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb22CEAiSx5DYQSGBTvbSokDrWCowDQYJKoZIhvcNAQEEBQADgYEAG/9sZNrkGnevLIUj5f7osVoLxSPFpMTkwaKTi2i7Q8cAnmd5llR3VfVZ4sR7U4bm5xAVwIWDgkEiF1rULlxVjvoB92Mo00SWOZE5l8rrwUU59/7KOUq0O0XZZvYX+hOWFV97QowMu8m1Mmg1JEH5h+b5r4L6TM0X7CdaoZ1KSYk=</X509Certificate></X509Data></KeyInfo></Identity></wsa10:EndpointReference></wsdl:port></wsdl:service>
-    <wsp1:Policy wsu:Id="AuthenticationServicePolicy">
-        <wsp1:ExactlyOne>
-            <wsp1:All>
-                <sc:CallbackHandlerConfiguration wspp:visibility="private">
-                    <sc:CallbackHandler default="HolperM" name="usernameHandler"/>
-                    <sc:CallbackHandler default="mh2404" name="passwordHandler"/>
-                </sc:CallbackHandlerConfiguration>
-            </wsp1:All>
-        </wsp1:ExactlyOne>
-    </wsp1:Policy>
+	<wsp1:Policy wsu:Id="JavaAdministrationServicePolicy">
+		<wsp1:ExactlyOne>
+			<wsp1:All>
+				<sc:CallbackHandlerConfiguration
+					wspp:visibility="private">
+					<sc:CallbackHandler default="okbtester" name="usernameHandler" />
+					<sc:CallbackHandler default="okbtester" name="passwordHandler" />
+				</sc:CallbackHandlerConfiguration>
+				 <!--  using truststore handler to hide password -->
+				<sc:TrustStore xmlns:sc="http://schemas.sun.com/2006/03/wss/client"
+					wspp:visibility="private"
+					callbackHandler="com.heuristiclab.okb.wsclient.handler.TrustStoreCallbackHandler"
+					peeralias="okb" />
+			</wsp1:All>
+		</wsp1:ExactlyOne>
+	</wsp1:Policy>    
+    
 </wsdl:definitions>
Index: branches/OKBJavaConnector/src/main/resources/QueryService.svc.xml
===================================================================
--- branches/OKBJavaConnector/src/main/resources/QueryService.svc.xml	(revision 5761)
+++ branches/OKBJavaConnector/src/main/resources/QueryService.svc.xml	(revision 5762)
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?><wsdl:definitions name="QueryService" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://tempuri.org/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsp1="http://www.w3.org/ns/ws-policy" xmlns:sc="http://schemas.sun.com/2006/03/wss/client" xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"><wsdl:types><xsd:schema targetNamespace="http://tempuri.org/Imports"><xsd:import schemaLocation="http://services.heuristiclab.com/OKB.SPR-3.3/QueryService.svc?xsd=xsd0" namespace="http://tempuri.org/"/><xsd:import schemaLocation="http://services.heuristiclab.com/OKB.SPR-3.3/QueryService.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/"/><xsd:import schemaLocation="http://services.heuristiclab.com/OKB.SPR-3.3/QueryService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTransfer"/><xsd:import schemaLocation="http://services.heuristiclab.com/OKB.SPR-3.3/QueryService.svc?xsd=xsd3" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays"/></xsd:schema></wsdl:types><wsdl:message name="IQueryService_GetFilters_InputMessage"><wsdl:part name="parameters" element="tns:GetFilters"/></wsdl:message><wsdl:message name="IQueryService_GetFilters_OutputMessage"><wsdl:part name="parameters" element="tns:GetFiltersResponse"/></wsdl:message><wsdl:message name="IQueryService_GetNumberOfRuns_InputMessage"><wsdl:part name="parameters" element="tns:GetNumberOfRuns"/></wsdl:message><wsdl:message name="IQueryService_GetNumberOfRuns_OutputMessage"><wsdl:part name="parameters" element="tns:GetNumberOfRunsResponse"/></wsdl:message><wsdl:message name="IQueryService_GetRunIds_InputMessage"><wsdl:part name="parameters" element="tns:GetRunIds"/></wsdl:message><wsdl:message name="IQueryService_GetRunIds_OutputMessage"><wsdl:part name="parameters" element="tns:GetRunIdsResponse"/></wsdl:message><wsdl:message name="IQueryService_GetRuns_InputMessage"><wsdl:part name="parameters" element="tns:GetRuns"/></wsdl:message><wsdl:message name="IQueryService_GetRuns_OutputMessage"><wsdl:part name="parameters" element="tns:GetRunsResponse"/></wsdl:message><wsdl:portType name="IQueryService"><wsdl:operation name="GetFilters"><wsdl:input wsaw:Action="http://tempuri.org/IQueryService/GetFilters" message="tns:IQueryService_GetFilters_InputMessage"/><wsdl:output wsaw:Action="http://tempuri.org/IQueryService/GetFiltersResponse" message="tns:IQueryService_GetFilters_OutputMessage"/></wsdl:operation><wsdl:operation name="GetNumberOfRuns"><wsdl:input wsaw:Action="http://tempuri.org/IQueryService/GetNumberOfRuns" message="tns:IQueryService_GetNumberOfRuns_InputMessage"/><wsdl:output wsaw:Action="http://tempuri.org/IQueryService/GetNumberOfRunsResponse" message="tns:IQueryService_GetNumberOfRuns_OutputMessage"/></wsdl:operation><wsdl:operation name="GetRunIds"><wsdl:input wsaw:Action="http://tempuri.org/IQueryService/GetRunIds" message="tns:IQueryService_GetRunIds_InputMessage"/><wsdl:output wsaw:Action="http://tempuri.org/IQueryService/GetRunIdsResponse" message="tns:IQueryService_GetRunIds_OutputMessage"/></wsdl:operation><wsdl:operation name="GetRuns"><wsdl:input wsaw:Action="http://tempuri.org/IQueryService/GetRuns" message="tns:IQueryService_GetRuns_InputMessage"/><wsdl:output wsaw:Action="http://tempuri.org/IQueryService/GetRunsResponse" message="tns:IQueryService_GetRuns_OutputMessage"/></wsdl:operation></wsdl:portType><wsdl:binding name="QueryService" type="tns:IQueryService"><soap12:binding transport="http://schemas.xmlsoap.org/soap/http"/><wsdl:operation name="GetFilters"><soap12:operation soapAction="http://tempuri.org/IQueryService/GetFilters" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation><wsdl:operation name="GetNumberOfRuns"><soap12:operation soapAction="http://tempuri.org/IQueryService/GetNumberOfRuns" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation><wsdl:operation name="GetRunIds"><soap12:operation soapAction="http://tempuri.org/IQueryService/GetRunIds" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation><wsdl:operation name="GetRuns"><soap12:operation soapAction="http://tempuri.org/IQueryService/GetRuns" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation></wsdl:binding><wsdl:binding name="JavaQueryService" type="tns:IQueryService"><wsp1:PolicyReference URI="#JavaQueryServicePolicy"/>
     <soap12:binding transport="http://schemas.xmlsoap.org/soap/http"/><wsdl:operation name="GetFilters"><soap12:operation soapAction="http://tempuri.org/IQueryService/GetFilters" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation><wsdl:operation name="GetNumberOfRuns"><soap12:operation soapAction="http://tempuri.org/IQueryService/GetNumberOfRuns" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation><wsdl:operation name="GetRunIds"><soap12:operation soapAction="http://tempuri.org/IQueryService/GetRunIds" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation><wsdl:operation name="GetRuns"><soap12:operation soapAction="http://tempuri.org/IQueryService/GetRuns" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation></wsdl:binding><wsdl:service name="QueryService"><wsdl:port name="QueryService" binding="tns:QueryService"><soap12:address location="http://services.heuristiclab.com/OKB.SPR-3.3/QueryService.svc"/><wsa10:EndpointReference><wsa10:Address>http://services.heuristiclab.com/OKB.SPR-3.3/QueryService.svc</wsa10:Address><Identity xmlns="http://schemas.xmlsoap.org/ws/2006/02/addressingidentity"><KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><X509Data><X509Certificate>MIICJjCCAY+gAwIBAgIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFADAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMB4XDTEwMDUxMTExMTQwMloXDTM5MTIzMTIzNTk1OVowJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqtugcJsHO5PuFt9Ki0No/hSJxC+Qbh+qKQ2Ogkpa7bd8UEv2p64b6W390IISw1SDc3B5M2z5pv0oLhuBfOUCwesTvrSWjr0aNIhCuYN3N9O7zCK7uxScJPzoaZREOSdYWw4C98ziZa1pYLakVcQrVXRd166CPQXLTrdTZHir/XsCAwEAAaNZMFcwVQYDVR0BBE4wTIAQo24HWHeI+SYFLidVqPxsa6EmMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb22CEAiSx5DYQSGBTvbSokDrWCowDQYJKoZIhvcNAQEEBQADgYEAG/9sZNrkGnevLIUj5f7osVoLxSPFpMTkwaKTi2i7Q8cAnmd5llR3VfVZ4sR7U4bm5xAVwIWDgkEiF1rULlxVjvoB92Mo00SWOZE5l8rrwUU59/7KOUq0O0XZZvYX+hOWFV97QowMu8m1Mmg1JEH5h+b5r4L6TM0X7CdaoZ1KSYk=</X509Certificate></X509Data></KeyInfo></Identity></wsa10:EndpointReference></wsdl:port><wsdl:port name="JavaQueryService" binding="tns:JavaQueryService"><soap12:address location="http://services.heuristiclab.com/OKB.SPR-3.3/QueryService.svc/Java"/><wsa10:EndpointReference><wsa10:Address>http://services.heuristiclab.com/OKB.SPR-3.3/QueryService.svc/Java</wsa10:Address><Identity xmlns="http://schemas.xmlsoap.org/ws/2006/02/addressingidentity"><KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><X509Data><X509Certificate>MIICJjCCAY+gAwIBAgIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFADAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMB4XDTEwMDUxMTExMTQwMloXDTM5MTIzMTIzNTk1OVowJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqtugcJsHO5PuFt9Ki0No/hSJxC+Qbh+qKQ2Ogkpa7bd8UEv2p64b6W390IISw1SDc3B5M2z5pv0oLhuBfOUCwesTvrSWjr0aNIhCuYN3N9O7zCK7uxScJPzoaZREOSdYWw4C98ziZa1pYLakVcQrVXRd166CPQXLTrdTZHir/XsCAwEAAaNZMFcwVQYDVR0BBE4wTIAQo24HWHeI+SYFLidVqPxsa6EmMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb22CEAiSx5DYQSGBTvbSokDrWCowDQYJKoZIhvcNAQEEBQADgYEAG/9sZNrkGnevLIUj5f7osVoLxSPFpMTkwaKTi2i7Q8cAnmd5llR3VfVZ4sR7U4bm5xAVwIWDgkEiF1rULlxVjvoB92Mo00SWOZE5l8rrwUU59/7KOUq0O0XZZvYX+hOWFV97QowMu8m1Mmg1JEH5h+b5r4L6TM0X7CdaoZ1KSYk=</X509Certificate></X509Data></KeyInfo></Identity></wsa10:EndpointReference></wsdl:port></wsdl:service>
-    <wsp1:Policy wsu:Id="JavaQueryServicePolicy">
-        <wsp1:ExactlyOne>
-            <wsp1:All>
-                <sc:CallbackHandlerConfiguration wspp:visibility="private">
-                    <sc:CallbackHandler default="HolperM" name="usernameHandler"/>
-                    <sc:CallbackHandler default="mh2404" name="passwordHandler"/>
-                </sc:CallbackHandlerConfiguration>
-            </wsp1:All>
-        </wsp1:ExactlyOne>
-    </wsp1:Policy>
+	<wsp1:Policy wsu:Id="JavaAdministrationServicePolicy">
+		<wsp1:ExactlyOne>
+			<wsp1:All>
+				<sc:CallbackHandlerConfiguration
+					wspp:visibility="private">
+					<sc:CallbackHandler default="okbtester" name="usernameHandler" />
+					<sc:CallbackHandler default="okbtester" name="passwordHandler" />
+				</sc:CallbackHandlerConfiguration>
+				 <!--  using truststore handler to hide password -->
+				<sc:TrustStore xmlns:sc="http://schemas.sun.com/2006/03/wss/client"
+					wspp:visibility="private"
+					callbackHandler="com.heuristiclab.okb.wsclient.handler.TrustStoreCallbackHandler"
+					peeralias="okb" />
+			</wsp1:All>
+		</wsp1:ExactlyOne>
+	</wsp1:Policy>    
 </wsdl:definitions>
Index: branches/OKBJavaConnector/src/main/resources/RunCreationService.svc.xml
===================================================================
--- branches/OKBJavaConnector/src/main/resources/RunCreationService.svc.xml	(revision 5761)
+++ branches/OKBJavaConnector/src/main/resources/RunCreationService.svc.xml	(revision 5762)
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?><wsdl:definitions name="RunCreationService" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://tempuri.org/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsp1="http://www.w3.org/ns/ws-policy" xmlns:sc="http://schemas.sun.com/2006/03/wss/client" xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy"><wsdl:types><xsd:schema targetNamespace="http://tempuri.org/Imports"><xsd:import schemaLocation="http://services.heuristiclab.com/OKB.SPR-3.3/RunCreationService.svc?xsd=xsd0" namespace="http://tempuri.org/"/><xsd:import schemaLocation="http://services.heuristiclab.com/OKB.SPR-3.3/RunCreationService.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/"/><xsd:import schemaLocation="http://services.heuristiclab.com/OKB.SPR-3.3/RunCreationService.svc?xsd=xsd2" namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.DataTransfer"/></xsd:schema></wsdl:types><wsdl:message name="IRunCreationService_GetAlgorithms_InputMessage"><wsdl:part name="parameters" element="tns:GetAlgorithms"/></wsdl:message><wsdl:message name="IRunCreationService_GetAlgorithms_OutputMessage"><wsdl:part name="parameters" element="tns:GetAlgorithmsResponse"/></wsdl:message><wsdl:message name="IRunCreationService_GetAlgorithmData_InputMessage"><wsdl:part name="parameters" element="tns:GetAlgorithmData"/></wsdl:message><wsdl:message name="IRunCreationService_GetAlgorithmData_OutputMessage"><wsdl:part name="parameters" element="tns:GetAlgorithmDataResponse"/></wsdl:message><wsdl:message name="IRunCreationService_GetProblems_InputMessage"><wsdl:part name="parameters" element="tns:GetProblems"/></wsdl:message><wsdl:message name="IRunCreationService_GetProblems_OutputMessage"><wsdl:part name="parameters" element="tns:GetProblemsResponse"/></wsdl:message><wsdl:message name="IRunCreationService_GetProblemData_InputMessage"><wsdl:part name="parameters" element="tns:GetProblemData"/></wsdl:message><wsdl:message name="IRunCreationService_GetProblemData_OutputMessage"><wsdl:part name="parameters" element="tns:GetProblemDataResponse"/></wsdl:message><wsdl:message name="IRunCreationService_AddRun_InputMessage"><wsdl:part name="parameters" element="tns:AddRun"/></wsdl:message><wsdl:message name="IRunCreationService_AddRun_OutputMessage"><wsdl:part name="parameters" element="tns:AddRunResponse"/></wsdl:message><wsdl:portType name="IRunCreationService"><wsdl:operation name="GetAlgorithms"><wsdl:input wsaw:Action="http://tempuri.org/IRunCreationService/GetAlgorithms" message="tns:IRunCreationService_GetAlgorithms_InputMessage"/><wsdl:output wsaw:Action="http://tempuri.org/IRunCreationService/GetAlgorithmsResponse" message="tns:IRunCreationService_GetAlgorithms_OutputMessage"/></wsdl:operation><wsdl:operation name="GetAlgorithmData"><wsdl:input wsaw:Action="http://tempuri.org/IRunCreationService/GetAlgorithmData" message="tns:IRunCreationService_GetAlgorithmData_InputMessage"/><wsdl:output wsaw:Action="http://tempuri.org/IRunCreationService/GetAlgorithmDataResponse" message="tns:IRunCreationService_GetAlgorithmData_OutputMessage"/></wsdl:operation><wsdl:operation name="GetProblems"><wsdl:input wsaw:Action="http://tempuri.org/IRunCreationService/GetProblems" message="tns:IRunCreationService_GetProblems_InputMessage"/><wsdl:output wsaw:Action="http://tempuri.org/IRunCreationService/GetProblemsResponse" message="tns:IRunCreationService_GetProblems_OutputMessage"/></wsdl:operation><wsdl:operation name="GetProblemData"><wsdl:input wsaw:Action="http://tempuri.org/IRunCreationService/GetProblemData" message="tns:IRunCreationService_GetProblemData_InputMessage"/><wsdl:output wsaw:Action="http://tempuri.org/IRunCreationService/GetProblemDataResponse" message="tns:IRunCreationService_GetProblemData_OutputMessage"/></wsdl:operation><wsdl:operation name="AddRun"><wsdl:input wsaw:Action="http://tempuri.org/IRunCreationService/AddRun" message="tns:IRunCreationService_AddRun_InputMessage"/><wsdl:output wsaw:Action="http://tempuri.org/IRunCreationService/AddRunResponse" message="tns:IRunCreationService_AddRun_OutputMessage"/></wsdl:operation></wsdl:portType><wsdl:binding name="RunCreationService" type="tns:IRunCreationService"><soap12:binding transport="http://schemas.xmlsoap.org/soap/http"/><wsdl:operation name="GetAlgorithms"><soap12:operation soapAction="http://tempuri.org/IRunCreationService/GetAlgorithms" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation><wsdl:operation name="GetAlgorithmData"><soap12:operation soapAction="http://tempuri.org/IRunCreationService/GetAlgorithmData" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation><wsdl:operation name="GetProblems"><soap12:operation soapAction="http://tempuri.org/IRunCreationService/GetProblems" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation><wsdl:operation name="GetProblemData"><soap12:operation soapAction="http://tempuri.org/IRunCreationService/GetProblemData" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation><wsdl:operation name="AddRun"><soap12:operation soapAction="http://tempuri.org/IRunCreationService/AddRun" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation></wsdl:binding><wsdl:binding name="JavaRunCreationService" type="tns:IRunCreationService"><wsp1:PolicyReference URI="#JavaRunCreationServicePolicy"/>
     <soap12:binding transport="http://schemas.xmlsoap.org/soap/http"/><wsdl:operation name="GetAlgorithms"><soap12:operation soapAction="http://tempuri.org/IRunCreationService/GetAlgorithms" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation><wsdl:operation name="GetAlgorithmData"><soap12:operation soapAction="http://tempuri.org/IRunCreationService/GetAlgorithmData" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation><wsdl:operation name="GetProblems"><soap12:operation soapAction="http://tempuri.org/IRunCreationService/GetProblems" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation><wsdl:operation name="GetProblemData"><soap12:operation soapAction="http://tempuri.org/IRunCreationService/GetProblemData" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation><wsdl:operation name="AddRun"><soap12:operation soapAction="http://tempuri.org/IRunCreationService/AddRun" style="document"/><wsdl:input><soap12:body use="literal"/></wsdl:input><wsdl:output><soap12:body use="literal"/></wsdl:output></wsdl:operation></wsdl:binding><wsdl:service name="RunCreationService"><wsdl:port name="RunCreationService" binding="tns:RunCreationService"><soap12:address location="http://services.heuristiclab.com/OKB.SPR-3.3/RunCreationService.svc"/><wsa10:EndpointReference><wsa10:Address>http://services.heuristiclab.com/OKB.SPR-3.3/RunCreationService.svc</wsa10:Address><Identity xmlns="http://schemas.xmlsoap.org/ws/2006/02/addressingidentity"><KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><X509Data><X509Certificate>MIICJjCCAY+gAwIBAgIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFADAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMB4XDTEwMDUxMTExMTQwMloXDTM5MTIzMTIzNTk1OVowJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqtugcJsHO5PuFt9Ki0No/hSJxC+Qbh+qKQ2Ogkpa7bd8UEv2p64b6W390IISw1SDc3B5M2z5pv0oLhuBfOUCwesTvrSWjr0aNIhCuYN3N9O7zCK7uxScJPzoaZREOSdYWw4C98ziZa1pYLakVcQrVXRd166CPQXLTrdTZHir/XsCAwEAAaNZMFcwVQYDVR0BBE4wTIAQo24HWHeI+SYFLidVqPxsa6EmMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb22CEAiSx5DYQSGBTvbSokDrWCowDQYJKoZIhvcNAQEEBQADgYEAG/9sZNrkGnevLIUj5f7osVoLxSPFpMTkwaKTi2i7Q8cAnmd5llR3VfVZ4sR7U4bm5xAVwIWDgkEiF1rULlxVjvoB92Mo00SWOZE5l8rrwUU59/7KOUq0O0XZZvYX+hOWFV97QowMu8m1Mmg1JEH5h+b5r4L6TM0X7CdaoZ1KSYk=</X509Certificate></X509Data></KeyInfo></Identity></wsa10:EndpointReference></wsdl:port><wsdl:port name="JavaRunCreationService" binding="tns:JavaRunCreationService"><soap12:address location="http://services.heuristiclab.com/OKB.SPR-3.3/RunCreationService.svc/Java"/><wsa10:EndpointReference><wsa10:Address>http://services.heuristiclab.com/OKB.SPR-3.3/RunCreationService.svc/Java</wsa10:Address><Identity xmlns="http://schemas.xmlsoap.org/ws/2006/02/addressingidentity"><KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"><X509Data><X509Certificate>MIICJjCCAY+gAwIBAgIQCJLHkNhBIYFO9tKiQOtYKjANBgkqhkiG9w0BAQQFADAkMSIwIAYDVQQDExlzZXJ2aWNlcy5oZXVyaXN0aWNsYWIuY29tMB4XDTEwMDUxMTExMTQwMloXDTM5MTIzMTIzNTk1OVowJDEiMCAGA1UEAxMZc2VydmljZXMuaGV1cmlzdGljbGFiLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqtugcJsHO5PuFt9Ki0No/hSJxC+Qbh+qKQ2Ogkpa7bd8UEv2p64b6W390IISw1SDc3B5M2z5pv0oLhuBfOUCwesTvrSWjr0aNIhCuYN3N9O7zCK7uxScJPzoaZREOSdYWw4C98ziZa1pYLakVcQrVXRd166CPQXLTrdTZHir/XsCAwEAAaNZMFcwVQYDVR0BBE4wTIAQo24HWHeI+SYFLidVqPxsa6EmMCQxIjAgBgNVBAMTGXNlcnZpY2VzLmhldXJpc3RpY2xhYi5jb22CEAiSx5DYQSGBTvbSokDrWCowDQYJKoZIhvcNAQEEBQADgYEAG/9sZNrkGnevLIUj5f7osVoLxSPFpMTkwaKTi2i7Q8cAnmd5llR3VfVZ4sR7U4bm5xAVwIWDgkEiF1rULlxVjvoB92Mo00SWOZE5l8rrwUU59/7KOUq0O0XZZvYX+hOWFV97QowMu8m1Mmg1JEH5h+b5r4L6TM0X7CdaoZ1KSYk=</X509Certificate></X509Data></KeyInfo></Identity></wsa10:EndpointReference></wsdl:port></wsdl:service>
-    <wsp1:Policy wsu:Id="JavaRunCreationServicePolicy">
-        <wsp1:ExactlyOne>
-            <wsp1:All>
-                <sc:CallbackHandlerConfiguration wspp:visibility="private">
-                    <sc:CallbackHandler default="HolperM" name="usernameHandler"/>
-                    <sc:CallbackHandler default="mh2404" name="passwordHandler"/>
-                </sc:CallbackHandlerConfiguration>
-            </wsp1:All>
-        </wsp1:ExactlyOne>
-    </wsp1:Policy>
+	<wsp1:Policy wsu:Id="JavaAdministrationServicePolicy">
+		<wsp1:ExactlyOne>
+			<wsp1:All>
+				<sc:CallbackHandlerConfiguration
+					wspp:visibility="private">
+					<sc:CallbackHandler default="okbtester" name="usernameHandler" />
+					<sc:CallbackHandler default="okbtester" name="passwordHandler" />
+				</sc:CallbackHandlerConfiguration>
+				 <!--  using truststore handler to hide password -->
+				<sc:TrustStore xmlns:sc="http://schemas.sun.com/2006/03/wss/client"
+					wspp:visibility="private"
+					callbackHandler="com.heuristiclab.okb.wsclient.handler.TrustStoreCallbackHandler"
+					peeralias="okb" />
+			</wsp1:All>
+		</wsp1:ExactlyOne>
+	</wsp1:Policy>    
 </wsdl:definitions>
Index: branches/OKBJavaConnector/src/test/java/at/hl/okb/wsclient/OKBClientTest.java
===================================================================
--- branches/OKBJavaConnector/src/test/java/at/hl/okb/wsclient/OKBClientTest.java	(revision 5761)
+++ branches/OKBJavaConnector/src/test/java/at/hl/okb/wsclient/OKBClientTest.java	(revision 5762)
@@ -46,5 +46,4 @@
 		this.srv = new AdministrationService();
 		this.port = srv.getJavaAdministrationService(); //.getWSHttpBindingIAdministrationService1();
-		
 	}
 
@@ -98,4 +97,6 @@
 		assertTrue("No Algorithms found!", algos.getAlgorithm().size() > 0);
 	}
+	
+	
 //
 //	@Test
