[midPoint-git] [Evolveum/midpoint] 75d706: json parsing..

katkav k.valalikova at evolveum.com
Mon Apr 14 18:37:16 CEST 2014


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 75d706edf6836dc7cdf70a26eda6c630b10e6753
      https://github.com/Evolveum/midpoint/commit/75d706edf6836dc7cdf70a26eda6c630b10e6753
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.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/controller/ControllerModifyObjectTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelCrudService.java
    M samples/rest/modification-assign-account.xml
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java

  Log Message:
  -----------
  json parsing..


  Commit: 2a4dcad5514de4d869f89b24a13a05db0cd5d405
      https://github.com/Evolveum/midpoint/commit/2a4dcad5514de4d869f89b24a13a05db0cd5d405
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

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

  Log Message:
  -----------
  json parsing tests..


  Commit: 90bfe5c774dc9af6fceb1b11ceb818269c6ec01c
      https://github.com/Evolveum/midpoint/commit/90bfe5c774dc9af6fceb1b11ceb818269c6ec01c
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M infra/prism/testng.xml

  Log Message:
  -----------
  json testing


  Commit: 2247600d02b357409c62e79f7feecdbf9be3034a
      https://github.com/Evolveum/midpoint/commit/2247600d02b357409c62e79f7feecdbf9be3034a
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJsonParsing.java
    A infra/schema/src/test/resources/common/json/resource-opendj.json

  Log Message:
  -----------
  jason parsin implementation..


  Commit: 2177c7eb70b96ac54c58ff2cd942d7c90dad4962
      https://github.com/Evolveum/midpoint/commit/2177c7eb70b96ac54c58ff2cd942d7c90dad4962
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java

  Log Message:
  -----------
  integration tests for rest..


  Commit: 327451e350cd5222d30d7fce100131e4db2d5792
      https://github.com/Evolveum/midpoint/commit/327451e350cd5222d30d7fce100131e4db2d5792
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java
    A testing/rest/src/test/resources/repo/account-chuck.xml

  Log Message:
  -----------
  rest integration tests..


  Commit: d23c547cf5c6d0088cd772cc526839c5344fcd49
      https://github.com/Evolveum/midpoint/commit/d23c547cf5c6d0088cd772cc526839c5344fcd49
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-12 (Sun, 12 Jan 2014)

  Changed paths:
    M build-system/pom.xml
    R config/activiti/activiti.db2.create.engine.sql
    R config/activiti/activiti.db2.create.history.sql
    R config/activiti/activiti.db2.create.identity.sql
    R config/activiti/activiti.db2.drop.engine.sql
    R config/activiti/activiti.db2.drop.history.sql
    R config/activiti/activiti.db2.drop.identity.sql
    R config/activiti/activiti.h2.create.engine.sql
    R config/activiti/activiti.h2.create.history.sql
    R config/activiti/activiti.h2.create.identity.sql
    R config/activiti/activiti.h2.drop.engine.sql
    R config/activiti/activiti.h2.drop.history.sql
    R config/activiti/activiti.h2.drop.identity.sql
    R config/activiti/activiti.mssql.create.engine.sql
    R config/activiti/activiti.mssql.create.history.sql
    R config/activiti/activiti.mssql.create.identity.sql
    R config/activiti/activiti.mssql.drop.engine.sql
    R config/activiti/activiti.mssql.drop.history.sql
    R config/activiti/activiti.mssql.drop.identity.sql
    R config/activiti/activiti.mysql.create.engine.sql
    R config/activiti/activiti.mysql.create.history.sql
    R config/activiti/activiti.mysql.create.identity.sql
    R config/activiti/activiti.mysql.drop.engine.sql
    R config/activiti/activiti.mysql.drop.history.sql
    R config/activiti/activiti.mysql.drop.identity.sql
    R config/activiti/activiti.oracle.create.engine.sql
    R config/activiti/activiti.oracle.create.history.sql
    R config/activiti/activiti.oracle.create.identity.sql
    R config/activiti/activiti.oracle.drop.engine.sql
    R config/activiti/activiti.oracle.drop.history.sql
    R config/activiti/activiti.oracle.drop.identity.sql
    R config/activiti/activiti.postgres.create.engine.sql
    R config/activiti/activiti.postgres.create.history.sql
    R config/activiti/activiti.postgres.create.identity.sql
    R config/activiti/activiti.postgres.drop.engine.sql
    R config/activiti/activiti.postgres.drop.history.sql
    R config/activiti/activiti.postgres.drop.identity.sql
    A config/eclipse/codetemplates.xml
    A config/eclipse/formatter-profile-midpoint.xml
    R config/h2-schema.sql
    R config/h2-upgrade-2.2-to-2.3.sql
    R config/mysql-schema.sql
    R config/mysql-upgrade-2.2-to-2.3.sql
    R config/oracle-schema.sql
    R config/oracle-upgrade-2.2-to-2.3.sql
    R config/postgresql-schema.sql
    R config/postgresql-upgrade-2.2-to-2.3.sql
    R config/quartz/tables_h2.sql
    R config/quartz/tables_mysql.sql
    R config/quartz/tables_mysql_innodb.sql
    R config/quartz/tables_oracle.sql
    R config/quartz/tables_postgres.sql
    R config/quartz/tables_sqlServer.sql
    A config/sql/activiti/activiti.db2.create.engine.sql
    A config/sql/activiti/activiti.db2.create.history.sql
    A config/sql/activiti/activiti.db2.create.identity.sql
    A config/sql/activiti/activiti.db2.drop.engine.sql
    A config/sql/activiti/activiti.db2.drop.history.sql
    A config/sql/activiti/activiti.db2.drop.identity.sql
    A config/sql/activiti/activiti.h2.create.engine.sql
    A config/sql/activiti/activiti.h2.create.history.sql
    A config/sql/activiti/activiti.h2.create.identity.sql
    A config/sql/activiti/activiti.h2.drop.engine.sql
    A config/sql/activiti/activiti.h2.drop.history.sql
    A config/sql/activiti/activiti.h2.drop.identity.sql
    A config/sql/activiti/activiti.mssql.create.engine.sql
    A config/sql/activiti/activiti.mssql.create.history.sql
    A config/sql/activiti/activiti.mssql.create.identity.sql
    A config/sql/activiti/activiti.mssql.drop.engine.sql
    A config/sql/activiti/activiti.mssql.drop.history.sql
    A config/sql/activiti/activiti.mssql.drop.identity.sql
    A config/sql/activiti/activiti.mysql.create.engine.sql
    A config/sql/activiti/activiti.mysql.create.history.sql
    A config/sql/activiti/activiti.mysql.create.identity.sql
    A config/sql/activiti/activiti.mysql.drop.engine.sql
    A config/sql/activiti/activiti.mysql.drop.history.sql
    A config/sql/activiti/activiti.mysql.drop.identity.sql
    A config/sql/activiti/activiti.oracle.create.engine.sql
    A config/sql/activiti/activiti.oracle.create.history.sql
    A config/sql/activiti/activiti.oracle.create.identity.sql
    A config/sql/activiti/activiti.oracle.drop.engine.sql
    A config/sql/activiti/activiti.oracle.drop.history.sql
    A config/sql/activiti/activiti.oracle.drop.identity.sql
    A config/sql/activiti/activiti.postgres.create.engine.sql
    A config/sql/activiti/activiti.postgres.create.history.sql
    A config/sql/activiti/activiti.postgres.create.identity.sql
    A config/sql/activiti/activiti.postgres.drop.engine.sql
    A config/sql/activiti/activiti.postgres.drop.history.sql
    A config/sql/activiti/activiti.postgres.drop.identity.sql
    A config/sql/midpoint/2.2/h2/h2-2.2.sql
    A config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.2.1.sql
    A config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql
    A config/sql/midpoint/2.2/mysql/mysql-2.2.sql
    A config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.2.1.sql
    A config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql
    A config/sql/midpoint/2.2/oracle/oracle-2.2.sql
    A config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.2.1.sql
    A config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql
    A config/sql/midpoint/2.2/postgresql/postgresql-2.2.sql
    A config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.2.1.sql
    A config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql
    A config/sql/midpoint/2.2/sqlserver/sqlserver-2.2.sql
    A config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.2.1.sql
    A config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql
    A config/sql/midpoint/2.3/h2/h2-2.3.sql
    A config/sql/midpoint/2.3/mysql/mysql-2.3.sql
    A config/sql/midpoint/2.3/oracle/oracle-2.3.sql
    A config/sql/midpoint/2.3/postgresql/postgresql-2.3.sql
    A config/sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql
    A config/sql/quartz/tables_h2.sql
    A config/sql/quartz/tables_mysql.sql
    A config/sql/quartz/tables_mysql_innodb.sql
    A config/sql/quartz/tables_oracle.sql
    A config/sql/quartz/tables_postgres.sql
    A config/sql/quartz/tables_sqlServer.sql
    R config/sqlserver-schema.sql
    R config/sqlserver-upgrade-2.2-to-2.3.sql
    A dist/midpoint-api/pom.xml
    M dist/pom.xml
    M gui/admin-gui-en-US/src/main/resources/Messages.localization
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/ExecuteChangeOptionsPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/assignment/ACAttributePanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/assignment/ResourceListPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/data/CountToolbar_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/dialog/ConfirmationDialog_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/dialog/UserBrowserDialog_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/input/DropDownChoicePanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/input/PasswordPanel_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/login/LoginPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/menu/top/UserMenuPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/message/FeedbackMessagePanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/message/OperationResultPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/message/TempMessagePanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/model/delta/ContainerValuePanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/model/delta/DeltaPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/model/delta/ModificationsPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/model/operationStatus/ModelOperationStatusPanel_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/orgStruct/StyledLinkLabel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/prism/PrismObjectPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/prism/PrismOptionButtonPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/prism/PrismValuePanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/decisions/DecisionsPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/deltas/WfDeltasPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/history/WfHistoryPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/workItems/WorkItemsPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wizard/WizardStep_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wizard/Wizard_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/PageBase_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/PageAdmin_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/ImportOptionsPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageAbout_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageAdminConfiguration_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageLogging_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageTest_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageTimeTest_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypeDialog_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/DebugButtonPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/ImportOptionsPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/help/PageAbout_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/help/PageAdminHelp_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/help/PageSystem_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/home/PageAdminHome_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/home/PageDashboard_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/home/PageMyPasswords_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/home/component/AsyncDashboardPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/home/component/MyAccountsPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/home/component/MyAssignmentsPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/home/component/PersonalInfoPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/home/component/SystemInfoPanel_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/internal/PageAccounts_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/PageAdminReports_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/PageReports_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/AuditPopupPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/ReconciliationPopupPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/resources/PageAdminResources_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/resources/PageResourceImport_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/resources/PageResource_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/resources/PageResources_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/resources/component/ContentPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/resources/content/PageContentEntitlements_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/roles/PageAdminRoles_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/roles/PageRole_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/roles/PageRoles_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/server/PageAdminTasks_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/server/PageTasks_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/server/subtasks/SubtasksPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/server/workflowInformation/WorkflowInformationPanel_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageAdminUsers_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageBulkUsers_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageFindUsers_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageOrgTree_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageUserPreview_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageUser_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageUsers_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/users/component/AccountOperationButtons_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/users/component/OrgUnitBrowser_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/users/component/ResourcesPopup_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstance_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/workflow/PageProcessInstances_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/workflow/ProcessInstancePanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/error/PageError_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/login/PageLogin_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/security/MidPointApplication_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/us.png
    M gui/admin-gui-sk-SK/src/main/resources/Messages.localization
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/data/CountToolbar_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/data/NavigatorPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/login/LoginPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/menu/top/UserMenuPanel_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/orgStruct/StyledLinkLabel_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/prism/PrismObjectPanel_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/settings/AccountSyncSettingsPanel_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wizard/WizardStep_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wizard/Wizard_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/NameStep_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/PageBase_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/PageAdmin_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/ImportOptionsPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageAbout_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageAdminConfiguration_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageLogging_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageTimeTest_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypeDialog_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/DebugButtonPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/ImportOptionsPanel_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/help/PageAbout_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/help/PageAdminHelp_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/help/PageSystem_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/home/PageAdminHome_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/home/PageDashboard_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/home/component/AsyncDashboardPanel_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/home/component/PersonalInfoPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/home/component/SystemInfoPanel_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/internal/PageAccounts_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/PageAdminReports_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/resources/PageResourceImport_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/resources/PageResource_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/resources/PageResources_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/roles/PageAdminRoles_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/roles/PageRole_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/server/PageAdminTasks_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/server/PageTasks_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageAdminUsers_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageFindUsers_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageOrgStruct_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageOrgTree_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageUserPreview_sk_SK.utf8.properties
    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-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageUsers_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/component/AccountOperationButtons_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/component/ExecuteChangeOptionsPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/component/OrgUnitBrowser_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/workflow/PageAdminWorkItems_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/error/PageError_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/login/PageLogin_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/security/MidPointApplication_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/sk.png
    R gui/admin-gui/misc/accept.png
    R gui/admin-gui/misc/add.png
    R gui/admin-gui/misc/application.png
    R gui/admin-gui/misc/application_add.png
    R gui/admin-gui/misc/application_delete.png
    R gui/admin-gui/misc/application_double.png
    R gui/admin-gui/misc/application_edit.png
    R gui/admin-gui/misc/application_get.png
    R gui/admin-gui/misc/application_go.png
    R gui/admin-gui/misc/application_put.png
    R gui/admin-gui/misc/application_view_list.png
    R gui/admin-gui/misc/arrow_refresh.png
    R gui/admin-gui/misc/arrow_refresh_gray.png
    R gui/admin-gui/misc/arrow_rotate_clockwise.png
    R gui/admin-gui/misc/calculator.png
    R gui/admin-gui/misc/calculator_delete.png
    R gui/admin-gui/misc/cancel.png
    R gui/admin-gui/misc/cog.png
    R gui/admin-gui/misc/computer.png
    R gui/admin-gui/misc/connect.png
    R gui/admin-gui/misc/control_play.png
    R gui/admin-gui/misc/control_play_blue.png
    R gui/admin-gui/misc/cross.png
    R gui/admin-gui/misc/custom-theme/images/searchBarArrow.png
    R gui/admin-gui/misc/custom-theme/images/ui-arrow.png
    R gui/admin-gui/misc/custom-theme/images/ui-bg_flat_0_aaaaaa_40x100.png
    R gui/admin-gui/misc/custom-theme/images/ui-bg_flat_75_ffffff_40x100.png
    R gui/admin-gui/misc/custom-theme/images/ui-bg_glass_55_fbf9ee_1x400.png
    R gui/admin-gui/misc/custom-theme/images/ui-bg_glass_65_ffffff_1x400.png
    R gui/admin-gui/misc/custom-theme/images/ui-bg_highlight-soft_75_333333_1x100.png
    R gui/admin-gui/misc/custom-theme/images/ui-bg_highlight-soft_75_acb8be_1x100.png
    R gui/admin-gui/misc/custom-theme/images/ui-bg_inset-soft_95_fef1ec_1x100.png
    R gui/admin-gui/misc/custom-theme/images/ui-icons_222222_256x240.png
    R gui/admin-gui/misc/custom-theme/images/ui-icons_2e83ff_256x240.png
    R gui/admin-gui/misc/custom-theme/images/ui-icons_454545_256x240.png
    R gui/admin-gui/misc/custom-theme/images/ui-icons_cd0a0a_256x240.png
    R gui/admin-gui/misc/custom-theme/images/ui-icons_ffffff_256x240.png
    R gui/admin-gui/misc/custom-theme/jquery-ui.css
    R gui/admin-gui/misc/database_lightning.png
    R gui/admin-gui/misc/delete.png
    R gui/admin-gui/misc/disk.png
    R gui/admin-gui/misc/door_in.png
    R gui/admin-gui/misc/drive.png
    R gui/admin-gui/misc/drive_add.png
    R gui/admin-gui/misc/drive_burn.png
    R gui/admin-gui/misc/drive_delete.png
    R gui/admin-gui/misc/drive_go.png
    R gui/admin-gui/misc/drive_go_gray.png
    R gui/admin-gui/misc/edit.png
    R gui/admin-gui/misc/error.png
    R gui/admin-gui/misc/exclamation.png
    R gui/admin-gui/misc/flag/Thumbs.db
    R gui/admin-gui/misc/flag/ad.png
    R gui/admin-gui/misc/flag/ae.png
    R gui/admin-gui/misc/flag/af.png
    R gui/admin-gui/misc/flag/ag.png
    R gui/admin-gui/misc/flag/ai.png
    R gui/admin-gui/misc/flag/al.png
    R gui/admin-gui/misc/flag/am.png
    R gui/admin-gui/misc/flag/an.png
    R gui/admin-gui/misc/flag/ao.png
    R gui/admin-gui/misc/flag/ar.png
    R gui/admin-gui/misc/flag/as.png
    R gui/admin-gui/misc/flag/at.png
    R gui/admin-gui/misc/flag/au.png
    R gui/admin-gui/misc/flag/aw.png
    R gui/admin-gui/misc/flag/ax.png
    R gui/admin-gui/misc/flag/az.png
    R gui/admin-gui/misc/flag/ba.png
    R gui/admin-gui/misc/flag/bb.png
    R gui/admin-gui/misc/flag/bd.png
    R gui/admin-gui/misc/flag/be.png
    R gui/admin-gui/misc/flag/bf.png
    R gui/admin-gui/misc/flag/bg.png
    R gui/admin-gui/misc/flag/bh.png
    R gui/admin-gui/misc/flag/bi.png
    R gui/admin-gui/misc/flag/bj.png
    R gui/admin-gui/misc/flag/bm.png
    R gui/admin-gui/misc/flag/bn.png
    R gui/admin-gui/misc/flag/bo.png
    R gui/admin-gui/misc/flag/br.png
    R gui/admin-gui/misc/flag/bs.png
    R gui/admin-gui/misc/flag/bt.png
    R gui/admin-gui/misc/flag/bv.png
    R gui/admin-gui/misc/flag/bw.png
    R gui/admin-gui/misc/flag/by.png
    R gui/admin-gui/misc/flag/bz.png
    R gui/admin-gui/misc/flag/ca.png
    R gui/admin-gui/misc/flag/catalonia.png
    R gui/admin-gui/misc/flag/cc.png
    R gui/admin-gui/misc/flag/cd.png
    R gui/admin-gui/misc/flag/cf.png
    R gui/admin-gui/misc/flag/cg.png
    R gui/admin-gui/misc/flag/ch.png
    R gui/admin-gui/misc/flag/ci.png
    R gui/admin-gui/misc/flag/ck.png
    R gui/admin-gui/misc/flag/cl.png
    R gui/admin-gui/misc/flag/cm.png
    R gui/admin-gui/misc/flag/cn.png
    R gui/admin-gui/misc/flag/co.png
    R gui/admin-gui/misc/flag/cr.png
    R gui/admin-gui/misc/flag/cs.png
    R gui/admin-gui/misc/flag/csZal.png
    R gui/admin-gui/misc/flag/cu.png
    R gui/admin-gui/misc/flag/cv.png
    R gui/admin-gui/misc/flag/cx.png
    R gui/admin-gui/misc/flag/cy.png
    R gui/admin-gui/misc/flag/cz.png
    R gui/admin-gui/misc/flag/de.png
    R gui/admin-gui/misc/flag/dj.png
    R gui/admin-gui/misc/flag/dk.png
    R gui/admin-gui/misc/flag/dm.png
    R gui/admin-gui/misc/flag/do.png
    R gui/admin-gui/misc/flag/dz.png
    R gui/admin-gui/misc/flag/ec.png
    R gui/admin-gui/misc/flag/ee.png
    R gui/admin-gui/misc/flag/eg.png
    R gui/admin-gui/misc/flag/eh.png
    R gui/admin-gui/misc/flag/en.png
    R gui/admin-gui/misc/flag/england.png
    R gui/admin-gui/misc/flag/er.png
    R gui/admin-gui/misc/flag/es.png
    R gui/admin-gui/misc/flag/et.png
    R gui/admin-gui/misc/flag/europeanunion.png
    R gui/admin-gui/misc/flag/fam.png
    R gui/admin-gui/misc/flag/fi.png
    R gui/admin-gui/misc/flag/fj.png
    R gui/admin-gui/misc/flag/fk.png
    R gui/admin-gui/misc/flag/fm.png
    R gui/admin-gui/misc/flag/fo.png
    R gui/admin-gui/misc/flag/fr.png
    R gui/admin-gui/misc/flag/ga.png
    R gui/admin-gui/misc/flag/gb.png
    R gui/admin-gui/misc/flag/gd.png
    R gui/admin-gui/misc/flag/ge.png
    R gui/admin-gui/misc/flag/gf.png
    R gui/admin-gui/misc/flag/gh.png
    R gui/admin-gui/misc/flag/gi.png
    R gui/admin-gui/misc/flag/gl.png
    R gui/admin-gui/misc/flag/gm.png
    R gui/admin-gui/misc/flag/gn.png
    R gui/admin-gui/misc/flag/gp.png
    R gui/admin-gui/misc/flag/gq.png
    R gui/admin-gui/misc/flag/gr.png
    R gui/admin-gui/misc/flag/gs.png
    R gui/admin-gui/misc/flag/gt.png
    R gui/admin-gui/misc/flag/gu.png
    R gui/admin-gui/misc/flag/gw.png
    R gui/admin-gui/misc/flag/gy.png
    R gui/admin-gui/misc/flag/hk.png
    R gui/admin-gui/misc/flag/hm.png
    R gui/admin-gui/misc/flag/hn.png
    R gui/admin-gui/misc/flag/hr.png
    R gui/admin-gui/misc/flag/ht.png
    R gui/admin-gui/misc/flag/hu.png
    R gui/admin-gui/misc/flag/id.png
    R gui/admin-gui/misc/flag/ie.png
    R gui/admin-gui/misc/flag/il.png
    R gui/admin-gui/misc/flag/in.png
    R gui/admin-gui/misc/flag/io.png
    R gui/admin-gui/misc/flag/iq.png
    R gui/admin-gui/misc/flag/ir.png
    R gui/admin-gui/misc/flag/is.png
    R gui/admin-gui/misc/flag/it.png
    R gui/admin-gui/misc/flag/jm.png
    R gui/admin-gui/misc/flag/jo.png
    R gui/admin-gui/misc/flag/jp.png
    R gui/admin-gui/misc/flag/ke.png
    R gui/admin-gui/misc/flag/kg.png
    R gui/admin-gui/misc/flag/kh.png
    R gui/admin-gui/misc/flag/ki.png
    R gui/admin-gui/misc/flag/km.png
    R gui/admin-gui/misc/flag/kn.png
    R gui/admin-gui/misc/flag/kp.png
    R gui/admin-gui/misc/flag/kr.png
    R gui/admin-gui/misc/flag/kw.png
    R gui/admin-gui/misc/flag/ky.png
    R gui/admin-gui/misc/flag/kz.png
    R gui/admin-gui/misc/flag/la.png
    R gui/admin-gui/misc/flag/lb.png
    R gui/admin-gui/misc/flag/lc.png
    R gui/admin-gui/misc/flag/li.png
    R gui/admin-gui/misc/flag/lk.png
    R gui/admin-gui/misc/flag/lr.png
    R gui/admin-gui/misc/flag/ls.png
    R gui/admin-gui/misc/flag/lt.png
    R gui/admin-gui/misc/flag/lu.png
    R gui/admin-gui/misc/flag/lv.png
    R gui/admin-gui/misc/flag/ly.png
    R gui/admin-gui/misc/flag/ma.png
    R gui/admin-gui/misc/flag/mc.png
    R gui/admin-gui/misc/flag/md.png
    R gui/admin-gui/misc/flag/me.png
    R gui/admin-gui/misc/flag/mg.png
    R gui/admin-gui/misc/flag/mh.png
    R gui/admin-gui/misc/flag/mk.png
    R gui/admin-gui/misc/flag/ml.png
    R gui/admin-gui/misc/flag/mm.png
    R gui/admin-gui/misc/flag/mn.png
    R gui/admin-gui/misc/flag/mo.png
    R gui/admin-gui/misc/flag/mp.png
    R gui/admin-gui/misc/flag/mq.png
    R gui/admin-gui/misc/flag/mr.png
    R gui/admin-gui/misc/flag/ms.png
    R gui/admin-gui/misc/flag/mt.png
    R gui/admin-gui/misc/flag/mu.png
    R gui/admin-gui/misc/flag/mv.png
    R gui/admin-gui/misc/flag/mw.png
    R gui/admin-gui/misc/flag/mx.png
    R gui/admin-gui/misc/flag/my.png
    R gui/admin-gui/misc/flag/mz.png
    R gui/admin-gui/misc/flag/na.png
    R gui/admin-gui/misc/flag/nc.png
    R gui/admin-gui/misc/flag/ne.png
    R gui/admin-gui/misc/flag/nf.png
    R gui/admin-gui/misc/flag/ng.png
    R gui/admin-gui/misc/flag/ni.png
    R gui/admin-gui/misc/flag/nl.png
    R gui/admin-gui/misc/flag/no.png
    R gui/admin-gui/misc/flag/np.png
    R gui/admin-gui/misc/flag/nr.png
    R gui/admin-gui/misc/flag/nu.png
    R gui/admin-gui/misc/flag/nz.png
    R gui/admin-gui/misc/flag/om.png
    R gui/admin-gui/misc/flag/pa.png
    R gui/admin-gui/misc/flag/pe.png
    R gui/admin-gui/misc/flag/pf.png
    R gui/admin-gui/misc/flag/pg.png
    R gui/admin-gui/misc/flag/ph.png
    R gui/admin-gui/misc/flag/pk.png
    R gui/admin-gui/misc/flag/pl.png
    R gui/admin-gui/misc/flag/pm.png
    R gui/admin-gui/misc/flag/pn.png
    R gui/admin-gui/misc/flag/pr.png
    R gui/admin-gui/misc/flag/ps.png
    R gui/admin-gui/misc/flag/pt.png
    R gui/admin-gui/misc/flag/pw.png
    R gui/admin-gui/misc/flag/py.png
    R gui/admin-gui/misc/flag/qa.png
    R gui/admin-gui/misc/flag/re.png
    R gui/admin-gui/misc/flag/ro.png
    R gui/admin-gui/misc/flag/rs.png
    R gui/admin-gui/misc/flag/ru.png
    R gui/admin-gui/misc/flag/rw.png
    R gui/admin-gui/misc/flag/sa.png
    R gui/admin-gui/misc/flag/sb.png
    R gui/admin-gui/misc/flag/sc.png
    R gui/admin-gui/misc/flag/scotland.png
    R gui/admin-gui/misc/flag/sd.png
    R gui/admin-gui/misc/flag/se.png
    R gui/admin-gui/misc/flag/sg.png
    R gui/admin-gui/misc/flag/sh.png
    R gui/admin-gui/misc/flag/si.png
    R gui/admin-gui/misc/flag/sj.png
    R gui/admin-gui/misc/flag/sk.png
    R gui/admin-gui/misc/flag/sl.png
    R gui/admin-gui/misc/flag/sm.png
    R gui/admin-gui/misc/flag/sn.png
    R gui/admin-gui/misc/flag/so.png
    R gui/admin-gui/misc/flag/sr.png
    R gui/admin-gui/misc/flag/st.png
    R gui/admin-gui/misc/flag/sv.png
    R gui/admin-gui/misc/flag/sy.png
    R gui/admin-gui/misc/flag/sz.png
    R gui/admin-gui/misc/flag/tc.png
    R gui/admin-gui/misc/flag/td.png
    R gui/admin-gui/misc/flag/tf.png
    R gui/admin-gui/misc/flag/tg.png
    R gui/admin-gui/misc/flag/th.png
    R gui/admin-gui/misc/flag/tj.png
    R gui/admin-gui/misc/flag/tk.png
    R gui/admin-gui/misc/flag/tl.png
    R gui/admin-gui/misc/flag/tm.png
    R gui/admin-gui/misc/flag/tn.png
    R gui/admin-gui/misc/flag/to.png
    R gui/admin-gui/misc/flag/tr.png
    R gui/admin-gui/misc/flag/tt.png
    R gui/admin-gui/misc/flag/tv.png
    R gui/admin-gui/misc/flag/tw.png
    R gui/admin-gui/misc/flag/tz.png
    R gui/admin-gui/misc/flag/ua.png
    R gui/admin-gui/misc/flag/ug.png
    R gui/admin-gui/misc/flag/um.png
    R gui/admin-gui/misc/flag/us.png
    R gui/admin-gui/misc/flag/uy.png
    R gui/admin-gui/misc/flag/uz.png
    R gui/admin-gui/misc/flag/va.png
    R gui/admin-gui/misc/flag/vc.png
    R gui/admin-gui/misc/flag/ve.png
    R gui/admin-gui/misc/flag/vg.png
    R gui/admin-gui/misc/flag/vi.png
    R gui/admin-gui/misc/flag/vn.png
    R gui/admin-gui/misc/flag/vu.png
    R gui/admin-gui/misc/flag/wales.png
    R gui/admin-gui/misc/flag/wf.png
    R gui/admin-gui/misc/flag/ws.png
    R gui/admin-gui/misc/flag/ye.png
    R gui/admin-gui/misc/flag/yt.png
    R gui/admin-gui/misc/flag/za.png
    R gui/admin-gui/misc/flag/zm.png
    R gui/admin-gui/misc/flag/zw.png
    R gui/admin-gui/misc/folder_error.png
    R gui/admin-gui/misc/folder_explore.png
    R gui/admin-gui/misc/folder_key.png
    R gui/admin-gui/misc/folder_user.png
    R gui/admin-gui/misc/formIcon/0.png
    R gui/admin-gui/misc/formIcon/1.png
    R gui/admin-gui/misc/formIcon/2.png
    R gui/admin-gui/misc/formIcon/3.png
    R gui/admin-gui/misc/formIcon/4.png
    R gui/admin-gui/misc/formIcon/5.png
    R gui/admin-gui/misc/formIcon/6.png
    R gui/admin-gui/misc/formIcon/7.png
    R gui/admin-gui/misc/formIcon/8.png
    R gui/admin-gui/misc/formIcon/9.png
    R gui/admin-gui/misc/formIcon/Alarme.png
    R gui/admin-gui/misc/formIcon/Ampersand.png
    R gui/admin-gui/misc/formIcon/Application.png
    R gui/admin-gui/misc/formIcon/Applications.png
    R gui/admin-gui/misc/formIcon/Arrow1 Down.png
    R gui/admin-gui/misc/formIcon/Arrow1 DownLeft.png
    R gui/admin-gui/misc/formIcon/Arrow1 DownRight.png
    R gui/admin-gui/misc/formIcon/Arrow1 Left.png
    R gui/admin-gui/misc/formIcon/Arrow1 Right.png
    R gui/admin-gui/misc/formIcon/Arrow1 Up.png
    R gui/admin-gui/misc/formIcon/Arrow1 UpLeft.png
    R gui/admin-gui/misc/formIcon/Arrow1 UpRight.png
    R gui/admin-gui/misc/formIcon/Arrow2 Down.png
    R gui/admin-gui/misc/formIcon/Arrow2 DownLeft.png
    R gui/admin-gui/misc/formIcon/Arrow2 DownRight.png
    R gui/admin-gui/misc/formIcon/Arrow2 Left.png
    R gui/admin-gui/misc/formIcon/Arrow2 Right.png
    R gui/admin-gui/misc/formIcon/Arrow2 Up.png
    R gui/admin-gui/misc/formIcon/Arrow2 UpLeft.png
    R gui/admin-gui/misc/formIcon/Arrow2 UpRight.png
    R gui/admin-gui/misc/formIcon/Arrow3 Down.png
    R gui/admin-gui/misc/formIcon/Arrow3 Left.png
    R gui/admin-gui/misc/formIcon/Arrow3 Right.png
    R gui/admin-gui/misc/formIcon/Arrow3 Up.png
    R gui/admin-gui/misc/formIcon/Attach.png
    R gui/admin-gui/misc/formIcon/Audio Message.png
    R gui/admin-gui/misc/formIcon/Back Top.png
    R gui/admin-gui/misc/formIcon/Back.png
    R gui/admin-gui/misc/formIcon/Bubble 1.png
    R gui/admin-gui/misc/formIcon/Bubble 3.png
    R gui/admin-gui/misc/formIcon/Burn.png
    R gui/admin-gui/misc/formIcon/Calc.png
    R gui/admin-gui/misc/formIcon/Calendar.png
    R gui/admin-gui/misc/formIcon/Cancel.png
    R gui/admin-gui/misc/formIcon/Car.png
    R gui/admin-gui/misc/formIcon/Card1.png
    R gui/admin-gui/misc/formIcon/Card2.png
    R gui/admin-gui/misc/formIcon/Card3.png
    R gui/admin-gui/misc/formIcon/Card4.png
    R gui/admin-gui/misc/formIcon/Cart.png
    R gui/admin-gui/misc/formIcon/Cart2.png
    R gui/admin-gui/misc/formIcon/Cd.png
    R gui/admin-gui/misc/formIcon/Clipboard Copy.png
    R gui/admin-gui/misc/formIcon/Clipboard Cut.png
    R gui/admin-gui/misc/formIcon/Clipboard Paste.png
    R gui/admin-gui/misc/formIcon/Clock.png
    R gui/admin-gui/misc/formIcon/Computer.png
    R gui/admin-gui/misc/formIcon/Contact.png
    R gui/admin-gui/misc/formIcon/Copyright.png
    R gui/admin-gui/misc/formIcon/Cube.png
    R gui/admin-gui/misc/formIcon/Currency Dollar.png
    R gui/admin-gui/misc/formIcon/Currency Euro.png
    R gui/admin-gui/misc/formIcon/Currency Pound.png
    R gui/admin-gui/misc/formIcon/Database.png
    R gui/admin-gui/misc/formIcon/Direction Diag1.png
    R gui/admin-gui/misc/formIcon/Direction Diag2.png
    R gui/admin-gui/misc/formIcon/Direction Horz.png
    R gui/admin-gui/misc/formIcon/Direction Vert.png
    R gui/admin-gui/misc/formIcon/Directions.png
    R gui/admin-gui/misc/formIcon/Discuss.png
    R gui/admin-gui/misc/formIcon/Document New.png
    R gui/admin-gui/misc/formIcon/Document.png
    R gui/admin-gui/misc/formIcon/Document2.png
    R gui/admin-gui/misc/formIcon/Dots Down.png
    R gui/admin-gui/misc/formIcon/Dots Up.png
    R gui/admin-gui/misc/formIcon/Dots.png
    R gui/admin-gui/misc/formIcon/Download.png
    R gui/admin-gui/misc/formIcon/Email.png
    R gui/admin-gui/misc/formIcon/Exclamation.png
    R gui/admin-gui/misc/formIcon/Fbook.png
    R gui/admin-gui/misc/formIcon/Flag.png
    R gui/admin-gui/misc/formIcon/Folder.png
    R gui/admin-gui/misc/formIcon/Folder2.png
    R gui/admin-gui/misc/formIcon/Folder3.png
    R gui/admin-gui/misc/formIcon/Footprint.png
    R gui/admin-gui/misc/formIcon/Forbidden.png
    R gui/admin-gui/misc/formIcon/Full Screen.png
    R gui/admin-gui/misc/formIcon/Full Size.png
    R gui/admin-gui/misc/formIcon/Game.png
    R gui/admin-gui/misc/formIcon/Gear.png
    R gui/admin-gui/misc/formIcon/Globe.png
    R gui/admin-gui/misc/formIcon/Go In.png
    R gui/admin-gui/misc/formIcon/Go Out.png
    R gui/admin-gui/misc/formIcon/Graph.png
    R gui/admin-gui/misc/formIcon/Hand.png
    R gui/admin-gui/misc/formIcon/Hdd Network.png
    R gui/admin-gui/misc/formIcon/Health.png
    R gui/admin-gui/misc/formIcon/Heart.png
    R gui/admin-gui/misc/formIcon/Home.png
    R gui/admin-gui/misc/formIcon/Home2.png
    R gui/admin-gui/misc/formIcon/Info.png
    R gui/admin-gui/misc/formIcon/Info2.png
    R gui/admin-gui/misc/formIcon/InfoSliderArrows.png
    R gui/admin-gui/misc/formIcon/InfoSmall.png
    R gui/admin-gui/misc/formIcon/InfoSmall2.png
    R gui/admin-gui/misc/formIcon/Ipod.png
    R gui/admin-gui/misc/formIcon/Key.png
    R gui/admin-gui/misc/formIcon/Light.png
    R gui/admin-gui/misc/formIcon/Link.png
    R gui/admin-gui/misc/formIcon/Lock Open.png
    R gui/admin-gui/misc/formIcon/Lock.png
    R gui/admin-gui/misc/formIcon/Loop.png
    R gui/admin-gui/misc/formIcon/Luggage.png
    R gui/admin-gui/misc/formIcon/Mail.png
    R gui/admin-gui/misc/formIcon/Man.png
    R gui/admin-gui/misc/formIcon/Microphone.png
    R gui/admin-gui/misc/formIcon/Minus.png
    R gui/admin-gui/misc/formIcon/Mobile.png
    R gui/admin-gui/misc/formIcon/Mouse.png
    R gui/admin-gui/misc/formIcon/Movie.png
    R gui/admin-gui/misc/formIcon/Music.png
    R gui/admin-gui/misc/formIcon/Music2.png
    R gui/admin-gui/misc/formIcon/Nuke.png
    R gui/admin-gui/misc/formIcon/Ok.png
    R gui/admin-gui/misc/formIcon/Paragraph.png
    R gui/admin-gui/misc/formIcon/Percent.png
    R gui/admin-gui/misc/formIcon/Phone.png
    R gui/admin-gui/misc/formIcon/Photo.png
    R gui/admin-gui/misc/formIcon/Picture.png
    R gui/admin-gui/misc/formIcon/Player Eject.png
    R gui/admin-gui/misc/formIcon/Player FastFwd.png
    R gui/admin-gui/misc/formIcon/Player FastRev.png
    R gui/admin-gui/misc/formIcon/Player Next.png
    R gui/admin-gui/misc/formIcon/Player Pause.png
    R gui/admin-gui/misc/formIcon/Player Play.png
    R gui/admin-gui/misc/formIcon/Player Previous.png
    R gui/admin-gui/misc/formIcon/Player Record.png
    R gui/admin-gui/misc/formIcon/Player Stop.png
    R gui/admin-gui/misc/formIcon/Plus.png
    R gui/admin-gui/misc/formIcon/Podcast.png
    R gui/admin-gui/misc/formIcon/Pointer.png
    R gui/admin-gui/misc/formIcon/Poll.png
    R gui/admin-gui/misc/formIcon/Printer.png
    R gui/admin-gui/misc/formIcon/Puzzle.png
    R gui/admin-gui/misc/formIcon/Question.png
    R gui/admin-gui/misc/formIcon/Reduced Size.png
    R gui/admin-gui/misc/formIcon/Refresh.png
    R gui/admin-gui/misc/formIcon/Rss 1.png
    R gui/admin-gui/misc/formIcon/Rss 2.png
    R gui/admin-gui/misc/formIcon/Save.png
    R gui/admin-gui/misc/formIcon/Screen.png
    R gui/admin-gui/misc/formIcon/Search.png
    R gui/admin-gui/misc/formIcon/Security.png
    R gui/admin-gui/misc/formIcon/Sitemap.png
    R gui/admin-gui/misc/formIcon/Size Diag1.png
    R gui/admin-gui/misc/formIcon/Size Diag2.png
    R gui/admin-gui/misc/formIcon/Size Horz.png
    R gui/admin-gui/misc/formIcon/Size Vert.png
    R gui/admin-gui/misc/formIcon/Sleep.png
    R gui/admin-gui/misc/formIcon/Smiley1.png
    R gui/admin-gui/misc/formIcon/Smiley2.png
    R gui/admin-gui/misc/formIcon/Smiley3.png
    R gui/admin-gui/misc/formIcon/Sound Minus.png
    R gui/admin-gui/misc/formIcon/Sound Off.png
    R gui/admin-gui/misc/formIcon/Sound On.png
    R gui/admin-gui/misc/formIcon/Sound Plus.png
    R gui/admin-gui/misc/formIcon/Standby.png
    R gui/admin-gui/misc/formIcon/Star.png
    R gui/admin-gui/misc/formIcon/Start.png
    R gui/admin-gui/misc/formIcon/Stats 3.png
    R gui/admin-gui/misc/formIcon/Stats.png
    R gui/admin-gui/misc/formIcon/Stats2.png
    R gui/admin-gui/misc/formIcon/Table.png
    R gui/admin-gui/misc/formIcon/Tag.png
    R gui/admin-gui/misc/formIcon/Tape.png
    R gui/admin-gui/misc/formIcon/Target.png
    R gui/admin-gui/misc/formIcon/Text Large.png
    R gui/admin-gui/misc/formIcon/Text Meduim.png
    R gui/admin-gui/misc/formIcon/Text Minus.png
    R gui/admin-gui/misc/formIcon/Text Plus.png
    R gui/admin-gui/misc/formIcon/Text Small.png
    R gui/admin-gui/misc/formIcon/Thumb Down.png
    R gui/admin-gui/misc/formIcon/Thumb Up.png
    R gui/admin-gui/misc/formIcon/Thumbs.db
    R gui/admin-gui/misc/formIcon/Tool.png
    R gui/admin-gui/misc/formIcon/Tool2.png
    R gui/admin-gui/misc/formIcon/Trackback.png
    R gui/admin-gui/misc/formIcon/Trash.png
    R gui/admin-gui/misc/formIcon/Travel.png
    R gui/admin-gui/misc/formIcon/Tree.png
    R gui/admin-gui/misc/formIcon/Tv.png
    R gui/admin-gui/misc/formIcon/Video.png
    R gui/admin-gui/misc/formIcon/Wait.png
    R gui/admin-gui/misc/formIcon/Warning.png
    R gui/admin-gui/misc/formIcon/Weather Cloud.png
    R gui/admin-gui/misc/formIcon/Weather Could Sun.png
    R gui/admin-gui/misc/formIcon/Weather Rain.png
    R gui/admin-gui/misc/formIcon/Weather Snow.png
    R gui/admin-gui/misc/formIcon/Weather Sun.png
    R gui/admin-gui/misc/formIcon/Wizard.png
    R gui/admin-gui/misc/formIcon/Woman.png
    R gui/admin-gui/misc/formIcon/Wordpress.png
    R gui/admin-gui/misc/formIcon/Write.png
    R gui/admin-gui/misc/formIcon/Write2.png
    R gui/admin-gui/misc/formIcon/Write3.png
    R gui/admin-gui/misc/formIcon/Zoom In.png
    R gui/admin-gui/misc/formIcon/Zoom Out.png
    R gui/admin-gui/misc/help.png
    R gui/admin-gui/misc/hourglass.png
    R gui/admin-gui/misc/house.png
    R gui/admin-gui/misc/images-selected.png
    R gui/admin-gui/misc/images.png
    R gui/admin-gui/misc/information.png
    R gui/admin-gui/misc/key.png
    R gui/admin-gui/misc/link_break.png
    R gui/admin-gui/misc/link_go.png
    R gui/admin-gui/misc/magnifier.png
    R gui/admin-gui/misc/monitor.png
    R gui/admin-gui/misc/nav-hover-blue.png
    R gui/admin-gui/misc/nav-hover-white.png
    R gui/admin-gui/misc/nav-hover.png
    R gui/admin-gui/misc/next.png
    R gui/admin-gui/misc/page_white_code.png
    R gui/admin-gui/misc/page_white_copy.png
    R gui/admin-gui/misc/page_white_stack.png
    R gui/admin-gui/misc/page_white_star.png
    R gui/admin-gui/misc/previous.png
    R gui/admin-gui/misc/printer.png
    R gui/admin-gui/misc/printer_add.png
    R gui/admin-gui/misc/printer_delete.png
    R gui/admin-gui/misc/report.png
    R gui/admin-gui/misc/report_add.png
    R gui/admin-gui/misc/report_delete.png
    R gui/admin-gui/misc/report_edit.png
    R gui/admin-gui/misc/resultset_first.png
    R gui/admin-gui/misc/resultset_last.png
    R gui/admin-gui/misc/resultset_next.png
    R gui/admin-gui/misc/resultset_previous.png
    R gui/admin-gui/misc/runn.png
    R gui/admin-gui/misc/save.png
    R gui/admin-gui/misc/sortableArrowUpDown.png
    R gui/admin-gui/misc/star.png
    R gui/admin-gui/misc/stop.png
    R gui/admin-gui/misc/table.png
    R gui/admin-gui/misc/table_add.png
    R gui/admin-gui/misc/table_delete.png
    R gui/admin-gui/misc/topBg.jpg
    R gui/admin-gui/misc/ui.totop.png
    R gui/admin-gui/misc/user_add.png
    R gui/admin-gui/misc/user_delete.png
    R gui/admin-gui/misc/user_edit.png
    R gui/admin-gui/misc/user_old.png
    R gui/admin-gui/misc/user_red_old.png
    R gui/admin-gui/misc/user_suit_old.png
    M gui/admin-gui/pom.xml
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxButton.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxDownloadBehaviorFromFile.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxDownloadBehaviorFromStream.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AjaxSubmitButton.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DateInput.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DateInput.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DropDownMultiChoice.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultiValueChoosePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultiValueChoosePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ajaxDownload/AjaxDownloadBehaviorFromFile.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ajaxDownload/AjaxDownloadBehaviorFromStream.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/atmosphere/GuiTaskHandler.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/atmosphere/NotifyMessage.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/atmosphere/NotifyMessageFilter.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/CountToolbar.properties
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/NavigatorPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/NavigatorPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/NavigatorPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableDataTable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.js
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TablePanel.less
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ButtonColumn.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnMenuAction.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/IconColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ImagePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ImagePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuColumn.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuHeaderColumn.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/LinkColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/LinkPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPageLink.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/ConfirmationDialog.html
    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/dialog/UserBrowserDialog.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/UserBrowserDialog.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/CheckFormGroup.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/CheckFormGroup.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DateFormGroup.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DateFormGroup.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/MultiValueTextFormGroup.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/MultiValueTextFormGroup.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextAreaFormGroup.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextAreaFormGroup.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextFormGroup.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DatePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DropDownChoicePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ListMultipleChoicePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/PasswordPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TextAreaPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TextPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TriStateComboPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/login/FlagImageResource.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/login/LocalePanel.css
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/login/LocalePanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/login/LoginPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/login/LoginPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItemAction.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/MenuDividerPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/MenuDividerPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/orgStruct/TreeNode.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/orgStruct/nested/Subtree.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/settings/AccountSyncSettingsPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/settings/AccountSyncSettingsPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageNotFound.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageServerError.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageUnauthorized.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/action/AddAccountAction.java

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

