[midPoint-git] [Evolveum/midpoint] c3f809: reevaluate search filters option ofr inital import...

[Katarina Valalikova]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: c3f80942088b8052bb146b25d122c05494fa8171
      https://github.com/Evolveum/midpoint/commit/c3f80942088b8052bb146b25d122c05494fa8171
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-28 (Sat, 28 Mar 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java

  Log Message:
  -----------
  reevaluate search filters option ofr inital import..


  Commit: 9dc0f89202c4b8c04077fa372a5ff005fb3564e7
      https://github.com/Evolveum/midpoint/commit/9dc0f89202c4b8c04077fa372a5ff005fb3564e7
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-28 (Sat, 28 Mar 2015)

  Changed paths:
    M config/sql/midpoint/3.1.1/postgresql/postgresql-3.1.1.sql
    M config/sql/midpoint/3.1.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxTabbedPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentSearchDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePannel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePannel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableOrgPopupContent.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableOrgPopupContent.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableRolePopupContent.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstance.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ObjectTypeGuiDescriptor.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/ProfilingConfigurationManager.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SystemConfigurationHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ObjectImporter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/MidpointRestAuthenticationHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/AbstractInternalModelIntegrationTest.java
    R model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorAddUser.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/sync/TestCorrelationConfiramtionEvaluator.java
    M model/model-impl/testng.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIntent.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLoggingConfiguration.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestScriptHooks.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestRoleEntitlement.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/BadImportTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/ImportRefTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/ImportTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.java
    M model/model-intest/src/test/resources/gensync/lookup-languages-replacement.xml
    M model/model-intest/src/test/resources/importer/import-ref.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/JobController.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/jobs/WfTaskUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/SpringApplicationContextHolder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/BaseAuditHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/PcpRepoAccessHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/BasePrimaryChangeAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspectHelper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/AbstractAddAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/AddResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/AddRoleAssignmentAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/AssignmentHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/ModifyResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/ModifyRoleAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestInfrastructure.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RLookupTableRow.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
    A testing/minipoint/pom.xml
    A testing/minipoint/src/main/java/com/evolveum/midpoint/testing/minipoint/Main.java
    A testing/minipoint/src/main/resources/ctx-minipoint-main.xml
    A testing/minipoint/src/main/resources/ctx-minipoint.xml
    A testing/minipoint/testng.xml
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java
    A testing/rest/src/test/resources/repo/role-reader.xml
    A testing/rest/src/test/resources/repo/role-rest.xml
    A testing/rest/src/test/resources/repo/user-cyclops.xml
    A testing/rest/src/test/resources/repo/user-nobody.xml
    A testing/rest/src/test/resources/repo/user-somebody.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java
    A testing/wstest/pom.xml
    A testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/AbstractWebserviceTest.java
    A testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/WebserviceSecurityTest.java
    A testing/wstest/src/test/resources/ctx-wstest-main.xml
    A testing/wstest/src/test/resources/ctx-wstest.xml
    A testing/wstest/src/test/resources/security/system_config_normal.xml
    A testing/wstest/src/test/resources/security/system_config_without_pass_policy.xml
    A testing/wstest/src/test/resources/security/user_test2.xml
    A testing/wstest/src/test/resources/security/user_test2_clean_pass.xml
    A testing/wstest/src/test/resources/security/user_test5.xml
    A testing/wstest/src/test/resources/security/user_test6.xml

  Log Message:
  -----------
  Merge branch 'master' of github.com:Evolveum/midpoint


Compare: https://github.com/Evolveum/midpoint/compare/4b1e377ddecf...9dc0f89202c4