From 59fe4477007188955a8cea000a821a6f31b50317 Mon Sep 17 00:00:00 2001
From: erik <erik.suta@evolveum.com>
Date: Mon, 30 Mar 2015 16:07:26 +0200
Subject: [PATCH 1/3] MID-2257 implementation - roleType search in assignable
 modal window - based on lookupTable values.

---
 .../admin/configuration/PageDebugView.java    |   8 +
 .../web/page/admin/users/PageUser.java        |  13 +-
 .../component/AssignableRolePopupContent.html |   4 +
 .../component/AssignableRolePopupContent.java | 295 +++++++++++-------
 4 files changed, 196 insertions(+), 124 deletions(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
index 98ec5bccdfa..d22069ca29f 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
@@ -41,6 +41,7 @@
 import com.evolveum.midpoint.web.page.admin.dto.ObjectViewDto;
 import com.evolveum.midpoint.web.security.MidPointApplication;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
@@ -129,10 +130,17 @@ private ObjectViewDto loadObject() {
             if (objectType != null && StringUtils.isNotBlank(objectType.toString())){
             	type = getPrismContext().getSchemaRegistry().determineCompileTimeClass(new QName(SchemaConstantsGenerated.NS_COMMON, objectType.toString()));
             }
+
             if (UserType.class.isAssignableFrom(type)) {
                 options.add(SelectorOptions.create(UserType.F_JPEG_PHOTO,
                         GetOperationOptions.createRetrieve(RetrieveOption.INCLUDE)));
             }
+
+            if(objectType != null && LookupTableType.COMPLEX_TYPE.getLocalPart().equals(objectType.toString())){
+                options.add(SelectorOptions.create(LookupTableType.F_ROW,
+                        GetOperationOptions.createRetrieve(RetrieveOption.INCLUDE)));
+            }
+
             PrismObject<ObjectType> object = getModelService().getObject(type, objectOid.toString(), options, task, result);
 
             PrismContext context = application.getPrismContext();
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
index 7e429764338..f1f5807decd 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
@@ -427,10 +427,10 @@ public PrismObject<UserType> getObject() {
             }
         };
 
-        summaryContainer.add(new Label(ID_SUMMARY_NAME, new PrismPropertyModel<UserType>(summaryUser, UserType.F_NAME)));
-        summaryContainer.add(new Label(ID_SUMMARY_FULL_NAME, new PrismPropertyModel<UserType>(summaryUser, UserType.F_FULL_NAME)));
-        summaryContainer.add(new Label(ID_SUMMARY_GIVEN_NAME, new PrismPropertyModel<UserType>(summaryUser, UserType.F_GIVEN_NAME)));
-        summaryContainer.add(new Label(ID_SUMMARY_FAMILY_NAME, new PrismPropertyModel<UserType>(summaryUser, UserType.F_FAMILY_NAME)));
+        summaryContainer.add(new Label(ID_SUMMARY_NAME, new PrismPropertyModel<>(summaryUser, UserType.F_NAME)));
+        summaryContainer.add(new Label(ID_SUMMARY_FULL_NAME, new PrismPropertyModel<>(summaryUser, UserType.F_FULL_NAME)));
+        summaryContainer.add(new Label(ID_SUMMARY_GIVEN_NAME, new PrismPropertyModel<>(summaryUser, UserType.F_GIVEN_NAME)));
+        summaryContainer.add(new Label(ID_SUMMARY_FAMILY_NAME, new PrismPropertyModel<>(summaryUser, UserType.F_FAMILY_NAME)));
 
         Image img = new Image(ID_SUMMARY_PHOTO, new AbstractReadOnlyModel<AbstractResource>() {
 
@@ -1026,6 +1026,11 @@ protected void handlePartialError(OperationResult result) {
             protected void addPerformed(AjaxRequestTarget target, List<ObjectType> selected) {
                 addSelectedAssignablePerformed(target, selected, MODAL_ID_ASSIGNABLE);
             }
+
+            @Override
+            protected PrismObject<UserType> getUserDefinition() {
+                return userModel.getObject().getObject();
+            }
         });
         add(window);
         
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableRolePopupContent.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableRolePopupContent.html
index 3d5f1bdf2db..4106f81674d 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableRolePopupContent.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableRolePopupContent.html
@@ -23,6 +23,10 @@
             <form wicket:id="searchForm" class="form-inline pull-right"
                   style="padding: 5px;">
 
+                <div class="form-group">
+                    <select class="form-control input-sm" wicket:id="typeSelect" />
+                </div>
+
                 <div wicket:id="basicSearch" />
             </form>
         </div>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableRolePopupContent.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableRolePopupContent.java
index 9bd490b7dde..bec4d88bdd7 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableRolePopupContent.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableRolePopupContent.java
@@ -1,26 +1,16 @@
 package com.evolveum.midpoint.web.page.admin.users.component;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.Validate;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.PropertyModel;
-
+import com.evolveum.midpoint.model.api.ModelInteractionService;
+import com.evolveum.midpoint.model.api.RoleSelectionSpecification;
+import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.match.PolyStringNormMatchingRule;
 import com.evolveum.midpoint.prism.polystring.PolyStringNormalizer;
-import com.evolveum.midpoint.prism.query.AndFilter;
-import com.evolveum.midpoint.prism.query.ObjectQuery;
-import com.evolveum.midpoint.prism.query.SubstringFilter;
+import com.evolveum.midpoint.prism.query.*;
 import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.util.DisplayableValue;
+import com.evolveum.midpoint.util.exception.ConfigurationException;
+import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
+import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
@@ -31,15 +21,35 @@
 import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.Validate;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.PropertyModel;
+
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.List;
 
 public class AssignableRolePopupContent extends AssignablePopupContent{
 
     private static final Trace LOGGER = TraceManager.getTrace(AssignableRolePopupContent.class);
 
+    private static final String DOT_CLASS = AssignableRolePopupContent.class.getName() + ".";
+    private static final String OPERATION_LOAD_ROLE_TYPES = DOT_CLASS + "loadRoleTypes";
+
     private QName searchParameter = RoleType.F_NAME;
 
     private static final String ID_TABLE = "table";
     private static final String ID_SEARCH_FORM = "searchForm";
+    private static final String ID_TYPE_SEARCH = "typeSelect";
     private static final String ID_BASIC_SEARCH = "basicSearch";
 
 	public AssignableRolePopupContent(String id) {
@@ -50,6 +60,7 @@ protected Panel createPopupContent(){
 		Form searchForm = new Form(ID_SEARCH_FORM);
         searchForm.setOutputMarkupId(true);
         add(searchForm);
+
         BasicSearchPanel<AssignmentSearchDto> basicSearch = new BasicSearchPanel<AssignmentSearchDto>(ID_BASIC_SEARCH) {
 
             @Override
@@ -69,129 +80,173 @@ protected void clearSearchPerformed(AjaxRequestTarget target) {
         };
         searchForm.add(basicSearch);
 
-   	 
-        TablePanel panel = createTable();
-//        add(panel);
-        return panel;
+        DropDownChoice typeSearch = new DropDownChoice<>(ID_TYPE_SEARCH,
+                new PropertyModel<String>(searchModel, AssignmentSearchDto.F_SEARCH_ROLE_TYPE),
+                createAvailableRoleTypesList());
+        typeSearch.add(new OnChangeAjaxBehavior() {
+
+            @Override
+            protected void onUpdate(AjaxRequestTarget target) {
+                assignmentSearchPerformed(target);
+            }
+        });
+        searchForm.add(typeSearch);
+
+        return createTable();
 	}
-	
-	  private void assignmentSearchPerformed(AjaxRequestTarget target){
-	        ObjectQuery query = createSearchQuery();
-	        TablePanel panel = (TablePanel) getTablePanel();
-	        DataTable table = panel.getDataTable();
-	        ObjectDataProvider provider = (ObjectDataProvider) table.getDataProvider();
-	        provider.setQuery(query);
-
-	        target.add(get(ID_TABLE));
-	        target.add(panel);
-	    }
-	  
-	  protected void assignmentClearSearchPerformed(AjaxRequestTarget target){
-	        searchModel.setObject(new AssignmentSearchDto());
 
-	        TablePanel panel = (TablePanel) getTablePanel();
-	        DataTable table = panel.getDataTable();
-	        ObjectDataProvider provider = (ObjectDataProvider)table.getDataProvider();
+    private List<String> createAvailableRoleTypesList(){
+        List<String> roleTypes = new ArrayList<>();
+        ModelInteractionService interactionService = getPageBase().getModelInteractionService();
+        OperationResult result = new OperationResult(OPERATION_LOAD_ROLE_TYPES);
 
-	        if(getProviderQuery() != null){
-	            provider.setQuery(getProviderQuery());
-	        } else {
-	            provider.setQuery(null);
-	        }
+        try {
+            RoleSelectionSpecification roleSpecification = interactionService.getAssignableRoleSpecification(getUserDefinition(), result);
+            List<DisplayableValue<String>> displayableValues = roleSpecification.getRoleTypes();
 
-	        target.add(panel);
-	    }
-	  
-	  protected Panel getTablePanel(){
-	        return (TablePanel) get(ID_TABLE);
-	    }
+            for(DisplayableValue<String> displayable: displayableValues){
+                roleTypes.add(displayable.getValue());
+            }
+
+        } catch (SchemaException | ConfigurationException | ObjectNotFoundException e) {
+            LOGGER.error("Could not retrieve available role types for search purposes.", e);
+            result.recordFatalError("Could not retrieve available role types for search purposes.", e);
+        }
+
+        return roleTypes;
+    }
+
+    protected PrismObject<UserType> getUserDefinition(){
+        return null;
+    }
+	
+    private void assignmentSearchPerformed(AjaxRequestTarget target){
+        ObjectQuery query = createSearchQuery();
+        TablePanel panel = (TablePanel) getTablePanel();
+        DataTable table = panel.getDataTable();
+        ObjectDataProvider provider = (ObjectDataProvider) table.getDataProvider();
+        provider.setQuery(query);
+
+        target.add(get(ID_TABLE));
+        target.add(panel);
+    }
 	  
-	  private TablePanel createTable() {
-	        List<IColumn> columns = createMultiSelectColumns();
-	        ObjectDataProvider provider = new ObjectDataProvider(getPageBase(), getType()){
-
-	            @Override
-	            protected void handleNotSuccessOrHandledErrorInIterator(OperationResult result) {
-	                if(result.isPartialError()){
-	                    handlePartialError(result);
-	                } else {
-	                    super.handleNotSuccessOrHandledErrorInIterator(result);
-	                }
-	            }
-	        };
-	        provider.setQuery(getProviderQuery());
-	        TablePanel table = new TablePanel(ID_TABLE, provider, columns);
-	        table.setOutputMarkupId(true);
+	protected void assignmentClearSearchPerformed(AjaxRequestTarget target){
+	    searchModel.setObject(new AssignmentSearchDto());
 
-	        return table;
+	    TablePanel panel = (TablePanel) getTablePanel();
+	    DataTable table = panel.getDataTable();
+	    ObjectDataProvider provider = (ObjectDataProvider)table.getDataProvider();
+
+	    if(getProviderQuery() != null){
+	        provider.setQuery(getProviderQuery());
+	    } else {
+	        provider.setQuery(null);
 	    }
-	  
-	  private ObjectQuery createSearchQuery(){
-	        AssignmentSearchDto dto = searchModel.getObject();
-	        ObjectQuery query = null;
 
-	        if(StringUtils.isEmpty(dto.getText())){
-	            if(getProviderQuery() != null){
-	                return getProviderQuery();
+	    target.add(panel);
+	}
+	  
+	protected Panel getTablePanel(){
+	    return (TablePanel) get(ID_TABLE);
+	}
+	  
+	private TablePanel createTable() {
+	    List<IColumn> columns = createMultiSelectColumns();
+	    ObjectDataProvider provider = new ObjectDataProvider(getPageBase(), getType()){
+
+	        @Override
+	        protected void handleNotSuccessOrHandledErrorInIterator(OperationResult result) {
+	            if(result.isPartialError()){
+	                handlePartialError(result);
 	            } else {
-	                return null;
+	                super.handleNotSuccessOrHandledErrorInIterator(result);
 	            }
 	        }
+	    };
+	    provider.setQuery(getProviderQuery());
+	    TablePanel table = new TablePanel(ID_TABLE, provider, columns);
+	    table.setOutputMarkupId(true);
+        return table;
+	}
+	  
+	private ObjectQuery createSearchQuery(){
+	    AssignmentSearchDto dto = searchModel.getObject();
+	    ObjectQuery query = null;
+
+//	    if(StringUtils.isEmpty(dto.getText())){
+//	        if(getProviderQuery() != null){
+//	            return getProviderQuery();
+//	        } else {
+//	            return null;
+//	        }
+//	    }
+
+	    try{
+            List<ObjectFilter> filters = new ArrayList<>();
+
+            if(getProviderQuery() != null){
+                filters.add(getProviderQuery().getFilter());
+            }
 
-	        try{
-	        	PolyStringNormalizer normalizer = getPageBase().getPrismContext().getDefaultPolyStringNormalizer();
-	            String normalized = normalizer.normalize(dto.getText());
+            if(dto.getText() != null && StringUtils.isNotEmpty(dto.getText())){
+                PolyStringNormalizer normalizer = getPageBase().getPrismContext().getDefaultPolyStringNormalizer();
+                String normalized = normalizer.normalize(dto.getText());
 
-	            SubstringFilter substring = SubstringFilter.createSubstring(searchParameter, type, getPageBase().getPrismContext(),
-	                    PolyStringNormMatchingRule.NAME, normalized);
+                SubstringFilter substring = SubstringFilter.createSubstring(searchParameter, type, getPageBase().getPrismContext(),
+                        PolyStringNormMatchingRule.NAME, normalized);
+                filters.add(substring);
+            }
 
-	            if(getProviderQuery() != null){
-	                AndFilter and = AndFilter.createAnd(getProviderQuery().getFilter(), substring);
-	                query = ObjectQuery.createObjectQuery(and);
-	            } else {
-	                query = ObjectQuery.createObjectQuery(substring);
-	            }
+            if(dto.getType() != null){
+                EqualFilter typeEquals = EqualFilter.createEqual(RoleType.F_ROLE_TYPE, RoleType.class, getPageBase().getPrismContext(),
+                        null, dto.getType());
+                filters.add(typeEquals);
+            }
 
-	        } catch (Exception e){
-	            error(getString("OrgUnitBrowser.message.queryError") + " " + e.getMessage());
-	            LoggingUtils.logException(LOGGER, "Couldn't create query filter.", e);
-	        }
+            query = ObjectQuery.createObjectQuery(AndFilter.createAnd(filters));
 
-	        return query;
+	    } catch (Exception e){
+	        error(getString("OrgUnitBrowser.message.queryError") + " " + e.getMessage());
+	        LoggingUtils.logException(LOGGER, "Couldn't create query filter.", e);
 	    }
-	  
-	  protected <T extends ObjectType> List<ObjectType> getSelectedObjects(){
-		  List<ObjectType> selected = new ArrayList<>();
-		  TablePanel table = (TablePanel) getTablePanel();
-	        ObjectDataProvider<SelectableBean<T>, T> provider = (ObjectDataProvider) table.getDataTable().getDataProvider();
-	        for (SelectableBean<T> bean : provider.getAvailableData()) {
-	            if (!bean.isSelected()) {
-	                continue;
-	            }
 
-	            selected.add(bean.getValue());
-	        }
-	        return selected;
-	  }
+	    return query;
+	}
 	  
-	  public void setType(Class type){
-		  this.type = type;
-		  TablePanel table = (TablePanel) getTablePanel();
-	        if (table != null) {
-	            ObjectDataProvider provider = (ObjectDataProvider) table.getDataTable().getDataProvider();
-	            provider.setType(type);
-
-	            //replace table with table with proper columns
-	            replace(createTable());
+	protected <T extends ObjectType> List<ObjectType> getSelectedObjects(){
+	    List<ObjectType> selected = new ArrayList<>();
+	    TablePanel table = (TablePanel) getTablePanel();
+	    ObjectDataProvider<SelectableBean<T>, T> provider = (ObjectDataProvider) table.getDataTable().getDataProvider();
+	    for (SelectableBean<T> bean : provider.getAvailableData()) {
+	        if (!bean.isSelected()) {
+	            continue;
 	        }
-	  }
-	  
-	  public QName getSearchParameter() {
-	        return searchParameter;
+
+	        selected.add(bean.getValue());
 	    }
+	    return selected;
+	}
+	  
+	public void setType(Class type){
+	    this.type = type;
+		TablePanel table = (TablePanel) getTablePanel();
 
-	    public void setSearchParameter(QName searchParameter) {
-	        Validate.notNull(searchParameter, "Search Parameter must not be null.");
-	        this.searchParameter = searchParameter;
+        if (table != null) {
+	        ObjectDataProvider provider = (ObjectDataProvider) table.getDataTable().getDataProvider();
+	        provider.setType(type);
+
+	        //replace table with table with proper columns
+	        replace(createTable());
 	    }
+	}
+	  
+	public QName getSearchParameter() {
+	    return searchParameter;
+	}
+
+	public void setSearchParameter(QName searchParameter) {
+	    Validate.notNull(searchParameter, "Search Parameter must not be null.");
+	    this.searchParameter = searchParameter;
+	}
 }

From ffbec2bc8bf7c008a2aced1c9ad77e1e8db0e80b Mon Sep 17 00:00:00 2001
From: Radovan Semancik <radovan.semancik@evolveum.com>
Date: Mon, 30 Mar 2015 20:25:52 +0200
Subject: [PATCH 2/3] Fixing some WS authentication details. Cleaning up WS
 tests.

---
 .../model/client/ModelClientUtil.java         |  26 ++
 ...ringAuthenticationInjectorInterceptor.java |   9 +-
 testing/wstest/pom.xml                        |  11 +
 .../wstest/AbstractWebserviceTest.java        | 191 ++++++---
 .../testing/wstest/ClientPasswordHandler.java |  44 +++
 .../wstest/WebserviceSecurityTest.java        | 370 ++++++++----------
 .../src/test/resources/logback-test.xml       |  53 +++
 .../src/test/resources/logging.properties     |   4 +
 testing/wstest/testng.xml                     |  28 ++
 9 files changed, 485 insertions(+), 251 deletions(-)
 create mode 100644 testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/ClientPasswordHandler.java
 create mode 100644 testing/wstest/src/test/resources/logback-test.xml
 create mode 100644 testing/wstest/src/test/resources/logging.properties
 create mode 100644 testing/wstest/testng.xml

diff --git a/model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java b/model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
index a85c2e1c119..1ea41ec924e 100644
--- a/model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
+++ b/model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
@@ -36,6 +36,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectDeltaOperationType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.PasswordType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 import com.evolveum.prism.xml.ns._public.query_3.FilterClauseType;
 import com.evolveum.prism.xml.ns._public.query_3.SearchFilterType;
 import com.evolveum.prism.xml.ns._public.types_3.ChangeTypeType;
@@ -250,4 +251,29 @@ public static ObjectDeltaOperationType findInDeltaOperationList(ObjectDeltaOpera
 		}
 	}
 
+	public static <O extends ObjectType> String toString(O obj) {
+		if (obj == null) {
+			return null;
+		}
+		StringBuilder sb = new StringBuilder();
+		String className = obj.getClass().getSimpleName();
+		if (className.endsWith("Type")) {
+			className = className.substring(0, className.lastIndexOf("Type")).toLowerCase();
+		}
+		sb.append(className);
+		sb.append("(");
+		sb.append(toString(obj.getName()));
+		sb.append(":");
+		sb.append(obj.getOid());
+		sb.append(")");
+		return sb.toString();
+	}
+	
+	public static String toString(PolyStringType poly) {
+		if (poly == null) {
+			return null;
+		}
+		return getOrig(poly);
+	}
+
 }
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SpringAuthenticationInjectorInterceptor.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SpringAuthenticationInjectorInterceptor.java
index 8530bf2969d..59b5c8f6532 100644
--- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SpringAuthenticationInjectorInterceptor.java
+++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/SpringAuthenticationInjectorInterceptor.java
@@ -125,7 +125,12 @@ private SOAPMessage getSOAPMessage(SoapMessage msg) {
     public void handleMessage(SoapMessage message) throws Fault {
         //Note: in constructor we have specified that we will be called after we have been successfully authenticated the user through WS-Security
         //Now we will only set the Spring Authentication object based on the user found in the header
+    	LOGGER.trace("Intercepted message: {}", message);
         SOAPMessage doc = getSOAPMessage(message);
+        if (doc == null) {
+        	LOGGER.error("No soap message in handler");
+        	throw new Fault(new WSSecurityException(WSSecurityException.ErrorCode.FAILURE));
+        }
         String username = null;
         try {
             Element securityHeader = WSSecurityUtil.getSecurityHeader(doc.getSOAPPart(), "");
@@ -160,7 +165,7 @@ public void handleMessage(SoapMessage message) throws Fault {
                 	LOGGER.debug("Access to web service denied for user '{}': not authorized", 
                 			new Object[]{username});
                 	auditLoginFailure(username);
-                	throw new Fault(new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "Not authorized"));
+                	throw new Fault(new WSSecurityException(WSSecurityException.ErrorCode.FAILED_AUTHENTICATION));
                 }
             }
         } catch (WSSecurityException e) {
@@ -172,7 +177,7 @@ public void handleMessage(SoapMessage message) throws Fault {
         	LOGGER.debug("Access to web service denied for user '{}': object not found: {}", 
         			new Object[]{username, e.getMessage(), e});
         	auditLoginFailure(username);
-            throw new Fault(new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, "Not authorized"));
+            throw new Fault(new WSSecurityException(WSSecurityException.ErrorCode.FAILED_AUTHENTICATION));
 		}
 
         LOGGER.debug("Access to web service allowed for user '{}'", username);
diff --git a/testing/wstest/pom.xml b/testing/wstest/pom.xml
index 4572f03b4b7..cfae0975b04 100644
--- a/testing/wstest/pom.xml
+++ b/testing/wstest/pom.xml
@@ -76,6 +76,17 @@
 			<version>3.2-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.evolveum.midpoint.infra</groupId>
+			<artifactId>test-util</artifactId>
+			<version>3.2-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.infra</groupId>
 			<artifactId>util</artifactId>
diff --git a/testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/AbstractWebserviceTest.java b/testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/AbstractWebserviceTest.java
index 9fe00e9b126..c4053415600 100644
--- a/testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/AbstractWebserviceTest.java
+++ b/testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/AbstractWebserviceTest.java
@@ -16,33 +16,50 @@
 
 package com.evolveum.midpoint.testing.wstest;
 
+import static org.testng.AssertJUnit.assertEquals;
+
+import com.evolveum.midpoint.model.client.ModelClientUtil;
+import com.evolveum.midpoint.test.util.TestUtil;
 import com.evolveum.midpoint.util.DOMUtil;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.xml.ns._public.common.api_types_3.ObjectDeltaListType;
+import com.evolveum.midpoint.xml.ns._public.common.api_types_3.ObjectDeltaOperationListType;
 import com.evolveum.midpoint.xml.ns._public.common.api_types_3.ObjectListType;
 import com.evolveum.midpoint.xml.ns._public.common.api_types_3.SelectorQualifiedGetOptionsType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.midpoint.xml.ns._public.model.model_3.ModelPortType;
 import com.evolveum.midpoint.xml.ns._public.model.model_3.ModelService;
 import com.evolveum.midpoint.xml.ns._public.common.fault_3.FaultMessage;
+import com.evolveum.midpoint.xml.ns._public.common.fault_3.FaultType;
 import com.evolveum.prism.xml.ns._public.query_3.PagingType;
+import com.evolveum.prism.xml.ns._public.types_3.ChangeTypeType;
+import com.evolveum.prism.xml.ns._public.types_3.ObjectDeltaType;
 import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.interceptor.LoggingInInterceptor;
+import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.testng.AssertJUnit;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.w3c.dom.*;
 
+import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.*;
 
@@ -72,6 +89,9 @@ public class AbstractWebserviceTest {
 
     protected static final Trace LOGGER = TraceManager.getTrace(AbstractWebserviceTest.class);
 
+    public static final String ENDPOINT = "http://localhost:8080/midpoint/ws/model-3";
+    private static final String USER_ADMINISTRATOR_OID = "00000000-0000-0000-0000-000000000002";
+    
     public static final String NS_COMMON = "http://midpoint.evolveum.com/xml/ns/public/common/common-3";
     public static final String NS_TYPES = "http://prism.evolveum.com/xml/ns/public/types-3";
     protected static final QName TYPES_POLYSTRING_ORIG = new QName(NS_TYPES, "orig");
@@ -84,8 +104,15 @@ public class AbstractWebserviceTest {
     protected static SystemConfigurationType configurationType;
 
     public static final String MULTIPLE_THREAD_USER_SEARCH_NAME = "Barbara";
+	
     public static Element MULTIPLE_THREAD_SEARCH_FILTER;
 
+    @BeforeClass
+    public void beforeTests(){
+    	displayTestTitle("beforeTests");
+        initSystem();
+    }
+    
 	/**
      * Takes care of system initialization. Need to be done before any tests are to be run.
      * */
@@ -101,41 +128,65 @@ protected static void initSystem() {
 			throw new IllegalStateException("Error creating XML document " + e.getMessage(), e);
 		}
     }
+    
+    @AfterClass
+    public void afterTests() throws FaultMessage {
+    	displayTestTitle("afterTests");
+        modelPort = createModelPort();
+        cleanRepository();
+        LOGGER.info("WebService test suite finished.");
+    }
+
+    protected static ModelPortType createModelPort() {
+    	return createModelPort("administrator", "5ecr3t");
+    }
 
     /**
      * Creates webservice client connecting to midpoint
      * */
-    protected static ModelPortType createModelPort(){
-        String endpointUrl = "http://localhost:8080/midpoint/model/model-1";
-        String username = "administrator";
+    protected static ModelPortType createModelPort(String username, String password) {
 
-        LOGGER.info("OpenDJtest: #createModelPort: Endpoint URL: " + endpointUrl);
+        LOGGER.info("Creating model client endpoint: {} , username={}, password={}", 
+        		new Object[] {ENDPOINT, username, password});
 
         ModelService modelService = new ModelService();
         ModelPortType modelPort = modelService.getModelPort();
         BindingProvider bp = (BindingProvider)modelPort;
         Map<String, Object> requestContext = bp.getRequestContext();
-        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointUrl);
+        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, ENDPOINT);
 
         org.apache.cxf.endpoint.Client client = ClientProxy.getClient(modelPort);
         org.apache.cxf.endpoint.Endpoint cxfEndpoint = client.getEndpoint();
 
         Map<String, Object> outProps = new HashMap<String, Object>();
-        outProps.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
-        outProps.put(WSHandlerConstants.USER, username);
-        outProps.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
-        outProps.put(WSHandlerConstants.PW_CALLBACK_CLASS, ClientPasswordHandler.class.getName());
+        if (username != null) {
+	        outProps.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
+	        outProps.put(WSHandlerConstants.USER, username);
+	        outProps.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
+	        ClientPasswordHandler.setPassword(password);
+	        outProps.put(WSHandlerConstants.PW_CALLBACK_CLASS, ClientPasswordHandler.class.getName());
+
+	        WSS4JOutInterceptor wssOut = new WSS4JOutInterceptor(outProps);
+	        cxfEndpoint.getOutInterceptors().add(wssOut);
+        }
 
-        WSS4JOutInterceptor wssOut = new WSS4JOutInterceptor(outProps);
-        cxfEndpoint.getOutInterceptors().add(wssOut);
+        cxfEndpoint.getInInterceptors().add(new LoggingInInterceptor());
+		cxfEndpoint.getOutInterceptors().add(new LoggingOutInterceptor());
 
         return modelPort;
     }
+    
+    private Object unmarshallFromFile(File file, String context) throws JAXBException {
+        JAXBContext jaxbContext = JAXBContext.newInstance(context);
+        javax.xml.bind.Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
+        JAXBElement jaxbElement = (JAXBElement)jaxbUnmarshaller.unmarshal(file);
+        return jaxbElement.getValue();
+    }
 
     /**
      * Retrieves and returns actual system configuration
      * */
-    protected static SystemConfigurationType getConfiguration(ModelPortType modelPort) throws FaultMessage{
+    protected static SystemConfigurationType getConfiguration() throws FaultMessage {
         Holder<ObjectType> objectHolder = new Holder<ObjectType>();
         Holder<OperationResultType> resultHolder = new Holder<OperationResultType>();
 
@@ -175,36 +226,33 @@ protected static PolyStringType createPolyStringType(String string, Document doc
         return polyStringType;
     }
 
-    /**
-     *
-     * */
     protected static Element createTextElement(QName qname, String value, Document doc) {
         Element element = doc.createElementNS(qname.getNamespaceURI(), qname.getLocalPart());
         element.setTextContent(value);
         return element;
     }
 
-    /**
-     * Creates CredentialsType - type used to store password. It's value is String password
-     * representation passed via argument
-     * */
-    protected static CredentialsType createPasswordCredentials(String password) {
-        CredentialsType credentialsType = new CredentialsType();
-        credentialsType.setPassword(createPasswordType(password));
-        return credentialsType;
-    }
-
-    protected static PasswordType createPasswordType(String password) {
-        PasswordType passwordType = new PasswordType();
-        passwordType.setValue(createProtectedString(password));
-        return passwordType;
-    }
-
-    protected static ProtectedStringType createProtectedString(String clearValue) {
-        ProtectedStringType protectedString = new ProtectedStringType();
-        protectedString.setClearValue(clearValue);
-        return protectedString;
-    }
+//    /**
+//     * Creates CredentialsType - type used to store password. It's value is String password
+//     * representation passed via argument
+//     * */
+//    protected static CredentialsType createPasswordCredentials(String password) {
+//        CredentialsType credentialsType = new CredentialsType();
+//        credentialsType.setPassword(createPasswordType(password));
+//        return credentialsType;
+//    }
+//
+//    protected static PasswordType createPasswordType(String password) {
+//        PasswordType passwordType = new PasswordType();
+//        passwordType.setValue(createProtectedString(password));
+//        return passwordType;
+//    }
+//
+//    protected static ProtectedStringType createProtectedString(String clearValue) {
+//        ProtectedStringType protectedString = new ProtectedStringType();
+//        protectedString.setClearValue(clearValue);
+//        return protectedString;
+//    }
 
     protected static Element createPathElement(String stringPath, Document doc) {
         String pathDeclaration = "declare default namespace '" + NS_COMMON + "'; " + stringPath;
@@ -226,27 +274,78 @@ protected void cleanRepository() throws FaultMessage {
         Holder<OperationResultType> resultHolder = new Holder<OperationResultType>();
         Holder<ObjectListType> objectListHolder = new Holder<ObjectListType>();
         PagingType paging = new PagingType();
-        String adminOid = "00000000-0000-0000-0000-000000000002";
 
-        modelPort.listObjects(getTypeUri(UserType.class), paging, null, objectListHolder, resultHolder);
+        modelPort.searchObjects(getTypeQName(UserType.class), null, null, objectListHolder, resultHolder);
 
         ObjectListType objectList = objectListHolder.value;
         List<ObjectType> objects = objectList.getObject();
 
         for(int i = 0; i < objects.size(); i++){
-            if(objects.get(i).getOid().compareTo(adminOid) != 0)
-                modelPort.deleteObject(getTypeUri(UserType.class), objects.get(i).getOid());
+        	UserType user = (UserType) objects.get(i);
+            if(!USER_ADMINISTRATOR_OID.equals(user.getOid())) {
+            	display("Deleting user "+ModelClientUtil.toString(user));
+            	deleteObject(UserType.class, user.getOid());
+            }
         }
     }
+    
+	protected <O extends ObjectType> void deleteObject(Class<O> type, String oid) throws FaultMessage {
+    	ObjectDeltaListType deltaList = new ObjectDeltaListType();
+    	ObjectDeltaType delta = new ObjectDeltaType();
+    	delta.setObjectType(getTypeQName(type));
+    	delta.setChangeType(ChangeTypeType.DELETE);
+    	delta.setOid(oid);
+		deltaList.getDelta().add(delta);
+		ObjectDeltaOperationListType deltaOpList = modelPort.executeChanges(deltaList, null);
+		assertSuccess(deltaOpList);
+    }
 
-    /**
-     *  Stand-alone test - if manual repository clean-up is needed
-     * */
+    protected void assertSuccess(ObjectDeltaOperationListType deltaOpList) {
+    	for (ObjectDeltaOperationType deltaOperation: deltaOpList.getDeltaOperation()) {
+    		OperationResultType result = deltaOperation.getExecutionResult();
+    		assertSuccess(result);
+    	}
+	}
+
+	protected void assertSuccess(OperationResultType result) {
+		assertEquals("Operation "+result.getOperation()+" failed:"+result.getStatus()+": " + result.getMessage(),
+				OperationResultStatusType.SUCCESS, result.getStatus());
+		// TODO: look inside
+	}
+	
+	protected <F extends FaultType> void assertFault(FaultMessage fault, Class<F> expectedFaultInfoClass) {
+    	FaultType faultInfo = fault.getFaultInfo();
+    	if (expectedFaultInfoClass != null && !expectedFaultInfoClass.isAssignableFrom(faultInfo.getClass())) {
+    		AssertJUnit.fail("Expected that faultInfo will be of type "+expectedFaultInfoClass+", but it was "+faultInfo.getClass());
+    	}
+    	OperationResultType result = faultInfo.getOperationResult();
+    	assertEquals("Expected that resut in FaultInfo will be fatal error, but it was "+result.getStatus(),
+    			OperationResultStatusType.FATAL_ERROR, result.getStatus());
+	}
+
+
+	protected void displayFault(FaultMessage fault) {
+		System.out.println("Got fault:");
+		fault.printStackTrace(System.out);
+		LOGGER.error("Got fault:\n{}",fault,fault);
+	}
+
+	protected void displayTestTitle(String testName) {		
+		TestUtil.displayTestTile(testName);
+	}
+
+	protected void display(String msg) {
+		System.out.println(msg);
+		LOGGER.info("{}", msg);
+	}
+
+	
     @Test
-    public void cleanRepositoryTest() throws FaultMessage {
-        initSystem();
+    public void test000SanityAndCleanup() throws Exception {
+    	final String TEST_NAME = "test000SanityAndCleanup";
+    	displayTestTitle(TEST_NAME);
         modelPort = createModelPort();
-        configurationType = getConfiguration(modelPort);
+        configurationType = getConfiguration();
         cleanRepository();
     }
 
diff --git a/testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/ClientPasswordHandler.java b/testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/ClientPasswordHandler.java
new file mode 100644
index 00000000000..198ba022787
--- /dev/null
+++ b/testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/ClientPasswordHandler.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2014 Evolveum
+ *
+ * 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 com.evolveum.midpoint.testing.wstest;
+
+import java.io.IOException;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.wss4j.common.ext.WSPasswordCallback;
+
+/**
+ * @author semancik
+ *
+ */
+public class ClientPasswordHandler implements CallbackHandler {
+	
+	 private static String password;
+
+    public static void setPassword(String password) {
+        ClientPasswordHandler.password = password;
+    }
+	
+	 @Override
+	public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+		WSPasswordCallback pc = (WSPasswordCallback) callbacks[0];
+        pc.setPassword(password);
+	}
+
+}
diff --git a/testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/WebserviceSecurityTest.java b/testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/WebserviceSecurityTest.java
index b4cfb82cb6d..8e885f6e1ab 100644
--- a/testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/WebserviceSecurityTest.java
+++ b/testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/WebserviceSecurityTest.java
@@ -15,36 +15,46 @@
  */
 
 package com.evolveum.midpoint.testing.wstest;
+
+import static org.testng.AssertJUnit.assertTrue;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
-import com.evolveum.midpoint.testing.wstest.xml.ns._public.common.api_types_2.ObjectModificationType;
-import com.evolveum.midpoint.testing.wstest.xml.ns._public.common.api_types_2.OperationOptionsType;
-import com.evolveum.midpoint.testing.wstest.xml.ns._public.common.common_2a.*;
-import com.evolveum.midpoint.testing.wstest.xml.ns._public.common.fault_1_wsdl.FaultMessage;
-import com.evolveum.midpoint.testing.wstest.xml.ns._public.model.model_1_wsdl.ModelPortType;
-import com.evolveum.midpoint.testing.wstest.xml.ns._public.model.model_1_wsdl.ModelService;
-
 import org.apache.cxf.binding.soap.SoapFault;
-import org.apache.ws.security.WSPasswordCallback;
 import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
-import org.apache.ws.security.WSConstants;
-import org.apache.ws.security.handler.WSHandlerConstants;
+import org.apache.wss4j.common.ext.WSPasswordCallback;
+import org.apache.wss4j.dom.WSConstants;
+import org.apache.wss4j.dom.handler.WSHandlerConstants;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.context.ContextConfiguration;
+import org.testng.AssertJUnit;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import com.evolveum.midpoint.xml.ns._public.common.api_types_3.ObjectModificationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultStatusType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemConfigurationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.SystemObjectsType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
+import com.evolveum.midpoint.xml.ns._public.common.fault_3.FaultMessage;
+import com.evolveum.midpoint.xml.ns._public.common.fault_3.FaultType;
+import com.evolveum.midpoint.xml.ns._public.model.model_3.ModelPortType;
+import com.evolveum.midpoint.xml.ns._public.model.model_3.ModelService;
+
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
+import javax.xml.soap.SOAPFault;
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.Holder;
+import javax.xml.ws.soap.SOAPFaultException;
 
 import java.io.File;
 import java.io.IOException;
@@ -81,58 +91,13 @@ public class WebserviceSecurityTest extends AbstractWebserviceTest {
 
     private static final String UNIVERSAL_USER_PASSWORD = "ineedmorepower";
 
-    /**
-     *  Creates modelPortType
-     * */
-    protected static ModelPortType createModelPort(String username, String testName){
-        String endpointUrl = "http://localhost:8080/midpoint/model/model-1";
-
-        LOGGER.info("WSSecurityTests: #createModelPort: Endpoint URL: " + endpointUrl + " for test: " + testName);
-
-        ModelService modelService = new ModelService();
-        ModelPortType modelPort = modelService.getModelPort();
-        BindingProvider bp = (BindingProvider)modelPort;
-        Map<String, Object> requestContext = bp.getRequestContext();
-        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointUrl);
-
-        org.apache.cxf.endpoint.Client client = ClientProxy.getClient(modelPort);
-        org.apache.cxf.endpoint.Endpoint cxfEndpoint = client.getEndpoint();
-
-        Map<String, Object> outProps = new HashMap<String, Object>();
-        outProps.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
-        outProps.put(WSHandlerConstants.USER, username);
-        outProps.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
-        outProps.put(WSHandlerConstants.PW_CALLBACK_CLASS, SecurityClientPasswordHandler.class.getName());
-
-        WSS4JOutInterceptor wssOut = new WSS4JOutInterceptor(outProps);
-        cxfEndpoint.getOutInterceptors().add(wssOut);
-
-        return modelPort;
-    }
-
-    private Object unmarshallFromFile(File file, String context) throws JAXBException {
-        JAXBContext jaxbContext = JAXBContext.newInstance(context);
-        Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
-        JAXBElement jaxbElement = (JAXBElement)jaxbUnmarshaller.unmarshal(file);
-        return jaxbElement.getValue();
-    }
 
     /*===============================================================================================================*/
     /*                                                      TESTS                                                    */
     /*===============================================================================================================*/
 
-    @BeforeClass
-    public void beforeTests(){
-        LOGGER.info("WebService security test suite started.");
-        initSystem();
-    }
+    
 
-    @AfterClass
-    public void afterTests() throws FaultMessage, JAXBException{
-        modelPort = createModelPort();
-        cleanRepository();
-        LOGGER.info("WebService security test suite finished successfully. All tests passed.");
-    }
 
     /**
      *  In this test, we try to use webservice as administrator, but we use wrong password.
@@ -141,156 +106,155 @@ public void afterTests() throws FaultMessage, JAXBException{
      *
      *  SoapFault is expected, or other security exception
      * */
-    @Test(expectedExceptions = Exception.class)
-    public void wsSecurityTest01() throws FaultMessage, SoapFault{
-        SecurityClientPasswordHandler.setClientPassword("wrongAdministratorPassword");
-        modelPort = createModelPort("administrator", "wsSecurityTest01");
-
-        //Try to retrieve system configuration should fail
-        configurationType = getConfiguration(modelPort);
-    }
-
-    /**
-     *  In this test, we first create and add user with admin privileges and empty password.
-     *  Next step is to try to use webservice with this user, so we create model port with
-     *  this user and set empty logon password.
-     *
-     *  Exception is expected
-     * */
-    @Test(expectedExceptions = Exception.class)
-    public void wsSecurity02() throws FaultMessage, JAXBException{
-        modelPort = createModelPort();
-        configurationType = getConfiguration(modelPort);
-        File file = new File(SECURITY_DIR_NAME + USER_TEST_2_FILENAME);
-        UserType user = (UserType)unmarshallFromFile(file, PACKAGE_COMMON_2A);
-
-        modelPort.addObject(user, new Holder<String>(), new Holder<OperationResultType>());
-        modelPort.deleteObject(getTypeUri(SystemConfigurationType.class), configurationType.getOid());
-
-        file = new File(SECURITY_DIR_NAME + SYSTEM_CONFIG_FILENAME);
-        SystemConfigurationType config = (SystemConfigurationType)unmarshallFromFile(file, PACKAGE_COMMON_2A);
-        modelPort.addObject(config, new Holder<String>(), new Holder<OperationResultType>());
-
-        file = new File(SECURITY_DIR_NAME + USER_TEST_2_CLEAN_PASS_FILENAME);
-        ObjectModificationType objectChange = (ObjectModificationType)unmarshallFromFile(file, PACKAGE_API_TYPES_2);
-        modelPort.modifyObject(getTypeUri(UserType.class), objectChange);
-
-        modelPort.deleteObject(getTypeUri(SystemConfigurationType.class), system_config_oid);
-        file = new File(SECURITY_DIR_NAME + SYSTEM_CONFIG_NORMAL_FILENAME);
-        config = (SystemConfigurationType)unmarshallFromFile(file, PACKAGE_COMMON_2A);
-        modelPort.addObject(config, new Holder<String>(), new Holder<OperationResultType>());
-
-        SecurityClientPasswordHandler.setClientPassword("");
-        modelPort = createModelPort("Anakin2", "wsSecurity02");
-        modelPort.getObject(getTypeUri(UserType.class), test_user_oid_2, new OperationOptionsType(), new Holder<ObjectType>(), new Holder<OperationResultType>());
-    }
-
-    /**
-     *  In this test, we try to establish connection without webservice token
-     * */
-    @Test(expectedExceptions = Exception.class)
-    public void wsSecurity03() throws FaultMessage{
-        String endpointUrl = "http://localhost:8080/midpoint/model/model-1";
-
-        LOGGER.info("WSSecurityTests: #createModelPort: Endpoint URL: " + endpointUrl + " for test: wsSecurity03");
-
-        ModelService modelService = new ModelService();
-        ModelPortType modelPort = modelService.getModelPort();
-        BindingProvider bp = (BindingProvider)modelPort;
-        Map<String, Object> requestContext = bp.getRequestContext();
-        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointUrl);
-
-        org.apache.cxf.endpoint.Client client = ClientProxy.getClient(modelPort);
-        org.apache.cxf.endpoint.Endpoint cxfEndpoint = client.getEndpoint();
-
-        Map<String, Object> outProps = new HashMap<String, Object>();
-        outProps.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
-
-        //Here we don't send token to webService
-        //outProps.put(WSHandlerConstants.USER, username);
-        //outProps.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
-        //outProps.put(WSHandlerConstants.PW_CALLBACK_CLASS, SecurityClientPasswordHandler.class.getName());
-
-        WSS4JOutInterceptor wssOut = new WSS4JOutInterceptor(outProps);
-        cxfEndpoint.getOutInterceptors().add(wssOut);
-
-        configurationType = getConfiguration(modelPort);
-    }
-
-    /**
-     *  Here will be test with user with non-existing username
-     * */
-    @Test(expectedExceptions = Exception.class)
-    public void wsSecurity04() throws FaultMessage{
-        modelPort = createModelPort("Not Existing user", "wsSecurity04");
-        configurationType = getConfiguration(modelPort);
-    }
-
-    /**
-     *  In this test, we test, if user with no admin privilages, but correct credentials is able to
-     *  log on midpoint webservices and use them. So, first we create non-admin user and then we
-     *  simply try to use we operations with him
-     *
-     * */
-    @Test(expectedExceptions = Exception.class)
-    public void wsSecurity05() throws JAXBException, FaultMessage{
-        modelPort = createModelPort();
-        File file = new File(SECURITY_DIR_NAME + USER_TEST_5_FILENAME);
-        UserType user = (UserType)unmarshallFromFile(file, PACKAGE_COMMON_2A);
-        modelPort.addObject(user, new Holder<String>(), new Holder<OperationResultType>());
-
-        SecurityClientPasswordHandler.setClientPassword(UNIVERSAL_USER_PASSWORD);
-        modelPort = createModelPort("Anakin5", "wsSecurity05");
-        configurationType = getConfiguration(modelPort);
-    }
-
-    /**
-     *  In this test, we test disabled user accessibility to midpoint webservice. To prevent
-     *  other potential faults, test user has enabled admin privileges and provided password
-     *  is correct
-     *
-     *  Exception is expected
-     * */
-    @Test(expectedExceptions = Exception.class)
-    public void wsSecurity06() throws JAXBException, FaultMessage{
-        modelPort = createModelPort();
-        File file = new File(SECURITY_DIR_NAME + USER_TEST_6_FILENAME);
-        UserType user = (UserType)unmarshallFromFile(file, PACKAGE_COMMON_2A);
-        modelPort.addObject(user, new Holder<String>(), new Holder<OperationResultType>());
-
-        SecurityClientPasswordHandler.setClientPassword(UNIVERSAL_USER_PASSWORD);
-        modelPort = createModelPort("Anakin6", "wsSecurity06");
-        configurationType = getConfiguration(modelPort);
+    @Test
+    public void test100GetConfigWrongPassword() throws Exception {
+    	final String TEST_NAME = "test100GetConfigWrongPassword";
+    	displayTestTitle(TEST_NAME);
+    	
+        modelPort = createModelPort("administrator", "wrongAdministratorPassword");
+
+        Holder<ObjectType> objectHolder = new Holder<ObjectType>();
+        Holder<OperationResultType> resultHolder = new Holder<OperationResultType>();
+        
+        // WHEN
+        try {
+        	modelPort.getObject(getTypeQName(SystemConfigurationType.class), SystemObjectsType.SYSTEM_CONFIGURATION.value(), 
+        		null, objectHolder, resultHolder);
+        	
+        	AssertJUnit.fail("Unexpected success");
+        	
+        } catch (SOAPFaultException e) {
+        	SOAPFault fault = e.getFault();
+        	String faultCode = fault.getFaultCode();
+        	display("SOAP fault code: "+faultCode);
+        	assertTrue("Unexpected fault code: "+faultCode, faultCode.endsWith("FailedAuthentication"));
+        	
+        }
+        
+        	
+//        } catch (FaultMessage fault) {
+//        	// this is expected
+//        	displayFault(fault);
+//        	assertFault(fault, null);
+//        }
     }
-}
 
 
+//
+//	/**
+//     *  In this test, we first create and add user with admin privileges and empty password.
+//     *  Next step is to try to use webservice with this user, so we create model port with
+//     *  this user and set empty logon password.
+//     *
+//     *  Exception is expected
+//     * */
+//    @Test(expectedExceptions = Exception.class)
+//    public void wsSecurity02() throws FaultMessage, JAXBException{
+//        modelPort = createModelPort();
+//        configurationType = getConfiguration(modelPort);
+//        File file = new File(SECURITY_DIR_NAME + USER_TEST_2_FILENAME);
+//        UserType user = (UserType)unmarshallFromFile(file, PACKAGE_COMMON_2A);
+//
+//        modelPort.addObject(user, new Holder<String>(), new Holder<OperationResultType>());
+//        modelPort.deleteObject(getTypeUri(SystemConfigurationType.class), configurationType.getOid());
+//
+//        file = new File(SECURITY_DIR_NAME + SYSTEM_CONFIG_FILENAME);
+//        SystemConfigurationType config = (SystemConfigurationType)unmarshallFromFile(file, PACKAGE_COMMON_2A);
+//        modelPort.addObject(config, new Holder<String>(), new Holder<OperationResultType>());
+//
+//        file = new File(SECURITY_DIR_NAME + USER_TEST_2_CLEAN_PASS_FILENAME);
+//        ObjectModificationType objectChange = (ObjectModificationType)unmarshallFromFile(file, PACKAGE_API_TYPES_2);
+//        modelPort.modifyObject(getTypeUri(UserType.class), objectChange);
+//
+//        modelPort.deleteObject(getTypeUri(SystemConfigurationType.class), system_config_oid);
+//        file = new File(SECURITY_DIR_NAME + SYSTEM_CONFIG_NORMAL_FILENAME);
+//        config = (SystemConfigurationType)unmarshallFromFile(file, PACKAGE_COMMON_2A);
+//        modelPort.addObject(config, new Holder<String>(), new Holder<OperationResultType>());
+//
+//        SecurityClientPasswordHandler.setClientPassword("");
+//        modelPort = createModelPort("Anakin2", "wsSecurity02");
+//        modelPort.getObject(getTypeUri(UserType.class), test_user_oid_2, new OperationOptionsType(), new Holder<ObjectType>(), new Holder<OperationResultType>());
+//    }
+//
+//    /**
+//     *  In this test, we try to establish connection without webservice token
+//     * */
+//    @Test(expectedExceptions = Exception.class)
+//    public void wsSecurity03() throws FaultMessage{
+//        String endpointUrl = "http://localhost:8080/midpoint/model/model-1";
+//
+//        LOGGER.info("WSSecurityTests: #createModelPort: Endpoint URL: " + endpointUrl + " for test: wsSecurity03");
+//
+//        ModelService modelService = new ModelService();
+//        ModelPortType modelPort = modelService.getModelPort();
+//        BindingProvider bp = (BindingProvider)modelPort;
+//        Map<String, Object> requestContext = bp.getRequestContext();
+//        requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointUrl);
+//
+//        org.apache.cxf.endpoint.Client client = ClientProxy.getClient(modelPort);
+//        org.apache.cxf.endpoint.Endpoint cxfEndpoint = client.getEndpoint();
+//
+//        Map<String, Object> outProps = new HashMap<String, Object>();
+//        outProps.put(WSHandlerConstants.ACTION, WSHandlerConstants.USERNAME_TOKEN);
+//
+//        //Here we don't send token to webService
+//        //outProps.put(WSHandlerConstants.USER, username);
+//        //outProps.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PW_DIGEST);
+//        //outProps.put(WSHandlerConstants.PW_CALLBACK_CLASS, SecurityClientPasswordHandler.class.getName());
+//
+//        WSS4JOutInterceptor wssOut = new WSS4JOutInterceptor(outProps);
+//        cxfEndpoint.getOutInterceptors().add(wssOut);
+//
+//        configurationType = getConfiguration(modelPort);
+//    }
+//
+//    /**
+//     *  Here will be test with user with non-existing username
+//     * */
+//    @Test(expectedExceptions = Exception.class)
+//    public void wsSecurity04() throws FaultMessage{
+//        modelPort = createModelPort("Not Existing user", "wsSecurity04");
+//        configurationType = getConfiguration(modelPort);
+//    }
+//
+//    /**
+//     *  In this test, we test, if user with no admin privilages, but correct credentials is able to
+//     *  log on midpoint webservices and use them. So, first we create non-admin user and then we
+//     *  simply try to use we operations with him
+//     *
+//     * */
+//    @Test(expectedExceptions = Exception.class)
+//    public void wsSecurity05() throws JAXBException, FaultMessage{
+//        modelPort = createModelPort();
+//        File file = new File(SECURITY_DIR_NAME + USER_TEST_5_FILENAME);
+//        UserType user = (UserType)unmarshallFromFile(file, PACKAGE_COMMON_2A);
+//        modelPort.addObject(user, new Holder<String>(), new Holder<OperationResultType>());
+//
+//        SecurityClientPasswordHandler.setClientPassword(UNIVERSAL_USER_PASSWORD);
+//        modelPort = createModelPort("Anakin5", "wsSecurity05");
+//        configurationType = getConfiguration(modelPort);
+//    }
+//
+//    /**
+//     *  In this test, we test disabled user accessibility to midpoint webservice. To prevent
+//     *  other potential faults, test user has enabled admin privileges and provided password
+//     *  is correct
+//     *
+//     *  Exception is expected
+//     * */
+//    @Test(expectedExceptions = Exception.class)
+//    public void wsSecurity06() throws JAXBException, FaultMessage{
+//        modelPort = createModelPort();
+//        File file = new File(SECURITY_DIR_NAME + USER_TEST_6_FILENAME);
+//        UserType user = (UserType)unmarshallFromFile(file, PACKAGE_COMMON_2A);
+//        modelPort.addObject(user, new Holder<String>(), new Holder<OperationResultType>());
+//
+//        SecurityClientPasswordHandler.setClientPassword(UNIVERSAL_USER_PASSWORD);
+//        modelPort = createModelPort("Anakin6", "wsSecurity06");
+//        configurationType = getConfiguration(modelPort);
+//    }
+//}
+//
 
-/**
- *  Custom Password Handler for these tests, we need to create customized modelPorts
- *  (With custom passwords)
- *
- *  @author Erik Suta
- *
- */
-class SecurityClientPasswordHandler implements CallbackHandler {
-
-    private static String clientPassword = "5ecr3t";
-
-    @Override
-    public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
-        WSPasswordCallback pc = (WSPasswordCallback) callbacks[0];
-
-        // set the password for our message.
-        pc.setPassword(clientPassword);
-    }
-
-    public static String getClientPassword() {
-        return clientPassword;
-    }
-
-    public static void setClientPassword(String clientPassword) {
-        SecurityClientPasswordHandler.clientPassword = clientPassword;
-    }
 }
 
diff --git a/testing/wstest/src/test/resources/logback-test.xml b/testing/wstest/src/test/resources/logback-test.xml
new file mode 100644
index 00000000000..8fd26795e62
--- /dev/null
+++ b/testing/wstest/src/test/resources/logback-test.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2010-2013 Evolveum
+  ~
+  ~ 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.
+  -->
+
+<configuration>
+
+
+	<appender name="X" class="ch.qos.logback.core.FileAppender">
+		<file>./target/test.log</file>
+		<encoder>
+			<!-- <pattern>%date [%thread] %-5level [%X{subsystem}]\(%logger{46}\): %message%n%caller{16}</pattern>  -->
+			<pattern>%date [%thread] %-5level [%X{subsystem}]\(%logger{46}\): %message%n</pattern>
+		</encoder>
+	</appender>
+    <logger name="org.hibernate.engine.jdbc.spi.SqlExceptionHelper" level="OFF"/>
+    <logger name="com.evolveum.midpoint.util.ClassPathUtil" level="INFO"/>
+	<logger name="org.springframework" level="WARN" />
+	<logger name="com.evolveum.midpoint" level="INFO" />
+	<logger name="com.evolveum.midpoint.model" level="TRACE" />
+	
+	<!-- Expression trace -->
+	<logger name="com.evolveum.midpoint.common.expression" level="TRACE" />
+	<logger name="com.evolveum.midpoint.common.expression.MidPointFunctions" level="TRACE" />
+	
+	<!--<logger name="com.evolveum.midpoint.provisioning" level="TRACE" />-->
+	<!--<logger name="com.evolveum.midpoint.common" level="TRACE" />-->
+	<!-- <logger name="com.evolveum.midpoint.repo" level="TRACE" />  -->
+	
+	<logger name="com.evolveum.midpoint.testing.sanity" level="TRACE" />
+	<logger name="com.evolveum.midpoint.test" level="TRACE" />
+	
+	<logger name="org.apache.cxf.services" level="TRACE" />
+    
+	<logger name="PROFILING" level="TRACE" />
+	
+	<root level="WARN">
+		<appender-ref ref="X" />
+	</root>
+</configuration>
+
diff --git a/testing/wstest/src/test/resources/logging.properties b/testing/wstest/src/test/resources/logging.properties
new file mode 100644
index 00000000000..e9e945521f2
--- /dev/null
+++ b/testing/wstest/src/test/resources/logging.properties
@@ -0,0 +1,4 @@
+// register SLF4JBridgeHandler as handler for the j.u.l. root logger
+handlers = org.slf4j.bridge.SLF4JBridgeHandler
+org.slf4j.bridge.SLF4JBridgeHandler.level=ALL
+.level=ALL
diff --git a/testing/wstest/testng.xml b/testing/wstest/testng.xml
new file mode 100644
index 00000000000..623ce0c322e
--- /dev/null
+++ b/testing/wstest/testng.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2010-2015 Evolveum
+  ~
+  ~ 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.
+  -->
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="unit" parallel="false">
+<listeners>
+		<listener class-name="com.evolveum.midpoint.tools.testng.AlphabeticalMethodInterceptor"/>
+	</listeners>
+	
+    <test name="WSTest" parallel="false" verbose="10" enabled="true">
+        <classes>
+            <class name="com.evolveum.midpoint.testing.wstest.WebserviceSecurityTest"/>
+        </classes>
+    </test>
+</suite>

From d9d12940c7d8939ee2330f7a2627c43efabbc8d8 Mon Sep 17 00:00:00 2001
From: "Katarina Valalikova (katkav)" <k.valalikova@evolveum.com>
Date: Mon, 30 Mar 2015 21:48:09 +0200
Subject: [PATCH 3/3] fixing handling of displayable values - enum extension
 attributes (GUI)

---
 .../evolveum/midpoint/web/component/prism/ValueWrapper.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ValueWrapper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ValueWrapper.java
index 821588eb9f9..c7bdbd481b7 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ValueWrapper.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ValueWrapper.java
@@ -18,6 +18,8 @@
 
 import com.evolveum.midpoint.prism.PrismPropertyValue;
 import com.evolveum.midpoint.prism.polystring.PolyString;
+import com.evolveum.midpoint.util.DisplayableValue;
+
 import org.apache.commons.lang.Validate;
 
 import java.io.Serializable;
@@ -96,6 +98,9 @@ public void normalize() {
             if (poly.getOrig()==null) {
                 value.setValue((T) new PolyString(""));
             }
+        } else if (value.getValue() instanceof DisplayableValue){
+        	DisplayableValue displayableValue = (DisplayableValue) value.getValue();
+        	value.setValue((T) displayableValue.getValue());
         }
     }