[midPoint-git] [Evolveum/midpoint] 21fcb7: disabled query tests, improved search/get, probabl...

[katkav]

  Branch: refs/heads/parser
  Home:   https://github.com/Evolveum/midpoint
  Commit: 21fcb7b668f59be68aa0513e0d5910648b277c20
      https://github.com/Evolveum/midpoint/commit/21fcb7b668f59be68aa0513e0d5910648b277c20
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-02-12 (Wed, 12 Feb 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.java
    M repo/repo-sql-impl-test/testng.xml
    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/QueryInterpreter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrgRestriction.java

  Log Message:
  -----------
  disabled query tests, improved search/get, probably still not working correctly


  Commit: a33d7dfe2d90b25af0a9c68023755bad3ef1e483
      https://github.com/Evolveum/midpoint/commit/a33d7dfe2d90b25af0a9c68023755bad3ef1e483
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-02-13 (Thu, 13 Feb 2014)

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

  Log Message:
  -----------
  improving other queryies


  Commit: f772cf656fd6a9d51305549e1fd7938705b1ea5c
      https://github.com/Evolveum/midpoint/commit/f772cf656fd6a9d51305549e1fd7938705b1ea5c
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-02-13 (Thu, 13 Feb 2014)

  Changed paths:
    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/dto/LoggingDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/StandardLogger.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/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/PageRoles.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/util/SearchFormEnterBehavior.java

  Log Message:
  -----------
  Merge branch 'master' of git://git.evolveum.com/midpoint


  Commit: 9dcbc63e7b5003881aacdad162c11e94dbcde976
      https://github.com/Evolveum/midpoint/commit/9dcbc63e7b5003881aacdad162c11e94dbcde976
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-02-15 (Sat, 15 Feb 2014)

  Changed paths:
    M config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.3/h2/h2-2.3.sql
    M config/sql/midpoint/2.3/mysql/mysql-2.3.sql
    M config/sql/midpoint/2.3/oracle/oracle-2.3.sql
    M config/sql/midpoint/2.3/postgresql/postgresql-2.3.sql
    M config/sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/SearchFormEnterBehavior.java
    M gui/admin-gui/src/main/webapp/WEB-INF/descriptor.xml
    R gui/admin-gui/src/main/webapp/img/cog.png
    R gui/admin-gui/src/main/webapp/img/headerBg.jpg
    M gui/admin-gui/src/main/webapp/img/placeholder.png
    R gui/admin-gui/src/main/webapp/img/preloader-error.gif
    R gui/admin-gui/src/main/webapp/img/preloader.gif
    M gui/admin-gui/src/main/webapp/less/midpoint/capabilities.less
    M gui/admin-gui/src/main/webapp/less/midpoint/operation-result.less
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M model/report-impl/pom.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/DataSourceReport.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/HibernateQueryDataSourceReport.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportCreateTaskHandler.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportManagerImpl.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportUtils.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    M model/report-impl/src/test/resources/reports/reportAuditLogs.xml
    M model/report-impl/src/test/resources/reports/reportReconciliation.xml
    A model/report-impl/src/test/resources/reports/reportUserAccounts.xml
    A model/report-impl/src/test/resources/reports/reportUserList.xml
    A model/report-impl/src/test/resources/reports/reportUserOrgs.xml
    A model/report-impl/src/test/resources/reports/reportUserRoles.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java

  Log Message:
  -----------
  Merge branch 'master' of git://git.evolveum.com/midpoint


  Commit: c76024c27d3bceb218399f3e1a29584579d0bdf8
      https://github.com/Evolveum/midpoint/commit/c76024c27d3bceb218399f3e1a29584579d0bdf8
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-02-16 (Sun, 16 Feb 2014)

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

  Log Message:
  -----------
  fixed build, cca 367k sql queries per build (compared to original 550k)


  Commit: deed7e4fd823df83619c771e2d0987751f59f2f3
      https://github.com/Evolveum/midpoint/commit/deed7e4fd823df83619c771e2d0987751f59f2f3
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

  Changed paths:
    A REPO-STATUS
    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/RAnyContainer.java

  Log Message:
  -----------
  improved shadow loading.


  Commit: d0f5d2828448ce8e36d54174643e64c0ad5eef09
      https://github.com/Evolveum/midpoint/commit/d0f5d2828448ce8e36d54174643e64c0ad5eef09
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

  Changed paths:
    A LONG-TEST-STATS.txt
    M REPO-STATUS

  Log Message:
  -----------
  longtest analytics


  Commit: af68ab4527bc4eba032f3175930c04efb6fa231b
      https://github.com/Evolveum/midpoint/commit/af68ab4527bc4eba032f3175930c04efb6fa231b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-02-18 (Tue, 18 Feb 2014)

  Changed paths:
    M REPO-STATUS
    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/RAnyContainer.java

  Log Message:
  -----------
  modify operation improved


  Commit: e4d48dbabcdfde9c5883d93ecfc7659e83045296
      https://github.com/Evolveum/midpoint/commit/e4d48dbabcdfde9c5883d93ecfc7659e83045296
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-02-18 (Tue, 18 Feb 2014)

  Changed paths:
    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:
  -----------
  improved exception handling


  Commit: a378ea8604749a505e467d026d75b63fc250ed52
      https://github.com/Evolveum/midpoint/commit/a378ea8604749a505e467d026d75b63fc250ed52
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-02-23 (Sun, 23 Feb 2014)

  Changed paths:
    R LONG-TEST-STATS.txt
    M REPO-STATUS
    M model/report-impl/testng.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.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/ObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAnyConverter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyClob.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyValue.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyClobId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyDateId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyLongId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyPolyStringId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyStringId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RObjectReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/AnyPropertyRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ReferenceRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/type/QNameType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/type/package-info.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

  Log Message:
  -----------
  moving QName (as string,string column) to simple string column, improving performance using smaller indexes. (from 53m full build to 51m)


  Commit: 5e99799af86d5edadeaf5fe3fa5e40c1d7833d36
      https://github.com/Evolveum/midpoint/commit/5e99799af86d5edadeaf5fe3fa5e40c1d7833d36
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-02-23 (Sun, 23 Feb 2014)

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxButton.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxDownloadBehaviorFromStream.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/input/UploadPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/MenuLinkPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismContainerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.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.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardSteps.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/SchemaStep.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/ObjectClassPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/ObjectClassPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/AttributeDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ObjectClassDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ObjectClassDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest.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/reports/PageCreatedReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.properties
    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/reports/PageReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReportSearchDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.html
    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.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/roles/dto/RolesSearchDto.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/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsersEncoder.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/CreatedReportsStorage.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/SessionStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/MidPointPageParametersEncoder.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportCreateTaskHandler.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportUtils.java
    M model/report-impl/src/test/resources/reports/reportUserAccounts.xml
    M model/report-impl/src/test/resources/reports/reportUserList.xml
    M model/report-impl/src/test/resources/reports/reportUserOrgs.xml
    M model/report-impl/src/test/resources/reports/reportUserRoles.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryFactory.java

  Log Message:
  -----------
  Merge branch 'master' of git://git.evolveum.com/midpoint


  Commit: 09f0a034b3aa7fa35c92fed1189be5167372f363
      https://github.com/Evolveum/midpoint/commit/09f0a034b3aa7fa35c92fed1189be5167372f363
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-02-23 (Sun, 23 Feb 2014)

  Changed paths:
    M REPO-STATUS
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.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/RAnyContainer.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAuthorization.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RContainer.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RExclusion.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RMetadata.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/data/common/RObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROperationResult.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrgClosure.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrgIncorrect.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROwnable.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSynchronizationSituationDescription.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTrigger.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyClob.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyClobId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyContainerId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyDateId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyLongId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyPolyStringId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyStringId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RContainerId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RMetadataId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RObjectReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RSynchronizationSituationDescriptionId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryInterpreter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrgRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerIdGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

  Log Message:
  -----------
  changing container id to short and object version to integer


  Commit: 9bd5fd74c78262ae44707b3a99edc92f5c435283
      https://github.com/Evolveum/midpoint/commit/9bd5fd74c78262ae44707b3a99edc92f5c435283
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxDownloadBehaviorFromStream.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/DoubleButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/DoubleButtonColumn.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/PageCreatedReports.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReportOutputDto.java
    A gui/admin-gui/src/main/resources/initial-objects/010-value-policy.xml
    A gui/admin-gui/src/main/resources/initial-objects/020-system-configuration.xml
    A gui/admin-gui/src/main/resources/initial-objects/030-role-superuser.xml
    A gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
    A gui/admin-gui/src/main/resources/initial-objects/050-user-administrator.xml
    A gui/admin-gui/src/main/resources/initial-objects/060-task-cleanup.xml
    A gui/admin-gui/src/main/resources/initial-objects/070-task-validity.xml
    A gui/admin-gui/src/main/resources/initial-objects/080-task-trigger.xml
    A gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
    A gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    A gui/admin-gui/src/main/resources/initial-objects/107-report-user-accounts.xml
    A gui/admin-gui/src/main/resources/initial-objects/108-report-user-orgs.xml
    A gui/admin-gui/src/main/resources/initial-objects/109-report-user-roles.xml
    A gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    R gui/admin-gui/src/main/resources/objects.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ReportTypeUtil.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportManagerImpl.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportUtils.java

  Log Message:
  -----------
  Merge branch 'master' of git://git.evolveum.com/midpoint


  Commit: d82802106fc9bdaed33cc347eb3a01abcbbd3a80
      https://github.com/Evolveum/midpoint/commit/d82802106fc9bdaed33cc347eb3a01abcbbd3a80
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    M REPO-STATUS
    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/util/RUtil.java

  Log Message:
  -----------
  minor changes, preparing to reimplement org. closure algorithms


  Commit: 715377204df8fddfc21f4cbb920890b41059046b
      https://github.com/Evolveum/midpoint/commit/715377204df8fddfc21f4cbb920890b41059046b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-02-26 (Wed, 26 Feb 2014)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BasicSearchPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BasicSearchPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BasicSearchPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/DoubleButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/ConfirmationDialog.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/PageBase.properties
    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/reports/PageAdminReports.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/PageReport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReportDto.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReportOutputDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReportOutputSearchDto.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/roles/PageRoles.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/dto/RolesSearchDto.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/PageUsers.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.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/users/component/TreeTablePanel.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/session/CreatedReportsStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebModelUtils.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd

  Log Message:
  -----------
  Merge branch 'master' of git://git.evolveum.com/midpoint


  Commit: b20db11b4585ac48d22375c7031459907124eba8
      https://github.com/Evolveum/midpoint/commit/b20db11b4585ac48d22375c7031459907124eba8
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-03 (Mon, 03 Mar 2014)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.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/ObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAuthorization.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RExclusion.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/data/common/RObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROperationResult.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyReference.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/RCapabilities.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/RCredentials.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerIdGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerOidGenerator.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/PrismIdentifierGenerator.java

  Log Message:
  -----------
  removing clob field from objects.


  Commit: f8fc7ffb06eb4b4e025391c63006fb8ca7191c21
      https://github.com/Evolveum/midpoint/commit/f8fc7ffb06eb4b4e025391c63006fb8ca7191c21
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-03 (Mon, 03 Mar 2014)

  Changed paths:
    M config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.3/h2/h2-2.3.sql
    M config/sql/midpoint/2.3/mysql/mysql-2.3.sql
    M config/sql/midpoint/2.3/oracle/oracle-2.3.sql
    M config/sql/midpoint/2.3/postgresql/postgresql-2.3.sql
    M config/sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityCredentialsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityScriptPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityStepDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityValuePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/CapabilityDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest2.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest2.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/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/reports/PageReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.html
    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/users/PageOrgTree.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgTreeProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportUtils.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    M model/report-impl/src/test/resources/reports/reportAuditLogs.xml
    M model/report-impl/src/test/resources/reports/reportUserList.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAssignment.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/data/common/ROrg.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReportOutput.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/PropertyRestriction.java

  Log Message:
  -----------
  Merge branch 'master' of git://git.evolveum.com/midpoint

Conflicts:
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAssignment.java
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java


  Commit: 9f2709ef915a75c1f89374dbe5532824f7f50aaf
      https://github.com/Evolveum/midpoint/commit/9f2709ef915a75c1f89374dbe5532824f7f50aaf
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-04 (Tue, 04 Mar 2014)

  Changed paths:
    M REPO-STATUS

  Log Message:
  -----------
  updated repo status, now 281k vs. 540k selects, clob columns removed.


  Commit: 68b684f7dfa7b220d839fde4de354e5c77bcd429
      https://github.com/Evolveum/midpoint/commit/68b684f7dfa7b220d839fde4de354e5c77bcd429
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-04 (Tue, 04 Mar 2014)

  Changed paths:
    M gui/admin-gui/pom.xml
    A infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedConnectorSchema.java
    M infra/common/src/main/resources/ctx-common.xml
    M infra/prism/pom.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismObjectConstruction.java
    M infra/schema/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ConnectorSchema.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M infra/schema/src/main/resources/META-INF/catalog.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog-model-context.xml
    M infra/schema/src/main/resources/xml/ns/private/fake/fake-1.wsdl
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-2.xsd
    A infra/schema/src/main/resources/xml/ns/public/connector/icf-1/connector-extension-2.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/model-1.wsdl
    A infra/schema/src/main/resources/xml/ns/public/model/scripting/extension-2.xsd
    A infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-2.xsd
    M infra/schema/src/main/resources/xml/ns/public/task/extension-2.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelPort.java
    M model/model-client/src/compile/resources/catalog.xml
    M model/model-client/src/compile/resources/jax-ws-catalog.xml
    M model/model-client/src/main/resources/META-INF/catalog.xml
    M model/model-client/src/main/resources/META-INF/jax-ws-catalog.xml
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelWebService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelController.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/ActionExecutor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/Data.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/ExecutionContext.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/ScriptExecutionException.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/ScriptExecutionTaskHandler.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/ScriptingExpressionEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/actions/AddExecutor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/actions/AssignExecutor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/actions/BaseActionExecutor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/actions/DeleteExecutor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/actions/EnableDisableExecutor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/actions/LogExecutor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/actions/ModifyExecutor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/actions/RecomputeExecutor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/actions/ResolveExecutor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/expressions/BaseExpressionEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/expressions/SearchEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/expressions/SelectEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/helpers/ExpressionHelper.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/helpers/JaxbHelper.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/helpers/OperationsHelper.java
    A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
    M model/model-intest/src/test/resources/common/user-elaine.xml
    M model/model-intest/src/test/resources/common/user-guybrush.xml
    A model/model-intest/src/test/resources/scripting/assign-to-jack-2.xml
    A model/model-intest/src/test/resources/scripting/assign-to-jack.xml
    A model/model-intest/src/test/resources/scripting/delete-and-add-jack.xml
    A model/model-intest/src/test/resources/scripting/disable-jack.xml
    A model/model-intest/src/test/resources/scripting/enable-jack.xml
    A model/model-intest/src/test/resources/scripting/log.xml
    A model/model-intest/src/test/resources/scripting/modify-jack-back.xml
    A model/model-intest/src/test/resources/scripting/modify-jack.xml
    A model/model-intest/src/test/resources/scripting/recompute-jack.xml
    A model/model-intest/src/test/resources/scripting/search-for-resources.xml
    A model/model-intest/src/test/resources/scripting/search-for-roles.xml
    A model/model-intest/src/test/resources/scripting/search-for-shadows-nofetch.xml
    A model/model-intest/src/test/resources/scripting/search-for-shadows.xml
    A model/model-intest/src/test/resources/scripting/search-for-users-accounts-nofetch.xml
    A model/model-intest/src/test/resources/scripting/search-for-users-accounts.xml
    A model/model-intest/src/test/resources/scripting/search-for-users.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/NodeRegistrar.java

  Log Message:
  -----------
  Merge branch 'master' of git://git.evolveum.com/midpoint


  Commit: 81b0891f5d665719c960777580c2abb6a56828b2
      https://github.com/Evolveum/midpoint/commit/81b0891f5d665719c960777580c2abb6a56828b2
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-08 (Sat, 08 Mar 2014)

  Changed paths:
    M config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql
    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/home/component/SystemInfoPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/SystemInfoPanel.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/security/MidPointApplication.properties
    M gui/admin-gui/src/main/webapp/WEB-INF/descriptor.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelWebService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/ExecutionContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/ScriptingExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/actions/BaseActionExecutor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/actions/DiscoverConnectorsExecutor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/actions/PurgeSchemaExecutor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/actions/TestResourceExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/expressions/SearchEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/helpers/OperationsHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/util/Utils.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java
    A model/model-intest/src/test/resources/scripting/purge-dummy-black-schema.xml
    A model/model-intest/src/test/resources/scripting/test-dummy-resource.xml
    M model/model-intest/testng.xml
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/AccountOperationListener.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/formatters/TextFormatter.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/notifiers/SimpleUserNotifier.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/DataSourceReport.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportCreateTaskHandler.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportUtils.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    M model/report-impl/src/test/resources/common/report-outputs-for-cleanup.xml
    M model/report-impl/src/test/resources/reports/report-test-without-design.xml
    M model/report-impl/src/test/resources/reports/report-test.xml
    M model/report-impl/src/test/resources/reports/reportDataSourceTest.jrxml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M samples/model-client-sample/pom.xml
    A samples/model-client-sample/src/main/assembly/bin.xml
    A samples/model-client-sample/src/main/bin/discover-rebind.xml
    A samples/model-client-sample/src/main/bin/discover.xml
    A samples/model-client-sample/src/main/bin/purge-schema.xml
    A samples/model-client-sample/src/main/bin/runscript.bat
    A samples/model-client-sample/src/main/bin/runscript.sh
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/ClientPasswordHandler.java
    A samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/RunScript.java

  Log Message:
  -----------
  Merge branch 'master' of git://git.evolveum.com/midpoint


  Commit: f2542609deed96a033e894cced6372b6f9e6ff51
      https://github.com/Evolveum/midpoint/commit/f2542609deed96a033e894cced6372b6f9e6ff51
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-08 (Sat, 08 Mar 2014)

  Changed paths:
    M REPO-STATUS
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgClosureTest.java

  Log Message:
  -----------
  org. closure test with some statistics.


  Commit: f83469fdb6006aebf021b50fb527b3a1969e4375
      https://github.com/Evolveum/midpoint/commit/f83469fdb6006aebf021b50fb527b3a1969e4375
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-08 (Sat, 08 Mar 2014)

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

  Log Message:
  -----------
  minor get object refactor.


  Commit: 6eb772f5b640a36b03898082556b590aeefdee5e
      https://github.com/Evolveum/midpoint/commit/6eb772f5b640a36b03898082556b590aeefdee5e
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalPanel.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/page/admin/workflow/PageWorkItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDto.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/extension-2.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/process-instance-state-2.xsd
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/events/workflow/DefaultWorkflowEventCreator.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
    M model/workflow-impl/pom.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/WorkflowManagerImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/ActivitiEngine.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/ActivitiEngineDataHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/ActivitiInterface.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/ActivitiUtil.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/SpringApplicationContextHolder.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/TestAuthenticationInfoHolder.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/dao/ProcessInstanceManager.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/dao/ProcessInstanceProvider.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/dao/WorkItemManager.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/dao/WorkItemProvider.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/dao/ProcessInstanceManager.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/dao/ProcessInstanceProvider.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/dao/WorkItemManager.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/dao/WorkItemProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/jobs/JobController.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/jobs/JobCreationInstruction.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/messages/TaskCompletedEvent.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/messages/TaskCreatedEvent.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/messages/TaskEvent.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/common/ActivitiUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/common/CommonProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/common/MidPointProcessListener.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/common/MidPointTaskListener.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/common/SpringApplicationContextHolder.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/itemApproval/ApprovalRequestImpl.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/itemApproval/Constants.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/itemApproval/InitializeLoopThroughApproversInLevel.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/itemApproval/PrepareResult.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/itemApproval/RecordIndividualDecision.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/itemApproval/SummarizeDecisionsInLevel.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/BaseAuditHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/BaseExternalizationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/ChangeProcessor.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/DefaultGcpProcessWrapper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/GcpProcessVariableNames.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/GcpProcessWrapper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/GeneralChangeProcessor.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/wrapper/DefaultGcpProcessWrapper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/wrapper/GcpProcessWrapper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpExternalizationHelper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpProcessVariableNames.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpRepoAccessHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PrimaryChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/user/AddRoleAssignmentWrapper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/user/ChangePasswordWrapper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/wrapper/BaseWrapper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/wrapper/PrimaryApprovalProcessWrapper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/wrapper/WrapperHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/util/MiscDataUtil.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/util/TestAuthenticationInfoHolder.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/TestUserChangeApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/general/ApprovingDummyResourceChangesProcessWrapper.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/general/TestGeneralChangeProcessor.java
    M model/workflow-impl/src/test/resources/ctx-workflow-test-main.xml
    M model/workflow-impl/src/test/resources/logback-test.xml
    M model/workflow-impl/testng.xml

  Log Message:
  -----------
  Merge branch 'master' of git://git.evolveum.com/midpoint


  Commit: d8168972a4e4b19c8b8a548d34f5a99f47f9c3e3
      https://github.com/Evolveum/midpoint/commit/d8168972a4e4b19c8b8a548d34f5a99f47f9c3e3
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    A testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestRepositoryPerformance.java
    A testing/longtest/src/test/resources/common/resource-opendj-generic-sync.xml
    M testing/longtest/testng.xml

  Log Message:
  -----------
  Merge branch 'master' of git://git.evolveum.com/midpoint


  Commit: b6eda63afff7225f5a5d82b8d0da625dc05df4b4
      https://github.com/Evolveum/midpoint/commit/b6eda63afff7225f5a5d82b8d0da625dc05df4b4
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/main/resources/ctx-repository-session.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SpringApplicationContextTest.java
    M repo/repo-sql-impl-test/testng.xml
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/Metadata.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAuthorization.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RContainer.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RExclusion.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RMetadata.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/data/common/RObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrgClosure.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSynchronizationSituationDescription.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTrigger.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RContainerType.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RObjectType.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/poc/RAA.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/poc/RAO.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/poc/RAR.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerIdGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerOidGenerator.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ObjectOidGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/repo-sql-impl/src/main/resources/ctx-repository-session.xml

  Log Message:
  -----------
  first round of repo refactor, really messed up...not anywhere near compilable or working


  Commit: a85c9d35f4180340369618373c5850a9864846ab
      https://github.com/Evolveum/midpoint/commit/a85c9d35f4180340369618373c5850a9864846ab
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-12 (Wed, 12 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/main/resources/ctx-repository-session.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.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/SpringApplicationContextTest.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/audit/RAuditEventRecord.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAnyContainer.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAuthorization.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RCObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RContainer.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RExclusion.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.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/data/common/ROperationResult.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrgClosure.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrgIncorrect.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTrigger.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyClob.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyClobId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyContainerId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyDateId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyLongId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyPolyStringId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyStringId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RCObjectReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RContainerId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RObjectReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RSynchronizationSituationDescriptionId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RContainerType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/poc/RAA.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/poc/RACId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryDefinitionRegistry.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/definition/ClassDefinitionParser.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerIdGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerTypeGenerator.java
    M repo/repo-sql-impl/src/main/resources/ctx-repository-session.xml

  Log Message:
  -----------
  refactoring, second round, now compiles. not yet fixed: metadata; assignment/any; containerType/objectType; query interpreter; PK generators


  Commit: bf49e70ad7a655e45dbc13b10cafb24beee31105
      https://github.com/Evolveum/midpoint/commit/bf49e70ad7a655e45dbc13b10cafb24beee31105
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-12 (Wed, 12 Mar 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/EmptyProcessDetailsPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/EmptyProcessDetailsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/EmptyProcessDetailsPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/StandardLoggerType.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDto.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/process-instance-state-2.xsd
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/events/workflow/DefaultWorkflowEventCreator.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WfTaskExtensionItemsNames.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpTaskExtensionItemsNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/WfConfiguration.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/WorkflowManagerImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/ActivitiInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/dao/ProcessInstanceManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/dao/ProcessInstanceProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/jobs/JobController.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/jobs/JobCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/jobs/WfTaskUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/messages/ProcessEvent.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/BaseProcessMidPointInterface.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/DefaultProcessMidPointInterface.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/ProcessInterfaceFinder.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/ProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/common/CommonProcessVariableNames.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/itemApproval/ItemApprovalProcessInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/itemApproval/PrepareResult.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/itemApproval/RecordIndividualDecision.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/BaseChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/BaseExternalizationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/ChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/GcpProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/GeneralChangeProcessor.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/scenarios/BaseGcpScenarioBean.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/scenarios/DefaultGcpScenarioBean.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/scenarios/GcpScenarioBean.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/wrapper/DefaultGcpProcessWrapper.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/wrapper/GcpProcessWrapper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpChildJobCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpConfigurationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpExternalizationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpJob.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PrimaryChangeProcessor.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/aspect/BasePrimaryChangeAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/aspect/PrimaryChangeAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/aspect/PrimaryChangeAspectHelper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/user/AddRoleAssignmentAspect.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/user/AddRoleAssignmentWrapper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/user/ChangePasswordAspect.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/user/ChangePasswordWrapper.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/wrapper/BaseWrapper.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/wrapper/PrimaryApprovalProcessWrapper.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/wrapper/WrapperHelper.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/general/ApprovingDummyResourceChangesProcessWrapper.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/general/ApprovingDummyResourceChangesScenarioBean.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/general/TestGeneralChangeProcessor.java
    M model/workflow-impl/src/test/resources/logback-test.xml
    M model/workflow-impl/src/test/resources/test-config.xml
    M model/workflow-impl/testng.xml

  Log Message:
  -----------
  Merge branch 'master' of git://git.evolveum.com/midpoint


  Commit: 960031e2bde528e7187440ffc9789e4038502083
      https://github.com/Evolveum/midpoint/commit/960031e2bde528e7187440ffc9789e4038502083
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-12 (Wed, 12 Mar 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/EmptyProcessDetailsPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/EmptyProcessDetailsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/EmptyProcessDetailsPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/StandardLoggerType.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDto.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/process-instance-state-2.xsd
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/events/workflow/DefaultWorkflowEventCreator.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WfTaskExtensionItemsNames.java
    M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpTaskExtensionItemsNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/WfConfiguration.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/WorkflowManagerImpl.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/ActivitiInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/dao/ProcessInstanceManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/dao/ProcessInstanceProvider.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/jobs/JobController.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/jobs/JobCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/jobs/WfTaskUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/messages/ProcessEvent.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/BaseProcessMidPointInterface.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/DefaultProcessMidPointInterface.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/ProcessInterfaceFinder.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/ProcessMidPointInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/common/CommonProcessVariableNames.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/itemApproval/ItemApprovalProcessInterface.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/itemApproval/PrepareResult.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/itemApproval/RecordIndividualDecision.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/BaseChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/BaseExternalizationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/ChangeProcessor.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/GcpProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/GeneralChangeProcessor.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/scenarios/BaseGcpScenarioBean.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/scenarios/DefaultGcpScenarioBean.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/scenarios/GcpScenarioBean.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/wrapper/DefaultGcpProcessWrapper.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/wrapper/GcpProcessWrapper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpChildJobCreationInstruction.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpConfigurationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpExternalizationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpJob.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpProcessVariableNames.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PrimaryChangeProcessor.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/aspect/BasePrimaryChangeAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/aspect/PrimaryChangeAspect.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/aspect/PrimaryChangeAspectHelper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/user/AddRoleAssignmentAspect.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/user/AddRoleAssignmentWrapper.java
    A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/user/ChangePasswordAspect.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/user/ChangePasswordWrapper.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/wrapper/BaseWrapper.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/wrapper/PrimaryApprovalProcessWrapper.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/wrapper/WrapperHelper.java
    R model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/general/ApprovingDummyResourceChangesProcessWrapper.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/general/ApprovingDummyResourceChangesScenarioBean.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/general/TestGeneralChangeProcessor.java
    M model/workflow-impl/src/test/resources/logback-test.xml
    M model/workflow-impl/src/test/resources/test-config.xml
    M model/workflow-impl/testng.xml

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


  Commit: 846269d47adf0c8668b4ad697978d3151cb33d8d
      https://github.com/Evolveum/midpoint/commit/846269d47adf0c8668b4ad697978d3151cb33d8d
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.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/audit/RAuditEventRecord.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAnyContainer.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.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/data/common/RObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyClob.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyClobId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyLongId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyStringId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RContainerType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RReferenceOwner.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RAccountRef.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RLinkRef.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryDefinitionRegistry.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerTypeGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

  Log Message:
  -----------
  fixed imports, removed RContainerType


  Commit: ea965ed79405502fe7356af2ebe50f4c68a072d3
      https://github.com/Evolveum/midpoint/commit/ea965ed79405502fe7356af2ebe50f4c68a072d3
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/CleanupTest.java
    M repo/repo-sql-impl-test/testng.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/Container.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAuthorization.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RContainer.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RExclusion.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/data/common/ROwnable.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTrigger.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerIdGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerOidGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

  Log Message:
  -----------
  add/get test working (will be improved to fail :) )


  Commit: af6fcba91a39872e12ef3b21481495c5cb3b0e42
      https://github.com/Evolveum/midpoint/commit/af6fcba91a39872e12ef3b21481495c5cb3b0e42
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/ConfirmationDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.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/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/MyAssignmentsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.html
    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/OrgUnitBrowser.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgUnitBrowser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgUnitBrowser.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/OrgUnitSearchDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/OrgUnitStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    M infra/prism/src/main/resources/xml/ns/public/query-2.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryConvertor.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/ConfigurableDSProvider.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/DataSourceReport.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/DataSourceReportProvider.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportCreateTaskHandler.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportUtils.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    M model/report-impl/src/test/resources/reports/report-test.xml
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml

  Log Message:
  -----------
  Merge branch 'master' of git://git.evolveum.com/midpoint


  Commit: 0f7186d5b45667fc903fee404aa5140feb4459b0
      https://github.com/Evolveum/midpoint/commit/0f7186d5b45667fc903fee404aa5140feb4459b0
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/ConfirmationDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismObjectPanel.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/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/MyAssignmentsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.html
    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/OrgUnitBrowser.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgUnitBrowser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgUnitBrowser.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/OrgUnitSearchDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/OrgUnitStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    M infra/prism/src/main/resources/xml/ns/public/query-2.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryConvertor.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/ConfigurableDSProvider.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/DataSourceReport.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/DataSourceReportProvider.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportCreateTaskHandler.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportUtils.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    M model/report-impl/src/test/resources/reports/report-test.xml
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml

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


  Commit: a7593d6beabefcbffbd2fb71ef99f9c9a44120a1
      https://github.com/Evolveum/midpoint/commit/a7593d6beabefcbffbd2fb71ef99f9c9a44120a1
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/DeleteTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl-test/testng.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java

  Log Message:
  -----------
  a couple more improvements, many tests disabled some still failing


  Commit: 31eb00fec469c1654daf34a6e1420babc1ae565d
      https://github.com/Evolveum/midpoint/commit/31eb00fec469c1654daf34a6e1420babc1ae565d
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.java
    M repo/repo-sql-impl-test/testng.xml
    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/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAuthorization.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RCObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RExclusion.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/data/common/RTrigger.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RCReferenceOwner.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RReferenceOwner.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RCCreateApproverRef.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RCModifyApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/ROrgRootRef.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/ObjectReferenceFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryInterpreter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrgRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

  Log Message:
  -----------
  fixed almost all tests.


  Commit: 7877d77ea53e25f398662d0ea48d292ae33262fd
      https://github.com/Evolveum/midpoint/commit/7877d77ea53e25f398662d0ea48d292ae33262fd
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-13 (Thu, 13 Mar 2014)

  Changed paths:
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/ObjectDBValidator.java

  Log Message:
  -----------
  db object validator implementation started


  Commit: 070ad62e9c43da086061fb636cf0c914d0f07692
      https://github.com/Evolveum/midpoint/commit/070ad62e9c43da086061fb636cf0c914d0f07692
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-14 (Fri, 14 Mar 2014)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/security/Authorization.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/security/AuthorizationConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    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/controller/ModelController.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/security/AuthorizationEnforcer.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/AbstractInternalModelIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/controller/ControllerGetObjectTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/sync/TestSynchronizationService.java
    M model/model-impl/src/test/resources/common/user-administrator.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Merge branch 'master' of git://git.evolveum.com/midpoint


  Commit: 9b14f94e686046de4d9964ca28f021bf79875494
      https://github.com/Evolveum/midpoint/commit/9b14f94e686046de4d9964ca28f021bf79875494
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-14 (Fri, 14 Mar 2014)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/security/Authorization.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/security/AuthorizationConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    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/controller/ModelController.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/security/AuthorizationEnforcer.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/AbstractInternalModelIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/controller/ControllerGetObjectTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/sync/TestSynchronizationService.java
    M model/model-impl/src/test/resources/common/user-administrator.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

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


  Commit: 949eb831e23eec2cbc5ea1ccc9bed4eaf477f1f3
      https://github.com/Evolveum/midpoint/commit/949eb831e23eec2cbc5ea1ccc9bed4eaf477f1f3
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-14 (Fri, 14 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/ObjectDBValidator.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/data/common/RShadow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerTypeGenerator.java

  Log Message:
  -----------
  fixed object/extension, still have to fix metadata, assignment/extension and others.


  Commit: 3fda6ac99f6f22c0fc5b21e5e199d85932f4ca46
      https://github.com/Evolveum/midpoint/commit/3fda6ac99f6f22c0fc5b21e5e199d85932f4ca46
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M REPO-STATUS
    M repo/repo-sql-impl-test/sample-configurations/sqlserver.properties
    M testing/longtest/testng.xml

  Log Message:
  -----------
  repo status update


  Commit: fcf2089ae6f71a46c5d33d1758c8b504622abcea
      https://github.com/Evolveum/midpoint/commit/fcf2089ae6f71a46c5d33d1758c8b504622abcea
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-15 (Sat, 15 Mar 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/roles/PageRole.html
    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/PageRole.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/dto/RoleDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
    A infra/common/src/main/java/com/evolveum/midpoint/common/security/SecurityEnforcer.java
    A infra/common/src/main/java/com/evolveum/midpoint/common/security/UserProfileService.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    R model/model-api/src/main/java/com/evolveum/midpoint/model/security/api/UserDetailsService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelController.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/security/AuthorizationEnforcer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/MidpointRestAuthenticationHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/PasswordCallback.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/SpringAuthenticationInjectorInterceptor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/SpringAuthenticationJanitorInterceptor.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/security/UserDetailsServiceImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/security/UserProfileServiceImpl.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
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/security/role-readonly-deep.xml
    A model/model-intest/src/test/resources/security/role-readonly.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    A model/report-impl/src/test/resources/common/role-superuser.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/CleanupTest.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestRepositoryPerformance.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java

  Log Message:
  -----------
  Merge branch 'master' of git://git.evolveum.com/midpoint


  Commit: 76f7da939c574e4bd3358451bc26b6b97ab8bd28
      https://github.com/Evolveum/midpoint/commit/76f7da939c574e4bd3358451bc26b6b97ab8bd28
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-15 (Sat, 15 Mar 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/roles/PageRole.html
    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/PageRole.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/dto/RoleDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
    A infra/common/src/main/java/com/evolveum/midpoint/common/security/SecurityEnforcer.java
    A infra/common/src/main/java/com/evolveum/midpoint/common/security/UserProfileService.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    R model/model-api/src/main/java/com/evolveum/midpoint/model/security/api/UserDetailsService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelController.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/security/AuthorizationEnforcer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/MidpointRestAuthenticationHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/PasswordCallback.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/SpringAuthenticationInjectorInterceptor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/SpringAuthenticationJanitorInterceptor.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/security/UserDetailsServiceImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/security/UserProfileServiceImpl.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
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/security/role-readonly-deep.xml
    A model/model-intest/src/test/resources/security/role-readonly.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    A model/report-impl/src/test/resources/common/role-superuser.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/JobExecutor.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/CleanupTest.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestRepositoryPerformance.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/AbstractStoryTest.java

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


  Commit: 17a445f8fecae3a3f96d9062447f575c4c0e882c
      https://github.com/Evolveum/midpoint/commit/17a445f8fecae3a3f96d9062447f575c4c0e882c
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/main/resources/ctx-repository-session.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/CleanupTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SpringApplicationContextTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/Container.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAssignment.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAuthorization.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RCObjectReference.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RExclusion.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.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/data/common/ROrgClosure.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROwnable.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTrigger.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/Container.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignmentReference.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAuthorization.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RExclusion.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RTrigger.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RCReferenceOwner.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RACreateApproverRef.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RAModifyApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RCCreateApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RCModifyApproverRef.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/ObjectReferenceFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerIdGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerOidGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/repo-sql-impl/src/main/resources/ctx-repository-session.xml

  Log Message:
  -----------
  renamed rcobjectreference to rassignmentreference, moving classes around just a bit.


  Commit: cc4b74ced4769f69a37a254b63756b819884d913
      https://github.com/Evolveum/midpoint/commit/cc4b74ced4769f69a37a254b63756b819884d913
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
    M repo/repo-sql-impl-test/testng.xml

  Log Message:
  -----------
  fixed query interpreter tests.


  Commit: 062d422e2bdb73c6a23b2a1be1dd6328d8b8cdc7
      https://github.com/Evolveum/midpoint/commit/062d422e2bdb73c6a23b2a1be1dd6328d8b8cdc7
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAnyConverter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyClob.java

  Log Message:
  -----------
  removed clob column from any clob table.


  Commit: 65c4a310733b37d1e98e19ba4950bf6dbb14d09b
      https://github.com/Evolveum/midpoint/commit/65c4a310733b37d1e98e19ba4950bf6dbb14d09b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-15 (Sat, 15 Mar 2014)

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

  Log Message:
  -----------
  enabled extension in object.


  Commit: 7b80d2bd757bee0ce407e90304756d698d8863a4
      https://github.com/Evolveum/midpoint/commit/7b80d2bd757bee0ce407e90304756d698d8863a4
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-16 (Sun, 16 Mar 2014)

  Changed paths:
    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/util/RUtil.java

  Log Message:
  -----------
  objects count during addObject improved.


  Commit: f277955cd7fe4161d3e718813b18e5c73c950ceb
      https://github.com/Evolveum/midpoint/commit/f277955cd7fe4161d3e718813b18e5c73c950ceb
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-16 (Sun, 16 Mar 2014)

  Changed paths:
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAClob.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyClob.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyString.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAClobId.java

  Log Message:
  -----------
  minor improvements - removed id from any* ID annotations.


  Commit: 59091c1c62fe941a598d4573d529bd1c27e73ad9
      https://github.com/Evolveum/midpoint/commit/59091c1c62fe941a598d4573d529bd1c27e73ad9
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-17 (Mon, 17 Mar 2014)

  Changed paths:
    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/data/common/container/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignmentReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

  Log Message:
  -----------
  fixed metadata


  Commit: 1aaf7def3bd070e06870f34b2a3addadd396ccda
      https://github.com/Evolveum/midpoint/commit/1aaf7def3bd070e06870f34b2a3addadd396ccda
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-17 (Mon, 17 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/RAnyConverterStaticTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl-test/testng.xml
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAnyContainer.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAnyConverter.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/data/common/RShadow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAClob.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RADate.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtensionValue.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RALong.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAPolyString.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAReference.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyClob.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyContainer.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyValue.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAssignmentExtension.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RExtensionValue.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAClobId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RADateId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RALongId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAPolyStringId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAReferenceId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAStringId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAssignmentExtensionId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/definition/ClassDefinitionParser.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/AnyPropertyRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerIdGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerOidGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerTypeGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

  Log Message:
  -----------
  somehow reimplemented mappings


  Commit: 8265f8c7b780973952af1eef81639b23f19282ee
      https://github.com/Evolveum/midpoint/commit/8265f8c7b780973952af1eef81639b23f19282ee
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-17 (Mon, 17 Mar 2014)

  Changed paths:
    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/any/RADate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RALong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyString.java

  Log Message:
  -----------
  removed unused indexes in any* tables


  Commit: 514b136359dfe8894d94638182f1374166326a00
      https://github.com/Evolveum/midpoint/commit/514b136359dfe8894d94638182f1374166326a00
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-17 (Mon, 17 Mar 2014)

  Changed paths:
    A testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    A testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestOrgHierarchy.java
    R testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestRepositoryPerformance.java
    M testing/longtest/testng.xml

  Log Message:
  -----------
  new test for org. hierarchy import, not finished yet.


  Commit: e28c6c5568dd3a7ca510f7c290c9a3cb8db7927a
      https://github.com/Evolveum/midpoint/commit/e28c6c5568dd3a7ca510f7c290c9a3cb8db7927a
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAReference.java

  Log Message:
  -----------
  fixed FK for assignment any


  Commit: 1c8fbd557f5402a28908cac87e084f2acfba7df8
      https://github.com/Evolveum/midpoint/commit/1c8fbd557f5402a28908cac87e084f2acfba7df8
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-18 (Tue, 18 Mar 2014)

  Changed paths:
    M config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.3/h2/h2-2.3.sql
    M config/sql/midpoint/2.3/mysql/mysql-2.3.sql
    M config/sql/midpoint/2.3/oracle/oracle-2.3.sql
    M config/sql/midpoint/2.3/postgresql/postgresql-2.3.sql
    M config/sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTableDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/UserMenuPanel.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/PageTest.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest2.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/configuration/PageAbout.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/PageAdminConfiguration.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/configuration/PageImportObject.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageAdminHome.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswords.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAdminReports.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/reports/PageReport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageAdminResources.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/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/PageAccount.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/PageContentEntitlements.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageAdminRoles.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.html
    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/PageRoleOld.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/PageAdminTasks.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/PageAdminUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageBulkUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageFindUsers.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/PageOrgUnit.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.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/workflow/PageAdminWorkItems.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/page/admin/workflow/PageProcessInstances.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstancesAll.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstancesRequestedBy.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstancesRequestedFor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.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/page/admin/workflow/dto/ProcessInstanceDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/AuditedLogoutHandler.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthWebSession.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/PageUrlMapping.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/SecurityUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    R gui/admin-gui/src/main/webapp/WEB-INF/ctx-security.xml
    A gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/PageUserTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/SpringApplicationContextTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestCleanStartup.java
    M gui/admin-gui/src/test/resources/ctx-test.xml
    R infra/common/src/main/java/com/evolveum/midpoint/common/security/Authorization.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/security/AuthorizationConstants.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/security/AuthorizationEvaluator.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/security/MidPointPrincipal.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/security/SecurityEnforcer.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/security/UserProfileService.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/XPathType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M model/model-api/pom.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelWebService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/importer/ObjectImporter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/Assignment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/MidpointRestAuthenticationHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/PasswordCallback.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/SpringAuthenticationInjectorInterceptor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/SpringAuthenticationJanitorInterceptor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/UserProfileServiceImpl.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/AbstractInternalModelIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/ModelWebServiceTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/controller/ControllerAddObjectTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/expr/TestModelExpressions.java
    A model/model-impl/src/test/resources/common/role-superuser.xml
    M model/model-impl/src/test/resources/common/user-administrator.xml
    M model/model-impl/src/test/resources/ctx-model-test-main.xml
    M model/model-impl/src/test/resources/ctx-model-test-no-repo.xml
    M model/model-intest/pom.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/TestPreviewChanges.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/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/common/user-capsize.xml
    M model/model-intest/src/test/resources/ctx-model-intest-test-main.xml
    A model/model-intest/src/test/resources/security/role-self.xml
    A model/model-intest/src/test/resources/security/user-lechuck.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-impl/pom.xml
    M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/TestTextFormatter.java
    M model/report-impl/pom.xml
    M model/report-impl/src/test/resources/ctx-report-test-main.xml
    M model/report-impl/src/test/resources/reports/reportUserList.xml
    M model/workflow-impl/pom.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/dao/WorkItemManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/itemApproval/RecordIndividualDecision.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/BaseAuditHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpRepoAccessHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/util/MiscDataUtil.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/util/TestAuthenticationInfoHolder.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/TestUserChangeApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/general/TestGeneralChangeProcessor.java
    A model/workflow-impl/src/test/resources/common/role-superuser.xml
    M model/workflow-impl/src/test/resources/common/user-administrator.xml
    M model/workflow-impl/src/test/resources/common/users-and-roles.xml
    M model/workflow-impl/src/test/resources/ctx-workflow-test-main.xml
    M provisioning/provisioning-impl/pom.xml
    M provisioning/provisioning-impl/src/test/resources/ctx-provisioning-test-main.xml
    M provisioning/provisioning-impl/src/test/resources/ctx-provisioning-test-no-repo.xml
    M repo/pom.xml
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    A repo/security-api/pom.xml
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/Authorization.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/MidPointPrincipal.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/UserProfileService.java
    A repo/security-api/testng.xml
    A repo/security-impl/pom.xml
    A repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    A repo/security-impl/src/main/resources/ctx-security.xml
    A repo/security-impl/testng.xml
    M repo/task-quartz-impl/pom.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/CleanupTest.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.java
    M samples/samples-test/pom.xml
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSampleImport.java
    M samples/samples-test/src/test/resources/ctx-samples-test-main.xml
    M testing/consistency-mechanism/pom.xml
    M testing/consistency-mechanism/src/test/resources/ctx-consistency-test-main.xml
    M testing/longtest/pom.xml
    M testing/longtest/src/test/resources/ctx-longtest-test-main.xml
    M testing/rest/src/test/resources/ctx-rest-test-main.xml
    M testing/sanity/pom.xml
    M testing/sanity/src/test/resources/ctx-sanity-test-main.xml
    M testing/story/pom.xml
    M testing/story/src/test/resources/ctx-story-test-main.xml
    M tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/BaseNinjaAction.java

  Log Message:
  -----------
  Merge branch 'master' of git://git.evolveum.com/midpoint

Conflicts:
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAuthorization.java


  Commit: a7a08d4488ed34fad9599a28a29582ead5f1e239
      https://github.com/Evolveum/midpoint/commit/a7a08d4488ed34fad9599a28a29582ead5f1e239
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/general/TestGeneralChangeProcessor.java

  Log Message:
  -----------
  disabled one failing test in WF impl


  Commit: dd3b42a69f56f300fa10bf591ad54cf892571106
      https://github.com/Evolveum/midpoint/commit/dd3b42a69f56f300fa10bf591ad54cf892571106
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.3/h2/h2-2.3.sql
    M config/sql/midpoint/2.3/mysql/mysql-2.3.sql
    M config/sql/midpoint/2.3/oracle/oracle-2.3.sql
    M config/sql/midpoint/2.3/postgresql/postgresql-2.3.sql
    M config/sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTableDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/UserMenuPanel.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/PageTest.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTest2.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/configuration/PageAbout.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/PageAdminConfiguration.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/configuration/PageImportObject.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageAdminHome.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageDashboard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswords.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAdminReports.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/reports/PageReport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageAdminResources.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/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/PageAccount.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/PageContentEntitlements.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageAdminRoles.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.html
    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/PageRoleOld.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/PageAdminTasks.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/PageAdminUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageBulkUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageFindUsers.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/PageOrgUnit.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.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/workflow/PageAdminWorkItems.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/page/admin/workflow/PageProcessInstances.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstancesAll.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstancesRequestedBy.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstancesRequestedFor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.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/page/admin/workflow/dto/ProcessInstanceDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/AuditedLogoutHandler.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthWebSession.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/PageUrlMapping.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/SecurityUtils.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    R gui/admin-gui/src/main/webapp/WEB-INF/ctx-security.xml
    A gui/admin-gui/src/main/webapp/WEB-INF/ctx-web-security.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/PageUserTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/SpringApplicationContextTest.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestCleanStartup.java
    M gui/admin-gui/src/test/resources/ctx-test.xml
    R infra/common/src/main/java/com/evolveum/midpoint/common/security/Authorization.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/security/AuthorizationConstants.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/security/AuthorizationEvaluator.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/security/MidPointPrincipal.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/security/SecurityEnforcer.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/security/UserProfileService.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/XPathType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M model/model-api/pom.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelWebService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/importer/ObjectImporter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/Assignment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/MidpointRestAuthenticationHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/PasswordCallback.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/SpringAuthenticationInjectorInterceptor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/SpringAuthenticationJanitorInterceptor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/UserProfileServiceImpl.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/AbstractInternalModelIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/ModelWebServiceTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/controller/ControllerAddObjectTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/expr/TestModelExpressions.java
    A model/model-impl/src/test/resources/common/role-superuser.xml
    M model/model-impl/src/test/resources/common/user-administrator.xml
    M model/model-impl/src/test/resources/ctx-model-test-main.xml
    M model/model-impl/src/test/resources/ctx-model-test-no-repo.xml
    M model/model-intest/pom.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/TestPreviewChanges.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/TestUserTemplate.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/resources/common/user-capsize.xml
    M model/model-intest/src/test/resources/ctx-model-intest-test-main.xml
    A model/model-intest/src/test/resources/security/role-self.xml
    A model/model-intest/src/test/resources/security/user-lechuck.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-impl/pom.xml
    M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/TestTextFormatter.java
    M model/report-impl/pom.xml
    M model/report-impl/src/test/resources/ctx-report-test-main.xml
    M model/report-impl/src/test/resources/reports/reportUserList.xml
    M model/workflow-impl/pom.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/dao/WorkItemManager.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/itemApproval/RecordIndividualDecision.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/BaseAuditHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpRepoAccessHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/util/MiscDataUtil.java
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/util/TestAuthenticationInfoHolder.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/TestUserChangeApproval.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/general/TestGeneralChangeProcessor.java
    A model/workflow-impl/src/test/resources/common/role-superuser.xml
    M model/workflow-impl/src/test/resources/common/user-administrator.xml
    M model/workflow-impl/src/test/resources/common/users-and-roles.xml
    M model/workflow-impl/src/test/resources/ctx-workflow-test-main.xml
    M provisioning/provisioning-impl/pom.xml
    M provisioning/provisioning-impl/src/test/resources/ctx-provisioning-test-main.xml
    M provisioning/provisioning-impl/src/test/resources/ctx-provisioning-test-no-repo.xml
    M repo/pom.xml
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    A repo/security-api/pom.xml
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/Authorization.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/MidPointPrincipal.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java
    A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/UserProfileService.java
    A repo/security-api/testng.xml
    A repo/security-impl/pom.xml
    A repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    A repo/security-impl/src/main/resources/ctx-security.xml
    A repo/security-impl/testng.xml
    M repo/task-quartz-impl/pom.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/CleanupTest.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/TestQuartzTaskManagerContract.java
    M samples/samples-test/pom.xml
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSampleImport.java
    M samples/samples-test/src/test/resources/ctx-samples-test-main.xml
    M testing/consistency-mechanism/pom.xml
    M testing/consistency-mechanism/src/test/resources/ctx-consistency-test-main.xml
    M testing/longtest/pom.xml
    M testing/longtest/src/test/resources/ctx-longtest-test-main.xml
    M testing/rest/src/test/resources/ctx-rest-test-main.xml
    M testing/sanity/pom.xml
    M testing/sanity/src/test/resources/ctx-sanity-test-main.xml
    M testing/story/pom.xml
    M testing/story/src/test/resources/ctx-story-test-main.xml
    M tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/BaseNinjaAction.java

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

Conflicts:
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java


  Commit: 7456b69ad5b9d645101188f13ff8aade98acf2f7
      https://github.com/Evolveum/midpoint/commit/7456b69ad5b9d645101188f13ff8aade98acf2f7
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-20 (Thu, 20 Mar 2014)

  Changed paths:
    M REPO-STATUS
    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/any/RAClob.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RADate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtensionValue.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RALong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignmentReference.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RAssignmentExtensionType.java

  Log Message:
  -----------
  added support for assigmnent extension/parameters


  Commit: ea2260590e171f0c640eabe7cea46578d2f3043b
      https://github.com/Evolveum/midpoint/commit/ea2260590e171f0c640eabe7cea46578d2f3043b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-20 (Thu, 20 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RADate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RALong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyString.java

  Log Message:
  -----------
  improved indexes on "any" tables.


  Commit: 4ee08728f916df4843322524bbb4e5a3babcb824
      https://github.com/Evolveum/midpoint/commit/4ee08728f916df4843322524bbb4e5a3babcb824
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-20 (Thu, 20 Mar 2014)

  Changed paths:
    M REPO-STATUS
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java

  Log Message:
  -----------
  repo status updated, new longtest results.


  Commit: ff631fa3faf7619f5661372bc3310fbfef41b25a
      https://github.com/Evolveum/midpoint/commit/ff631fa3faf7619f5661372bc3310fbfef41b25a
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-22 (Sat, 22 Mar 2014)

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

  Log Message:
  -----------
  added log. message before org. unit save.


  Commit: 37849ff5008f8991d69b9b3ef9629966b18e9ebe
      https://github.com/Evolveum/midpoint/commit/37849ff5008f8991d69b9b3ef9629966b18e9ebe
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/ObjectDBValidator.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/data/common/RShadow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyClob.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyContainer.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RExtensionValue.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/definition/ClassDefinitionParser.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/AnyPropertyRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerIdGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerOidGenerator.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerTypeGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

  Log Message:
  -----------
  removed m_any from m_object


  Commit: d799f952500ed4fa4b4e5d2df5403e7ff690fb84
      https://github.com/Evolveum/midpoint/commit/d799f952500ed4fa4b4e5d2df5403e7ff690fb84
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RADate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RALong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyClob.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyString.java

  Log Message:
  -----------
  fixed indexes for m_a_* tables, updated m_any_* table names


  Commit: 2021e643c0e8d72679e46f83755844b69520dd38
      https://github.com/Evolveum/midpoint/commit/2021e643c0e8d72679e46f83755844b69520dd38
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml

  Log Message:
  -----------
  added assignment extension to objects.xml


  Commit: 1f44a2d169a0430f49718219be7494b468563fde
      https://github.com/Evolveum/midpoint/commit/1f44a2d169a0430f49718219be7494b468563fde
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrgRestriction.java

  Log Message:
  -----------
  fixed querying org. structure for sql server.


  Commit: 9dd80fdd84c12fd6b02b6d12996c80d6ad9be681
      https://github.com/Evolveum/midpoint/commit/9dd80fdd84c12fd6b02b6d12996c80d6ad9be681
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.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
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAClob.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RADate.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtClob.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtDate.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtLong.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtPolyString.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtReference.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtString.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtValue.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtensionValue.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RALong.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAPolyString.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAReference.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAString.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyClob.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyDate.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyLong.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyPolyString.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyReference.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAssignmentExtension.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RExtensionValue.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtClob.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtDate.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtLong.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtPolyString.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtReference.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtString.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtValue.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

  Log Message:
  -----------
  proper naming for "any" tables.


  Commit: 8f2b1a13e0eb695ab434107f69f0d4cdc0e51600
      https://github.com/Evolveum/midpoint/commit/8f2b1a13e0eb695ab434107f69f0d4cdc0e51600
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtClob.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtClob.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtString.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAClobId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RADateId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtClobId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtDateId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtLongId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtPolyStringId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtReferenceId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtStringId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RALongId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAPolyStringId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAReferenceId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAStringId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyClobId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyContainerId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyDateId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyLongId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyPolyStringId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyReferenceId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyStringId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtClobId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtDateId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtLongId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtPolyStringId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtReferenceId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtStringId.java

  Log Message:
  -----------
  renamed id classes.


  Commit: 273192df03c05f2bf90945c29662a67c5d255302
      https://github.com/Evolveum/midpoint/commit/273192df03c05f2bf90945c29662a67c5d255302
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtDate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtLong.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtPolyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/AnyPropertyRestriction.java

  Log Message:
  -----------
  yet another index improvements for "any" tables


  Commit: 34c5c90f1657c1fc0fd44aa6cfcd8fbf22c68bc4
      https://github.com/Evolveum/midpoint/commit/34c5c90f1657c1fc0fd44aa6cfcd8fbf22c68bc4
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M README
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.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/users/component/TreeTablePanel.properties

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


  Commit: 55c36bd8bd74fa235388fc30b5da296bd994ce02
      https://github.com/Evolveum/midpoint/commit/55c36bd8bd74fa235388fc30b5da296bd994ce02
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/api/transports/MailTransport.java

  Log Message:
  -----------
  Protecting SMTP password (MID-1781).


  Commit: 5c2c4c323f61b8b5d801bfa5ae99088242a90f8b
      https://github.com/Evolveum/midpoint/commit/5c2c4c323f61b8b5d801bfa5ae99088242a90f8b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/api/transports/MailTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/notifiers/GeneralNotifier.java

  Log Message:
  -----------
  Fixing diacritics in mail notification messages (MID-1782).


  Commit: ffc05922384ee4478a85365b728f801bafb65834
      https://github.com/Evolveum/midpoint/commit/ffc05922384ee4478a85365b728f801bafb65834
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/api/transports/MailTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/notifiers/GeneralNotifier.java

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


  Commit: ef80b950aebafccf2e85f434bae7e9b7f1326472
      https://github.com/Evolveum/midpoint/commit/ef80b950aebafccf2e85f434bae7e9b7f1326472
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

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

  Log Message:
  -----------
  fix for  MID-1787 couldn't create/save org. unit.


  Commit: a6a51173f5647a43c35d99b1fe598ad152cb04c4
      https://github.com/Evolveum/midpoint/commit/a6a51173f5647a43c35d99b1fe598ad152cb04c4
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

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

  Log Message:
  -----------
  minor refactoring + comments for erik.


  Commit: 4f3957cb9316211c83c840c82366bb193066c8e4
      https://github.com/Evolveum/midpoint/commit/4f3957cb9316211c83c840c82366bb193066c8e4
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/crypto/CryptoUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd

  Log Message:
  -----------
  Ensuring the encryption of mail/sms passwords, unfortunately by brutal hack for now (MID-1781).


  Commit: 174f269d6e4649125506335db63a706d4f2db7d0
      https://github.com/Evolveum/midpoint/commit/174f269d6e4649125506335db63a706d4f2db7d0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

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

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


  Commit: 84e93374ca9c463c689312f5ba4addddf1b9a38c
      https://github.com/Evolveum/midpoint/commit/84e93374ca9c463c689312f5ba4addddf1b9a38c
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java

  Log Message:
  -----------
  fixing test in query interpreter.


  Commit: c781020062568487f435a786456a15fb0a9f4abc
      https://github.com/Evolveum/midpoint/commit/c781020062568487f435a786456a15fb0a9f4abc
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/DeleteTest.java

  Log Message:
  -----------
  disabling failing delete test.


  Commit: 4406aec5b6e8971ade5699e8c38f36c8bf772157
      https://github.com/Evolveum/midpoint/commit/4406aec5b6e8971ade5699e8c38f36c8bf772157
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java

  Log Message:
  -----------
  compile typo fix


  Commit: 92c16cce536340c905d97245df9925a98ba898da
      https://github.com/Evolveum/midpoint/commit/92c16cce536340c905d97245df9925a98ba898da
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M README
    M config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.3/h2/h2-2.3.sql
    M config/sql/midpoint/2.3/mysql/mysql-2.3.sql
    M config/sql/midpoint/2.3/oracle/oracle-2.3.sql
    M config/sql/midpoint/2.3/postgresql/postgresql-2.3.sql
    M config/sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTableDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/SimplePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.html
    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/dto/RoleDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgUnitBrowser.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/users/component/TreeTablePanel.properties
    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/110-report-user-list.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/crypto/CryptoUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelCrudService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelWebService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/expr/MidpointFunctionsImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/security/role-filter-object-caribbean.xml
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/api/transports/MailTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/notifiers/GeneralNotifier.java
    M model/report-impl/src/test/resources/reports/reportAuditLogs.xml
    M model/report-impl/src/test/resources/reports/reportReconciliation.xml
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/general/TestGeneralChangeProcessor.java
    A model/workflow-impl/src/test/resources/model-context.xml
    A model/workflow-impl/src/test/resources/task.xml
    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/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    A samples/objects/security-policy.xml
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java
    M tools/repo-ninja/pom.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'github/master'

Conflicts:
	model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/general/TestGeneralChangeProcessor.java
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RContainerType.java
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java


  Commit: 1881671606807678dfb82f1c938edbdc707a63b1
      https://github.com/Evolveum/midpoint/commit/1881671606807678dfb82f1c938edbdc707a63b1
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RObjectType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java

  Log Message:
  -----------
  # Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java
#	modified:   repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RObjectType.java
#	modified:   repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java
#


  Commit: c5761cb84142af766674b6da705f1af7b67166d8
      https://github.com/Evolveum/midpoint/commit/c5761cb84142af766674b6da705f1af7b67166d8
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    A 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

  Log Message:
  -----------
  org. closure manager prepared, not yet finished.


  Commit: c64965ff41d01914257044bc696ebcd8035c5df9
      https://github.com/Evolveum/midpoint/commit/c64965ff41d01914257044bc696ebcd8035c5df9
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensUtil.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestRepositoryPerformance.java
    A testing/longtest/src/test/resources/common/object-template-org.xml
    M testing/longtest/src/test/resources/common/resource-opendj-generic-sync.xml
    M testing/longtest/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Making TestRepositoryPerformance.test100TreeImport work. Some logging improvements.


  Commit: 93ea14fe87fc9ac03d9298e70c7b8f25b40f1441
      https://github.com/Evolveum/midpoint/commit/93ea14fe87fc9ac03d9298e70c7b8f25b40f1441
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    A testing/longtest/src/test/resources/schema/orgsync.xsd

  Log Message:
  -----------
  Forgotten file.


  Commit: 24a4d133685e93b0031476adaab7d1289e2a8d1c
      https://github.com/Evolveum/midpoint/commit/24a4d133685e93b0031476adaab7d1289e2a8d1c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Attept to do more work on security - needs to be postponed until the parser branch is merged.


  Commit: e7bf14a639c7ba382c4d6d001268c421a9ef0781
      https://github.com/Evolveum/midpoint/commit/e7bf14a639c7ba382c4d6d001268c421a9ef0781
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/DeleteTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java

  Log Message:
  -----------
  fixed deleting objects with assignment/createApproverRef


  Commit: eb9ea70464c5641bd033c29e38a8fc917fb260d9
      https://github.com/Evolveum/midpoint/commit/eb9ea70464c5641bd033c29e38a8fc917fb260d9
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyUser.java
    A repo/repo-sql-impl-test/src/test/resources/basic/t002.xml
    A repo/repo-sql-impl-test/src/test/resources/basic/t003.xml
    A repo/repo-sql-impl-test/src/test/resources/basic/user-big.xml
    M repo/repo-sql-impl-test/src/test/resources/schema/extension.xsd

  Log Message:
  -----------
  simple tests to check hibernate lazy merge optimization, not finished yet.


  Commit: ddb21bf2ff1976bb9a76a42a8a4c632ff2554b86
      https://github.com/Evolveum/midpoint/commit/ddb21bf2ff1976bb9a76a42a8a4c632ff2554b86
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

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

  Log Message:
  -----------
  MID-1791 - fixed incorrent handling of parent org unit addition to created Org Unit.


  Commit: 9c395cbff7fd2b8b6dcd206e2e578e508d4e8784
      https://github.com/Evolveum/midpoint/commit/9c395cbff7fd2b8b6dcd206e2e578e508d4e8784
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

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

  Log Message:
  -----------
  MID-1789 fix - user is now able to delete parent org units in org unit editor.


  Commit: 3c547ea21a1f805bf49c3901327873fb33a77d20
      https://github.com/Evolveum/midpoint/commit/3c547ea21a1f805bf49c3901327873fb33a77d20
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensUtil.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ShadowConstraintsChecker.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusConstraintsChecker.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ProjectionValuesProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ShadowConstraintsChecker.java

  Log Message:
  -----------
  Focal iteration support (MID-1771) work in progress


  Commit: 72cf98994e9bff7ba426d07f36a8f6f4bc94d072
      https://github.com/Evolveum/midpoint/commit/72cf98994e9bff7ba426d07f36a8f6f4bc94d072
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

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

  Log Message:
  -----------
  MID-1756 - one more small fix.


  Commit: 3f68bd36e25462e314721c87543d607ac6bc8bd3
      https://github.com/Evolveum/midpoint/commit/3f68bd36e25462e314721c87543d607ac6bc8bd3
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultiValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensUtil.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java
    A testing/longtest/src/test/resources/common/object-template-org.xml
    M testing/longtest/src/test/resources/common/resource-opendj-generic-sync.xml
    M testing/longtest/src/test/resources/logback-test.xml
    A testing/longtest/src/test/resources/schema/orgsync.xsd

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

Conflicts:
	testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java


  Commit: 0b0e7589f0dd932207723966f3e6518f8a1bc4ac
      https://github.com/Evolveum/midpoint/commit/0b0e7589f0dd932207723966f3e6518f8a1bc4ac
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyUser.java
    A repo/repo-sql-impl-test/src/test/resources/basic/t004.xml
    M repo/repo-sql-impl-test/src/test/resources/basic/user-big.xml

  Log Message:
  -----------
  created failing test for parentOrgRefs, disabled for now. repository operation fails, but should fail differently (or fix it properly).


  Commit: df639649f3f6fb8e89357fffa1e3e1872026ad75
      https://github.com/Evolveum/midpoint/commit/df639649f3f6fb8e89357fffa1e3e1872026ad75
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java

  Log Message:
  -----------
  compile fix for longtests


  Commit: 4f0d5636a42aa00c7b576de4313fc0ab98daf9f5
      https://github.com/Evolveum/midpoint/commit/4f0d5636a42aa00c7b576de4313fc0ab98daf9f5
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypeDialog.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/PageRole.properties
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.properties

  Log Message:
  -----------
  MID-1772 - fixed + some minor code cleanup based on Notes from Vilo.


  Commit: 267dfad63fcdeab12cae7ca89f01d594ab5a9b94
      https://github.com/Evolveum/midpoint/commit/267dfad63fcdeab12cae7ca89f01d594ab5a9b94
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusPolicyProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    A model/model-intest/src/test/resources/iteration/resource-dummy-dark-violet.xml
    A model/model-intest/src/test/resources/iteration/task-dumy-dark-violet-livesync.xml
    A model/model-intest/src/test/resources/iteration/user-template-iteration.xml
    M model/model-intest/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Focus iteration tests (still work in progress)


  Commit: b2db4706f335f1c68b679246f49baff9ac187324
      https://github.com/Evolveum/midpoint/commit/b2db4706f335f1c68b679246f49baff9ac187324
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypeDialog.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/PageRole.properties
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java

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


  Commit: 428f21726597bb8c7ca68a4fd27f78cf9222f99b
      https://github.com/Evolveum/midpoint/commit/428f21726597bb8c7ca68a4fd27f78cf9222f99b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java

  Log Message:
  -----------
  added iterator to repo impl


  Commit: a704c2b591a741428e94fe0a3f74b0004aceab86
      https://github.com/Evolveum/midpoint/commit/a704c2b591a741428e94fe0a3f74b0004aceab86
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ProjectionValuesProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
    M model/model-intest/src/test/resources/iteration/resource-dummy-dark-violet.xml

  Log Message:
  -----------
  Focal iteration seems to work (MID-1771)


  Commit: 355ecd4b367eb73d3c9593de7d16af7f166f75d4
      https://github.com/Evolveum/midpoint/commit/355ecd4b367eb73d3c9593de7d16af7f166f75d4
  Author: garbika <garbika at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M config/sql/midpoint/2.3/h2/h2-2.3.sql
    M config/sql/midpoint/2.3/mysql/mysql-2.3.sql
    M config/sql/midpoint/2.3/oracle/oracle-2.3.sql
    M config/sql/midpoint/2.3/postgresql/postgresql-2.3.sql
    M config/sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql

  Log Message:
  -----------
  new iteration attribut in object template


  Commit: 85878800c9cf63e1df7cd59d84164cec8d46857d
      https://github.com/Evolveum/midpoint/commit/85878800c9cf63e1df7cd59d84164cec8d46857d
  Author: garbika <garbika at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql

  Log Message:
  -----------
  upgrade databases scripts - new attribut iteration in table m_object_template


  Commit: 4ed5eef218bd3861f66a7307f18752cca34e1d42
      https://github.com/Evolveum/midpoint/commit/4ed5eef218bd3861f66a7307f18752cca34e1d42
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

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

  Log Message:
  -----------
  Fixing the iteration-related issues of "null name".


  Commit: 5794d9c42598e814d588e1a8ff2add9f5710c35f
      https://github.com/Evolveum/midpoint/commit/5794d9c42598e814d588e1a8ff2add9f5710c35f
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/AbstractSchemaTest.java

  Log Message:
  -----------
  Work in progress


  Commit: 9e8caec74db4eafcddfae35dc95f71052820e3b1
      https://github.com/Evolveum/midpoint/commit/9e8caec74db4eafcddfae35dc95f71052820e3b1
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    A infra/schema/src/test/resources/common/role-construction.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/AbstractInternalModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java

  Log Message:
  -----------
  Work in progress on recompte test + some schema tests


  Commit: 2c42d3866c09dca9f9299556e077a4aaf8c4e2ff
      https://github.com/Evolveum/midpoint/commit/2c42d3866c09dca9f9299556e077a4aaf8c4e2ff
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.3/h2/h2-2.3.sql
    M config/sql/midpoint/2.3/mysql/mysql-2.3.sql
    M config/sql/midpoint/2.3/oracle/oracle-2.3.sql
    M config/sql/midpoint/2.3/postgresql/postgresql-2.3.sql
    M config/sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql

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


  Commit: 32a718c01417883be45376a26e8d8a371ffdec05
      https://github.com/Evolveum/midpoint/commit/32a718c01417883be45376a26e8d8a371ffdec05
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/AbstractSchemaTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java

  Log Message:
  -----------
  Compilation fix. Sorry.


  Commit: c3204aa4c74f069a2bb80ae038d78d62e87abb1a
      https://github.com/Evolveum/midpoint/commit/c3204aa4c74f069a2bb80ae038d78d62e87abb1a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M model/workflow-impl/pom.xml

  Log Message:
  -----------
  Fixed repo-test-util dependency in workflow-impl.


  Commit: 4ad1df9eb787ebee0f1ba4cf5920d29ac31797bb
      https://github.com/Evolveum/midpoint/commit/4ad1df9eb787ebee0f1ba4cf5920d29ac31797bb
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java

  Log Message:
  -----------
  Added givenName change operation in model-client-sample.


  Commit: 084543c7a9950b3764ec0b6787e2f0402c1dd239
      https://github.com/Evolveum/midpoint/commit/084543c7a9950b3764ec0b6787e2f0402c1dd239
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/AbstractSchemaTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    A infra/schema/src/test/resources/common/role-construction.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusPolicyProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/AbstractInternalModelIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjector.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java

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


  Commit: b645e45d7192b3dfd58e489d43b5ef8fa56b2e06
      https://github.com/Evolveum/midpoint/commit/b645e45d7192b3dfd58e489d43b5ef8fa56b2e06
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd

  Log Message:
  -----------
  Iteration and iterationToken in FocusType


  Commit: 70a7d06e3c1b9d53fbd8284008ac694a15a2be7c
      https://github.com/Evolveum/midpoint/commit/70a7d06e3c1b9d53fbd8284008ac694a15a2be7c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    M infra/schema/testng.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java

  Log Message:
  -----------
  TestRecomputeTask and delta tests - disabled, work in progress


  Commit: a850546a713a941aaa00be3fd8471e0f797e33a2
      https://github.com/Evolveum/midpoint/commit/a850546a713a941aaa00be3fd8471e0f797e33a2
  Author: garbika <garbika at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M model/report-impl/src/test/resources/reports/reportReconciliation.xml

  Log Message:
  -----------
  fix MID-1801 Reconciliation report cannot be imported from XML - bad schema


  Commit: 028995d5b30babb9e2765516c087650d8153502d
      https://github.com/Evolveum/midpoint/commit/028995d5b30babb9e2765516c087650d8153502d
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageUser_sk_SK.utf8.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultiValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypeDialog.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/users/PageOrgUnit.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/PageUser.properties

  Log Message:
  -----------
  fixes for MID-1798 and MID-1776


  Commit: a3b1c9a5b27a814d1336808403f25e3530310c4b
      https://github.com/Evolveum/midpoint/commit/a3b1c9a5b27a814d1336808403f25e3530310c4b
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java

  Log Message:
  -----------
  updated repo impl after schema changes.


  Commit: bb704fabd1bf29c633e6813f6d8944854a1232ce
      https://github.com/Evolveum/midpoint/commit/bb704fabd1bf29c633e6813f6d8944854a1232ce
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M config/sql/midpoint/2.3/h2/h2-2.3.sql
    M config/sql/midpoint/2.3/mysql/mysql-2.3.sql
    M config/sql/midpoint/2.3/oracle/oracle-2.3.sql
    M config/sql/midpoint/2.3/postgresql/postgresql-2.3.sql
    M config/sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql

  Log Message:
  -----------
  updated main 2.3 scripts, added 2 columns based on repo changes.


  Commit: 0f8b659e1ad48fd62115fc85bc81bb8160017e01
      https://github.com/Evolveum/midpoint/commit/0f8b659e1ad48fd62115fc85bc81bb8160017e01
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.3/h2/h2-2.3.sql
    M config/sql/midpoint/2.3/mysql/mysql-2.3.sql
    M config/sql/midpoint/2.3/oracle/oracle-2.3.sql
    M config/sql/midpoint/2.3/postgresql/postgresql-2.3.sql
    M config/sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageUser_sk_SK.utf8.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultiValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypeDialog.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/PageRole.properties
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.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/PageUser.properties
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/AbstractSchemaTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    A infra/schema/src/test/resources/common/role-construction.xml
    M infra/schema/testng.xml
    M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensUtil.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ShadowConstraintsChecker.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusConstraintsChecker.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ProjectionValuesProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ShadowConstraintsChecker.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/AbstractInternalModelIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjector.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/sync/TestRecomputeTask.java
    A model/model-intest/src/test/resources/iteration/resource-dummy-dark-violet.xml
    A model/model-intest/src/test/resources/iteration/task-dumy-dark-violet-livesync.xml
    A model/model-intest/src/test/resources/iteration/user-template-iteration.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M model/report-impl/src/test/resources/reports/reportReconciliation.xml
    M model/workflow-impl/pom.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java

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

Conflicts:
	repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java


  Commit: bbf2d08755abba412f25655eadf3f04529584856
      https://github.com/Evolveum/midpoint/commit/bbf2d08755abba412f25655eadf3f04529584856
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml

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

Conflicts:
	repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch repository
# Changes to be committed:
#
#	modified:   ../../config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql
#	modified:   ../../config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql
#	modified:   ../../config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql
#	modified:   ../../config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql
#	modified:   ../../config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql
#	modified:   ../../config/sql/midpoint/2.3/h2/h2-2.3.sql
#	modified:   ../../config/sql/midpoint/2.3/mysql/mysql-2.3.sql
#	modified:   ../../config/sql/midpoint/2.3/oracle/oracle-2.3.sql
#	modified:   ../../config/sql/midpoint/2.3/postgresql/postgresql-2.3.sql
#	modified:   ../../config/sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql
#	modified:   ../../gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageUser_sk_SK.utf8.properties
#	modified:   ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultiValueChoosePanel.java
#	modified:   ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypeDialog.java
#	modified:   ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
#	modified:   ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.properties
#	deleted:    ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.html
#	deleted:    ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.java
#	deleted:    ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.properties
#	modified:   ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
#	modified:   ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
#	modified:   ../../gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.properties
#	modified:   ../../gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
#	modified:   ../../infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
#	modified:   ../../infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
#	new file:   ../../infra/schema/src/test/java/com/evolveum/midpoint/schema/AbstractSchemaTest.java
#	modified:   ../../infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
#	new file:   ../../infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
#	new file:   ../../infra/schema/src/test/resources/common/role-construction.xml
#	modified:   ../../infra/schema/testng.xml
#	modified:   ../../model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
#	modified:   ../../model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensElementContext.java
#	modified:   ../../model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensUtil.java
#	new file:   ../../model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusConstraintsChecker.java
#	modified:   ../../model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusPolicyProcessor.java
#	modified:   ../../model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ProjectionValuesProcessor.java
#	renamed:    ../../model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ShadowConstraintsChecker.java -> ../../model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ShadowConstraintsChecker.java
#	modified:   ../../model/model-impl/src/test/java/com/evolveum/midpoint/model/AbstractInternalModelIntegrationTest.java
#	modified:   ../../model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjector.java
#	modified:   ../../model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestIteration.java
#	modified:   ../../model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
#	new file:   ../../model/model-intest/src/test/resources/iteration/resource-dummy-dark-violet.xml
#	new file:   ../../model/model-intest/src/test/resources/iteration/task-dumy-dark-violet-livesync.xml
#	new file:   ../../model/model-intest/src/test/resources/iteration/user-template-iteration.xml
#	modified:   ../../model/model-intest/src/test/resources/logback-test.xml
#	modified:   ../../model/report-impl/src/test/resources/reports/reportReconciliation.xml
#	modified:   ../../model/workflow-impl/pom.xml
#	modified:   ../repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
#	modified:   ../../samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   src/test/resources/basic/objects.xml
#


  Commit: abb24fe06072f8f6d75ed48efbc79ac3c9bc52cf
      https://github.com/Evolveum/midpoint/commit/abb24fe06072f8f6d75ed48efbc79ac3c9bc52cf
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    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

  Log Message:
  -----------
  introduced named queries, not all transformed to named queries yet.


  Commit: bfe5907f8ec59972381df1552dcf62059a203958
      https://github.com/Evolveum/midpoint/commit/bfe5907f8ec59972381df1552dcf62059a203958
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    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
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java

  Log Message:
  -----------
  fixed branch hopefully


  Commit: e32b592e46b14567974b5fb790095b212a8ef210
      https://github.com/Evolveum/midpoint/commit/e32b592e46b14567974b5fb790095b212a8ef210
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

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

  Log Message:
  -----------
  max locking attempts reverted to 40


  Commit: 0176f7e9b018a00280dca87dfba4b6a0264665ad
      https://github.com/Evolveum/midpoint/commit/0176f7e9b018a00280dca87dfba4b6a0264665ad
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-03-29 (Sat, 29 Mar 2014)

  Changed paths:
    A REPO-STATUS
    M config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql
    M config/sql/midpoint/2.3/h2/h2-2.3.sql
    M config/sql/midpoint/2.3/mysql/mysql-2.3.sql
    M config/sql/midpoint/2.3/oracle/oracle-2.3.sql
    M config/sql/midpoint/2.3/postgresql/postgresql-2.3.sql
    M config/sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageUser_sk_SK.utf8.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultiValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypeDialog.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/PageRole.properties
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.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/PageUser.properties
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/crypto/CryptoUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/AbstractSchemaTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    A infra/schema/src/test/resources/common/role-construction.xml
    M infra/schema/testng.xml
    M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensUtil.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ShadowConstraintsChecker.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusConstraintsChecker.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/FocusPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ProjectionValuesProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ShadowConstraintsChecker.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/AbstractInternalModelIntegrationTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjector.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/sync/TestRecomputeTask.java
    A model/model-intest/src/test/resources/iteration/resource-dummy-dark-violet.xml
    A model/model-intest/src/test/resources/iteration/task-dumy-dark-violet-livesync.xml
    A model/model-intest/src/test/resources/iteration/user-template-iteration.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/api/transports/MailTransport.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/notifiers/GeneralNotifier.java
    M model/report-impl/src/test/resources/reports/reportReconciliation.xml
    M model/report-impl/testng.xml
    M model/workflow-impl/pom.xml
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/general/TestGeneralChangeProcessor.java
    M repo/repo-sql-impl-test/sample-configurations/sqlserver.properties
    M repo/repo-sql-impl-test/src/main/resources/ctx-repository-session.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/CleanupTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/DeleteTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyUser.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgClosureTest.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/QueryInterpreterTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/RAnyConverterStaticTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SpringApplicationContextTest.java
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/ObjectDBValidator.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    A repo/repo-sql-impl-test/src/test/resources/basic/t002.xml
    A repo/repo-sql-impl-test/src/test/resources/basic/t003.xml
    A repo/repo-sql-impl-test/src/test/resources/basic/t004.xml
    A repo/repo-sql-impl-test/src/test/resources/basic/user-big.xml
    M repo/repo-sql-impl-test/src/test/resources/schema/extension.xsd
    A 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/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RAuditEventRecord.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/Metadata.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAnyContainer.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAnyConverter.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAssignment.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAuthorization.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnector.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RContainer.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RExclusion.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RMetadata.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/data/common/RObjectReference.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROperationResult.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrgClosure.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrgIncorrect.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROwnable.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSecurityPolicy.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSynchronizationSituationDescription.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTrigger.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtClob.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtDate.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtLong.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtPolyString.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtReference.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtString.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtValue.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyClob.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyDate.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyLong.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyPolyString.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyReference.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyString.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyValue.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAssignmentExtension.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtClob.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtDate.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtLong.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtPolyString.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtReference.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtString.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/ROExtValue.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/Container.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignmentReference.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAuthorization.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RExclusion.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RTrigger.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/RCredentials.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedReference.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtClobId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtDateId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtLongId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtPolyStringId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtReferenceId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtStringId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyClobId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyContainerId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyDateId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyLongId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyPolyStringId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyReferenceId.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAnyStringId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAssignmentExtensionId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RCObjectReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RContainerId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RMetadataId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtClobId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtDateId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtLongId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtPolyStringId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtReferenceId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtStringId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RObjectReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RSynchronizationSituationDescriptionId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RCReferenceOwner.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RContainerType.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RObjectType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RReferenceOwner.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RACreateApproverRef.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RAModifyApproverRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RAccountRef.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RAssignmentExtensionType.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/RLinkRef.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/type/ROrgRootRef.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/MetadataFactory.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/factory/ObjectReferenceFactory.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/poc/RAA.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/poc/RACId.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/poc/RAO.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/poc/RAR.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryDefinitionRegistry.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryInterpreter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/definition/ClassDefinitionParser.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/AnyPropertyRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrgRestriction.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ReferenceRestriction.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/type/QNameType.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/type/package-info.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ClassMapper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerIdGenerator.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerOidGenerator.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ContainerTypeGenerator.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/ObjectOidGenerator.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/PrismIdentifierGenerator.java
    M repo/repo-sql-impl/src/main/resources/ctx-repository-session.xml
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    A testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java
    A testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestOrgHierarchy.java
    R testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestRepositoryPerformance.java
    A testing/longtest/src/test/resources/common/object-template-org.xml
    M testing/longtest/src/test/resources/common/resource-opendj-generic-sync.xml
    M testing/longtest/src/test/resources/logback-test.xml
    A testing/longtest/src/test/resources/schema/orgsync.xsd
    M testing/longtest/testng.xml

  Log Message:
  -----------
  Merge branch 'repository' into parser

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoleOld.java
	infra/common/src/main/java/com/evolveum/midpoint/common/crypto/CryptoUtil.java
	repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
	repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.java
	repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
	repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RAbstractRole.java
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RConnectorHost.java
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectReference.java
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObjectTemplate.java
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RShadow.java
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RSystemConfiguration.java
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RValuePolicy.java
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAExtReference.java
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/RCapabilities.java
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/REmbeddedReference.java
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
	repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java


  Commit: dacda763e16c57b422b4466ea11976aa1c0ad2a1
      https://github.com/Evolveum/midpoint/commit/dacda763e16c57b422b4466ea11976aa1c0ad2a1
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-03-29 (Sat, 29 Mar 2014)

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

  Log Message:
  -----------
  fixing compilation failures..


  Commit: 55fb8b295e3fda6a8942f2fa17b305c11ee4ce55
      https://github.com/Evolveum/midpoint/commit/55fb8b295e3fda6a8942f2fa17b305c11ee4ce55
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-03-29 (Sat, 29 Mar 2014)

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluator.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/api/transports/MailTransport.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/RAbstractRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RTask.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  more compilation fixes..


  Commit: 3e81e7ba30cd08a45adbe5ed18db720b64a89512
      https://github.com/Evolveum/midpoint/commit/3e81e7ba30cd08a45adbe5ed18db720b64a89512
  Author: katkav <katka.valalikova at evolveum.com>
  Date:   2014-03-29 (Sat, 29 Mar 2014)

  Changed paths:
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    M samples/model-client-sample/pom.xml
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java

  Log Message:
  -----------
  more compilation fixes..(build successful, tests skipped)


Compare: https://github.com/Evolveum/midpoint/compare/9bc6fe960bf4...3e81e7ba30cd