[midPoint-git] [Evolveum/midpoint] d7ee79: fixing resource wizard - connector configuration s...

[Pavol Mederly]

  Branch: refs/heads/closure
  Home:   https://github.com/Evolveum/midpoint
  Commit: d7ee796d424c36c0dfacc23584c17021c24ad4b9
      https://github.com/Evolveum/midpoint/commit/d7ee796d424c36c0dfacc23584c17021c24ad4b9
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java

  Log Message:
  -----------
  fixing resource wizard - connector configuration step..


  Commit: d1d24f95ecd06ffb2b4c9142c01e9773a5aa1e61
      https://github.com/Evolveum/midpoint/commit/d1d24f95ecd06ffb2b4c9142c01e9773a5aa1e61
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java

  Log Message:
  -----------
  Improved error reporting (for longtest)


  Commit: 4be17288cfe4737fb70c9151372a2dad14639de0
      https://github.com/Evolveum/midpoint/commit/4be17288cfe4737fb70c9151372a2dad14639de0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResourceModifications.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java
    M model/model-intest/testng.xml

  Log Message:
  -----------
  Refactoring the tests


  Commit: aacd8e7973286bba161f7be5a2a7ee96e2af86ca
      https://github.com/Evolveum/midpoint/commit/aacd8e7973286bba161f7be5a2a7ee96e2af86ca
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M config/sql/midpoint/3.0/h2/h2-3.0.sql
    M config/sql/midpoint/3.0/mysql/mysql-3.0.sql
    M config/sql/midpoint/3.0/oracle/oracle-3.0.sql
    M config/sql/midpoint/3.0/postgresql/postgresql-3.0.sql
    M config/sql/midpoint/3.0/sqlserver/sqlserver-3.0.sql
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/AbstractOrgClosureTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/OrgClosureCorrectnessTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/OrgClosureManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrgClosure.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrgIncorrect.java

  Log Message:
  -----------
  ParentRef cycle prevention. Automatic startup-time creation of global temporary table in Oracle. Updated manual creation scripts.


  Commit: db6faed0255edc5451ac26ce7cbba808b0d1a821
      https://github.com/Evolveum/midpoint/commit/db6faed0255edc5451ac26ce7cbba808b0d1a821
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResourceModifications.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java
    M model/model-intest/testng.xml

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


  Commit: 58537f3b7ad00fdeba47594f494f215ef791d9cc
      https://github.com/Evolveum/midpoint/commit/58537f3b7ad00fdeba47594f494f215ef791d9cc
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java

  Log Message:
  -----------
  Resource Wizard bugfix - removing obsolete field for settuping Connextor version in NameStep


  Commit: 59bda72bb2323c49ad2af9934878b8bac3c222b3
      https://github.com/Evolveum/midpoint/commit/59bda72bb2323c49ad2af9934878b8bac3c222b3
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_en_US.utf8.properties
    M gui/admin-gui-es-ES/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_es_ES.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_sk_SK.utf8.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.properties

  Log Message:
  -----------
  Resource Wizard update - NameStep - changing connector type label from "Type" to "Connector"


  Commit: c7a19fdd08c702c03923cb7f7a3e1874c4402c1a
      https://github.com/Evolveum/midpoint/commit/c7a19fdd08c702c03923cb7f7a3e1874c4402c1a
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.properties

  Log Message:
  -----------
  Resource Wizard update - changing navigation menu based on requirements


  Commit: b648b10514ad419de03b9929caab2ef811b81c80
      https://github.com/Evolveum/midpoint/commit/b648b10514ad419de03b9929caab2ef811b81c80
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/AbstractOrgClosureTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/OrgClosureConcurrencyTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/OrgClosureCorrectnessTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/OrgClosurePerformanceTest1.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/OrgClosurePerformanceTest2.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/OrgClosureTestConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/OrgClosureManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java

  Log Message:
  -----------
  Changing closure to contain orgs only (work in progress).


  Commit: 00a43aa203a7b4238900e0919ab8ec204f32e04c
      https://github.com/Evolveum/midpoint/commit/00a43aa203a7b4238900e0919ab8ec204f32e04c
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.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/ExpressionUtil.java

  Log Message:
  -----------
  Resource Wizard update - fixing mapping label creation and a few minor issues on the way


  Commit: c9c8ca7c796b349ff8b3d53592eb66a651f8731f
      https://github.com/Evolveum/midpoint/commit/c9c8ca7c796b349ff8b3d53592eb66a651f8731f
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java

  Log Message:
  -----------
  Resource Wizard update - adding arrows to accordion items in wizard to indicate, that item is collapsable


  Commit: 35c8a36d6abdf94ade89bc498d1da6390f6c9feb
      https://github.com/Evolveum/midpoint/commit/35c8a36d6abdf94ade89bc498d1da6390f6c9feb
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java

  Log Message:
  -----------
  Resource Wizard update - adding arrows and different delete icons to side-collapsible menus (capabilities, sync objects object types)


  Commit: fa2a420c70da6d4cdd7049816009cf06fb62745c
      https://github.com/Evolveum/midpoint/commit/fa2a420c70da6d4cdd7049816009cf06fb62745c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-10-09 (Thu, 09 Oct 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResourceModifications.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResources.java
    M model/model-intest/testng.xml

  Log Message:
  -----------
  Merge branch 'master' into closure


  Commit: d5c18be3a327c5b2c34bfc036270f80799bae407
      https://github.com/Evolveum/midpoint/commit/d5c18be3a327c5b2c34bfc036270f80799bae407
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-10-09 (Thu, 09 Oct 2014)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/020-system-configuration.xml
    M gui/admin-gui/src/main/resources/logback.xml
    M gui/admin-gui/src/test/resources/logback-test.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrgFilter.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/AbstractOrgClosureTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/OrgClosureConcurrencyTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/OrgClosureCorrectnessTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/OrgClosurePerformanceTest1.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/OrgClosurePerformanceTest2.java
    M repo/repo-sql-impl-test/testng.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/OrgClosureManager.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlBaseService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrgRestriction.java

  Log Message:
  -----------
  Integration of closure into midPoint (mainly changing isAnySubordinate and Org filter processing).


  Commit: 0068f82ec55645e5006cd714e17c3265a49fe246
      https://github.com/Evolveum/midpoint/commit/0068f82ec55645e5006cd714e17c3265a49fe246
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-10-09 (Thu, 09 Oct 2014)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java

  Log Message:
  -----------
  Improved error checking during connector initialization


  Commit: c2884081b12ee6e82dbe989903233af548731a9c
      https://github.com/Evolveum/midpoint/commit/c2884081b12ee6e82dbe989903233af548731a9c
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java

  Log Message:
  -----------
  MID-1993 - fix for typo in code, that was causing this issue.


  Commit: f591b44042b75fd22dac77a3dfc63e6c4fa1a108
      https://github.com/Evolveum/midpoint/commit/f591b44042b75fd22dac77a3dfc63e6c4fa1a108
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/AbstractOrgClosureTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/closure/OrgClosureConcurrencyTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/OrgClosureManager.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SerializationRelatedException.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlBaseService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java

  Log Message:
  -----------
  Some temporary serialization fixes for PostgreSQL (not related to closure). Preparing for temp table creation on transaction start (for H2).


  Commit: e68fd7989da4660b465335d5ee01226eedf8ad32
      https://github.com/Evolveum/midpoint/commit/e68fd7989da4660b465335d5ee01226eedf8ad32
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_en_US.utf8.properties
    M gui/admin-gui-es-ES/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_es_ES.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_sk_SK.utf8.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.properties
    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/ExpressionUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java

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


  Commit: cc4b4f6eadedf26d53bce58933f01db8f40ebd37
      https://github.com/Evolveum/midpoint/commit/cc4b4f6eadedf26d53bce58933f01db8f40ebd37
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/CustomQuery.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/OrgFilterQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryEngine.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/CustomQuery.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/OrgFilterQuery.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/ShadowQueryWithDisjunction.java

  Log Message:
  -----------
  Working around duplicate records returned from a special kind of OR-style attribute-related query.


  Commit: d543ed4d8defb1c3c2254f49a98d10d786bc5f49
      https://github.com/Evolveum/midpoint/commit/d543ed4d8defb1c3c2254f49a98d10d786bc5f49
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_en_US.utf8.properties
    M gui/admin-gui-es-ES/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_es_ES.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_sk_SK.utf8.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceActivationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceIterationEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceProtectedEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/LimitationsEditorDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/MappingTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.properties
    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/ExpressionUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/CustomQuery.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/OrgFilterQuery.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryEngine.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/CustomQuery.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/OrgFilterQuery.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/custom/ShadowQueryWithDisjunction.java

  Log Message:
  -----------
  Merge branch 'master' into closure


Compare: https://github.com/Evolveum/midpoint/compare/3066dd9ffc4a...d543ed4d8def