Conflicts:
	infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java
	infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJsonParsing.java
	samples/rest/modification-assign-account.xml


  Commit: 127cfe3d440d06864e73f583ef9583a44652830d
      https://github.com/Evolveum/midpoint/commit/127cfe3d440d06864e73f583ef9583a44652830d
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-14 (Tue, 14 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJsonParsing.java
    M infra/schema/src/test/resources/common/user-jack.xml
    M infra/schema/src/test/resources/testdata/attribute-description-1.xml
    M pom.xml

  Log Message:
  -----------
  json parsing..


  Commit: 320969344b6fe0d11ca5d1f7fc83c90711ccaed8
      https://github.com/Evolveum/midpoint/commit/320969344b6fe0d11ca5d1f7fc83c90711ccaed8
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-15 (Wed, 15 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJsonParsing.java

  Log Message:
  -----------
  json parsing/serializing..


  Commit: 0fb09e0694cbc42759cb1d2cb120824e2e3a8d16
      https://github.com/Evolveum/midpoint/commit/0fb09e0694cbc42759cb1d2cb120824e2e3a8d16
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-16 (Thu, 16 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java

  Log Message:
  -----------
  json parsing/serializing


  Commit: 1395de8967d0b6806a686bb328e9b909a82ba56e
      https://github.com/Evolveum/midpoint/commit/1395de8967d0b6806a686bb328e9b909a82ba56e
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-21 (Tue, 21 Jan 2014)

  Changed paths:
    M infra/prism/pom.xml
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/json/DOMDeserializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/json/DOMSerializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/json/JaxbElementDeserializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/json/JaxbElementSerializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PolyStringSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/json/QNameDeserializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/json/QNameSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/PrismJaxbProcessor.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJsonParsing.java
    M infra/schema/src/test/resources/common/resource-opendj.xml

  Log Message:
  -----------
  json parsing/serializing


  Commit: 8c59a0dc2d040ade10a20bbcdbd142dd65fe1a2a
      https://github.com/Evolveum/midpoint/commit/8c59a0dc2d040ade10a20bbcdbd142dd65fe1a2a
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-23 (Thu, 23 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java

  Log Message:
  -----------
  json parsin/serializing


  Commit: 20a6ea7e6aecf3d1757b9eaf41f0909a94110212
      https://github.com/Evolveum/midpoint/commit/20a6ea7e6aecf3d1757b9eaf41f0909a94110212
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-01-23 (Thu, 23 Jan 2014)

  Changed paths:
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DOMParser.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ListXNode.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/RootXNode.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ValueParser.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDOM.java

  Log Message:
  -----------
  New parsers: XNode work in progress


  Commit: ac803efdac191cbf0d0cda1ae63cbcc4ef277b14
      https://github.com/Evolveum/midpoint/commit/ac803efdac191cbf0d0cda1ae63cbcc4ef277b14
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-01-23 (Thu, 23 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DOMParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ListXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    R infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDOM.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java

  Log Message:
  -----------
  Improved dom parser


  Commit: edd1ae896dd8fca1b0bb5dd4de8facb0977db743
      https://github.com/Evolveum/midpoint/commit/edd1ae896dd8fca1b0bb5dd4de8facb0977db743
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-01-23 (Thu, 23 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/PrismDomProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DOMParser.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ListXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/RootXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ValueParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java

  Log Message:
  -----------
  More work on parsers. Things are very broken here.


  Commit: 2e236d86a068742c67e08e287bc12a2394848493
      https://github.com/Evolveum/midpoint/commit/2e236d86a068742c67e08e287bc12a2394848493
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-01-24 (Fri, 24 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ListXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/RootXNode.java

  Log Message:
  -----------
  More work on parsers. Less broken, but still broken.


  Commit: 22a49dbf4cc0b200d8eea66d5b8aba63bbde3053
      https://github.com/Evolveum/midpoint/commit/22a49dbf4cc0b200d8eea66d5b8aba63bbde3053
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-01-24 (Fri, 24 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DOMParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java

  Log Message:
  -----------
  One more step. Still broken.


  Commit: 76d707c75cf5ac65f204cc6dc2acc94241abbed1
      https://github.com/Evolveum/midpoint/commit/76d707c75cf5ac65f204cc6dc2acc94241abbed1
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-01-24 (Fri, 24 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DOMParser.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/Parser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDom.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestExtraSchema.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestFind.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java
    A infra/prism/src/test/resources/common/json/user-jack.json
    R infra/prism/src/test/resources/common/user-jack.xml
    A infra/prism/src/test/resources/common/xml/user-jack.xml
    A infra/prism/src/test/resources/common/yaml/user-jack.yaml

  Log Message:
  -----------
  More fixes and some cleanup


  Commit: 4e5a97d2d08f0647199fdf1790ebfe14bbf14c38
      https://github.com/Evolveum/midpoint/commit/4e5a97d2d08f0647199fdf1790ebfe14bbf14c38
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-01-24 (Fri, 24 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java
    M infra/prism/testng.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/JAXBUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java

  Log Message:
  -----------
  Almost works


  Commit: b7a756f4ae2582fbe3e9b3a33a0c2e647180c153
      https://github.com/Evolveum/midpoint/commit/b7a756f4ae2582fbe3e9b3a33a0c2e647180c153
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-01-25 (Sat, 25 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualsFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectQuery.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PropertyValueFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ValueFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemPathType.java
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/resources/common/xml/user-jack.xml

  Log Message:
  -----------
  Almost works more ... a bit


  Commit: 99d15d89fd367341eaf6491d0e8eb8426dd95aa4
      https://github.com/Evolveum/midpoint/commit/99d15d89fd367341eaf6491d0e8eb8426dd95aa4
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-01-25 (Sat, 25 Jan 2014)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/Utils.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DOMParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/TrivialXPathParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathSegment.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/PagingConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/PagingTypeFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/holder/ExpressionCodeHolder.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/holder/TrivialXPathParser.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/holder/XPathHolder.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/holder/XPathSegment.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/Expression.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/PathExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/PathExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpression.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/XPathExpressionCodeHolder.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpressionUtil.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/DataSourceReport.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectNotFoundHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java

  Log Message:
  -----------
  XPathHolder refactoring. More fixes. DOM parser test passing.


  Commit: 20b70a80df2954c60e047b0c5976a5175d913e27
      https://github.com/Evolveum/midpoint/commit/20b70a80df2954c60e047b0c5976a5175d913e27
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M build-system/pom.xml
    M config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.2.1.sql
    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.2.1.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.2.1.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.2.1.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.2.1.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
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/data/column/DoubleButtonColumn_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/DecisionsPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/ItemApprovalPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/WfDeltasPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/WfHistoryPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/WorkItemsPanel_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/decisions/DecisionsPanel_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/deltas/WfDeltasPanel_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/history/WfHistoryPanel_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalPanel_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/workItems/WorkItemsPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/PageAdmin_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageAbout_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/PageReports_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/ReportButtonPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/SingleButtonRowPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/security/MidPointApplication_en_US.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/data/column/DoubleButtonColumn_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/DecisionsPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/ItemApprovalPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/WfDeltasPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/WfHistoryPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/WorkItemsPanel_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/decisions/DecisionsPanel_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/deltas/WfDeltasPanel_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/history/WfHistoryPanel_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalPanel_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/workItems/WorkItemsPanel_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/PageAdmin_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/PageAbout_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/PageReports_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/ReportButtonPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/SingleButtonRowPanel_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/security/MidPointApplication_sk_SK.utf8.properties
    M gui/admin-gui/pom.xml
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/PageDescriptor.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AceEditor.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/DoubleButtonPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/DoubleButtonPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/DoubleButtonPanel.properties
    A 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/data/column/LinkIconColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/LinkIconPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/LinkIconPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextAreaFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/CheckTableHeader.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/DecisionsPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/DecisionsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/DecisionsPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WfDeltasPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WfDeltasPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WfDeltasPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WfHistoryEventDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WfHistoryPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WfHistoryPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WfHistoryPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.properties
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/decisions/DecisionsPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/decisions/DecisionsPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/decisions/DecisionsPanel.properties
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/deltas/WfDeltasPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/deltas/WfDeltasPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/deltas/WfDeltasPanel.properties
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/history/WfHistoryEventDto.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/history/WfHistoryPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/history/WfHistoryPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/history/WfHistoryPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/workItems/WorkItemsPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/workItems/WorkItemsPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/workItems/WorkItemsPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/XmlEditorPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/xml/ace/AceEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.html
    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/PageAdmin.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.html
    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/PageAbout.properties
    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/PageLogging.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/configuration/PageSystemConfiguration.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageTimeTest.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.properties
    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.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
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.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/component/AceEditorPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AceEditorPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AceEditorPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditPopupPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditPopupPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/DefaultReportPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/DefaultReportPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/DefaultReportPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReconciliationPopupPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReconciliationPopupPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReconciliationPopupPanel.properties
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportButtonPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportButtonPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportButtonPanel.properties
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/SingleButtonRowPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/SingleButtonRowPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/SingleButtonRowPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/UserReportConfigPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/UserReportConfigPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/UserReportConfigPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditReportDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReconciliationReportDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReportDeleteDialogDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/ReportDto.java
    A 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/UserReportDto.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.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.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/PageResources.properties
    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/resources/content/dto/AccountContentSearchDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceSearchDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceStatus.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.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.html
    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/PageTaskEdit.properties
    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/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/workflowInformation/WorkflowInformationPanel.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.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/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.html
    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/PageWorkItem.properties
    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/ProcessInstancePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/DecisionDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDetailedDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError401.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError403.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError404.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/test/PageBootstrap.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/test/PageBootstrap.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/test/PageBootstrap.properties
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/test/PageTest.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/test/PageTest.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/test/PageTest.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/PageUrlMapping.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ReportsStorage.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ResourcesStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/OnePageParameterEncoder.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebModelUtils.java
    A gui/admin-gui/src/main/webapp/WEB-INF/descriptor.xml
    A gui/admin-gui/src/main/webapp/css/font-awesome.css
    A gui/admin-gui/src/main/webapp/fonts/FontAwesome.otf
    A gui/admin-gui/src/main/webapp/fonts/fontawesome-webfont.eot
    A gui/admin-gui/src/main/webapp/fonts/fontawesome-webfont.svg
    A gui/admin-gui/src/main/webapp/fonts/fontawesome-webfont.ttf
    A gui/admin-gui/src/main/webapp/fonts/fontawesome-webfont.woff
    A gui/admin-gui/src/main/webapp/fonts/glyphicons-halflings-regular.eot
    A gui/admin-gui/src/main/webapp/fonts/glyphicons-halflings-regular.svg
    A gui/admin-gui/src/main/webapp/fonts/glyphicons-halflings-regular.ttf
    A gui/admin-gui/src/main/webapp/fonts/glyphicons-halflings-regular.woff
    M gui/admin-gui/src/main/webapp/js/midpoint/midpoint.js
    M gui/admin-gui/src/main/webapp/less/bootstrap/variables.less
    R gui/admin-gui/src/main/webapp/less/fonts/glyphicons-halflings-regular.eot
    R gui/admin-gui/src/main/webapp/less/fonts/glyphicons-halflings-regular.svg
    R gui/admin-gui/src/main/webapp/less/fonts/glyphicons-halflings-regular.ttf
    R gui/admin-gui/src/main/webapp/less/fonts/glyphicons-halflings-regular.woff
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
    M gui/admin-gui/src/main/webapp/reports/reportAuditLogs.jrxml
    M gui/admin-gui/src/main/webapp/reports/reportReconciliation.jrxml
    M gui/admin-gui/src/main/webapp/reports/reportUserAccounts.jrxml
    M gui/admin-gui/src/main/webapp/reports/reportUserList.jrxml
    M gui/admin-gui/src/main/webapp/reports/reportUserOrgs.jrxml
    M gui/admin-gui/src/main/webapp/reports/reportUserRoles.jrxml
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/TestCleanStartup.java
    M gui/gui-components/pom.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/LoggingConfigurationManager.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/Utils.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/crypto/CryptoUtil.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.java
    A infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/security/AuthorizationConstants.java
    M infra/common/src/test/resources/refinery/resource-complex.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ContainerDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/PrismDomProcessor.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DOMParser.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/Parser.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/TrivialXPathParser.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualsFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectQuery.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PropertyValueFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ValueFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ListXNode.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/RootXNode.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ValueParser.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemPathType.java
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDom.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestExtraSchema.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestFind.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java
    A infra/prism/src/test/resources/common/json/user-jack.json
    R infra/prism/src/test/resources/common/user-jack.xml
    A infra/prism/src/test/resources/common/xml/user-jack.xml
    A infra/prism/src/test/resources/common/yaml/user-jack.yaml
    M infra/prism/testng.xml
    M infra/schema/.gitignore
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/PagingConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/PagingTypeFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ExpressionConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/holder/ExpressionCodeHolder.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/holder/TrivialXPathParser.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/holder/XPathHolder.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/holder/XPathSegment.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectResolver.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.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/common-2a.xsd
    R infra/schema/src/main/resources/xml/ns/public/communication/workflow-1.xsd
    A infra/schema/src/main/resources/xml/ns/public/gui/admin-1.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/common-forms-2.xsd
    A infra/schema/src/main/resources/xml/ns/public/model/workflow/process-instance-state-2.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/DirectoryFileObjectResolver.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointAsserts.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/JAXBUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-client/src/compile/resources/catalog.xml

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


  Commit: bc802fe2b1851f70e33b7f072b35a66d4fea0c9c
      https://github.com/Evolveum/midpoint/commit/bc802fe2b1851f70e33b7f072b35a66d4fea0c9c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DiffUtil.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/AttributeNamedNodeMapImpl.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/AttributeNodeImpl.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/DomSerializer.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/ElementPrismAbstractImpl.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/ElementPrismContainerImpl.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/ElementPrismPropertyImpl.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/ElementPrismReferenceImpl.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/NamedNodeMapEmptyImpl.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/NodeListEmptyImpl.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/NodeListPrismContainerImpl.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/NodeListPrismPropertyImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/PrismDomProcessor.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/TextPrismPropertyImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DOMParser.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/Parser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/AnyArrayList.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/PrismJaxbProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    R infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDom.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismObjectConstruction.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    M infra/prism/testng.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/ExportObjects.java

  Log Message:
  -----------
  Lot of JAXB/DOM refactoring, some work on serialization. Seriously broken.


  Commit: 92b4845f391f933b7e0d72b3cb4b113be2c82472
      https://github.com/Evolveum/midpoint/commit/92b4845f391f933b7e0d72b3cb4b113be2c82472
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/PrismDomProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DOMParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/Parser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java

  Log Message:
  -----------
  Almost works. Again.


  Commit: 02d68c514231236e2b3573df96cc4142964b0407
      https://github.com/Evolveum/midpoint/commit/02d68c514231236e2b3573df96cc4142964b0407
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java

  Log Message:
  -----------
  Fix polystring and Qname serialization


  Commit: ced882655672c5d0517fb74ec47bcf9c6300d1fe
      https://github.com/Evolveum/midpoint/commit/ced882655672c5d0517fb74ec47bcf9c6300d1fe
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DOMParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java

  Log Message:
  -----------
  Ordering test. Fails.


  Commit: 6152e63751f2f33f61a3cab44e4d19bce45746cd
      https://github.com/Evolveum/midpoint/commit/6152e63751f2f33f61a3cab44e4d19bce45746cd
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/DOMSerializer.java

  Log Message:
  -----------
  build fix


  Commit: 905e92203c87c19036770bd706bb720bcb8ffb86
      https://github.com/Evolveum/midpoint/commit/905e92203c87c19036770bd706bb720bcb8ffb86
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-27 (Mon, 27 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DiffUtil.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/AttributeNamedNodeMapImpl.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/AttributeNodeImpl.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/DomSerializer.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/ElementPrismAbstractImpl.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/ElementPrismContainerImpl.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/ElementPrismPropertyImpl.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/ElementPrismReferenceImpl.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/NamedNodeMapEmptyImpl.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/NodeListEmptyImpl.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/NodeListPrismContainerImpl.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/NodeListPrismPropertyImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/PrismDomProcessor.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/TextPrismPropertyImpl.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DOMParser.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/Parser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/AnyArrayList.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/PrismJaxbProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    R infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDom.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismObjectConstruction.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java
    M infra/prism/testng.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/ExportObjects.java

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


  Commit: 1f22115b20b4bc9d8178df3a1429052332015753
      https://github.com/Evolveum/midpoint/commit/1f22115b20b4bc9d8178df3a1429052332015753
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-01-28 (Tue, 28 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java

  Log Message:
  -----------
  Fixed the ordering issue.


  Commit: 34889a2dbd89b9fd903fcaffcb169b16c0ea281f
      https://github.com/Evolveum/midpoint/commit/34889a2dbd89b9fd903fcaffcb169b16c0ea281f
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-01-28 (Tue, 28 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/resources/common/xml/user-jack.xml

  Log Message:
  -----------
  Fixing the test and also a handful of bugs.


  Commit: 3584d3fa8ade22e0df641db23721a90baa25f842
      https://github.com/Evolveum/midpoint/commit/3584d3fa8ade22e0df641db23721a90baa25f842
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-29 (Wed, 29 Jan 2014)

  Changed paths:
    M infra/prism/pom.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/JaxbElementDeserializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PolyStringSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestJsonParser.java
    A infra/prism/src/test/resources/common/json/user-jack-v1.json
    M infra/prism/src/test/resources/common/json/user-jack.json
    A infra/prism/src/test/resources/json/user-jack.json
    M infra/prism/testng.xml

  Log Message:
  -----------
  json -> XNode parser/serializer


  Commit: 516ee7a6a50fd983b4ee972ded11e09d4e42cb38
      https://github.com/Evolveum/midpoint/commit/516ee7a6a50fd983b4ee972ded11e09d4e42cb38
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-29 (Wed, 29 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DOMParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java
    M infra/prism/src/test/resources/common/xml/user-jack.xml

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

Conflicts:
	infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
	infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java


  Commit: 0100489baf4a96f56531faa66c30afc99802fc9c
      https://github.com/Evolveum/midpoint/commit/0100489baf4a96f56531faa66c30afc99802fc9c
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-29 (Wed, 29 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java

  Log Message:
  -----------
  build fix after merge..


  Commit: 0ec18021440fa65adff3a031fe180d34198031b4
      https://github.com/Evolveum/midpoint/commit/0ec18021440fa65adff3a031fe180d34198031b4
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-29 (Wed, 29 Jan 2014)

  Changed paths:
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java

  Log Message:
  -----------
  fixing dom parser test after merge..


  Commit: e7fb243ebff9319e29ca231e51dc929007ba1dd2
      https://github.com/Evolveum/midpoint/commit/e7fb243ebff9319e29ca231e51dc929007ba1dd2
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/QNameDeserializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/test/resources/common/json/user-jack.json

  Log Message:
  -----------
  json - xnode - prism parsing/serializing


  Commit: 5fd01e07da0cd524dd5f3606461b7c737c50507d
      https://github.com/Evolveum/midpoint/commit/5fd01e07da0cd524dd5f3606461b7c737c50507d
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/json/ItemPathDeserializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestJsonParser.java
    M infra/prism/src/test/resources/common/json/user-jack.json

  Log Message:
  -----------
  json - xnode - prism parser/serializer


  Commit: 0cf0c41cacd8ed452a87b3ea6906322c890577c4
      https://github.com/Evolveum/midpoint/commit/0cf0c41cacd8ed452a87b3ea6906322c890577c4
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/QNameSerializer.java
    M infra/prism/src/test/resources/common/json/user-jack.json

  Log Message:
  -----------
  fixing test (serializing from XNode to (Json) string)..


  Commit: e02fc09aa8445fa46ae5ddae31bee38c134e30c5
      https://github.com/Evolveum/midpoint/commit/e02fc09aa8445fa46ae5ddae31bee38c134e30c5
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DOMParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryConvertor.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryJaxbConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJsonParsing.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.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/importer/ObjectImporter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/CorrelationConfirmationEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/RecomputeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/util/Utils.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/sync/TestCorrelationConfiramtionEvaluator.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/DataSourceReport.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

  Log Message:
  -----------
  Partial compilation fix


  Commit: bff0117666beb4d643047ef5f624714cb44c5b98
      https://github.com/Evolveum/midpoint/commit/bff0117666beb4d643047ef5f624714cb44c5b98
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/json/JsonValueParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java

  Log Message:
  -----------
  adding json value parser..


  Commit: e476203b43f7305f998bc011b83094e619da12b3
      https://github.com/Evolveum/midpoint/commit/e476203b43f7305f998bc011b83094e619da12b3
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java

  Log Message:
  -----------
  small cleaning in Json parser/serializer


  Commit: c67f4cd5f6a36f873551517f0c0045d02595bd33
      https://github.com/Evolveum/midpoint/commit/c67f4cd5f6a36f873551517f0c0045d02595bd33
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java

  Log Message:
  -----------
  some other cleaning in Json parser/serializing


  Commit: a3a313578786dc7d0a3439d49521768715473feb
      https://github.com/Evolveum/midpoint/commit/a3a313578786dc7d0a3439d49521768715473feb
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestJsonParser.java

  Log Message:
  -----------
  cleaning of json parser/serializer continue..removing unused methods, adding some helper methods..


  Commit: a84647bd87864ba4320f2cb5f63a7222a9b3a580
      https://github.com/Evolveum/midpoint/commit/a84647bd87864ba4320f2cb5f63a7222a9b3a580
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java

  Log Message:
  -----------
  json parser/serializer clean up....


  Commit: 5ee99f04c9af3fd07e6b36151ea7809c3d0b85a5
      https://github.com/Evolveum/midpoint/commit/5ee99f04c9af3fd07e6b36151ea7809c3d0b85a5
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/JsonValueParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java

  Log Message:
  -----------
  json parser/serializer clean up in progress...


  Commit: e2d08c289e59e278bca6f344bd8f3de3e7474ffc
      https://github.com/Evolveum/midpoint/commit/e2d08c289e59e278bca6f344bd8f3de3e7474ffc
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-01 (Sat, 01 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java

  Log Message:
  -----------
  json parser/serializer clean up..


  Commit: 755cc011b667537a54ba3b92667f8052f66b068b
      https://github.com/Evolveum/midpoint/commit/755cc011b667537a54ba3b92667f8052f66b068b
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-01 (Sat, 01 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java

  Log Message:
  -----------
  some other cleaning in json parser/serializer


  Commit: 4963825d50665a0ff95dca2f8041b96035572151
      https://github.com/Evolveum/midpoint/commit/4963825d50665a0ff95dca2f8041b96035572151
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-02 (Sun, 02 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/ItemPathDeserializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/SubstringFilter.java

  Log Message:
  -----------
  implementing object filter serialization..


  Commit: 41e81e0043f37f06417a87c50bce2b794979affd
      https://github.com/Evolveum/midpoint/commit/41e81e0043f37f06417a87c50bce2b794979affd
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-02 (Sun, 02 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java

  Log Message:
  -----------
  fixing serializing objectFilter if there is raw property present..


  Commit: e58e39fbb399aac5350af7e6473511a1bcb04620
      https://github.com/Evolveum/midpoint/commit/e58e39fbb399aac5350af7e6473511a1bcb04620
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-02 (Sun, 02 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/JsonValueParser.java

  Log Message:
  -----------
  small improvement in pronting details about value parser


  Commit: 70a03e443d3d59e3ac7b7b6a5307f2fb00a7da69
      https://github.com/Evolveum/midpoint/commit/70a03e443d3d59e3ac7b7b6a5307f2fb00a7da69
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-02 (Sun, 02 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/ItemPathDeserializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/json/ItemPathSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/test/resources/common/json/user-jack.json

  Log Message:
  -----------
  json itemPath serialization/deserialization


  Commit: beca675b3a653276fa39354938340f8047940389
      https://github.com/Evolveum/midpoint/commit/beca675b3a653276fa39354938340f8047940389
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/QNameDeserializer.java

  Log Message:
  -----------
  improving qname deserializer


  Commit: 4ae78cff23bfef03ab11237160c3198874c00072
      https://github.com/Evolveum/midpoint/commit/4ae78cff23bfef03ab11237160c3198874c00072
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DOMParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryJaxbConvertor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java

  Log Message:
  -----------
  More compilation fixes


  Commit: b530d4d417d2036597800cb4b84ba2953ad67a0c
      https://github.com/Evolveum/midpoint/commit/b530d4d417d2036597800cb4b84ba2953ad67a0c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchema.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestExtraSchema.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPolyString.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismContext.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismObjectConstruction.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseModelContext.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTask.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java

  Log Message:
  -----------
  More compilation fixes. Removing old junk.


  Commit: f982eb566bdaa58773122228c01bacd5cfc82fe0
      https://github.com/Evolveum/midpoint/commit/f982eb566bdaa58773122228c01bacd5cfc82fe0
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/crypto/AESProtector.java
    M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/PrismDomProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/JaxbElementDeserializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JaxbTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/PrismJaxbProcessor.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestFind.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseGenericObject.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseModelContext.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTask.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUser.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

  Log Message:
  -----------
  Moved PrismJaxbProcessor to its rightful place ... to tests.


  Commit: 8ee718ce943f6c33ab9db3465e562b1e6dae08ca
      https://github.com/Evolveum/midpoint/commit/8ee718ce943f6c33ab9db3465e562b1e6dae08ca
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDynamicSchema.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbConstruction.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbParsing.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseGenericObject.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseObjectTemplate.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUser.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/TestResourceSchema.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/DirectoryFileObjectResolver.java

  Log Message:
  -----------
  Fixed complilation of schema


  Commit: 74e8b16e031f33b88e15a54d81e6aa31e4a92c4b
      https://github.com/Evolveum/midpoint/commit/74e8b16e031f33b88e15a54d81e6aa31e4a92c4b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/crypto/AESProtector.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java

  Log Message:
  -----------
  More compilation fixes


  Commit: f9a43962464026a5ff091ece5a8fa5ecd0842554
      https://github.com/Evolveum/midpoint/commit/f9a43962464026a5ff091ece5a8fa5ecd0842554
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DOMParser.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java
    M infra/prism/src/test/resources/common/user-jack-adhoc.xml
    M infra/prism/src/test/resources/common/user-jack-object.xml
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java

  Log Message:
  -----------
  Some test fixes


  Commit: e31e5f18adcca6dbcff9f803959183f2025f5bf1
      https://github.com/Evolveum/midpoint/commit/e31e5f18adcca6dbcff9f803959183f2025f5bf1
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/resources/xml/ns/test/foo-1.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java

  Log Message:
  -----------
  More test fixes


  Commit: 0457262e897d548fc5e2be2cb45defa3f5e7c531
      https://github.com/Evolveum/midpoint/commit/0457262e897d548fc5e2be2cb45defa3f5e7c531
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    M infra/prism/src/test/resources/common/user-will.xml
    M infra/prism/src/test/resources/schema/extension.xsd

  Log Message:
  -----------
  More tests fixes


  Commit: a282c6c1bc2fd8130e336893befa275781aba847
      https://github.com/Evolveum/midpoint/commit/a282c6c1bc2fd8130e336893befa275781aba847
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismObjectConstruction.java

  Log Message:
  -----------
  Fixing serialization element ordering


  Commit: 098049d1489c02ea8ea4faf16b873ccc8460062c
      https://github.com/Evolveum/midpoint/commit/098049d1489c02ea8ea4faf16b873ccc8460062c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestObjectQuery.java
    M infra/prism/src/test/resources/common/user-jack-modified.xml

  Log Message:
  -----------
  Prism tests fixed


  Commit: 9674a1bd86949feff033abf345ac9a51c500ec97
      https://github.com/Evolveum/midpoint/commit/9674a1bd86949feff033abf345ac9a51c500ec97
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M infra/prism/pom.xml
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/json/AbstractParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/YamlParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestYamlParser.java
    M infra/prism/src/test/resources/common/yaml/user-jack.yaml

  Log Message:
  -----------
  yaml parsing/serializing


  Commit: 07f92fa3feccdbbecfa8818f83b5546017443282
      https://github.com/Evolveum/midpoint/commit/07f92fa3feccdbbecfa8818f83b5546017443282
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java

  Log Message:
  -----------
  Fix for empty containers


  Commit: d36cdfec785b069e6f7a64f724a8aef648da6c76
      https://github.com/Evolveum/midpoint/commit/d36cdfec785b069e6f7a64f724a8aef648da6c76
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/crypto/AESProtector.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/validator/Validator.java
    M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/PrismDomProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/JaxbElementDeserializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchema.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JaxbTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/PrismJaxbProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/prism/src/main/resources/xml/ns/test/foo-1.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestExtraSchema.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestFind.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestObjectQuery.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPolyString.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismContext.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismObjectConstruction.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java
    M infra/prism/src/test/resources/common/user-jack-adhoc.xml
    M infra/prism/src/test/resources/common/user-jack-modified.xml
    M infra/prism/src/test/resources/common/user-jack-object.xml
    M infra/prism/src/test/resources/common/user-will.xml
    M infra/prism/src/test/resources/schema/extension.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryJaxbConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDynamicSchema.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbConstruction.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbParsing.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseGenericObject.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseModelContext.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseObjectTemplate.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTask.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUser.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/TestResourceSchema.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/DirectoryFileObjectResolver.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

  Log Message:
  -----------
  Merge branch 'parser' of git.evolveum.com:/srv/git/projects/midpoint into parser

Conflicts:
	infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java


  Commit: 7d8337bb3e762a4a2ddc435a73f0889ba5a9791d
      https://github.com/Evolveum/midpoint/commit/7d8337bb3e762a4a2ddc435a73f0889ba5a9791d
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DOMParser.java

  Log Message:
  -----------
  resolving conflict related to DOMParser.java after rename to DomParser.java


  Commit: cdee62977130d419e21c5710eeee78ddef24bd15
      https://github.com/Evolveum/midpoint/commit/cdee62977130d419e21c5710eeee78ddef24bd15
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java

  Log Message:
  -----------
  Merge branch 'parser' of git.evolveum.com:/srv/git/projects/midpoint into parser


  Commit: 715864793b43206ba47f3a187a9b1f6ee3c4c4a7
      https://github.com/Evolveum/midpoint/commit/715864793b43206ba47f3a187a9b1f6ee3c4c4a7
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java

  Log Message:
  -----------
  fixing TestDomParserTest


  Commit: 07687a56b3f76303c9d897764b2e3f0640c45b8b
      https://github.com/Evolveum/midpoint/commit/07687a56b3f76303c9d897764b2e3f0640c45b8b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DOMParser.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java

  Log Message:
  -----------
  Rename, battle with Windows, attempt 2 :-)


  Commit: d97eb3b1edb55fe60732d0ad1239800cd9495c85
      https://github.com/Evolveum/midpoint/commit/d97eb3b1edb55fe60732d0ad1239800cd9495c85
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/prism/src/main/resources/xml/ns/test/foo-1.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/test/resources/common/user-jack.xml

  Log Message:
  -----------
  Experiment with ProtectedString


  Commit: 76d4ef61be4902a0bdc2c603686a0b60e43265b7
      https://github.com/Evolveum/midpoint/commit/76d4ef61be4902a0bdc2c603686a0b60e43265b7
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd

  Log Message:
  -----------
  fixed protectedString experimental schema


  Commit: abc2f178c941903fc1a0c305937cdaee797ffad4
      https://github.com/Evolveum/midpoint/commit/abc2f178c941903fc1a0c305937cdaee797ffad4
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.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/util/WebMiscUtil.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/crypto/AESProtector.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/crypto/CryptoUtil.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/crypto/EncryptionException.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/crypto/Protector.java
    M infra/common/src/test/java/com/evolveum/midpoint/common/crypto/TestProtector.java
    M infra/prism/pom.xml
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/AESProtector.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/EncryptionException.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/ProtectedData.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/Protector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/CipherDataType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/EncryptedDataType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/EncryptionMethodType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/KeyInfoType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ProtectedByteArrayType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ProtectedDataType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ProtectedStringType.java
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    M infra/prism/src/test/resources/common/user-jack-adhoc.xml
    M infra/prism/src/test/resources/common/user-jack-modified.xml
    M infra/prism/src/test/resources/common/user-jack-object.xml
    M infra/prism/src/test/resources/common/xml/user-jack.xml
    A infra/util/src/main/java/com/evolveum/midpoint/util/Transformer.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AsIsExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AsIsExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssignmentTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationTargetSearchExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/PathExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/PathExpressionEvaluatorFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpressionFactory.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingFactory.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/AbstractScriptTest.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestExpressionFunctions.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestGroovyExpressions.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestJavaScriptExpressions.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestScriptCaching.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestXPathExpressions.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestValueConstructionAbsolute.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/controller/ModelUtils.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/expr/MidpointFunctionsImpl.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/ContextFactory.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/PasswordPolicyProcessor.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/util/Utils.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/ModelUtilsTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.java
    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/notifiers/AccountPasswordNotifier.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/notifiers/UserPasswordNotifier.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/TestInfrastructure.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorFactoryIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/util/UcfUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/ConfigurableProtectorFactory.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/KeyStoreDumper.java

  Log Message:
  -----------
  Big rebuild of protector and protected data types. Still work in progress. But some things works.


  Commit: e5c2b9302801f2097ba1bc159a1e376f552353d2
      https://github.com/Evolveum/midpoint/commit/e5c2b9302801f2097ba1bc159a1e376f552353d2
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/CipherDataType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/EncryptedDataType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/EncryptionMethodType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/KeyInfoType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ProtectedDataType.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    M infra/prism/src/test/resources/common/json/user-jack.json

  Log Message:
  -----------
  Fixing protected types. But still some things to do ...


  Commit: a2a2aae7c089f36532bb52228126d56b0f44de9a
      https://github.com/Evolveum/midpoint/commit/a2a2aae7c089f36532bb52228126d56b0f44de9a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ProtectedDataType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryJaxbConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/main/resources/xml/ns/public/connector/icf-1/resource-schema-2.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbParsing.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/XsdTypeConverterTest.java

  Log Message:
  -----------
  Changing ProtectedStringType to correct namespace. Compilation fixes.


  Commit: 9d689175b2c218d4922bfd2eb13234ce8d6b14ff
      https://github.com/Evolveum/midpoint/commit/9d689175b2c218d4922bfd2eb13234ce8d6b14ff
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectFactory.java
    M infra/schema/src/main/resources/xml/ns/public/connector/icf-1/resource-schema-2.xsd
    M infra/schema/src/test/resources/common/user-barbossa.xml
    M infra/schema/src/test/resources/common/user-jack.xml
    M infra/schema/src/test/resources/schema/extension.xsd

  Log Message:
  -----------
  More fixes. But still broken.


  Commit: dd6dcdf5b94dd28144e3789b3e4c2746a8137985
      https://github.com/Evolveum/midpoint/commit/dd6dcdf5b94dd28144e3789b3e4c2746a8137985
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-05 (Wed, 05 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/AnyArrayList.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/test/resources/common/user-jack-adhoc.xml
    M infra/prism/src/test/resources/common/user-jack-modified.xml
    M infra/prism/src/test/resources/common/user-jack-object.xml
    M infra/prism/src/test/resources/common/xml/user-jack.xml
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUser.java

  Log Message:
  -----------
  Fixing search filter namespace. This breaks json tests. Fixing some NPEs.


  Commit: 0959e822335cc2fec24bb31e8b5ff05ffeca64cd
      https://github.com/Evolveum/midpoint/commit/0959e822335cc2fec24bb31e8b5ff05ffeca64cd
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-06 (Thu, 06 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryJaxbConvertor.java

  Log Message:
  -----------
  Fixing DOM element parsing and some JAXB issues which fixes some schema tests


  Commit: c83c8b59e6433bb70e5ac18e3ca8c0d3ab345673
      https://github.com/Evolveum/midpoint/commit/c83c8b59e6433bb70e5ac18e3ca8c0d3ab345673
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-06 (Thu, 06 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/AjaxSubmitButton.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TreeThemeBasic.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/component/dialog/UserBrowserDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ListMultipleChoicePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConnectorHostTypeComparator.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConnectorTypeComparator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/CapabilityDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ConnectorHostTypeComparator.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ConnectorTypeComparator.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/configuration/PageDebugList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageLogging.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageLogging.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/configuration/component/ChooseTypeDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.properties
    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/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/dto/ReportOutputDto.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.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.properties
    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.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/PageResources.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceController.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceDto.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceState.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceStatus.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
    A 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/PageTaskAdd.html
    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/PageTaskAdd.properties
    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/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/OperationResultStatusIcon.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskAddDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/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/OrgUnitBrowser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ResourceContentStorage.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RolesStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/TasksStorage.java
    M gui/admin-gui/src/main/webapp/WEB-INF/descriptor.xml
    A gui/admin-gui/src/main/webapp/img/placeholder.png
    M gui/admin-gui/src/main/webapp/js/midpoint/midpoint.js
    A gui/admin-gui/src/main/webapp/less/midpoint/capabilities.less
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
    A gui/admin-gui/src/main/webapp/less/midpoint/tree-theme-basic.less
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/test/resources/diff/user-jack-after.xml
    M infra/schema/src/test/resources/diff/user-jack-before.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.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/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/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/CorrelationConfirmationEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestAssignmentEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResourceModifications.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemEvent.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/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
    A model/report-impl/src/test/resources/reports/report-sample.xml
    A model/report-impl/src/test/resources/reports/reportAuditLogs-with-datasource.xml
    M model/report-impl/src/test/resources/reports/reportAuditLogs.xml
    M model/report-impl/testng.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
    M repo/repo-sql-impl-test/.gitignore
    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
    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/data/common/RUser.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/RDataSource.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryInterpreter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOrgSync.java
    M testing/story/src/test/resources/logback-test.xml
    A testing/story/src/test/resources/orgsync/booty-lookout.ldif
    A testing/story/src/test/resources/orgsync/booty.ldif
    M testing/story/src/test/resources/orgsync/resource-opendj.xml
    A testing/story/src/test/resources/orgsync/scabb.ldif

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

Conflicts:
	infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
	model/report-impl/src/main/java/com/evolveum/midpoint/report/DataSourceReport.java
	model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java


  Commit: d5c612c54ff942ed6b59507c373b05ffe2495eee
      https://github.com/Evolveum/midpoint/commit/d5c612c54ff942ed6b59507c373b05ffe2495eee
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-06 (Thu, 06 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java

  Log Message:
  -----------
  More fixes


  Commit: 63fff51ca4e551b01e4f56f639062366704ed627
      https://github.com/Evolveum/midpoint/commit/63fff51ca4e551b01e4f56f639062366704ed627
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-06 (Thu, 06 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectFactory.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/SchemaDefinitionType.java
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/resources/common/resource-opendj-simple.xml
    M infra/schema/src/test/resources/common/resource-opendj.xml
    M infra/schema/src/test/resources/common/user-jack.xml

  Log Message:
  -----------
  Type for Schema Definition


  Commit: 9733eb3b7e348e5229bd1731d73750e6cfa84eec
      https://github.com/Evolveum/midpoint/commit/9733eb3b7e348e5229bd1731d73750e6cfa84eec
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/SchemaDefinitionType.java
    M infra/prism/src/main/resources/xml/ns/test/foo-1.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/DummyProtectedStringType.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/FooObjectClass.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/ObjectFactory.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/ObjectReferenceType.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/ResourceType.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    A infra/prism/src/test/resources/common/xml/resource-rum.xml
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbConstruction.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java

  Log Message:
  -----------
  Adding a test for schema parsing


  Commit: 259fc81b9340532adf157b0493d64be1c24a84ac
      https://github.com/Evolveum/midpoint/commit/259fc81b9340532adf157b0493d64be1c24a84ac
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/SchemaXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/SchemaDefinitionType.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/ResourceType.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java

  Log Message:
  -----------
  Schema XNode serialization, round trip test.


  Commit: faf4563273a24f81d024726efcda12f447c13ac9
      https://github.com/Evolveum/midpoint/commit/faf4563273a24f81d024726efcda12f447c13ac9
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-07 (Fri, 07 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/AbstractParser.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/json/AbstractParser2.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/ItemPathSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/JsonValueParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PolyStringSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/QNameDeserializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/QNameSerializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/json/XmlGregorialCalendarSerializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/json/YamlQNameSerializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/MidpoinYAMLGenerator.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/MidpointYAMLFactory.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/MidpointYAMLParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/YamlParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/resources/common/json/user-jack.json
    M infra/prism/src/test/resources/common/yaml/user-jack.yaml

  Log Message:
  -----------
  yaml + json parsing improvement (addig support for yaml type tags)..


  Commit: b0ea3a4418bf56c1cb116f3cf63bb68631f65b1e
      https://github.com/Evolveum/midpoint/commit/b0ea3a4418bf56c1cb116f3cf63bb68631f65b1e
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-08 (Sat, 08 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/AjaxSubmitButton.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TreeThemeBasic.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/component/dialog/UserBrowserDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/ListMultipleChoicePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConnectorHostTypeComparator.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConnectorTypeComparator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/CapabilityDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ConnectorHostTypeComparator.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/ConnectorTypeComparator.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/configuration/PageDebugList.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageLogging.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageLogging.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/configuration/component/ChooseTypeDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.properties
    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/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/dto/ReportOutputDto.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.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.properties
    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.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/PageResources.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceController.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceDto.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceState.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceStatus.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
    A 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/PageTaskAdd.html
    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/PageTaskAdd.properties
    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/server/PageTaskEdit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/OperationResultStatusIcon.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskAddDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/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/OrgUnitBrowser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/error/PageError.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ResourceContentStorage.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RolesStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/SessionStorage.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/TasksStorage.java
    M gui/admin-gui/src/main/webapp/WEB-INF/descriptor.xml
    A gui/admin-gui/src/main/webapp/img/placeholder.png
    M gui/admin-gui/src/main/webapp/js/midpoint/midpoint.js
    A gui/admin-gui/src/main/webapp/less/midpoint/capabilities.less
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
    A gui/admin-gui/src/main/webapp/less/midpoint/tree-theme-basic.less
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAssociationDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PropertyDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/SchemaXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectFactory.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/SchemaDefinitionType.java
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/prism/src/main/resources/xml/ns/test/foo-1.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/DummyProtectedStringType.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/FooObjectClass.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/ObjectFactory.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/ObjectReferenceType.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/ResourceType.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java
    A infra/prism/src/test/resources/common/xml/resource-rum.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryJaxbConvertor.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbConstruction.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/resources/common/resource-opendj-simple.xml
    M infra/schema/src/test/resources/common/resource-opendj.xml
    M infra/schema/src/test/resources/common/user-jack.xml
    M infra/schema/src/test/resources/diff/user-jack-after.xml
    M infra/schema/src/test/resources/diff/user-jack-before.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.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/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/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/CorrelationConfirmationEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestAssignmentEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestResourceModifications.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkItemEvent.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/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
    A model/report-impl/src/test/resources/reports/report-sample.xml
    A model/report-impl/src/test/resources/reports/reportAuditLogs-with-datasource.xml
    M model/report-impl/src/test/resources/reports/reportAuditLogs.xml
    M model/report-impl/testng.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
    M repo/repo-sql-impl-test/.gitignore
    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
    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/data/common/RUser.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/RDataSource.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryInterpreter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOrgSync.java
    M testing/story/src/test/resources/logback-test.xml
    A testing/story/src/test/resources/orgsync/booty-lookout.ldif
    A testing/story/src/test/resources/orgsync/booty.ldif
    M testing/story/src/test/resources/orgsync/resource-opendj.xml
    A testing/story/src/test/resources/orgsync/scabb.ldif

  Log Message:
  -----------
  Merge branch 'parser' of git.evolveum.com:/srv/git/projects/midpoint into parser


  Commit: 8f5a2f445fc4d8759f2edded5ca5d743d5ede61d
      https://github.com/Evolveum/midpoint/commit/8f5a2f445fc4d8759f2edded5ca5d743d5ede61d
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/AbstractParser2.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/json/DomElementSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/JsonValueParser.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PolyStringDeserializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/YamlParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    A infra/prism/src/test/resources/common/json/resource-rum.json
    A infra/prism/src/test/resources/common/yaml/resource-rum.yaml

  Log Message:
  -----------
  json / yaml <-> xnode <-> prism improvements..implemented support for schemaXnode..


  Commit: 35a65711498b96511d4d727f44e173160ff34e24
      https://github.com/Evolveum/midpoint/commit/35a65711498b96511d4d727f44e173160ff34e24
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/AbstractParser2.java

  Log Message:
  -----------
  build fix..


  Commit: 93079d50d97f878e693ad53efab89f20cfcba40d
      https://github.com/Evolveum/midpoint/commit/93079d50d97f878e693ad53efab89f20cfcba40d
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/AbstractParser.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/json/AbstractParser2.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/json/DOMDeserializer.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/json/DOMSerializer.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/json/DomElementSerializer.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/json/ItemPathDeserializer.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/json/ItemPathSerializer.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/json/JaxbElementDeserializer.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/json/JaxbElementSerializer.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/json/JsonValueParser.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PolyStringDeserializer.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PolyStringSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJsonSerializer.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/json/QNameDeserializer.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/json/QNameSerializer.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/json/XmlGregorialCalendarSerializer.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/json/YamlQNameSerializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/AbstractParser.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JsonParser.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/MidpoinYAMLGenerator.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/MidpointYAMLFactory.java
    R infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/MidpointYAMLParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/YamlParser.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/DomElementSerializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/ItemPathDeserializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/ItemPathSerializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/JsonValueParser.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/PolyStringDeserializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/PolyStringSerializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/QNameDeserializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/QNameSerializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/XmlGregorialCalendarSerializer.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/yaml/MidpoinYAMLGenerator.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/yaml/MidpointYAMLFactory.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/yaml/MidpointYAMLParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestJsonParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestYamlParser.java

  Log Message:
  -----------
  small refactoring for yaml and json parsing..


  Commit: 7661bb2515c52e43eb31ca6541b76f4afa35ea5c
      https://github.com/Evolveum/midpoint/commit/7661bb2515c52e43eb31ca6541b76f4afa35ea5c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemPathType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/XPathType.java
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/holder/ExpressionCodeHolder.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbParsing.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaSanity.java
    R infra/schema/src/test/java/com/evolveum/midpoint/schema/TestScriptExpressionCodeHolder.java
    M infra/schema/src/test/resources/common/resource-opendj.xml
    M infra/schema/testng.xml

  Log Message:
  -----------
  Much more work on bean converter. Support for more exotic JAXB cases. Breaks a couple of things.
Some things unfinished. Quite a mess.


  Commit: bdfb64cff19cb7192697545a7a65954f0968cb46
      https://github.com/Evolveum/midpoint/commit/bdfb64cff19cb7192697545a7a65954f0968cb46
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/AbstractParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JsonParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/YamlParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismJsonParsing.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismXmlParsing.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismYamlParsing.java
    A infra/prism/src/test/resources/common/json/user-barbossa.json
    A infra/prism/src/test/resources/common/json/user-jack-adhoc.json
    A infra/prism/src/test/resources/common/json/user-jack-object.json
    A infra/prism/src/test/resources/common/json/user-jack-old.json
    A infra/prism/src/test/resources/common/json/user-will.json
    R infra/prism/src/test/resources/common/user-barbossa.xml
    R infra/prism/src/test/resources/common/user-jack-adhoc.xml
    R infra/prism/src/test/resources/common/user-jack-object.xml
    R infra/prism/src/test/resources/common/user-will.xml
    A infra/prism/src/test/resources/common/xml/user-barbossa.xml
    A infra/prism/src/test/resources/common/xml/user-jack-adhoc.xml
    A infra/prism/src/test/resources/common/xml/user-jack-object.xml
    A infra/prism/src/test/resources/common/xml/user-will.xml
    A infra/prism/src/test/resources/common/yaml/user-barbossa.yaml
    A infra/prism/src/test/resources/common/yaml/user-jack-adhoc.yaml
    A infra/prism/src/test/resources/common/yaml/user-jack-object.yaml
    A infra/prism/src/test/resources/common/yaml/user-will.yaml
    M infra/prism/testng.xml

  Log Message:
  -----------
  prism tests - support for yaml and json..


  Commit: fe14785b9dc1213bb2c676e0f4b2a200bd86639d
      https://github.com/Evolveum/midpoint/commit/fe14785b9dc1213bb2c676e0f4b2a200bd86639d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-11 (Tue, 11 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/assignment/AssignmentEditorPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadPanel.java
    A 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/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.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/configuration/component/LoggingConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/StandardLogger.java
    A 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/reports/PageReport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/DefaultReportPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/DefaultReportPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/DefaultReportPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.properties
    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/users/PageOrgTree.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.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/OrgTreeProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
    M gui/admin-gui/src/main/resources/objects.xml
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyAccount.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyGroup.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyObject.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyPrivilege.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedResourceSchema.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/PropertyLimitations.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/security/Authorization.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/security/MidPointPrincipal.java
    M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
    M infra/common/src/test/java/com/evolveum/midpoint/common/test/PasswordPolicyValidatorTest.java
    M infra/common/src/test/java/com/evolveum/midpoint/validator/test/BasicValidatorTest.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReference.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PrismValueDeltaSetTriple.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/NameItemPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/AndFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualsFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/GreaterFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/InFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/InOidFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/LessFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NaryLogicalFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NotFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectPaging.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectQuery.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrgFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/SubstringFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchema.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDescription.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/DynamicNamespacePrefixMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/GlobalDynamicNamespacePrefixMapper.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/PolyStringType.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDiff.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestExtraSchema.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestObjectQuery.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismContext.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismObjectConstruction.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismSchemaConstruction.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectDeltaOperation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ReportTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/model/context/model-context-2.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDynamicSchema.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbParsing.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJsonParsing.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseGenericObject.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseObjectTemplate.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTask.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUser.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/SchemaProcessorTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/TestResourceSchema.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    R infra/util/src/main/java/com/evolveum/midpoint/util/Dumpable.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelElementContext.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/HookRegistry.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/ReadHook.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionVariables.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ObjectDeltaObject.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/Source.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/LazyXPathVariableResolver.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSysVar.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/ModelObjectResolver.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/controller/ModelDiagController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/hooks/HookRegistryImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/importer/ImportAccountsFromResourceTaskHandler.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/ChangeExecutor.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/Construction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ItemValueWithOrigin.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensProjectionContext.java
    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/ObjectDeltaWaves.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ShadowConstraintsChecker.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ConsolidationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/OutboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/UserDetailsServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/CorrelationConfirmationEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/FocusValidityScannerTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/RecomputeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/ReconciliationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/ReconciliationTaskResult.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/SynchronizationService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/SynchronizeAccountResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/trigger/RecomputeTriggerHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/util/AbstractSearchIterativeResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/util/AbstractSearchIterativeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/util/Utils.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/controller/ControllerGetObjectTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/controller/ControllerListAccountShadowOwnerTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/controller/ControllerListObjectsTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/expr/ExpressionHandlerImplTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestAssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjectorAddUser.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/util/mock/MockClockworkHook.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/util/mock/MockLensDebugListener.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractInboundSyncTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/util/ProfilingLensDebugListener.java
    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/AccountOperationListener.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/notifiers/SimpleAccountNotifier.java
    M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/TestTextFormatter.java
    M model/report-impl/pom.xml
    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/workflow-impl/src/main/java/com/evolveum/midpoint/wf/WorkflowManagerImpl.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/processors/BaseModelInvocationProcessingHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/user/AddRoleAssignmentWrapper.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
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ResourceEventDescription.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ResourceObjectShadowChangeDescription.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ResourceOperationDescription.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/GenericErrorHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ChangeNotificationDispatcherImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceEventListenerImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/query/ValueOperation.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/AbstractDummyTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestConnectorDiscovery.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDBTable.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummySchemaless.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyUuidNonUniqueName.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventRecord.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    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/EncodingTest.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/QueryInterpreterTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.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/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/Definition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/NaryLogicalRestriction.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/UnaryLogicalRestriction.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    A repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskListener.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
    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/TaskQuartzImpl.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/TestQuartzTaskManagerContract.java
    A samples/resources/opendj/opendj-localhost-medium.xml
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSamples.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/resources/repo/resource-opendj.xml

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

Conflicts:
	infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
	infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDom.java
	infra/prism/src/test/java/com/evolveum/midpoint/prism/TestExtraSchema.java
	infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismContext.java
	infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJsonParsing.java


  Commit: 0e9d8994afb252aa5915f658a0c289ef63607c68
      https://github.com/Evolveum/midpoint/commit/0e9d8994afb252aa5915f658a0c289ef63607c68
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-12 (Wed, 12 Feb 2014)

  Changed paths:
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompareJson.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompareXml.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompareYaml.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestExtraSchema.java
    R infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismJsonParsing.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingJson.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingXml.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingYaml.java
    R infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismXmlParsing.java
    R infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismYamlParsing.java
    A infra/prism/src/test/resources/common/json/user-jack-modified.json
    R infra/prism/src/test/resources/common/user-jack-modified.xml
    A infra/prism/src/test/resources/common/xml/user-jack-modified.xml
    A infra/prism/src/test/resources/common/yaml/user-jack-modified.yaml
    M infra/prism/testng.xml
    M tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/ExportObjects.java
    M tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/KeyStoreDumper.java
    M tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/Main.java

  Log Message:
  -----------
  extending tests for json and yaml


  Commit: c53603907e8fa0fc8239b46a9b6adc13ad3bb90f
      https://github.com/Evolveum/midpoint/commit/c53603907e8fa0fc8239b46a9b6adc13ad3bb90f
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-12 (Wed, 12 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/assignment/AssignmentEditorPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadPanel.java
    A 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/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.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/configuration/component/LoggingConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/StandardLogger.java
    A 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/reports/PageReport.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/DefaultReportPanel.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/DefaultReportPanel.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/DefaultReportPanel.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel.properties
    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/users/PageOrgTree.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.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/OrgTreeProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
    M gui/admin-gui/src/main/resources/objects.xml
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyAccount.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyGroup.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyObject.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyPrivilege.java
    M icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedResourceSchema.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/PropertyLimitations.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/security/Authorization.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/security/MidPointPrincipal.java
    M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
    M infra/common/src/test/java/com/evolveum/midpoint/common/test/PasswordPolicyValidatorTest.java
    M infra/common/src/test/java/com/evolveum/midpoint/validator/test/BasicValidatorTest.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReference.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PrismValueDeltaSetTriple.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/NameItemPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/AndFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualsFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/GreaterFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/InFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/InOidFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/LessFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NaryLogicalFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/NotFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectPaging.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectQuery.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrgFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/SubstringFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchema.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDescription.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/DynamicNamespacePrefixMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/GlobalDynamicNamespacePrefixMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemPathType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/PolyStringType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/XPathType.java
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDiff.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestExtraSchema.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestObjectQuery.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismContext.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismObjectConstruction.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismSchemaConstruction.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/ObjectDeltaOperation.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/holder/ExpressionCodeHolder.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ReportTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/context/model-context-2.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDynamicSchema.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbParsing.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJsonParsing.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseGenericObject.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseObjectTemplate.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTask.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUser.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaSanity.java
    R infra/schema/src/test/java/com/evolveum/midpoint/schema/TestScriptExpressionCodeHolder.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/SchemaProcessorTest.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/TestResourceSchema.java
    M infra/schema/src/test/resources/common/resource-opendj.xml
    M infra/schema/testng.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    R infra/util/src/main/java/com/evolveum/midpoint/util/Dumpable.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelElementContext.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/HookRegistry.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/ReadHook.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionVariables.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ObjectDeltaObject.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/Source.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/LazyXPathVariableResolver.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSysVar.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/ModelObjectResolver.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/controller/ModelDiagController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/hooks/HookRegistryImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/importer/ImportAccountsFromResourceTaskHandler.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/ChangeExecutor.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/Construction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ItemValueWithOrigin.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensProjectionContext.java
    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/ObjectDeltaWaves.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ShadowConstraintsChecker.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ConsolidationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/InboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/OutboundProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/UserDetailsServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/CorrelationConfirmationEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/FocusValidityScannerTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/RecomputeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/ReconciliationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/ReconciliationTaskResult.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/SynchronizationService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/SynchronizeAccountResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/trigger/RecomputeTriggerHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/util/AbstractSearchIterativeResultHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/util/AbstractSearchIterativeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/util/Utils.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/controller/ControllerGetObjectTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/controller/ControllerListAccountShadowOwnerTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/controller/ControllerListObjectsTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/expr/ExpressionHandlerImplTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestAssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjectorAddUser.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/util/mock/MockClockworkHook.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/util/mock/MockLensDebugListener.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/negative/TestAssignmentErrors.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractInboundSyncTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/util/ProfilingLensDebugListener.java
    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/AccountOperationListener.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/notifiers/SimpleAccountNotifier.java
    M model/notifications-impl/src/test/java/com/evolveum/midpoint/notifications/TestTextFormatter.java
    M model/report-impl/pom.xml
    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/workflow-impl/src/main/java/com/evolveum/midpoint/wf/WorkflowManagerImpl.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/processors/BaseModelInvocationProcessingHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/user/AddRoleAssignmentWrapper.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
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ResourceEventDescription.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ResourceObjectShadowChangeDescription.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ResourceOperationDescription.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/GenericErrorHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ChangeNotificationDispatcherImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceEventListenerImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/query/ValueOperation.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/AbstractDummyTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestConnectorDiscovery.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDBTable.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummySchemaless.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyUuidNonUniqueName.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java
    M repo/audit-api/src/main/java/com/evolveum/midpoint/audit/api/AuditEventRecord.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    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/EncodingTest.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/QueryInterpreterTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.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/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/Definition.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/NaryLogicalRestriction.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/UnaryLogicalRestriction.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/Task.java
    A repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskListener.java
    M repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskManager.java
    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/TaskQuartzImpl.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/TestQuartzTaskManagerContract.java
    A samples/resources/opendj/opendj-localhost-medium.xml
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSamples.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/resources/repo/resource-opendj.xml

  Log Message:
  -----------
  Merge branch 'parser' of git.evolveum.com:/srv/git/projects/midpoint into parser

Conflicts:
	infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java


  Commit: 78ca5fb05acda0afc3bcd05f5379c0ea3637aa4b
      https://github.com/Evolveum/midpoint/commit/78ca5fb05acda0afc3bcd05f5379c0ea3637aa4b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-13 (Thu, 13 Feb 2014)

  Changed paths:
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/data/DoubleButtonPanel_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/data/column/DoubleButtonColumn_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/input/UploadPanel_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/ItemApprovalPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/PageReport_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/AceEditorPanel_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/ReportButtonPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/SingleButtonRowPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/UserReportConfigPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageOrgTree_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/security/MidPointApplication_en_US.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/data/DoubleButtonPanel_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/data/column/DoubleButtonColumn_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/input/UploadPanel_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/ItemApprovalPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalPanel_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/PageReport_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/AceEditorPanel_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/AuditPopupPanel_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/ReconciliationPopupPanel_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/ReportButtonPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/SingleButtonRowPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/UserReportConfigPanel_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/roles/PageRoles_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageOrgTree_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/security/MidPointApplication_sk_SK.utf8.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AsyncUpdatePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AsyncUpdatePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/GuiComponents.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.css
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.js
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/accordion/AccordionItem.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/accordion/AccordionItem.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/accordion/accordionArrow.png
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/accordion/accordionHeaderBg.png
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/accordion/accordionHeaderBgOver.png
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/atmosphere/GuiTaskHandler.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/atmosphere/NotifyMessage.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
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/MainFeedback.css
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/MainFeedback.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/MainFeedback.js
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-error-arrow.png
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-error-icon.png
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-exp-icon.png
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-info-arrow.png
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-info-icon.png
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-succ-arrow.png
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-succ-icon.png
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-warn-arrow.png
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-warn-icon.png
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/AjaxCallListenerFactory.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/BaseSimplePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/CallableResult.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FutureUpdateBehavior.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/LoadableModel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/VisibleEnableBehaviour.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.properties
    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/server/PageTaskAdd.html
    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.html
    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/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/security/MidPointApplication.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/SearchFormEnterBehavior.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/TooltipBehavior.java
    R gui/admin-gui/src/main/webapp/css/reset.css
    R gui/admin-gui/src/main/webapp/css/tipsy.css
    A gui/admin-gui/src/main/webapp/img/messages-exp-icon.png
    R gui/admin-gui/src/main/webapp/js/easing.js
    R gui/admin-gui/src/main/webapp/js/jquery-1.10.2.js
    R gui/admin-gui/src/main/webapp/js/tipsy.js
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
    A gui/admin-gui/src/main/webapp/less/midpoint/operation-result.less
    R gui/gui-components/.gitignore
    R gui/gui-components/pom.xml
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/GuiComponents.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.css
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.html
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.js
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/accordion/AccordionItem.html
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/accordion/AccordionItem.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/accordion/accordionArrow.png
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/accordion/accordionHeaderBg.png
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/accordion/accordionHeaderBgOver.png
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/async/AsyncUpdatePanel.html
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/async/AsyncUpdatePanel.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/async/CallableResult.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/async/FutureUpdateBehavior.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/resource/img/ImgResources.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/resource/img/ajax-loader.gif
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/util/AjaxCallListenerFactory.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/util/BaseSimplePanel.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/util/LoadableModel.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/util/VisibleEnableBehaviour.java
    R gui/gui-components/testng.xml
    M gui/pom.xml
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportCreateTaskHandler.java
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
    A model/report-impl/src/test/resources/DejaVuSans.ttf
    M model/report-impl/src/test/resources/reports/reportAuditLogs.xml
    A model/report-impl/src/test/resources/reports/reportReconciliation.xml

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

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java


  Commit: efc33e10eb4fe25dc50145bac833ac1210541a29
      https://github.com/Evolveum/midpoint/commit/efc33e10eb4fe25dc50145bac833ac1210541a29
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-13 (Thu, 13 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java

  Log Message:
  -----------
  post-merge fix


  Commit: fa1484f13488c6a8c596203156152afca9095b46
      https://github.com/Evolveum/midpoint/commit/fa1484f13488c6a8c596203156152afca9095b46
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-13 (Thu, 13 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/JsonValueParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ValueParser.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java

  Log Message:
  -----------
  Improved PrismBeanConverter


  Commit: af43d813bdbac5415e322ef914bba539a1503e51
      https://github.com/Evolveum/midpoint/commit/af43d813bdbac5415e322ef914bba539a1503e51
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-13 (Thu, 13 Feb 2014)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbSanity.java
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/util/ProcessorUtils.java

  Log Message:
  -----------
  Switching capabilities to container. Fixing the problems with underscroes in generated JAXB code.


  Commit: a11c39d3d374f678309bd2c11924db5e093fe1f2
      https://github.com/Evolveum/midpoint/commit/a11c39d3d374f678309bd2c11924db5e093fe1f2
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/annotation_2/AccessAnnotationType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/annotation_2/ObjectFactory.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/annotation_2/package-info.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/FilterType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/LogicalOperatorFilterType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/NAryLogicalOperatorFilterType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/ObjectFactory.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/OrderDirectionType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/PagingType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/PropertyComplexValueFilterType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/PropertyNoValueFilterType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/PropertySimpleValueFilterType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/QueryType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/UnaryLogicalOperatorFilterType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/UriFilterType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/ValueType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/package-info.java
    M infra/schema/pom.xml
    M infra/schema/src/test/resources/common/resource-opendj.xml

  Log Message:
  -----------
  Moving query schema to prism, QueryType in progress.


  Commit: 21d8d4b6b7104c637f19fc54dc19fc10bb4f181c
      https://github.com/Evolveum/midpoint/commit/21d8d4b6b7104c637f19fc54dc19fc10bb4f181c
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/JsonValueParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/RootXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/SchemaXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ValueParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/QueryType.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/resources/common/resource-opendj.xml

  Log Message:
  -----------
  Fixes for schemaless serialization


  Commit: 40cff81a5c055aab209b3917f0cef946f86db38b
      https://github.com/Evolveum/midpoint/commit/40cff81a5c055aab209b3917f0cef946f86db38b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/QueryType.java

  Log Message:
  -----------
  More jaxb fixes


  Commit: 5633bc0734b495d44c09087e820e52c2dd824667
      https://github.com/Evolveum/midpoint/commit/5633bc0734b495d44c09087e820e52c2dd824667
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-14 (Fri, 14 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
    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' into parser

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


  Commit: 7a2bb795cfe01d1c5347d8dd8b0b2f438ef5802d
      https://github.com/Evolveum/midpoint/commit/7a2bb795cfe01d1c5347d8dd8b0b2f438ef5802d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M .gitignore
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUser.java

  Log Message:
  -----------
  More fixes related to raw elements. Still some glitches.


  Commit: 57edfa8038f43a428808445cf46d4c3f44fde989
      https://github.com/Evolveum/midpoint/commit/57edfa8038f43a428808445cf46d4c3f44fde989
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/AbstractParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/ItemPathTypeDeserializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemPathType.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/Generator.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismObjectConstruction.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingXml.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    A tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/FileTransformer.java

  Log Message:
  -----------
  extending tests to support json, yaml..


  Commit: de2475493afbed70b6f33511b29526355d2d403b
      https://github.com/Evolveum/midpoint/commit/de2475493afbed70b6f33511b29526355d2d403b
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-17 (Mon, 17 Feb 2014)

  Changed paths:
    M .gitignore
    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
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/data/DoubleButtonPanel_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/data/column/DoubleButtonColumn_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/input/UploadPanel_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/ItemApprovalPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/PageReport_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/AceEditorPanel_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/ReportButtonPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel_en_US.utf8.properties
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/SingleButtonRowPanel_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/UserReportConfigPanel_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageOrgTree_en_US.utf8.properties
    M gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/security/MidPointApplication_en_US.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/data/DoubleButtonPanel_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/data/column/DoubleButtonColumn_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/input/UploadPanel_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/ItemApprovalPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/wf/processes/itemApproval/ItemApprovalPanel_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/PageReport_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/AceEditorPanel_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/AuditPopupPanel_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/ReconciliationPopupPanel_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/ReportButtonPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/ReportConfigurationPanel_sk_SK.utf8.properties
    R gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/SingleButtonRowPanel_sk_SK.utf8.properties
    A gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/reports/component/UserReportConfigPanel_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/roles/PageRoles_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/page/admin/users/PageOrgTree_sk_SK.utf8.properties
    M gui/admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/security/MidPointApplication_sk_SK.utf8.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AsyncUpdatePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AsyncUpdatePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/GuiComponents.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.css
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.js
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/accordion/AccordionItem.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/accordion/AccordionItem.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/accordion/accordionArrow.png
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/accordion/accordionHeaderBg.png
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/accordion/accordionHeaderBgOver.png
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/atmosphere/GuiTaskHandler.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/atmosphere/NotifyMessage.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
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/MainFeedback.css
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/MainFeedback.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/MainFeedback.js
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-error-arrow.png
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-error-icon.png
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-exp-icon.png
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-info-arrow.png
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-info-icon.png
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-succ-arrow.png
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-succ-icon.png
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-warn-arrow.png
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/messages-warn-icon.png
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/AjaxCallListenerFactory.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/BaseSimplePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/CallableResult.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FutureUpdateBehavior.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/LoadableModel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/VisibleEnableBehaviour.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
    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/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/LoggingConfigPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.properties
    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/server/PageTaskAdd.html
    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.html
    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/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/security/MidPointApplication.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/SearchFormEnterBehavior.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/TooltipBehavior.java
    M gui/admin-gui/src/main/webapp/WEB-INF/descriptor.xml
    R gui/admin-gui/src/main/webapp/css/reset.css
    R gui/admin-gui/src/main/webapp/css/tipsy.css
    A gui/admin-gui/src/main/webapp/img/messages-exp-icon.png
    R gui/admin-gui/src/main/webapp/js/easing.js
    R gui/admin-gui/src/main/webapp/js/jquery-1.10.2.js
    R gui/admin-gui/src/main/webapp/js/tipsy.js
    M gui/admin-gui/src/main/webapp/less/midpoint/capabilities.less
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
    A gui/admin-gui/src/main/webapp/less/midpoint/operation-result.less
    R gui/gui-components/.gitignore
    R gui/gui-components/pom.xml
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/GuiComponents.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.css
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.html
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/accordion/Accordion.js
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/accordion/AccordionItem.html
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/accordion/AccordionItem.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/accordion/accordionArrow.png
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/accordion/accordionHeaderBg.png
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/accordion/accordionHeaderBgOver.png
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/async/AsyncUpdatePanel.html
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/async/AsyncUpdatePanel.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/async/CallableResult.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/async/FutureUpdateBehavior.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/resource/img/ImgResources.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/resource/img/ajax-loader.gif
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/util/AjaxCallListenerFactory.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/util/BaseSimplePanel.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/util/LoadableModel.java
    R gui/gui-components/src/main/java/com/evolveum/midpoint/web/component/util/VisibleEnableBehaviour.java
    R gui/gui-components/testng.xml
    M gui/pom.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/JsonValueParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/RootXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/SchemaXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ValueParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/annotation_2/AccessAnnotationType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/annotation_2/ObjectFactory.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/annotation_2/package-info.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/FilterType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/LogicalOperatorFilterType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/NAryLogicalOperatorFilterType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/ObjectFactory.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/OrderDirectionType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/PagingType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/PropertyComplexValueFilterType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/PropertyNoValueFilterType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/PropertySimpleValueFilterType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/QueryType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/UnaryLogicalOperatorFilterType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/UriFilterType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/ValueType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/package-info.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestDomParser.java
    M infra/schema/pom.xml
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUser.java
    M infra/schema/src/test/resources/common/resource-opendj.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    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
    A model/report-impl/src/test/resources/DejaVuSans.ttf
    M model/report-impl/src/test/resources/reports/reportAuditLogs.xml
    A 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
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/util/ProcessorUtils.java

  Log Message:
  -----------
  Merge branch 'parser' of git.evolveum.com:/srv/git/projects/midpoint into parser

Conflicts:
	infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java


  Commit: cec9b647ed538ac8cb9c5e977020cbddd64261d1
      https://github.com/Evolveum/midpoint/commit/cec9b647ed538ac8cb9c5e977020cbddd64261d1
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-18 (Tue, 18 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/AbstractParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/ItemPathDeserializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/JsonValueParser.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    M infra/prism/src/test/resources/common/json/user-jack.json

  Log Message:
  -----------
  tests for yaml and json..itemPath deserialization..


  Commit: f5d4e86eabe027f6a44987d93e2f9ad4395e4a02
      https://github.com/Evolveum/midpoint/commit/f5d4e86eabe027f6a44987d93e2f9ad4395e4a02
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-19 (Wed, 19 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/json/ItemPathTypeDeserializer.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUser.java

  Log Message:
  -----------
  fixing schema tests..


  Commit: 7e90b1904ede12ff5782bd7f9b9afda9d127ec3a
      https://github.com/Evolveum/midpoint/commit/7e90b1904ede12ff5782bd7f9b9afda9d127ec3a
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-20 (Thu, 20 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/CloneUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ListXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/SchemaXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemPathType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ProtectedStringType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/SchemaDefinitionType.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUser.java
    M infra/schema/src/test/resources/common/resource-opendj.xml
    M infra/schema/src/test/resources/common/user-barbossa.xml
    M infra/schema/src/test/resources/common/user-jack.xml
    M infra/schema/src/test/resources/deltaconverter/user-modify-add-role-pirate.xml
    M infra/schema/src/test/resources/diff/resource-after-ns-change.xml
    M infra/schema/src/test/resources/diff/resource-after.xml
    M infra/schema/src/test/resources/diff/resource-before.xml

  Log Message:
  -----------
  fixing schema tests..work in progress..


  Commit: 6eb251324af5358f1944519c51187eeac62a3576
      https://github.com/Evolveum/midpoint/commit/6eb251324af5358f1944519c51187eeac62a3576
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-20 (Thu, 20 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbConstruction.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJsonParsing.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseGenericObject.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/SchemaProcessorTest.java
    M infra/schema/src/test/resources/common/generic-sample-configuration.xml
    M infra/schema/src/test/resources/common/task-1.xml
    M infra/schema/src/test/resources/common/user-barbossa.xml

  Log Message:
  -----------
  fixing schema test...continue..


  Commit: 9554ea95fbf30a41e3656f7af62236f088654674
      https://github.com/Evolveum/midpoint/commit/9554ea95fbf30a41e3656f7af62236f088654674
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-22 (Sat, 22 Feb 2014)

  Changed paths:
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/Referencable.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/SubstringFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/QueryType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemPathType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryJaxbConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ConnectorTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUser.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/TestResourceSchema.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java
    M infra/schema/src/test/resources/common/resource-opendj.xml
    M infra/schema/src/test/resources/common/user-barbossa-modify-delete-assignment-account-opendj-attr.xml
    M infra/schema/src/test/resources/common/user-jack.xml
    M infra/schema/src/test/resources/queryconvertor/query-and-generic.xml
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

  Log Message:
  -----------
  fixing schema tests - finish..all tests pass


  Commit: 751215cb736edfb64404a741c31e9456125079a0
      https://github.com/Evolveum/midpoint/commit/751215cb736edfb64404a741c31e9456125079a0
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-23 (Sun, 23 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PropertyValueFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/resources/queryconvertor/query-account-by-attributes-and-resource-ref.xml
    M infra/schema/src/test/resources/queryconvertor/query-or-composite.xml

  Log Message:
  -----------
  imporving tests for query parsing..


  Commit: 0299efdf1fc357506faf411363f3f966e3b1d8ce
      https://github.com/Evolveum/midpoint/commit/0299efdf1fc357506faf411363f3f966e3b1d8ce
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    M tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/FileTransformer.java
    M tools/repo-ninja/src/main/java/com/evolveum/midpoint/tools/ninja/KeyStoreDumper.java

  Log Message:
  -----------
  transformation between xml, json, yaml..


  Commit: 71bfae97a18def3373e7025cb97d99d60333e6ef
      https://github.com/Evolveum/midpoint/commit/71bfae97a18def3373e7025cb97d99d60333e6ef
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-24 (Mon, 24 Feb 2014)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/crypto/CryptoUtil.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/policy/PasswordPolicyUtils.java
    M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
    M infra/common/src/test/java/com/evolveum/midpoint/common/test/PasswordPolicyValidatorTest.java
    R infra/common/src/test/resources/keystore.jceks
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/crypto/TestProtector.java
    A infra/prism/src/test/resources/keystore.jceks
    M infra/prism/testng.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointTestConstants.java

  Log Message:
  -----------
  moving test for protector.


  Commit: 1a20eeb8f07bcfce96cc9dceedcbe4f2c529e483
      https://github.com/Evolveum/midpoint/commit/1a20eeb8f07bcfce96cc9dceedcbe4f2c529e483
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-25 (Tue, 25 Feb 2014)

  Changed paths:
    R infra/common/src/main/java/com/evolveum/midpoint/common/crypto/AESProtector.java
    R infra/common/src/test/java/com/evolveum/midpoint/common/crypto/TestProtector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/AESProtector.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/crypto/TestProtector.java

  Log Message:
  -----------
  fixing aes protector (added missing apache crypto library initializaiton)..


  Commit: 5978a7be50fa3e450e148f2184fd1bcfc3023dcd
      https://github.com/Evolveum/midpoint/commit/5978a7be50fa3e450e148f2184fd1bcfc3023dcd
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-02-26 (Wed, 26 Feb 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/AbstractParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/Parser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JaxbTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ValueSerializationUtil.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ProtectedDataType.java
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestConstants.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUser.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUserJson.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUserXml.java
    M infra/schema/src/test/resources/common/json/user-jack.json
    A infra/schema/src/test/resources/common/xml/user-jack.xml
    M infra/schema/testng.xml
    M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/ResourceCarefulAntUtil.java
    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/AddOverwriteTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.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/ConcurrencyTest.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/ListAccountShadowOwnerTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyAssignmentTest.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/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/ResourceModifyTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchShadowOwnerTest.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/ctx-configuration-sql-test.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/resource-csv.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/resource-opendj.xml
    M repo/repo-sql-impl-test/src/test/resources/query/query-account-by-attributes-and-resource-ref.xml
    M repo/repo-sql-impl-test/src/test/resources/query/query-or-composite.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/audit/RObjectDeltaOperation.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/RAnyConverter.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/RConnectorHost.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/RSystemConfiguration.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
    M 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/util/RUtil.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/ConfigurableProtectorFactory.java

  Log Message:
  -----------
  some repo fixes..improved bean converter, some schema improvements, etc..


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XmlTypeConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    M infra/schema/src/test/resources/common/resource-opendj.xml

  Log Message:
  -----------
  some other test fixes..


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

  Changed paths:
    M infra/prism-maven-plugin/src/main/java/com/evolveum/midpoint/prism/maven/SchemaDocMojo.java
    M infra/schema/pom.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog-model-context.xml
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/main/resources/xml/ns/public/connector/icf-1/resource-schema-2.xsd
    M infra/schema/src/test/resources/common/resource-opendj.xml

  Log Message:
  -----------
  Hacking and fixing ResourceObjectPatternType


  Commit: 6f0110a4faa699e7e377536ad3a112028a6020a6
      https://github.com/Evolveum/midpoint/commit/6f0110a4faa699e7e377536ad3a112028a6020a6
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-03-04 (Tue, 04 Mar 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java

  Log Message:
  -----------
  fixing enums..


  Commit: 31bb343835a4f28f2ad8de929a9444f135ea4d5d
      https://github.com/Evolveum/midpoint/commit/31bb343835a4f28f2ad8de929a9444f135ea4d5d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-04 (Tue, 04 Mar 2014)

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

  Log Message:
  -----------
  Improving filter schema, part 1


  Commit: 66a587bbd60349afc5d55e0a4dc29b1f7c925c8d
      https://github.com/Evolveum/midpoint/commit/66a587bbd60349afc5d55e0a4dc29b1f7c925c8d
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2014-03-04 (Tue, 04 Mar 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/FilterClauseType.java
    R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/FilterType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/LogicalOperatorFilterType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/ObjectFactory.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/PropertyComplexValueFilterType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/PropertyNoValueFilterType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/PropertySimpleValueFilterType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/QueryType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/SearchFilterType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/UriFilterType.java
    M infra/prism/src/main/resources/xml/ns/public/query-2.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

  Log Message:
  -----------
  Query schema cleanup, part 2


  Commit: 68bee015f115a9f088e7929de0453be91554c692
      https://github.com/Evolveum/midpoint/commit/68bee015f115a9f088e7929de0453be91554c692
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-03-04 (Tue, 04 Mar 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ResourceModifyTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/resource-opendj.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RResource.java

  Log Message:
  -----------
  some other fixes for tests..(improving serialization of enums, operation result,...)


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

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/ResourceObjectPattern.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/QueryType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryJaxbConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbConstruction.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseObjectTemplate.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUser.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java

  Log Message:
  -----------
  Fixing the query schema


  Commit: 69af95f1a409cd7d90acd92fbff13b4de01a6d39
      https://github.com/Evolveum/midpoint/commit/69af95f1a409cd7d90acd92fbff13b4de01a6d39
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-03-06 (Thu, 06 Mar 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ValueSerializationUtil.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemDeltaType.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 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/RAbstractRole.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/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/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/util/RUtil.java

  Log Message:
  -----------
  continue with fixing repo tests.


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

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/ResourceObjectPattern.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/FilterClauseType.java
    R infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/FilterType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/LogicalOperatorFilterType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/ObjectFactory.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/PropertyComplexValueFilterType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/PropertyNoValueFilterType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/PropertySimpleValueFilterType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/QueryType.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/SearchFilterType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/UriFilterType.java
    M infra/prism/src/main/resources/xml/ns/public/query-2.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryJaxbConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbConstruction.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseObjectTemplate.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUser.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

  Log Message:
  -----------
  Merge branch 'parser' of git.evolveum.com:/srv/git/projects/midpoint into parser


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

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/StaticExpressionUtil.java

  Log Message:
  -----------
  StaticExpressionUtil work in progress


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

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/StaticExpressionUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java

  Log Message:
  -----------
  Fixing RawType


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

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/StaticExpressionUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java

  Log Message:
  -----------
  Merge branch 'parser' of git.evolveum.com:/srv/git/projects/midpoint into parser


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java

  Log Message:
  -----------
  fixing prism tests..


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

  Changed paths:
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ItemPathUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbParsing.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java

  Log Message:
  -----------
  switching XPathType to ItemPathType in ItemDeltaType..


  Commit: 9b67c98482f104a679810625662e1394f9c0cc86
      https://github.com/Evolveum/midpoint/commit/9b67c98482f104a679810625662e1394f9c0cc86
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-03-07 (Fri, 07 Mar 2014)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResultFactory.java

  Log Message:
  -----------
  fixing build.. (OperationResultFactory)


  Commit: 92227b0a5d02f8ded37ae4a51a252d1cc058d757
      https://github.com/Evolveum/midpoint/commit/92227b0a5d02f8ded37ae4a51a252d1cc058d757
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-03-07 (Fri, 07 Mar 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/NameItemPathSegment.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemPathType.java

  Log Message:
  -----------
  switchin XPathType to ItemPathType in ItemDeltaType


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/AndFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualsFilter.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PagingConvertor.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/query/QueryJaxbConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JaxbTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/ObjectFactory.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/QueryType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/SearchFilterType.java
    M infra/prism/src/main/resources/xml/ns/public/query-2.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    R infra/prism/src/test/java/com/evolveum/midpoint/prism/TestObjectQuery.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestObjectQuery.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestQueryConvertors.java
    A infra/prism/src/test/resources/query/filter-user-and.xml
    A infra/prism/src/test/resources/query/filter-user-name.xml
    M infra/prism/testng.xml
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/PagingConvertor.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryJaxbConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/resources/common/resource-opendj.xml
    A infra/schema/src/test/resources/queryconvertor/filter-account-by-attributes-and-resource-ref.xml
    A infra/schema/src/test/resources/queryconvertor/filter-account.xml
    A infra/schema/src/test/resources/queryconvertor/filter-and-generic.xml
    A infra/schema/src/test/resources/queryconvertor/filter-connector-by-type.xml
    A infra/schema/src/test/resources/queryconvertor/filter-or-composite.xml
    A infra/schema/src/test/resources/queryconvertor/filter-user-by-fullName.xml
    A infra/schema/src/test/resources/queryconvertor/filter-user-by-name.xml
    A infra/schema/src/test/resources/queryconvertor/filter-user-substring-fullName.xml
    R infra/schema/src/test/resources/queryconvertor/query-account-by-attributes-and-resource-ref.xml
    R infra/schema/src/test/resources/queryconvertor/query-and-generic.xml
    R infra/schema/src/test/resources/queryconvertor/query-connector-by-type.xml
    R infra/schema/src/test/resources/queryconvertor/query-or-composite.xml
    R infra/schema/src/test/resources/queryconvertor/query-user-by-fullName.xml
    R infra/schema/src/test/resources/queryconvertor/query-user-by-name.xml
    R infra/schema/src/test/resources/queryconvertor/query-user-substring-fullName.xml
    R infra/schema/src/test/resources/queryconvertor/query.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/DomAsserts.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.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/importer/ObjectImporter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/CorrelationConfirmationEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/RecomputeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/util/Utils.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/sync/TestCorrelationConfiramtionEvaluator.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/DataSourceReport.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java

  Log Message:
  -----------
  Fixing query converters. Couple of new tests.


  Commit: 0c7c09b2ed4a9f062e1f0b2d97590ea8e4c84b15
      https://github.com/Evolveum/midpoint/commit/0c7c09b2ed4a9f062e1f0b2d97590ea8e4c84b15
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-03-07 (Fri, 07 Mar 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/AndFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualsFilter.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PagingConvertor.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/query/QueryJaxbConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JaxbTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/ObjectFactory.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/QueryType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/SearchFilterType.java
    M infra/prism/src/main/resources/xml/ns/public/query-2.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    R infra/prism/src/test/java/com/evolveum/midpoint/prism/TestObjectQuery.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestObjectQuery.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestQueryConvertors.java
    A infra/prism/src/test/resources/query/filter-user-and.xml
    A infra/prism/src/test/resources/query/filter-user-name.xml
    M infra/prism/testng.xml
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/PagingConvertor.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryJaxbConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java
    M infra/schema/src/test/resources/common/resource-opendj.xml
    A infra/schema/src/test/resources/queryconvertor/filter-account-by-attributes-and-resource-ref.xml
    A infra/schema/src/test/resources/queryconvertor/filter-account.xml
    A infra/schema/src/test/resources/queryconvertor/filter-and-generic.xml
    A infra/schema/src/test/resources/queryconvertor/filter-connector-by-type.xml
    A infra/schema/src/test/resources/queryconvertor/filter-or-composite.xml
    A infra/schema/src/test/resources/queryconvertor/filter-user-by-fullName.xml
    A infra/schema/src/test/resources/queryconvertor/filter-user-by-name.xml
    A infra/schema/src/test/resources/queryconvertor/filter-user-substring-fullName.xml
    R infra/schema/src/test/resources/queryconvertor/query-account-by-attributes-and-resource-ref.xml
    R infra/schema/src/test/resources/queryconvertor/query-and-generic.xml
    R infra/schema/src/test/resources/queryconvertor/query-connector-by-type.xml
    R infra/schema/src/test/resources/queryconvertor/query-or-composite.xml
    R infra/schema/src/test/resources/queryconvertor/query-user-by-fullName.xml
    R infra/schema/src/test/resources/queryconvertor/query-user-by-name.xml
    R infra/schema/src/test/resources/queryconvertor/query-user-substring-fullName.xml
    R infra/schema/src/test/resources/queryconvertor/query.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    A infra/util/src/main/java/com/evolveum/midpoint/util/DomAsserts.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.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/importer/ObjectImporter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/CorrelationConfirmationEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/RecomputeTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/util/Utils.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/sync/TestCorrelationConfiramtionEvaluator.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/DataSourceReport.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java

  Log Message:
  -----------
  Merge branch 'parser' of git.evolveum.com:/srv/git/projects/midpoint into parser


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/SearchFilterType.java

  Log Message:
  -----------
  More query-related fixes


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/SearchFilterType.java

  Log Message:
  -----------
  Merge branch 'parser' of git.evolveum.com:/srv/git/projects/midpoint into parser


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualsFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PropertyValueFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/QueryJaxbConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ValueFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ListXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/RootXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/SchemaXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/SearchFilterType.java
    M infra/prism/src/main/resources/xml/ns/public/query-2.xsd
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestQueryConvertors.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java

  Log Message:
  -----------
  More work on query ... but still in progress


  Commit: 20be7205f202f98093ca86a41a2e403bee87dca9
      https://github.com/Evolveum/midpoint/commit/20be7205f202f98093ca86a41a2e403bee87dca9
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-03-11 (Tue, 11 Mar 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualsFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PropertyValueFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/QueryJaxbConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ValueFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ListXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/RootXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/SchemaXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/SearchFilterType.java
    M infra/prism/src/main/resources/xml/ns/public/query-2.xsd
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestQueryConvertors.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConvertor.java

  Log Message:
  -----------
  Merge branch 'parser' of git.evolveum.com:/srv/git/projects/midpoint into parser


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

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedResourceSchema.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/AbstractParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JsonParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/YamlParser.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.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/embedded/REmbeddedReference.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java

  Log Message:
  -----------
  small clean up in yaml/json parer + build fixes..


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/Revivable.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectFilter.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/SearchFilterType.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/util/SerializationSafeContainer.java

  Log Message:
  -----------
  Experiment with "Revivable" interface


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Item.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Revivable.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectFilter.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/SearchFilterType.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Compilation fixes


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualsFilter.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ExpressionWrapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/PropertyValueFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/RefFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/SchemaDefinitionType.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java

  Log Message:
  -----------
  Traversing container values using unqualified path segments (unfinished).
Parsing expressions in search filters (unfinished, to be discussed).


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/PrismDomProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/QueryJaxbConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/SearchFilterType.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbConstruction.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseUser.java

  Log Message:
  -----------
  Fixed schema tests.


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java

  Log Message:
  -----------
  Disabled brute-force serialization of unparsed values, but allowing serialization of unparsed values with known type.


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

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

  Log Message:
  -----------
  Made objects.xml compliant with the schema.


  Commit: 2015bde88e07c00711bf6260e74c31b41c6f6102
      https://github.com/Evolveum/midpoint/commit/2015bde88e07c00711bf6260e74c31b41c6f6102
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-03-20 (Thu, 20 Mar 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ValueSerializationUtil.java
    M infra/schema/src/test/resources/queryconvertor/filter-user-by-fullName.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
    M repo/repo-sql-impl-test/src/test/resources/query/query-account-by-attributes-and-resource-ref.xml
    M repo/repo-sql-impl-test/src/test/resources/query/query-and-generic.xml
    M repo/repo-sql-impl-test/src/test/resources/query/query-connector-by-type.xml
    M repo/repo-sql-impl-test/src/test/resources/query/query-or-composite.xml
    M repo/repo-sql-impl-test/src/test/resources/query/query-user-by-enabled.xml
    M repo/repo-sql-impl-test/src/test/resources/query/query-user-by-fullName.xml
    M repo/repo-sql-impl-test/src/test/resources/query/query-user-by-name.xml
    M repo/repo-sql-impl-test/src/test/resources/query/query-user-substring-fullName.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyReference.java

  Log Message:
  -----------
  some fixes in repo impl tests..


  Commit: 3832ced0bd4480e739db36268e75f1ebc66b2d03
      https://github.com/Evolveum/midpoint/commit/3832ced0bd4480e739db36268e75f1ebc66b2d03
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-03-20 (Thu, 20 Mar 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemDeltaType.java
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbParsing.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java

  Log Message:
  -----------
  working on ItemDeltaType ...changing Value to RawType..


  Commit: 9d9525131aedc9eda5ec2a4458a9c556ca94d301
      https://github.com/Evolveum/midpoint/commit/9d9525131aedc9eda5ec2a4458a9c556ca94d301
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-03-20 (Thu, 20 Mar 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/AESProtector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/Protector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/QueryJaxbConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/QueryType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/SearchFilterType.java
    M infra/prism/src/main/resources/xml/ns/public/query-2.xsd
    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/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/resources/common/resource-opendj.xml
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/Expression.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpression.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/LazyXPathVariableResolver.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/XPathExpressionCodeHolder.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/XPathScriptEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSimple.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSysVar.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingStatic.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestValueConstructionAbsolute.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.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/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 provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/PasswordChangeOperation.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/util/UcfUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/AbstractDummyTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestCsvFile.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDBTable.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyHacks.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyResourceAndSchemaCaching.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyUuidNonUniqueName.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJNegative.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.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

  Log Message:
  -----------
  Continuing with fixing compile errors:
- replacing c:ProtectedStringType with t:ProtectedStringType
- adapting code to other changes in schema
- adding missing methods to Protector, JaxbDomHack and DomParser
- removing condition from QueryType, creating c:ConditionalSearchFilterType
- etc
First compilation errors in model-common, first failed tests in sql-repo-impl-test.


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

  Changed paths:
    M build-system/pom.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/StaticExpressionUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/AbstractParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JsonParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/Parser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/YamlParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/SearchFilterType.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointTestConstants.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpressionUtil.java
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/expr/MidpointFunctionsImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/importer/ImportObjectsFromCamelTaskHandler.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/projector/CredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/PasswordPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/rest/MidpointXmlProvider.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/sync/CorrelationConfirmationEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/util/Utils.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/ControllerAddObjectTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/expr/ExpressionHandlerImplTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestClockwork.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestDependencies.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/migrator/TestMigrator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/sync/TestCorrelationConfiramtionEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMisc.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelCrudService.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.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/importer/ImportTest.java

  Log Message:
  -----------
  Fixed compilation errors in model-common, model-impl, model-intest. Thrown out Camel integration.


  Commit: 6419c7388f574cd19ed17e532ac70468b8138887
      https://github.com/Evolveum/midpoint/commit/6419c7388f574cd19ed17e532ac70468b8138887
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-03-21 (Fri, 21 Mar 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/assignment/ACAttributeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/OpResult.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.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/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.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/PageReport.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/roles/PageRole.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/util/WebMiscUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/QueryJaxbConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchema.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/CipherDataType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/EncryptedDataType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/EncryptionMethodType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/KeyInfoType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectDeltaType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ProtectedDataType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ProtectedStringType.java
    M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/GcpConfigurationHelper.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/util/MiscDataUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/util/SerializationSafeContainer.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

  Log Message:
  -----------
  Fixed compilation errors in model-client, workflow-impl, admin-gui.


  Commit: 8bfbc0f081f008957fe15a4a6dbdbc934797b39b
      https://github.com/Evolveum/midpoint/commit/8bfbc0f081f008957fe15a4a6dbdbc934797b39b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-03-21 (Fri, 21 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
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSamples.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/ModelClientUtil.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java

  Log Message:
  -----------
  Fixed remaining compilation issues.


  Commit: 591e2936d4190547f1ececac8a793f6c43fc7a6a
      https://github.com/Evolveum/midpoint/commit/591e2936d4190547f1ececac8a793f6c43fc7a6a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-03-22 (Sat, 22 Mar 2014)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/RetrieveOption.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-2.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/model-1.wsdl

  Log Message:
  -----------
  Reworked model WSDL to be compliant with current state of ModelService.


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ValueSerializationUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemDeltaType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemPathType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectDeltaType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-2.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbParsing.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java
    M infra/schema/src/test/resources/common/user-barbossa-modify-delete-assignment-account-opendj-attr.xml
    M infra/schema/src/test/resources/deltaconverter/user-modify-add-account.xml
    M infra/schema/src/test/resources/deltaconverter/user-modify-add-role-pirate.xml
    M infra/schema/src/test/resources/deltaconverter/user-modify-givenname.xml
    M infra/schema/src/test/resources/deltaconverter/user-modify-password.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelWebService.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/CommunicationExceptionHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ConfigurationExceptionHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/GenericErrorHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectNotFoundHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/SchemaExceptionHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/SecurityViolationHandler.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheProvisioner.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCacheReconciler.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.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/resources/modify/account-delete-object-change.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-add-assignment.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-add-inducement.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-assignment.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-delete-add-assignment.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-delete-assignment.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-delete-inducement.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-inducement.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/change-add-non-existing.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/change-add.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/change-name.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/modify-orgStruct-add-orgref.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/modify-orgStruct-add-user.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/modify-user-add-roles.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/role-modify-change.xml
    M repo/repo-sql-impl-test/src/test/resources/orgstruct/modify-orgStruct-delete-ref.xml
    M repo/repo-sql-impl-test/src/test/resources/orgstruct/modify-orgStruct-incorrect-add-orgref.xml
    M repo/repo-sql-impl-test/src/test/resources/orgstruct/modify-orgStruct-incorrect-delete-ref.xml
    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/RShadow.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java

  Log Message:
  -----------
  some more changes in objectModificationType and ObjectDeltaType..fixing schema tests..still not working..


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

  Changed paths:
    M build-system/pom.xml
    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/assignment/ACAttributeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/OpResult.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PropertyWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.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/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.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/PageReport.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/roles/PageRole.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/util/WebMiscUtil.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/StaticExpressionUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/AESProtector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/Protector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/AbstractParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JsonParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/Parser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/YamlParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/QueryJaxbConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchema.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/QueryType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/SearchFilterType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/CipherDataType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/EncryptedDataType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/EncryptionMethodType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/KeyInfoType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectDeltaType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ProtectedDataType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ProtectedStringType.java
    M infra/prism/src/main/resources/xml/ns/public/query-2.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/RetrieveOption.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-2.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/model-1.wsdl
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java
    M infra/schema/src/test/resources/common/resource-opendj.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/MidPointTestConstants.java
    M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/Expression.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpression.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/LazyXPathVariableResolver.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/XPathExpressionCodeHolder.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/XPathScriptEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/ExpressionTestUtil.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpressionUtil.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/MappingTestEvaluator.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSimple.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSysVar.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingStatic.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestValueConstructionAbsolute.java
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/expr/MidpointFunctionsImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/importer/ImportObjectsFromCamelTaskHandler.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/projector/CredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/PasswordPolicyProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/rest/MidpointXmlProvider.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/sync/CorrelationConfirmationEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/util/Utils.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/ControllerAddObjectTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/expr/ExpressionHandlerImplTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestClockwork.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestDependencies.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/migrator/TestMigrator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/sync/TestCorrelationConfiramtionEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMisc.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelCrudService.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.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/importer/ImportTest.java
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.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/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/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/general/GcpConfigurationHelper.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/util/MiscDataUtil.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/util/SerializationSafeContainer.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
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/PasswordChangeOperation.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/util/UcfUtil.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/AbstractDummyTest.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestCsvFile.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDBTable.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyHacks.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyResourceAndSchemaCaching.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyUuidNonUniqueName.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJNegative.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.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/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSamples.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/ModelClientUtil.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java

  Log Message:
  -----------
  Merge branch 'parser' of git.evolveum.com:/srv/git/projects/midpoint into parser

Conflicts:
	infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
	infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
	infra/schema/src/main/resources/xml/ns/public/common/api-types-2.xsd


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

  Changed paths:
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/util/RawTypeUtil.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemDeltaType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbParsing.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseDiffPatch.java
    M infra/schema/src/test/resources/deltaconverter/user-modify-add-account.xml

  Log Message:
  -----------
  more work on itemDeltaType..fixing schema tests..


  Commit: 49079d14f63e614707f8a98f07ea6e8a0450993a
      https://github.com/Evolveum/midpoint/commit/49079d14f63e614707f8a98f07ea6e8a0450993a
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/CloneUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/RawTypeUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ValueSerializationUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/XNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemPathType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/test/resources/deltaconverter/user-modify-add-role-pirate.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyAssignmentTest.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/ResourceModifyTest.java
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-add-inducement.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-assignment.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-inducement.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/modify-orgStruct-add-orgref.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/modify-orgStruct-add-user.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/role-modify-change.xml
    M repo/repo-sql-impl-test/src/test/resources/orgstruct/modify-orgStruct-add-orgref.xml
    M repo/repo-sql-impl-test/src/test/resources/orgstruct/modify-orgStruct-add-user.xml
    M repo/repo-sql-impl-test/src/test/resources/orgstruct/modify-orgStruct-delete-ref.xml
    M repo/repo-sql-impl-test/src/test/resources/orgstruct/modify-orgStruct-incorrect-add-orgref.xml
    M repo/repo-sql-impl-test/src/test/resources/orgstruct/modify-orgStruct-incorrect-delete-ref.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/util/RUtil.java

  Log Message:
  -----------
  finishing work on objectDeltaType and itemDeltaType..fixing repo tests..


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

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-2.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/model-1.wsdl
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelPort.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/ModelWebService.java
    M repo/repo-test-util/src/main/resources/ctx-configuration-test.xml

  Log Message:
  -----------
  Aligned ModelWebService.java with changed model-1.wsdl.
Removed obsolete listResourceObjects from model WSDL.


  Commit: 80a9bdc049df460776cae87b91142c1209265e98
      https://github.com/Evolveum/midpoint/commit/80a9bdc049df460776cae87b91142c1209265e98
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchema.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/RawTypeUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/ValueSerializationUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemDeltaType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.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/RAnyConverter.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/util/RUtil.java
    M repo/repo-test-util/src/main/resources/ctx-configuration-test.xml
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/MockSingleTaskHandler.java
    M repo/task-quartz-impl/src/test/resources/repo/task-003GetProgress.xml
    M repo/task-quartz-impl/src/test/resources/repo/task-004aTaskBigProperty.xml
    M repo/task-quartz-impl/src/test/resources/repo/task-005Single.xml
    M repo/task-quartz-impl/src/test/resources/repo/task-006Cycle.xml
    M repo/task-quartz-impl/src/test/resources/repo/task-008MoreHandlers.xml
    M repo/task-quartz-impl/src/test/resources/repo/task-009CycleLoose.xml
    M repo/task-quartz-impl/src/test/resources/repo/task-010CycleCronLoose.xml
    M repo/task-quartz-impl/src/test/resources/repo/task-011MoreHandlersAndSchedules.xml
    M repo/task-quartz-impl/src/test/resources/repo/task-015DeleteTaskFromRepo.xml
    M repo/task-quartz-impl/src/test/resources/repo/task-019FinishedHandler.xml

  Log Message:
  -----------
  fixing more tests - task quartz impl..(some improvements in rawtype, prim bean converter, etc..)


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

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-2.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/model-1.wsdl
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelPort.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/ModelWebService.java

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

Conflicts:
	repo/repo-test-util/src/main/resources/ctx-configuration-test.xml


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

  Changed paths:
    M README
    M build-system/pom.xml
    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
    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
    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
    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/data/DoubleButtonPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/DoubleButtonColumn.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/ConfirmationDialog.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/menu/top/UserMenuPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ContainerWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/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/util/SimplePanel.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/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/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
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/AttributeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/CapabilityDto.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.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/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/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.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/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/configuration/dto/StandardLoggerType.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/home/component/MyAssignmentsPanel.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/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/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.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
    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
    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/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.html
    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.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.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/PageAccount.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/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/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.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
    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/page/admin/roles/dto/RolesSearchDto.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.html
    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.html
    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.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
    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/page/admin/users/component/OrgTreeProvider.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
    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
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/OrgUnitSearchDto.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/ProcessInstancePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDto.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/MidPointApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/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
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/CreatedReportsStorage.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/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/java/com/evolveum/midpoint/web/util/WebModelUtils.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
    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/descriptor.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/web.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/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
    A infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedConnectorSchema.java
    R infra/common/src/main/java/com/evolveum/midpoint/common/security/AuthorizationEvaluator.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/PrismContainerValue.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/main/java/com/evolveum/prism/xml/ns/_public/types_2/XPathType.java
    M infra/prism/src/main/resources/xml/ns/public/query-2.xsd
    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
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryConvertor.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
    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/java/com/evolveum/midpoint/schema/util/ReportTypeUtil.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
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.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/model/workflow/extension-2.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/workflow/process-instance-state-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/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
    M model/model-api/pom.xml
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelPort.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.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/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    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/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/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/expr/MidpointFunctionsImpl.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
    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/DiscoverConnectorsExecutor.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/PurgeSchemaExecutor.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/actions/TestResourceExecutor.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
    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-impl/src/main/java/com/evolveum/midpoint/model/util/Utils.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/ControllerGetObjectTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/expr/TestModelExpressions.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/sync/TestSynchronizationService.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
    R model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/TestAuthenticationInfoHolder.java

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

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswords.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
	infra/prism/pom.xml
	infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
	infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
	infra/schema/pom.xml
	infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryConvertor.java
	infra/schema/src/main/resources/xml/ns/public/common/api-types-2.xsd
	infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
	infra/schema/src/main/resources/xml/ns/public/model/model-1.wsdl
	infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
	infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
	infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
	model/model-impl/pom.xml
	model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelRestService.java
	model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelWebService.java
	model/model-impl/src/main/java/com/evolveum/midpoint/model/security/MidpointRestAuthenticationHandler.java
	model/model-impl/src/main/java/com/evolveum/midpoint/model/security/PasswordCallback.java
	model/model-impl/src/test/java/com/evolveum/midpoint/model/controller/ControllerAddObjectTest.java
	model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportCreateTaskHandler.java
	model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportUtils.java
	model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
	model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpExternalizationHelper.java
	model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/util/MiscDataUtil.java
	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/util/RUtil.java
	testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    R infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryConvertor.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/scripting/scripting-2.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelWebService.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:
  -----------
  Merge branch 'master' into parser

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/init/InitialDataImport.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswords.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointAuthenticationProvider.java
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
	infra/prism/pom.xml
	infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
	infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
	infra/schema/pom.xml
	infra/schema/src/main/java/com/evolveum/midpoint/schema/QueryConvertor.java
	infra/schema/src/main/resources/xml/ns/public/common/api-types-2.xsd
	infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
	infra/schema/src/main/resources/xml/ns/public/model/model-1.wsdl
	infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaRegistry.java
	infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
	infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
	model/model-impl/pom.xml
	model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelRestService.java
	model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelWebService.java
	model/model-impl/src/main/java/com/evolveum/midpoint/model/security/MidpointRestAuthenticationHandler.java
	model/model-impl/src/main/java/com/evolveum/midpoint/model/security/PasswordCallback.java
	model/model-impl/src/test/java/com/evolveum/midpoint/model/controller/ControllerAddObjectTest.java
	model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportCreateTaskHandler.java
	model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportUtils.java
	model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
	model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processors/primary/PcpExternalizationHelper.java
	model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/util/MiscDataUtil.java
	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/util/RUtil.java
	testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/RootXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.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/scripting/scripting-2.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelCrudService.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/scripting/ScriptingExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/expressions/SelectEvaluator.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 repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Fixed another couple of compile errors, currently compilable up to model-impl (problems with scripting there). Besides one test in provisioning-impl.


  Commit: 0056e39af21cba78dc11f89ec6b1963a0d133d99
      https://github.com/Evolveum/midpoint/commit/0056e39af21cba78dc11f89ec6b1963a0d133d99
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ObjectQuery.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/scripting/ScriptExecutionTaskHandler.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/AssignExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/actions/ModifyExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/actions/RecomputeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/actions/ResolveExecutor.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/expressions/SelectEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/helpers/ExpressionHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/scripting/helpers/JaxbHelper.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/ModelWebServiceTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/scripting/TestScriptingBasic.java

  Log Message:
  -----------
  Another bunch of compile fixes.


  Commit: 845eeec9c165bad41a24fcd76ed461d68f23ecfb
      https://github.com/Evolveum/midpoint/commit/845eeec9c165bad41a24fcd76ed461d68f23ecfb
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-03-27 (Thu, 27 Mar 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/page/admin/configuration/PageAccounts.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/resources/PageResourceWizard.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/PageRoleOld.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/util/WebMiscUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.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/scripting/TestScriptingBasic.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/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
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/general/TestGeneralChangeProcessor.java
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java

  Log Message:
  -----------
  Another bunch of compile fixes (some of the being quite temporary ones).


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

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelCrudService.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java

  Log Message:
  -----------
  Compilation fixes for everything except TestSanity and TestUcfOpenDj.


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/ObjectFactory.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemPathType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectFactory.java
    M infra/prism/src/main/resources/xml/ns/public/query-2.xsd
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-2.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/PathExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelWebService.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
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/util/SerializationSafeContainer.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/Authorization.java

  Log Message:
  -----------
  Replaced all occurrences of XPathType with ItemPathType.


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/IdItemPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/NameItemPathSegment.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemPathType.java

  Log Message:
  -----------
  ItemPathType is now (really) serializable and cloneable.


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/AESProtector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/RawTypeUtil.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ProtectedDataType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ProtectedStringType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.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/test/java/com/evolveum/midpoint/schema/TestJaxbSanity.java
    M infra/schema/src/test/resources/common/user-barbossa.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java
    M provisioning/provisioning-impl/src/test/resources/impl/account-change-description.xml
    M provisioning/provisioning-impl/src/test/resources/impl/account-change-password.xml
    M provisioning/provisioning-impl/src/test/resources/impl/dummy-hacks/connector-dummy.xml
    M provisioning/provisioning-impl/src/test/resources/impl/dummy-hacks/resource-dummy.xml
    M provisioning/provisioning-impl/src/test/resources/impl/dummy/account-lechuck.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/disable-account-simulated.xml
    M provisioning/provisioning-impl/src/test/resources/impl/query-complex-filter.xml
    M provisioning/provisioning-impl/src/test/resources/impl/query-filter-all-accounts.xml
    M provisioning/provisioning-impl/src/test/resources/impl/sync-task-example.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml
    M 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/util/RUtil.java
    M repo/repo-test-util/src/main/resources/ctx-configuration-test-no-repo.xml

  Log Message:
  -----------
  continue fixing..(provisioning tests)


  Commit: 9bc6fe960bf40ae7072354908c11258104b71dc4
      https://github.com/Evolveum/midpoint/commit/9bc6fe960bf40ae7072354908c11258104b71dc4
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/IdItemPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/NameItemPathSegment.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/ObjectFactory.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemPathType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectFactory.java
    M infra/prism/src/main/resources/xml/ns/public/query-2.xsd
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/api-types-2.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/PathExpressionEvaluator.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/ModelWebService.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
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/util/SerializationSafeContainer.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/Authorization.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java

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


  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)


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    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/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
    M 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/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/resources/basic/objects.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/task.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java

  Log Message:
  -----------
  continue fixing..(tests in provisioning, repo)...


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/Expression.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionVariables.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/PathExpressionEvaluator.java

  Log Message:
  -----------
  continue fixing test (model-common, expressions)..


  Commit: 3cc328beff403f7aa65faa659f44cfaa199f9e3f
      https://github.com/Evolveum/midpoint/commit/3cc328beff403f7aa65faa659f44cfaa199f9e3f
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-03-30 (Sun, 30 Mar 2014)

  Changed paths:
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java

  Log Message:
  -----------
  more compilation fixes..(sanity tests)


  Commit: 70f5302d7589681ea2d22c026a8269dd094883b8
      https://github.com/Evolveum/midpoint/commit/70f5302d7589681ea2d22c026a8269dd094883b8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-03-31 (Mon, 31 Mar 2014)

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/ReflectionXPathFunctionResolver.java
    M model/model-common/src/test/resources/expression/xpath/expression-list.xml
    M model/model-common/src/test/resources/expression/xpath/expression-objectref-variables-polystring.xml
    M model/model-common/src/test/resources/expression/xpath/expression-objectref-variables.xml
    M model/model-common/src/test/resources/expression/xpath/expression-root-node.xml
    M model/model-common/src/test/resources/expression/xpath/expression-string-variables.xml
    M model/model-common/src/test/resources/expression/xpath/expression-user-extension-ship-path.xml
    M model/model-common/src/test/resources/expression/xpath/expression-user-given-name.xml
    M model/model-common/src/test/resources/expression/xpath/expression-user-stringify-full-name.xml

  Log Message:
  -----------
  Fixed TestXPathExpressions (by changing XML resources).


  Commit: 11c0e2d953c37c2c95179bd739e6f2a69b4275cb
      https://github.com/Evolveum/midpoint/commit/11c0e2d953c37c2c95179bd739e6f2a69b4275cb
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-03-31 (Mon, 31 Mar 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java

  Log Message:
  -----------
  Some preliminary housekeeping.


  Commit: a316b1426321fc7a87c56aad7d9621ecb98bfe53
      https://github.com/Evolveum/midpoint/commit/a316b1426321fc7a87c56aad7d9621ecb98bfe53
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemPathType.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/PathExpressionEvaluatorFactory.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/expr/ExpressionHandlerImplTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/sync/TestCorrelationConfiramtionEvaluator.java
    M model/model-impl/src/test/resources/common/account-elaine-dummy.xml
    M model/model-impl/src/test/resources/common/account-guybrush-dummy.xml
    M model/model-impl/src/test/resources/common/account-hbarbossa-dummy.xml
    M model/model-impl/src/test/resources/common/account-herman-dummy.xml
    M model/model-impl/src/test/resources/common/account-shadow-guybrush-dummy.xml
    M model/model-impl/src/test/resources/common/account-shadow-jack-dummy.xml
    M model/model-impl/src/test/resources/common/resource-dummy.xml
    M model/model-impl/src/test/resources/common/task-reconcile-dummy.xml
    M model/model-impl/src/test/resources/common/user-barbossa.xml
    M model/model-impl/src/test/resources/common/user-elaine.xml
    M model/model-impl/src/test/resources/common/user-guybrush.xml
    M model/model-impl/src/test/resources/common/user-jack.xml
    M model/model-impl/src/test/resources/expr/account-xpath-evaluation.xml
    M model/model-impl/src/test/resources/expr/user-new.xml
    M model/model-impl/src/test/resources/lens/account-before-script.xml
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-add-assignment-account-dummy-attr.xml
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-delete-assignment-account-dummy-attr.xml
    M model/model-impl/src/test/resources/lens/user-jack-modify-add-assignment-account-dummy-attr.xml
    M model/model-impl/src/test/resources/lens/user-jack-modify-add-assignment-account-dummy.xml
    M model/model-impl/src/test/resources/lens/user-jack-modify-delete-assignment-account-dummy.xml
    M model/model-impl/src/test/resources/sync/correlation-case-insensitive.xml
    M model/model-impl/src/test/resources/sync/correlation-case-insensitive_empl_number.xml
    M model/model-impl/src/test/resources/sync/correlation-first-filter.xml
    M model/model-impl/src/test/resources/sync/correlation-or-filter.xml
    M model/model-impl/src/test/resources/sync/correlation-second-filter.xml
    M model/model-impl/src/test/resources/sync/correlation-with-condition-emplNumber.xml
    M model/model-impl/src/test/resources/sync/correlation-with-condition.xml

  Log Message:
  -----------
  continue fixing tests (model-impl..fixed some xml problems)..


  Commit: 26665bdbe8800abf5945eb38a2251edfe9c1e26d
      https://github.com/Evolveum/midpoint/commit/26665bdbe8800abf5945eb38a2251edfe9c1e26d
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/ReflectionXPathFunctionResolver.java
    M model/model-common/src/test/resources/expression/xpath/expression-list.xml
    M model/model-common/src/test/resources/expression/xpath/expression-objectref-variables-polystring.xml
    M model/model-common/src/test/resources/expression/xpath/expression-objectref-variables.xml
    M model/model-common/src/test/resources/expression/xpath/expression-root-node.xml
    M model/model-common/src/test/resources/expression/xpath/expression-string-variables.xml
    M model/model-common/src/test/resources/expression/xpath/expression-user-extension-ship-path.xml
    M model/model-common/src/test/resources/expression/xpath/expression-user-given-name.xml
    M model/model-common/src/test/resources/expression/xpath/expression-user-stringify-full-name.xml

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


  Commit: 8f351ed4284621b58c807248d650dea681bc82b8
      https://github.com/Evolveum/midpoint/commit/8f351ed4284621b58c807248d650dea681bc82b8
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M model/model-impl/src/test/resources/common/entitlement-shadow-pirate-dummy.xml
    M model/model-impl/src/test/resources/sync/shadow-pirates-dummy.xml

  Log Message:
  -----------
  fixing more samples (model-impl tests)


  Commit: 698f1e2db262d9e1ab5004352675f933456f3c82
      https://github.com/Evolveum/midpoint/commit/698f1e2db262d9e1ab5004352675f933456f3c82
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/RawTypeUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/LazyXPathVariableResolver.java

  Log Message:
  -----------
  Implemented serializing to DOM elements.


  Commit: c93a7f10dd0e47380b3b1aec6379949e07cb0152
      https://github.com/Evolveum/midpoint/commit/c93a7f10dd0e47380b3b1aec6379949e07cb0152
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M model/model-common/src/test/resources/mapping/mapping-script-list-relative-xpath.xml
    M model/model-common/src/test/resources/mapping/mapping-script-root-node.xml
    M model/model-common/src/test/resources/mapping/mapping-script-system-variables-polystring-xpath.xml
    M model/model-common/src/test/resources/mapping/mapping-script-variables-xpath.xml

  Log Message:
  -----------
  Fixing some of model-common tests.


  Commit: 931a306fcf9b8e48cfee8f65c23dad7d9bf16557
      https://github.com/Evolveum/midpoint/commit/931a306fcf9b8e48cfee8f65c23dad7d9bf16557
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/Expression.java
    M model/model-common/src/test/resources/mapping/mapping-script-system-variables-condition-xpath.xml
    M model/model-common/src/test/resources/mapping/mapping-script-variables-groovy.xml

  Log Message:
  -----------
  Fixed model-common tests.


  Commit: df5e92879fdb94d2a2cbfce8fbd06fb06b35d887
      https://github.com/Evolveum/midpoint/commit/df5e92879fdb94d2a2cbfce8fbd06fb06b35d887
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-01 (Tue, 01 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualsFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ListXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ChangeExecutor.java
    M model/model-impl/src/test/resources/common/resource-dummy.xml
    M model/model-impl/src/test/resources/common/user-barbossa.xml
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-add-assignment-account-dummy-attr.xml
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-assignment-replace-ac.xml
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-delete-assignment-account-dummy-attr.xml
    M model/model-impl/src/test/resources/sync/correlation-case-insensitive.xml
    M model/model-impl/src/test/resources/sync/correlation-case-insensitive_empl_number.xml
    M model/model-impl/src/test/resources/sync/correlation-first-filter.xml
    M model/model-impl/src/test/resources/sync/correlation-or-filter.xml
    M model/model-impl/src/test/resources/sync/correlation-second-filter.xml
    M model/model-impl/src/test/resources/sync/correlation-with-condition-emplNumber.xml
    M model/model-impl/src/test/resources/sync/correlation-with-condition.xml
    M model/model-intest/src/test/resources/common/resource-opendj.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/definition/EntityDefinition.java

  Log Message:
  -----------
  fixing some tests in model-impl (by modifying samples and small improvements in rawType implementation etc.)


  Commit: e1904c41de895901dd88d558d2bdfe89825817b4
      https://github.com/Evolveum/midpoint/commit/e1904c41de895901dd88d558d2bdfe89825817b4
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-02 (Wed, 02 Apr 2014)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/StaticExpressionUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/prism/src/main/resources/xml/ns/test/foo-1.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/AccountConstructionType.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/prism/src/test/resources/common/json/user-jack.json
    M infra/prism/src/test/resources/common/xml/user-jack.xml
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    M model/model-intest/src/test/resources/common/resource-opendj.xml

  Log Message:
  -----------
  Stopped parsing RawType also when it is part of prism property. Fixing tests (in progress).


  Commit: c7a4c7ad11616621628ae37f14db67be4e444611
      https://github.com/Evolveum/midpoint/commit/c7a4c7ad11616621628ae37f14db67be4e444611
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-02 (Wed, 02 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/EqualsFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ListXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ChangeExecutor.java
    M model/model-impl/src/test/resources/common/resource-dummy.xml
    M model/model-impl/src/test/resources/common/user-barbossa.xml
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-add-assignment-account-dummy-attr.xml
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-assignment-replace-ac.xml
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-delete-assignment-account-dummy-attr.xml
    M model/model-impl/src/test/resources/sync/correlation-case-insensitive.xml
    M model/model-impl/src/test/resources/sync/correlation-case-insensitive_empl_number.xml
    M model/model-impl/src/test/resources/sync/correlation-first-filter.xml
    M model/model-impl/src/test/resources/sync/correlation-or-filter.xml
    M model/model-impl/src/test/resources/sync/correlation-second-filter.xml
    M model/model-impl/src/test/resources/sync/correlation-with-condition-emplNumber.xml
    M model/model-impl/src/test/resources/sync/correlation-with-condition.xml
    M model/model-intest/src/test/resources/common/resource-opendj.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/definition/EntityDefinition.java

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

Conflicts:
	infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
	infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java


  Commit: 52b4a7a1be33cf111813f9fa67aa241aca40de53
      https://github.com/Evolveum/midpoint/commit/52b4a7a1be33cf111813f9fa67aa241aca40de53
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-02 (Wed, 02 Apr 2014)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/StaticExpressionUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/CloneUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ListXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/RootXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/SchemaXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/AccountConstructionType.java
    M infra/prism/src/test/resources/common/json/user-jack-adhoc.json
    M infra/prism/src/test/resources/common/json/user-jack-modified.json
    M infra/prism/src/test/resources/common/json/user-jack-object.json
    M infra/prism/src/test/resources/common/json/user-jack.json
    M infra/prism/src/test/resources/common/xml/user-jack-adhoc.xml
    M infra/prism/src/test/resources/common/xml/user-jack-modified.xml
    M infra/prism/src/test/resources/common/xml/user-jack-object.xml
    M infra/prism/src/test/resources/common/yaml/user-jack-adhoc.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack-modified.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack-object.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack.yaml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M infra/schema/src/test/resources/common/user-barbossa-modify-delete-assignment-account-opendj-attr.xml
    M infra/schema/src/test/resources/deltaconverter/user-modify-add-role-pirate.xml
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestCsvFile.java

  Log Message:
  -----------
  Implemented hashCode & equals for XNodes.
Changed RawType do deal with value content (not the wrapping element).
Removed RawType.setXNode.
Enhanced parser tests to deal with complex RawType.


  Commit: dcb30a86dd3e0444b1af6724369fd5ad54fbb3b9
      https://github.com/Evolveum/midpoint/commit/dcb30a86dd3e0444b1af6724369fd5ad54fbb3b9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-02 (Wed, 02 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java

  Log Message:
  -----------
  Fixed XPath-related schema tests.


  Commit: b31606e4f7fcd0ff7905bee88894aa5b39751c93
      https://github.com/Evolveum/midpoint/commit/b31606e4f7fcd0ff7905bee88894aa5b39751c93
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-02 (Wed, 02 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/CloneUtil.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbSanity.java
    M infra/schema/src/test/resources/common/user-barbossa-modify-delete-assignment-account-opendj-attr.xml
    M infra/schema/src/test/resources/deltaconverter/user-modify-add-account.xml
    M infra/schema/src/test/resources/deltaconverter/user-modify-add-role-pirate.xml

  Log Message:
  -----------
  XML attribute "type" in RawValue. Fixed a couple of tests in schema, some remain broken.


  Commit: 93e04025f3466c0189eff5ab686331fa0777c7bc
      https://github.com/Evolveum/midpoint/commit/93e04025f3466c0189eff5ab686331fa0777c7bc
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-02 (Wed, 02 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java

  Log Message:
  -----------
  Small fix.


  Commit: 4ab184251d9aff3b1a11d6a875c043e061e714db
      https://github.com/Evolveum/midpoint/commit/4ab184251d9aff3b1a11d6a875c043e061e714db
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-03 (Thu, 03 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectReferenceType.java

  Log Message:
  -----------
  Fixed parsing composite objects as part of references.


  Commit: b63877e295ee96dc65d79edff395a06a3eaa178f
      https://github.com/Evolveum/midpoint/commit/b63877e295ee96dc65d79edff395a06a3eaa178f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-03 (Thu, 03 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchema.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbSanity.java
    M infra/schema/src/test/resources/common/user-barbossa-modify-delete-assignment-account-opendj-attr.xml
    M infra/schema/src/test/resources/common/user-barbossa.xml

  Log Message:
  -----------
  Fixed schema tests (wrong XML & stupid bug in xnode equals).


  Commit: 3653b27c788ad57b43871eaf09b9a6018485942f
      https://github.com/Evolveum/midpoint/commit/3653b27c788ad57b43871eaf09b9a6018485942f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-04 (Fri, 04 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M infra/schema/src/test/resources/common/user-barbossa-modify-delete-assignment-account-opendj-attr.xml
    A infra/schema/src/test/resources/deltaconverter/role-modify-inducement.xml
    M infra/schema/src/test/resources/deltaconverter/user-modify-add-account.xml
    M infra/schema/src/test/resources/deltaconverter/user-modify-add-role-pirate.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.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/resources/modify/assignment/modify-add-assignment.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-add-inducement.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-assignment.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-delete-add-assignment.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-delete-assignment.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-delete-inducement.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-inducement.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/modify-user-add-roles.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/role-modify-change.xml
    M repo/repo-sql-impl-test/testng.xml

  Log Message:
  -----------
  RawType accepts attributes (e.g. id for containers, oid, type for references).
RawType accepts xsiType as a replacement for xsi:Type.
Tests pass up to (excluding) task-quartz-impl.


  Commit: 610f539cb1c541eecf5bf4fca3b2c0022336482d
      https://github.com/Evolveum/midpoint/commit/610f539cb1c541eecf5bf4fca3b2c0022336482d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-05 (Sat, 05 Apr 2014)

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

  Log Message:
  -----------
  Test showing bug in XPathHolder.


  Commit: 781528443cd228dd07df12e7fcb58cd5efa47ceb
      https://github.com/Evolveum/midpoint/commit/781528443cd228dd07df12e7fcb58cd5efa47ceb
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-05 (Sat, 05 Apr 2014)

  Changed paths:
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/MockSingleTaskHandler.java
    M repo/task-quartz-impl/src/test/resources/schema/whatever-extension.xsd

  Log Message:
  -----------
  Attempt to clean-up task test code.


  Commit: 4b1c5476273527f5b07e3bef8440546e39190e01
      https://github.com/Evolveum/midpoint/commit/4b1c5476273527f5b07e3bef8440546e39190e01
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-05 (Sat, 05 Apr 2014)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java

  Log Message:
  -----------
  Attempt to fix delta conversion when PrismProperty<Boolean> is to be serialized (toAny->toXNode)


  Commit: 68f36782c7bf6d8bd2299bda8ba54f6d19025898
      https://github.com/Evolveum/midpoint/commit/68f36782c7bf6d8bd2299bda8ba54f6d19025898
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-06 (Sun, 06 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathSegment.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java
    M repo/task-quartz-impl/src/test/resources/schema/whatever-extension.xsd

  Log Message:
  -----------
  Fixed XPath serialization to element and task-quartz-impl tests.


  Commit: bdd1afbb9337f0e762e8c7000ace60e075bb808c
      https://github.com/Evolveum/midpoint/commit/bdd1afbb9337f0e762e8c7000ace60e075bb808c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-06 (Sun, 06 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/crypto/TestProtector.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestProtectedString.java
    M infra/prism/testng.xml
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java

  Log Message:
  -----------
  Fixed TestUcfOpenDj test.


  Commit: 7a53ee81ade0aab0a4ce153ac7b1fa169c8c4a3f
      https://github.com/Evolveum/midpoint/commit/7a53ee81ade0aab0a4ce153ac7b1fa169c8c4a3f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-06 (Sun, 06 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java

  Log Message:
  -----------
  Fixed bug in RawType, provisioning-impl tests pass.


  Commit: c9ea4772564df48790df1ca4e7a6c3ba363e9f06
      https://github.com/Evolveum/midpoint/commit/c9ea4772564df48790df1ca4e7a6c3ba363e9f06
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-06 (Sun, 06 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Referencable.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/RawTypeUtil.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectDeltaType.java
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.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-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/XPathScriptEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelCrudService.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestClockwork.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/util/mock/MockClockworkHook.java
    M model/model-impl/src/test/resources/lens/user-jack-modify-add-assignment-account-dummy.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RObjectDeltaOperation.java

  Log Message:
  -----------
  fixing objectDeltaType


  Commit: 16f085aed7781ff6c490ec66f7d78087e81816ad
      https://github.com/Evolveum/midpoint/commit/16f085aed7781ff6c490ec66f7d78087e81816ad
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-06 (Sun, 06 Apr 2014)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/StaticExpressionUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathSegment.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchema.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/CloneUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ListXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/RootXNode.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/SchemaXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectFactory.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectReferenceType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
    M infra/prism/src/main/resources/xml/ns/test/foo-1.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/crypto/TestProtector.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/AccountConstructionType.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestProtectedString.java
    M infra/prism/src/test/resources/common/json/user-jack-adhoc.json
    M infra/prism/src/test/resources/common/json/user-jack-modified.json
    M infra/prism/src/test/resources/common/json/user-jack-object.json
    M infra/prism/src/test/resources/common/json/user-jack.json
    M infra/prism/src/test/resources/common/xml/user-jack-adhoc.xml
    M infra/prism/src/test/resources/common/xml/user-jack-modified.xml
    M infra/prism/src/test/resources/common/xml/user-jack-object.xml
    M infra/prism/src/test/resources/common/xml/user-jack.xml
    M infra/prism/src/test/resources/common/yaml/user-jack-adhoc.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack-modified.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack-object.yaml
    M infra/prism/src/test/resources/common/yaml/user-jack.yaml
    M infra/prism/testng.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.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/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbSanity.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java
    M infra/schema/src/test/resources/common/user-barbossa-modify-delete-assignment-account-opendj-attr.xml
    M infra/schema/src/test/resources/common/user-barbossa.xml
    A infra/schema/src/test/resources/deltaconverter/role-modify-inducement.xml
    M infra/schema/src/test/resources/deltaconverter/user-modify-add-account.xml
    M infra/schema/src/test/resources/deltaconverter/user-modify-add-role-pirate.xml
    M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestCsvFile.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.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/resources/modify/assignment/modify-add-assignment.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-add-inducement.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-assignment.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-delete-add-assignment.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-delete-assignment.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-delete-inducement.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-inducement.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/modify-user-add-roles.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/role-modify-change.xml
    M repo/repo-sql-impl-test/testng.xml
    M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/MockSingleTaskHandler.java
    M repo/task-quartz-impl/src/test/resources/schema/whatever-extension.xsd

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

Conflicts:
	infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
	infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
	infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java


  Commit: 084bdf91165384a0bc2aba96a953d535a071e642
      https://github.com/Evolveum/midpoint/commit/084bdf91165384a0bc2aba96a953d535a071e642
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/RawTypeUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/AnyArrayList.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestProtectedString.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
    M model/model-common/src/test/resources/mapping/mapping-value-multi-deep.xml
    M model/model-common/src/test/resources/mapping/mapping-value-single-deep.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ChangeExecutor.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/ExpressionHandlerImplTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestClockwork.java
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-add-assignment-account-dummy-attr.xml
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-assignment-replace-ac.xml
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-delete-assignment-account-dummy-attr.xml
    M model/model-impl/src/test/resources/lens/user-jack-modify-add-assignment-account-dummy-attr.xml
    M model/model-impl/src/test/resources/lens/user-jack-modify-add-assignment-account-dummy.xml
    M model/model-impl/src/test/resources/lens/user-jack-modify-delete-assignment-account-dummy.xml

  Log Message:
  -----------
  fixing model-impl tests..


  Commit: 842d88c0081c44be129a599077c1512c4122b0d1
      https://github.com/Evolveum/midpoint/commit/842d88c0081c44be129a599077c1512c4122b0d1
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/util/XNodeProcessorUtil.java
    A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectType.java

  Log Message:
  -----------
  adding missing resources..


  Commit: a258ce509f7ad26cf84bf4a0fea2b27bccbedcf7
      https://github.com/Evolveum/midpoint/commit/a258ce509f7ad26cf84bf4a0fea2b27bccbedcf7
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/AnyArrayList.java
    M model/model-intest/src/test/resources/common/connector-dbtable.xml
    M model/model-intest/src/test/resources/common/user-herman.xml
    M model/model-intest/src/test/resources/importer/import-bad.xml
    M model/model-intest/src/test/resources/importer/import-users.xml
    M model/model-intest/src/test/resources/negative/connector-dummy-nojars.xml
    M model/model-intest/src/test/resources/negative/resource-dummy-nojars.xml

  Log Message:
  -----------
  some fixes in xml resources for tests in model-intest


  Commit: 43dd1f78f292dc22e0862543cc12238b2a92d2b4
      https://github.com/Evolveum/midpoint/commit/43dd1f78f292dc22e0862543cc12238b2a92d2b4
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/util/SerializationSafeContainer.java

  Log Message:
  -----------
  Temporary fixing compilation error.


  Commit: 0596ccf005ab56775ff58aee7ca5f6fd2e93a774
      https://github.com/Evolveum/midpoint/commit/0596ccf005ab56775ff58aee7ca5f6fd2e93a774
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    M infra/prism/src/main/resources/xml/ns/test/foo-1.xsd
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/EventCategoryFilterType.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/EventHandlerChainType.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/EventHandlerType.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/EventOperationFilterType.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/EventStatusFilterType.java
    A infra/prism/src/test/resources/common/xml/event-handler.xml

  Log Message:
  -----------
  Test case.


  Commit: ce7440975771096a224b1234da99edcef04c0004
      https://github.com/Evolveum/midpoint/commit/ce7440975771096a224b1234da99edcef04c0004
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M infra/prism/.gitignore
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JaxbTestUtil.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/ModelExecuteOptions.java
    M model/model-impl/.gitignore
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelController.java
    M model/model-intest/.gitignore
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/resources/repo/resource-opendj.xml
    M testing/sanity/src/test/resources/repo/role-captain.xml
    M testing/sanity/src/test/resources/repo/role-pirate.xml
    M testing/sanity/src/test/resources/repo/sample-configuration-object.xml
    M testing/sanity/src/test/resources/repo/task-opendj-sync.xml
    M testing/sanity/src/test/resources/request/account-modify-attrs.xml
    M testing/sanity/src/test/resources/request/user-modify-activation-disable.xml
    M testing/sanity/src/test/resources/request/user-modify-activation-enable.xml
    M testing/sanity/src/test/resources/request/user-modify-add-account-derby.xml
    M testing/sanity/src/test/resources/request/user-modify-add-account.xml
    M testing/sanity/src/test/resources/request/user-modify-add-role-captain-1.xml
    M testing/sanity/src/test/resources/request/user-modify-add-role-captain-2.xml
    M testing/sanity/src/test/resources/request/user-modify-add-role-judge.xml
    M testing/sanity/src/test/resources/request/user-modify-add-role-pirate.xml
    M testing/sanity/src/test/resources/request/user-modify-delete-role-captain-1.xml
    M testing/sanity/src/test/resources/request/user-modify-delete-role-captain-2.xml
    M testing/sanity/src/test/resources/request/user-modify-delete-role-pirate.xml
    M testing/sanity/src/test/resources/request/user-modify-fullname-locality.xml
    M testing/sanity/src/test/resources/request/user-modify-givenname.xml
    M testing/sanity/src/test/resources/request/user-modify-name.xml
    M testing/sanity/src/test/resources/request/user-modify-password.xml

  Log Message:
  -----------
  some fixes in sanity test.. (fixing samples, changing objectModificationType to objectDeltaType, switching to executeChanges instead of CRUD operations)


  Commit: bbcbd69ea0b02885c0d0239216ef42ccad66d182
      https://github.com/Evolveum/midpoint/commit/bbcbd69ea0b02885c0d0239216ef42ccad66d182
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/AnyArrayList.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/resources/repo/resource-opendj.xml
    M testing/sanity/src/test/resources/repo/task-opendj-reconciliation.xml
    M testing/sanity/src/test/resources/repo/user-template.xml

  Log Message:
  -----------
  fixing sanity test (most fixes in xml resources)...


  Commit: 94a92fca712bcbce1d6d4fbba48b657f5c99d80c
      https://github.com/Evolveum/midpoint/commit/94a92fca712bcbce1d6d4fbba48b657f5c99d80c
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M infra/prism/src/main/resources/xml/ns/test/foo-1.xsd
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/EventCategoryFilterType.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/EventHandlerChainType.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/EventHandlerType.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/EventOperationFilterType.java
    A infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/EventStatusFilterType.java
    A infra/prism/src/test/resources/common/xml/event-handler.xml

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


  Commit: 5c044697e8b5a8561fa3ca76132518dbb12e9a73
      https://github.com/Evolveum/midpoint/commit/5c044697e8b5a8561fa3ca76132518dbb12e9a73
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M infra/prism/src/main/resources/xml/ns/test/foo-1.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/ObjectFactory.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M model/model-intest/src/test/resources/common/system-configuration-with-template.xml
    M model/model-intest/src/test/resources/common/system-configuration.xml
    M model/model-intest/src/test/resources/common/user-template-complex-include.xml
    M model/model-intest/src/test/resources/common/user-template-complex.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/NotificationManagerImpl.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/filters/CategoryFilter.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/filters/ExpressionFilter.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/filters/OperationFilter.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/filters/StatusFilter.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/handlers/AggregatedEventHandler.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/handlers/BaseHandler.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/handlers/ChainHandler.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/handlers/ForkHandler.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/notifiers/GeneralNotifier.java

  Log Message:
  -----------
  Started fixing model-intest. Reworked notifications to get rid of XSD features unsupported in prism.


  Commit: 37d8d5fe6382621da8e1d79aec46331c08e8539e
      https://github.com/Evolveum/midpoint/commit/37d8d5fe6382621da8e1d79aec46331c08e8539e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M infra/prism/.gitignore
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/JaxbTestUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/AnyArrayList.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/ModelExecuteOptions.java
    M model/model-impl/.gitignore
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelController.java
    M model/model-intest/.gitignore
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RObject.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/resources/repo/resource-opendj.xml
    M testing/sanity/src/test/resources/repo/role-captain.xml
    M testing/sanity/src/test/resources/repo/role-pirate.xml
    M testing/sanity/src/test/resources/repo/sample-configuration-object.xml
    M testing/sanity/src/test/resources/repo/task-opendj-reconciliation.xml
    M testing/sanity/src/test/resources/repo/task-opendj-sync.xml
    M testing/sanity/src/test/resources/repo/user-template.xml
    M testing/sanity/src/test/resources/request/account-modify-attrs.xml
    M testing/sanity/src/test/resources/request/user-modify-activation-disable.xml
    M testing/sanity/src/test/resources/request/user-modify-activation-enable.xml
    M testing/sanity/src/test/resources/request/user-modify-add-account-derby.xml
    M testing/sanity/src/test/resources/request/user-modify-add-account.xml
    M testing/sanity/src/test/resources/request/user-modify-add-role-captain-1.xml
    M testing/sanity/src/test/resources/request/user-modify-add-role-captain-2.xml
    M testing/sanity/src/test/resources/request/user-modify-add-role-judge.xml
    M testing/sanity/src/test/resources/request/user-modify-add-role-pirate.xml
    M testing/sanity/src/test/resources/request/user-modify-delete-role-captain-1.xml
    M testing/sanity/src/test/resources/request/user-modify-delete-role-captain-2.xml
    M testing/sanity/src/test/resources/request/user-modify-delete-role-pirate.xml
    M testing/sanity/src/test/resources/request/user-modify-fullname-locality.xml
    M testing/sanity/src/test/resources/request/user-modify-givenname.xml
    M testing/sanity/src/test/resources/request/user-modify-name.xml
    M testing/sanity/src/test/resources/request/user-modify-password.xml

  Log Message:
  -----------
  Merge branch 'parser' of git at github.com:Evolveum/midpoint.git into parser

Conflicts:
	infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java


  Commit: a87b7cf868dd8179c3c3945b2bba2ac7ccc1def3
      https://github.com/Evolveum/midpoint/commit/a87b7cf868dd8179c3c3945b2bba2ac7ccc1def3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M model/model-intest/src/test/resources/multi/resource-dummy-beige.xml
    M model/model-intest/src/test/resources/multi/resource-dummy-ivory.xml
    M model/model-intest/src/test/resources/multi/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/multi/role-dummies.xml

  Log Message:
  -----------
  Fixed TestResourceMulti in model-intest.


  Commit: 3be63bb4330ba6fd711aecca5f7b52b8ed43901a
      https://github.com/Evolveum/midpoint/commit/3be63bb4330ba6fd711aecca5f7b52b8ed43901a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java

  Log Message:
  -----------
  Fixed bug related to marshalling specific types (e.g. SearchFilterType).


  Commit: 0bbad3f22773605b81538e1a8bd39adb09572a91
      https://github.com/Evolveum/midpoint/commit/0bbad3f22773605b81538e1a8bd39adb09572a91
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/match/MatchingRuleRegistry.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/SearchFilterType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemDeltaType.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/GenericErrorHandler.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/consistency-mechanism/src/test/resources/logback-test.xml
    M testing/consistency-mechanism/src/test/resources/repo/account-deniels.xml
    M testing/consistency-mechanism/src/test/resources/repo/resource-opendj.xml
    M testing/consistency-mechanism/src/test/resources/repo/sample-configuration-object.xml
    M testing/consistency-mechanism/src/test/resources/repo/task-opendj-reconciliation.xml
    M testing/consistency-mechanism/src/test/resources/repo/user-abomba.xml
    M testing/consistency-mechanism/src/test/resources/repo/user-deniels.xml
    M testing/consistency-mechanism/src/test/resources/repo/user-guybrush-modify-not-found.xml
    M testing/consistency-mechanism/src/test/resources/repo/user-guybrush.xml
    M testing/consistency-mechanism/src/test/resources/repo/user-hector.xml
    M testing/consistency-mechanism/src/test/resources/repo/user-jack2.xml
    M testing/consistency-mechanism/src/test/resources/request/account-guybrush-modify-attributes.xml
    M testing/consistency-mechanism/src/test/resources/request/account-modify-attrs-communication-problem.xml
    M testing/consistency-mechanism/src/test/resources/request/add-account-jack.xml
    M testing/consistency-mechanism/src/test/resources/request/resource-modify-resource-schema.xml
    M testing/consistency-mechanism/src/test/resources/request/resource-modify-synchronization.xml
    M testing/consistency-mechanism/src/test/resources/request/user-modify-add-account-already-exist-linked.xml
    M testing/consistency-mechanism/src/test/resources/request/user-modify-add-account-communication-problem.xml
    M testing/consistency-mechanism/src/test/resources/request/user-modify-add-account-directly.xml
    M testing/consistency-mechanism/src/test/resources/request/user-modify-delete-account-communication-problem.xml
    M testing/consistency-mechanism/src/test/resources/request/user-modify-delete-account.xml
    M testing/consistency-mechanism/src/test/resources/request/user-modify-employeeType-givenName.xml
    M testing/consistency-mechanism/src/test/resources/request/user-modify-employeeType.xml
    M testing/sanity/src/test/resources/request/user-modify-add-account.xml

  Log Message:
  -----------
  started fixing consistency tests (fixing xml resource)


  Commit: f52ed162a499361ef3d13ba233cf54294b18e3b2
      https://github.com/Evolveum/midpoint/commit/f52ed162a499361ef3d13ba233cf54294b18e3b2
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
    M infra/prism/src/main/resources/xml/ns/test/foo-1.xsd
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/ObjectFactory.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M model/model-intest/src/test/resources/common/system-configuration-with-template.xml
    M model/model-intest/src/test/resources/common/system-configuration.xml
    M model/model-intest/src/test/resources/common/user-template-complex-include.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/multi/resource-dummy-beige.xml
    M model/model-intest/src/test/resources/multi/resource-dummy-ivory.xml
    M model/model-intest/src/test/resources/multi/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/multi/role-dummies.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/NotificationManagerImpl.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/filters/CategoryFilter.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/filters/ExpressionFilter.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/filters/OperationFilter.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/filters/StatusFilter.java
    A model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/handlers/AggregatedEventHandler.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/handlers/BaseHandler.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/handlers/ChainHandler.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/handlers/ForkHandler.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/notifiers/GeneralNotifier.java

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


  Commit: 24952f11934c3bfc7fd6ff3cd3cc31c8eeb11885
      https://github.com/Evolveum/midpoint/commit/24952f11934c3bfc7fd6ff3cd3cc31c8eeb11885
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/match/MatchingRuleRegistry.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/query_2/SearchFilterType.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ItemDeltaType.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/consistency/impl/GenericErrorHandler.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/consistency-mechanism/src/test/resources/logback-test.xml
    M testing/consistency-mechanism/src/test/resources/repo/account-deniels.xml
    M testing/consistency-mechanism/src/test/resources/repo/resource-opendj.xml
    M testing/consistency-mechanism/src/test/resources/repo/sample-configuration-object.xml
    M testing/consistency-mechanism/src/test/resources/repo/task-opendj-reconciliation.xml
    M testing/consistency-mechanism/src/test/resources/repo/user-abomba.xml
    M testing/consistency-mechanism/src/test/resources/repo/user-deniels.xml
    M testing/consistency-mechanism/src/test/resources/repo/user-guybrush-modify-not-found.xml
    M testing/consistency-mechanism/src/test/resources/repo/user-guybrush.xml
    M testing/consistency-mechanism/src/test/resources/repo/user-hector.xml
    M testing/consistency-mechanism/src/test/resources/repo/user-jack2.xml
    M testing/consistency-mechanism/src/test/resources/request/account-guybrush-modify-attributes.xml
    M testing/consistency-mechanism/src/test/resources/request/account-modify-attrs-communication-problem.xml
    M testing/consistency-mechanism/src/test/resources/request/add-account-jack.xml
    M testing/consistency-mechanism/src/test/resources/request/resource-modify-resource-schema.xml
    M testing/consistency-mechanism/src/test/resources/request/resource-modify-synchronization.xml
    M testing/consistency-mechanism/src/test/resources/request/user-modify-add-account-already-exist-linked.xml
    M testing/consistency-mechanism/src/test/resources/request/user-modify-add-account-communication-problem.xml
    M testing/consistency-mechanism/src/test/resources/request/user-modify-add-account-directly.xml
    M testing/consistency-mechanism/src/test/resources/request/user-modify-delete-account-communication-problem.xml
    M testing/consistency-mechanism/src/test/resources/request/user-modify-delete-account.xml
    M testing/consistency-mechanism/src/test/resources/request/user-modify-employeeType-givenName.xml
    M testing/consistency-mechanism/src/test/resources/request/user-modify-employeeType.xml
    M testing/sanity/src/test/resources/request/user-modify-add-account.xml

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


  Commit: aa54efdc9c6430d1b5b289439d63c0fc5b88353d
      https://github.com/Evolveum/midpoint/commit/aa54efdc9c6430d1b5b289439d63c0fc5b88353d
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/dom/PrismDomProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/SchemaDefinitionType.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMisc.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/importer/ImportTest.java
    M model/model-intest/src/test/resources/common/resource-dummy-black.xml
    M model/model-intest/src/test/resources/common/resource-dummy-blue-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-blue.xml
    M model/model-intest/src/test/resources/common/resource-dummy-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-green-deprecated.xml
    M model/model-intest/src/test/resources/common/resource-dummy-green.xml
    M model/model-intest/src/test/resources/common/resource-dummy-red.xml
    M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
    M model/model-intest/src/test/resources/common/resource-dummy.xml
    M model/model-intest/src/test/resources/common/resource-opendj.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/entitlements/role-landluber.xml
    M model/model-intest/src/test/resources/entitlements/role-swashbuckler.xml
    M model/model-intest/src/test/resources/gensync/system-configuration.xml
    M model/model-intest/src/test/resources/scripthooks/resource-dummy-hook.xml
    M model/model-intest/src/test/resources/scripthooks/system-configuration-hooks.xml
    M model/model-intest/testng.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ItemRestriction.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java

  Log Message:
  -----------
  Fixing some model-intest tests.


  Commit: c9a360353844924b12a100d6ec5a85ef40656f05
      https://github.com/Evolveum/midpoint/commit/c9a360353844924b12a100d6ec5a85ef40656f05
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M model/model-impl/src/test/resources/expr/account-xpath-evaluation.xml

  Log Message:
  -----------
  Fixed input data for a failed model test.


  Commit: 58c0cdf5a038ccb7a2a004b5d2e7d007b1ad77f7
      https://github.com/Evolveum/midpoint/commit/58c0cdf5a038ccb7a2a004b5d2e7d007b1ad77f7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M repo/repo-sql-impl-test/testng.xml

  Log Message:
  -----------
  Reenabling forgotten tests.


  Commit: f6e1811eaea7dcca5b598b65620583700915bc04
      https://github.com/Evolveum/midpoint/commit/f6e1811eaea7dcca5b598b65620583700915bc04
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Temporarily disabling testing connector initialization counts.


  Commit: a2e8c64af3cfae7ebffb451f23ed6f70c1a33b4c
      https://github.com/Evolveum/midpoint/commit/a2e8c64af3cfae7ebffb451f23ed6f70c1a33b4c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-intest/src/test/resources/common/task-reconcile-dummy-blue.xml
    M model/model-intest/src/test/resources/common/task-reconcile-dummy-green.xml
    M model/model-intest/src/test/resources/common/task-reconcile-dummy.xml
    M model/model-intest/src/test/resources/sync/task-dummy-emerald-recon.xml
    M model/model-intest/src/test/resources/sync/task-reconcile-dummy-azure.xml
    M model/model-intest/src/test/resources/sync/task-reconcile-dummy-lime.xml
    M model/model-intest/src/test/resources/sync/task-reconcile-dummy-single.xml

  Log Message:
  -----------
  Fixing remaining tests in model-intest.


  Commit: c078122d98181e9ec5501c868e95d639df19d976
      https://github.com/Evolveum/midpoint/commit/c078122d98181e9ec5501c868e95d639df19d976
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M repo/repo-sql-impl-test/src/test/resources/orgstruct/modify-orgStruct-add-orgref.xml
    M repo/repo-sql-impl-test/src/test/resources/orgstruct/modify-orgStruct-add-user.xml
    M repo/repo-sql-impl-test/src/test/resources/orgstruct/modify-orgStruct-delete-ref.xml
    M repo/repo-sql-impl-test/src/test/resources/orgstruct/modify-orgStruct-incorrect-add-orgref.xml
    M repo/repo-sql-impl-test/src/test/resources/orgstruct/modify-orgStruct-incorrect-delete-ref.xml
    M repo/repo-sql-impl-test/src/test/resources/orgstruct/modify-orgStruct-replace.xml

  Log Message:
  -----------
  Fixed OrgStructTest input data.


  Commit: 45ed00c9175a03032ab9bd59a53c17cffd2341dc
      https://github.com/Evolveum/midpoint/commit/45ed00c9175a03032ab9bd59a53c17cffd2341dc
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/AESProtector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ProtectedDataType.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Fixed all tests up to and including model-intest.


  Commit: 45de3119542dacacdc8ba2040c405d807ba4a2bc
      https://github.com/Evolveum/midpoint/commit/45de3119542dacacdc8ba2040c405d807ba4a2bc
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/consistency-mechanism/src/test/resources/request/user-modify-employeeType.xml

  Log Message:
  -----------
  fixing consistency test (temporary disabled assertion on objectDelta - some problem with raw type equals)..


  Commit: df1dc0b417d63a9712ae6c211d5af78c0587dd68
      https://github.com/Evolveum/midpoint/commit/df1dc0b417d63a9712ae6c211d5af78c0587dd68
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/AESProtector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ProtectedDataType.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

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


  Commit: 7c3820176a82d77476778b2ffa6f8aab766ddd2b
      https://github.com/Evolveum/midpoint/commit/7c3820176a82d77476778b2ffa6f8aab766ddd2b
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M samples/demo/hr.xml
    M samples/objects/connector-host-localhost.xml
    M samples/objects/simple-notifications.xml
    M samples/objects/user-jack-with-password.xml
    M samples/resources/ad/ad-resource-advanced-sync.xml
    M samples/resources/csvfile/localhost-csvfile-resource-advanced-sync.xml
    M samples/resources/databasetable/localhost-dbtable-advanced-sync.xml
    M samples/resources/dsee/odsee-localhost-advanced-sync.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-advanced.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-2.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-test.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced.xml
    M samples/resources/scriptedsql/localhost-scriptedsql-advanced-sync.xml
    M samples/rest/modification-assign-account.xml
    M samples/roles/approvals-complete.xml
    M samples/roles/users-for-approval-processes.xml
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSamples.java
    M samples/tasks/recon-task-csv-dry-run.xml
    M samples/tasks/recon-task-csv.xml
    M samples/tasks/recon-task-opendj-test.xml
    M samples/tasks/recon-task-opendj.xml

  Log Message:
  -----------
  fixing samples..


  Commit: a04fa82cd5bf275357e6bb1f48c0953f6dd3f419
      https://github.com/Evolveum/midpoint/commit/a04fa82cd5bf275357e6bb1f48c0953f6dd3f419
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/AESProtector.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/BaseProtector.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ProtectedStringType.java

  Log Message:
  -----------
  Eliminated cloning in decryptString.


  Commit: 62fdd7cc7dd8eb123e447fa3ffe4b8e6185afbdf
      https://github.com/Evolveum/midpoint/commit/62fdd7cc7dd8eb123e447fa3ffe4b8e6185afbdf
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M samples/demo/hr.xml
    M samples/objects/connector-host-localhost.xml
    M samples/objects/simple-notifications.xml
    M samples/objects/user-jack-with-password.xml
    M samples/resources/ad/ad-resource-advanced-sync.xml
    M samples/resources/csvfile/localhost-csvfile-resource-advanced-sync.xml
    M samples/resources/databasetable/localhost-dbtable-advanced-sync.xml
    M samples/resources/dsee/odsee-localhost-advanced-sync.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-advanced.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-2.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-test.xml
    M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced.xml
    M samples/resources/scriptedsql/localhost-scriptedsql-advanced-sync.xml
    M samples/rest/modification-assign-account.xml
    M samples/roles/approvals-complete.xml
    M samples/roles/users-for-approval-processes.xml
    M samples/samples-test/src/test/java/com/evolveum/midpoint/samples/test/TestSamples.java
    M samples/tasks/recon-task-csv-dry-run.xml
    M samples/tasks/recon-task-csv.xml
    M samples/tasks/recon-task-opendj-test.xml
    M samples/tasks/recon-task-opendj.xml
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/consistency-mechanism/src/test/resources/request/user-modify-employeeType.xml

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


  Commit: 27645352b754d45b4480c5bf87d3e5cca8878569
      https://github.com/Evolveum/midpoint/commit/27645352b754d45b4480c5bf87d3e5cca8878569
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    R REPO-STATUS
    M build-system/pom.xml
    R config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql
    R config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql
    R config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql
    R config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql
    R 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/AssignmentEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    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/prism/ObjectWrapper.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/PageAdmin.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.properties
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageTimeTest.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageTimeTest.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageTimeTest.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/InternalsConfigDto.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/component/AssignablePopupContent.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/security/MidPointApplication.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ObjectTypeGuiDescriptor.java
    M gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M gui/admin-gui/src/main/resources/initial-objects/107-report-user-accounts.xml
    M gui/admin-gui/src/main/resources/initial-objects/109-report-user-roles.xml
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/descriptor.xml
    M gui/admin-gui/src/main/webapp/less/midpoint/page-user-details.less
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainer.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ContainerDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/GreaterFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/LessFilter.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java
    M infra/schema/.gitignore
    M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
    M infra/schema/src/main/resources/xml/ns/public/model/context/model-context-2.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/JAXBUtil.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/AccountConstructionPack.java
    R 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/AssignmentPathSegment.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ConstructionPack.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/EvaluatedAssignment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensContext.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/LensFocusContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensProjectionContext.java
    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/AssignmentProcessor.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/Projector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/UserProfileServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/FocusValidityScannerTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/util/AbstractSearchIterativeTaskHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestAssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestAssignmentProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestClockwork.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjector.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestProjectorRoleEntitlement.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/sync/TestSynchronizationService.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/TestOrgStruct.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/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java
    M model/model-intest/src/test/resources/iteration/resource-dummy-dark-violet.xml
    A model/model-intest/src/test/resources/iteration/user-template-iteration-random.xml
    M model/model-intest/src/test/resources/iteration/user-template-iteration.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/sync/task-user-recompute-captain.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/report-impl/src/test/resources/reports/reportAuditLogs.xml
    M model/report-impl/src/test/resources/reports/reportReconciliation.xml
    M model/report-impl/src/test/resources/reports/reportUserAccounts.xml
    M model/report-impl/src/test/resources/reports/reportUserRoles.xml
    M provisioning/provisioning-impl/pom.xml
    M provisioning/provisioning-impl/src/test/resources/ctx-provisioning-test-no-repo.xml
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-sql-impl-test/sample-configurations/postgresql.properties
    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/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/BaseSQLRepoTest.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/ModifyAssignmentTest.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/ModifyUser.java
    R repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/PartialLoadingTest.java
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/PerformanceTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/RUtilTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SpringApplicationContextTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/util/SimpleTaskAdapter.java
    M repo/repo-sql-impl-test/src/test/resources/ctx-test-datasource.xml
    M repo/repo-sql-impl-test/src/test/resources/ctx-test.xml
    M repo/repo-sql-impl-test/testng.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlBaseService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RObjectDeltaOperation.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/OperationResult.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/OperationResultFull.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/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/RFocus.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RNode.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/RObjectTemplate.java
    R 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/RReport.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/data/common/RResource.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.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
    R 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
    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
    R 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/RAExtValue.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/RAnyValue.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/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
    M 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/data/common/container/RAssignment.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAuthorization.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtClobId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtDateId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtLongId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtPolyStringId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RAExtReferenceId.java
    M 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/ROExtClobId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtDateId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtLongId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtPolyStringId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtReferenceId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/ROExtStringId.java
    R 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/type/RObjectExtensionType.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/Query.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryCriteriaImpl.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryEngine.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryHQLImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryInterpreter.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/RQuery.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/RQueryCriteriaImpl.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/RQueryImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/definition/ClassDefinitionParser.java

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

Conflicts:
	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ObjectWrapper.java
	infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
	infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
	infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
	infra/util/src/main/java/com/evolveum/midpoint/util/JAXBUtil.java
	repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
	repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/BaseSQLRepoTest.java
	repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyAssignmentTest.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/QueryInterpreterTest.java
	repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
	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/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/any/RAnyConverter.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
	samples/resources/ad/ad-resource-advanced-sync.xml
	samples/resources/csvfile/localhost-csvfile-resource-advanced-sync.xml
	samples/resources/databasetable/localhost-dbtable-advanced-sync.xml
	samples/resources/dsee/odsee-localhost-advanced-sync.xml
	samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced.xml
	samples/resources/scriptedsql/localhost-scriptedsql-advanced-sync.xml


  Commit: cd92739ff0620d3184f7be4ada5f50186ce18949
      https://github.com/Evolveum/midpoint/commit/cd92739ff0620d3184f7be4ada5f50186ce18949
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M infra/schema/.gitignore
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/PerformanceTest.java
    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/SqlRepositoryServiceImpl.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/util/RUtil.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Some compilation fixes after merge.


  Commit: f84d32e3c98f73405b4c705cbfa602b3edfb6967
      https://github.com/Evolveum/midpoint/commit/f84d32e3c98f73405b4c705cbfa602b3edfb6967
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-11 (Fri, 11 Apr 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/src/test/resources/basic/tasks.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RObjectDeltaOperation.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/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/RUser.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/RUtil.java

  Log Message:
  -----------
  fixing repo tests...


  Commit: 43870fb342c53dc8a446a271110614c858149c81
      https://github.com/Evolveum/midpoint/commit/43870fb342c53dc8a446a271110614c858149c81
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-delete-assignment-account-dummy-attr.xml
    M model/model-intest/src/test/resources/sync/task-user-recompute-captain.xml
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  fixing model-impl and model-intest tests...


  Commit: 63933f00758481346788148e69bf9d906fd0a3c9
      https://github.com/Evolveum/midpoint/commit/63933f00758481346788148e69bf9d906fd0a3c9
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/Clock.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/AssignmentPath.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/AssignmentPathSegment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/Construction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ConstructionPack.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/EvaluatedAssignment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/AssignmentProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java
    M model/model-intest/src/test/resources/logback-test.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryEngine.java

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


  Commit: b896497a91ca68afb833474bc8c4d198befabf82
      https://github.com/Evolveum/midpoint/commit/b896497a91ca68afb833474bc8c4d198befabf82
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/resources/repo/resource-dummy.xml

  Log Message:
  -----------
  fixing sanity tests..


  Commit: 5e247b7bb4df90b79cd91043752a35e528410745
      https://github.com/Evolveum/midpoint/commit/5e247b7bb4df90b79cd91043752a35e528410745
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-12 (Sat, 12 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanInspector.java

  Log Message:
  -----------
  Caching of majority of reflection calls in PrismBeanConverter.


  Commit: bd4b3007ba80a3e1b740c89de00992de1c03fc78
      https://github.com/Evolveum/midpoint/commit/bd4b3007ba80a3e1b740c89de00992de1c03fc78
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-12 (Sat, 12 Apr 2014)

  Changed paths:
    M infra/common/src/main/java/com/evolveum/midpoint/common/Clock.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.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/AssignmentPath.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/AssignmentPathSegment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/Construction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ConstructionPack.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/EvaluatedAssignment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/test/resources/lens/user-barbossa-modify-delete-assignment-account-dummy-attr.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestValidityRecomputeTask.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/model-intest/src/test/resources/sync/task-user-recompute-captain.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/resources/basic/tasks.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RObjectDeltaOperation.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/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/RUser.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryEngine.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
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/resources/repo/resource-dummy.xml

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


  Commit: 285940dad331e95154d3f225725b0b580a760c96
      https://github.com/Evolveum/midpoint/commit/285940dad331e95154d3f225725b0b580a760c96
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-12 (Sat, 12 Apr 2014)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M model/workflow-impl/testng.xml

  Log Message:
  -----------
  Disabling wf tests. Fixing small bug in bean converter.


  Commit: f35a3b0fd381e1e01137fc38231afe557f98063f
      https://github.com/Evolveum/midpoint/commit/f35a3b0fd381e1e01137fc38231afe557f98063f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M gui/admin-gui/src/main/resources/initial-objects/107-report-user-accounts.xml
    M gui/admin-gui/src/main/resources/initial-objects/108-report-user-orgs.xml
    M gui/admin-gui/src/main/resources/initial-objects/109-report-user-roles.xml
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java

  Log Message:
  -----------
  Fixing admin-gui tests. Allowing embedded XML to be parsed as a string.


  Commit: a8a852d5b398063fb3137d8648cece75245b3a8b
      https://github.com/Evolveum/midpoint/commit/a8a852d5b398063fb3137d8648cece75245b3a8b
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    A testing/consistency-mechanism/src/test/resources/request/user-modify-assign-account.xml

  Log Message:
  -----------
  adding missing resources..


  Commit: a3cefb34137270a44110c8b71659b501f863a11f
      https://github.com/Evolveum/midpoint/commit/a3cefb34137270a44110c8b71659b501f863a11f
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M gui/admin-gui/src/main/resources/initial-objects/107-report-user-accounts.xml
    M gui/admin-gui/src/main/resources/initial-objects/108-report-user-orgs.xml
    M gui/admin-gui/src/main/resources/initial-objects/109-report-user-roles.xml
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java

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


  Commit: 574d6475e052ba9dc272ab53f53474dbe020da17
      https://github.com/Evolveum/midpoint/commit/574d6475e052ba9dc272ab53f53474dbe020da17
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M gui/admin-gui/src/main/resources/initial-objects/050-user-administrator.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/crypto/AESProtector.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/crypto/TestProtector.java
    R model/model-impl/src/main/resources/ctx-camel-imports.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestClockwork.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/PerformanceTest.java
    M repo/system-init/src/main/resources/ctx-configuration.xml

  Log Message:
  -----------
  small fix for serialization..and fixing starting in tomcat..


  Commit: 73eab137a3e8f6831831458b826e7473c819324f
      https://github.com/Evolveum/midpoint/commit/73eab137a3e8f6831831458b826e7473c819324f
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    A samples/resources/csvfile/localhost-csvfile-resource-advanced-sync-2.xml
    R samples/resources/csvfile/localhost-csvfile-resource-advanced-sync.xml

  Log Message:
  -----------
  fixing csv resource sample..


  Commit: f7354e78b4d57933c4a9cea88517bde4bf9fd3d1
      https://github.com/Evolveum/midpoint/commit/f7354e78b4d57933c4a9cea88517bde4bf9fd3d1
  Author: katkav <k.valalikova at evolveum.com>
  Date:   2014-04-14 (Mon, 14 Apr 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
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/paging/NavigatorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgUnit.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgTreeProvider.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgUnitAddDeletePopup.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgUnitAddDeletePopup.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgUnitAddDeletePopup.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 infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SelectorOptionsTest.java
    M infra/schema/testng.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M repo/repo-sql-impl-test/sql-procedures/mysql.sql
    M repo/repo-sql-impl-test/sql-procedures/postgresql.sql
    M repo/repo-sql-impl-test/sql-procedures/sqlserver.sql
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.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/SqlRepositoryFactory.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/RUser.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUserPhoto.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RUserPhotoId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryEngine.java
    A samples/resources/csvfile/localhost-csvfile-resource-advanced-sync-2.xml
    R samples/resources/csvfile/localhost-csvfile-resource-advanced-sync.xml

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

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


Compare: https://github.com/Evolveum/midpoint/compare/690ef40533a3...f7354e78b4d5


More information about the midPoint-svn mailing list