[midPoint-git] [Evolveum/midpoint] 1fa690: added support for evaluation prism reference value...

Viliam Repan vilo.repan at evolveum.com
Mon Dec 22 18:52:49 CET 2014


  Branch: refs/heads/hibernate_upgrade
  Home:   https://github.com/Evolveum/midpoint
  Commit: 1fa6904bb8614229ec4a5a45febd49d452a4d8ae
      https://github.com/Evolveum/midpoint/commit/1fa6904bb8614229ec4a5a45febd49d452a4d8ae
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-12-14 (Sun, 14 Dec 2014)

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/XPathScriptEvaluator.java

  Log Message:
  -----------
  added support for evaluation prism reference values in script expressions..


  Commit: 08503ae9ac4e188910eb88c0a84572500c5dc2ce
      https://github.com/Evolveum/midpoint/commit/08503ae9ac4e188910eb88c0a84572500c5dc2ce
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-12-14 (Sun, 14 Dec 2014)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M gui/admin-gui/src/main/resources/initial-objects/107-report-user-accounts.xml
    M gui/admin-gui/src/main/resources/initial-objects/111-report-reconciliation-shadow-owner.xml

  Log Message:
  -----------
  small improvements in reports (.jrxml) - switched to query api whenever possible


  Commit: 24b5a0b0ae0568dce5560f22ab0b258922b401a4
      https://github.com/Evolveum/midpoint/commit/24b5a0b0ae0568dce5560f22ab0b258922b401a4
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-12-15 (Mon, 15 Dec 2014)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SynchronizationSituationUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationService.java

  Log Message:
  -----------
  Minor fixes (mostly typos) and comments.


  Commit: bf8ce2e27dfa4e56fc6e18f3453c1fbe754b12e1
      https://github.com/Evolveum/midpoint/commit/bf8ce2e27dfa4e56fc6e18f3453c1fbe754b12e1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-12-15 (Mon, 15 Dec 2014)

  Changed paths:
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueAutoCompleteTextPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    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/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebModelUtils.java
    M gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M gui/admin-gui/src/main/resources/initial-objects/107-report-user-accounts.xml
    M gui/admin-gui/src/main/resources/initial-objects/108-report-user-orgs.xml
    M gui/admin-gui/src/main/resources/initial-objects/109-report-user-roles.xml
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    A gui/admin-gui/src/main/resources/initial-objects/111-report-reconciliation-shadow-owner.xml
    M infra/common/src/test/resources/validator/resource-1-valid.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/InOidFilter.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/RawType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/MidPointConstants.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/XPathScriptEvaluator.java
    M model/report-impl/pom.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/DataSourceReportProvider.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointDataSource.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointDataSourceProvider.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointQueryExecutor.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointQueryExecutorFactory.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportFunctions.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java
    A model/report-impl/src/main/resources/jasperreports.properties
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    A model/report-impl/src/test/java/com/evolveum/midpoint/report/TestReport.java
    A model/report-impl/src/test/resources/common/connector-dummy.xml
    A model/report-impl/src/test/resources/common/connector-ldap.xml
    A model/report-impl/src/test/resources/common/resource-dummy.xml
    A model/report-impl/src/test/resources/common/resource-opendj.xml
    A model/report-impl/src/test/resources/common/user-jack.xml
    M model/report-impl/src/test/resources/ctx-report-test-main.xml
    A model/report-impl/src/test/resources/reports/report-audit-ds.jrxml
    M model/report-impl/src/test/resources/reports/report-test-without-design.xml
    M model/report-impl/src/test/resources/reports/report-test.xml
    A model/report-impl/src/test/resources/reports/report-users-ds.jrxml
    M model/report-impl/src/test/resources/reports/reportUserAccounts.xml
    M model/report-impl/src/test/resources/reports/reportUserList.xml
    M model/report-impl/testng.xml
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditService.java
    M repo/audit-impl/src/main/java/com/evolveum/midpoint/audit/impl/LoggerAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RObjectDeltaOperation.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/enums/ROperationResultStatus.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/AuditServiceProxy.java

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


  Commit: 0b7b7f335f2afd65cc033f3b4e14faaf8b0ae616
      https://github.com/Evolveum/midpoint/commit/0b7b7f335f2afd65cc033f3b4e14faaf8b0ae616
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-12-15 (Mon, 15 Dec 2014)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ThreeStateBooleanPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ThreeStateBooleanPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ThreeStateBooleanPanel.properties
    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/component/schemahandling/modal/LimitationsEditorDialog.properties

  Log Message:
  -----------
  Adding 3-state widget to GUI. Adding first usage to limitations property access controllers in RW


  Commit: a1a56008410838772366aaab86c3e0003fd890b7
      https://github.com/Evolveum/midpoint/commit/a1a56008410838772366aaab86c3e0003fd890b7
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-12-15 (Mon, 15 Dec 2014)

  Changed paths:
    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/util/InfoTooltipBehavior.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/TooltipBehavior.java

  Log Message:
  -----------
  Fixing tooltip displaying in limitations editor on RW


  Commit: 2c83d2347558774ae489395fd59119e6ec5a90a8
      https://github.com/Evolveum/midpoint/commit/2c83d2347558774ae489395fd59119e6ec5a90a8
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-12-15 (Mon, 15 Dec 2014)

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

  Log Message:
  -----------
  ResourceItem attributes are now visible by default in association editor in RW


  Commit: 51e4e1c26fe3399cfc1b33f66d348669e3a5e429
      https://github.com/Evolveum/midpoint/commit/51e4e1c26fe3399cfc1b33f66d348669e3a5e429
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-12-15 (Mon, 15 Dec 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/resources/ctx-test-datasource.xml

  Log Message:
  -----------
  Fixing oracle-specific bamboo tests.


  Commit: 67a15973b68af1700a9a62b3cf6dbcb376282d60
      https://github.com/Evolveum/midpoint/commit/67a15973b68af1700a9a62b3cf6dbcb376282d60
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-12-15 (Mon, 15 Dec 2014)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ThreeStateBooleanPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ThreeStateBooleanPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ThreeStateBooleanPanel.properties
    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/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/component/schemahandling/modal/LimitationsEditorDialog.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/InfoTooltipBehavior.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/TooltipBehavior.java

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


  Commit: 5707914ea03adcae0fafcc229bf1ebda798badec
      https://github.com/Evolveum/midpoint/commit/5707914ea03adcae0fafcc229bf1ebda798badec
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java

  Log Message:
  -----------
  Attempt to fix MID-2125 (concurrency issues when interrupting tasks).


  Commit: 44ffd17063c6b7182b1247b7afcedf792b4d817d
      https://github.com/Evolveum/midpoint/commit/44ffd17063c6b7182b1247b7afcedf792b4d817d
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    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/TestSecurity.java
    A model/model-intest/src/test/resources/security/role-basic.xml
    A model/model-intest/src/test/resources/security/role-filter-object-user-type-shadow.xml
    A model/model-intest/src/test/resources/security/user-angelica.xml

  Log Message:
  -----------
  added test for MID-2027


  Commit: 9a02f8c954cd622212e210e5beddb261fb57d9bd
      https://github.com/Evolveum/midpoint/commit/9a02f8c954cd622212e210e5beddb261fb57d9bd
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ThreeStateBooleanPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ThreeStateBooleanPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ThreeStateBooleanPanel.properties
    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/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/component/schemahandling/modal/LimitationsEditorDialog.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/InfoTooltipBehavior.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/TooltipBehavior.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SynchronizationSituationUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationService.java
    M repo/repo-sql-impl-test/src/test/resources/ctx-test-datasource.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java

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


  Commit: f64d37db59a0de8706adaf222edae99e1c541340
      https://github.com/Evolveum/midpoint/commit/f64d37db59a0de8706adaf222edae99e1c541340
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java

  Log Message:
  -----------
  Fixing MID-2027.


  Commit: 19efa121b25c534c1ba12bf5b494e6400c11c395
      https://github.com/Evolveum/midpoint/commit/19efa121b25c534c1ba12bf5b494e6400c11c395
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

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

  Log Message:
  -----------
  fix for NPE on CapabilityStep in RW


  Commit: 6d96afea6982e9449aed7149af047e3669e4f6b4
      https://github.com/Evolveum/midpoint/commit/6d96afea6982e9449aed7149af047e3669e4f6b4
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/Wizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardButtonBar.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java
    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/ConfigurationStep.java
    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/ResourceWizard.java
    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/SchemaStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java

  Log Message:
  -----------
  enabling finish button in all steps of resource wizard + implementing functionallity in steps.


  Commit: 99c370fb0ff88dc8278195aff1f8519d4dc4c809
      https://github.com/Evolveum/midpoint/commit/99c370fb0ff88dc8278195aff1f8519d4dc4c809
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java

  Log Message:
  -----------
  Attempt to fix closure-related test failures in PostgreSQL.


  Commit: 0cb66565e56d6b44e30abf474b21d4c45c4d2295
      https://github.com/Evolveum/midpoint/commit/0cb66565e56d6b44e30abf474b21d4c45c4d2295
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/Wizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardButtonBar.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java
    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/ConfigurationStep.java
    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/ResourceWizard.java
    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/SchemaStep.java
    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/page/admin/resources/PageResourceWizard.java

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


  Commit: b7a0f587229342d3a91068d83c717748badf1fc8
      https://github.com/Evolveum/midpoint/commit/b7a0f587229342d3a91068d83c717748badf1fc8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDataProvider.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java

  Log Message:
  -----------
  Enabling/disabling counting of accounts in Resource->Accounts page based on countObjects capability (was: pagedSearch)


  Commit: eaa734092518cdeb8ff80d62f27412f2bea50a49
      https://github.com/Evolveum/midpoint/commit/eaa734092518cdeb8ff80d62f27412f2bea50a49
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-12-17 (Wed, 17 Dec 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameEditorPanel.properties
    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/ResourceAttributeEditor.java

  Log Message:
  -----------
  Reworking QName editor and working with association and attribute references in RW.


  Commit: b26b4e42e9d4d74370f85b3344549f60e0ae07a4
      https://github.com/Evolveum/midpoint/commit/b26b4e42e9d4d74370f85b3344549f60e0ae07a4
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-12-17 (Wed, 17 Dec 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java

  Log Message:
  -----------
  Small fix for attributes and associations on schemaHandlingStep in RW


  Commit: 999dfb60ddd8d45f88669b727daa0d209d199d2b
      https://github.com/Evolveum/midpoint/commit/999dfb60ddd8d45f88669b727daa0d209d199d2b
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-12-17 (Wed, 17 Dec 2014)

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

  Log Message:
  -----------
  reorganizing synchronization form components placement in RW


  Commit: 320dc44fa20beec1066c1098ef7f08656f357c08
      https://github.com/Evolveum/midpoint/commit/320dc44fa20beec1066c1098ef7f08656f357c08
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-12-17 (Wed, 17 Dec 2014)

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

  Log Message:
  -----------
  Changing synchronize checkbox in synchronization step in RW to threeState widget


  Commit: 8da50a23e1a147c53eb1232119394ddb5205c2d8
      https://github.com/Evolveum/midpoint/commit/8da50a23e1a147c53eb1232119394ddb5205c2d8
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-12-17 (Wed, 17 Dec 2014)

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

  Log Message:
  -----------
  Fix for MID-2033, 15. - LiveSync capability is no longer shown twice


  Commit: a0e19eee4e165918da79e2d1d6991f7a3bc12819
      https://github.com/Evolveum/midpoint/commit/a0e19eee4e165918da79e2d1d6991f7a3bc12819
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M gui/admin-gui/src/main/resources/initial-objects/107-report-user-accounts.xml
    M gui/admin-gui/src/main/resources/initial-objects/111-report-reconciliation-shadow-owner.xml

  Log Message:
  -----------
  fixing report templates - copy&paste error


  Commit: d631acbb61a53667677efbed64f6650bd590dbcf
      https://github.com/Evolveum/midpoint/commit/d631acbb61a53667677efbed64f6650bd590dbcf
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameEditorPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ThreeStateBooleanPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/Wizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardButtonBar.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java
    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/ConfigurationStep.java
    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/ResourceWizard.java
    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/SchemaStep.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/capability/AddCapabilityDialog.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/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDataProvider.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java

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


  Commit: 522a80f6b603cae6f73c0f15b6a2338fc2ca6a06
      https://github.com/Evolveum/midpoint/commit/522a80f6b603cae6f73c0f15b6a2338fc2ca6a06
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

  Changed paths:
    M infra/util/src/main/java/com/evolveum/midpoint/util/logging/LoggingUtils.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.java

  Log Message:
  -----------
  Fixing ConcurrentModificationException for multithreaded imports. Added exception class info for "short" exception reports (when debug level is INFO).


  Commit: e899c5a2032cc108970e8a1ca26777bf21111d3b
      https://github.com/Evolveum/midpoint/commit/e899c5a2032cc108970e8a1ca26777bf21111d3b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M gui/admin-gui/src/main/resources/initial-objects/107-report-user-accounts.xml
    M gui/admin-gui/src/main/resources/initial-objects/111-report-reconciliation-shadow-owner.xml

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


  Commit: 482d29f2d42bd99dc3ee816e61c19510c6bb266a
      https://github.com/Evolveum/midpoint/commit/482d29f2d42bd99dc3ee816e61c19510c6bb266a
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableDataTable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TextDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.html
    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/Wizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.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/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ConfigurationStorage.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/PageStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ReportsStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ResourcesStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RolesStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/TasksStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java

  Log Message:
  -----------
  MID-1987 fix


  Commit: b3ac4fa69ae8a984bae64d0e356db79d44bac63e
      https://github.com/Evolveum/midpoint/commit/b3ac4fa69ae8a984bae64d0e356db79d44bac63e
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java

  Log Message:
  -----------
  (partialy) fixing MID-2107 - try searching in repo, use shadow value..


  Commit: 783c3a77526b96339900a1bd759e99f78b98d1d1
      https://github.com/Evolveum/midpoint/commit/783c3a77526b96339900a1bd759e99f78b98d1d1
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableDataTable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TextDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.html
    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/Wizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.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/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ConfigurationStorage.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/PageStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ReportsStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ResourcesStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RolesStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/TasksStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/logging/LoggingUtils.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.java

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


  Commit: e68dd25a8e1db1c89725bc208db842708a19722d
      https://github.com/Evolveum/midpoint/commit/e68dd25a8e1db1c89725bc208db842708a19722d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizeAccountResultHandler.java

  Log Message:
  -----------
  Fixed another concurrency-related bug in parallel import/recon.


  Commit: 08b54490dc13fc5432ff6bda45b63fde178051bd
      https://github.com/Evolveum/midpoint/commit/08b54490dc13fc5432ff6bda45b63fde178051bd
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableDataTable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TextDetailsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.html
    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/Wizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.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/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ConfigurationStorage.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/PageStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ReportsStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ResourcesStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RolesStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/TasksStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java

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


  Commit: e6754082bcd15b5dbf04bbe67e7ab1c400325788
      https://github.com/Evolveum/midpoint/commit/e6754082bcd15b5dbf04bbe67e7ab1c400325788
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java

  Log Message:
  -----------
  fixing MID-1684 - Unwanted unlinking of accounts on resources that are down


  Commit: 5f7ef688fb6c43d8ea3cc95a95973e8fa9c83446
      https://github.com/Evolveum/midpoint/commit/5f7ef688fb6c43d8ea3cc95a95973e8fa9c83446
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java

  Log Message:
  -----------
  fixing MID-1684 - Unwanted unlinking of accounts on resources that are down


  Commit: b53e734ac1955f02a759d9208560eceaaecf3764
      https://github.com/Evolveum/midpoint/commit/b53e734ac1955f02a759d9208560eceaaecf3764
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizeAccountResultHandler.java

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


  Commit: 609633db477df3b70c03bace8fbe5144a6fe974e
      https://github.com/Evolveum/midpoint/commit/609633db477df3b70c03bace8fbe5144a6fe974e
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java

  Log Message:
  -----------
  temporary fixfor problem on TreeTablePanel


  Commit: 5b07fc15472e5123ee1ca3240628458f8f8569a4
      https://github.com/Evolveum/midpoint/commit/5b07fc15472e5123ee1ca3240628458f8f8569a4
  Author: erik <erik.suta at evolveum.com>
  Date:   2014-12-22 (Mon, 22 Dec 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/UserBrowserDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgUnitBrowser.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ResourcesPopup.html

  Log Message:
  -----------
  fix for CSS clearfix problems with search bars in firefox


  Commit: 24232ee53e7cd4b68322198b636fcaaba8d60f4c
      https://github.com/Evolveum/midpoint/commit/24232ee53e7cd4b68322198b636fcaaba8d60f4c
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-12-22 (Mon, 22 Dec 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableDataTable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/UserBrowserDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/QNameEditorPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TextDetailsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ThreeStateBooleanPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ThreeStateBooleanPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ThreeStateBooleanPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.html
    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/Wizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardButtonBar.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java
    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/ConfigurationStep.java
    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/ResourceWizard.java
    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/SchemaStep.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/capability/AddCapabilityDialog.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/ResourceAttributeEditor.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/component/schemahandling/modal/LimitationsEditorDialog.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.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/PageUsers.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgUnitBrowser.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ResourcesPopup.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ConfigurationStorage.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/PageStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ReportsStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ResourcesStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RolesStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/TasksStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/UsersStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/InfoTooltipBehavior.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/TooltipBehavior.java
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M gui/admin-gui/src/main/resources/initial-objects/107-report-user-accounts.xml
    M gui/admin-gui/src/main/resources/initial-objects/111-report-reconciliation-shadow-owner.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SynchronizationSituationUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/logging/LoggingUtils.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/XPathScriptEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/importer/ImportAccountsFromResourceTaskHandler.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/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/DependencyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/PasswordPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizeAccountResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/AbstractSearchIterativeResultHandler.java
    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/TestSecurity.java
    A model/model-intest/src/test/resources/security/role-basic.xml
    A model/model-intest/src/test/resources/security/role-filter-object-user-type-shadow.xml
    A model/model-intest/src/test/resources/security/user-angelica.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M repo/repo-sql-impl-test/src/test/resources/ctx-test-datasource.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestScience.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into hibernate_upgrade


Compare: https://github.com/Evolveum/midpoint/compare/952e1e525268...24232ee53e7c


More information about the midPoint-svn mailing list