[midPoint-git] [Evolveum/midpoint] e6b287: exclusion for javax.servlet (causing problem while...

Katarina Valalikova k.valalikova at evolveum.com
Thu Apr 16 10:30:13 CEST 2015


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: e6b2872a23342b6156a8c39249c00de7da5f99c4
      https://github.com/Evolveum/midpoint/commit/e6b2872a23342b6156a8c39249c00de7da5f99c4
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M gui/admin-gui/pom.xml

  Log Message:
  -----------
  exclusion for javax.servlet (causing problem while starting embedded tomcat in eclipse..)


  Commit: a4d1ffbc84866b7d71eae6895d20eaff4320d341
      https://github.com/Evolveum/midpoint/commit/a4d1ffbc84866b7d71eae6895d20eaff4320d341
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M build-system/pom.xml
    M 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/page/PageBase_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.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-es-ES/src/main/resources/com/evolveum/midpoint/web/page/PageTemplate_es_ES.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-tr-TR/src/main/resources/com/evolveum/midpoint/web/component/menu/top/UserMenuPanel_tr_TR.utf8.properties
    M gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/PageBase_tr_TR.utf8.properties
    M gui/admin-gui/pom.xml
    M 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/input/SecurityQuestionPAnel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/top/UserMenuPanel.html
    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/menu/top/UserMenuPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/SystemConfigurationDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswords.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/MyPasswordQuestionsPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/MyPasswordQuestionsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/PasswordQuestionsDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/dto/SecurityQuestionAnswerDTO.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/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsPreviewDto.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/dto/QuestionDTO.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/dto/SecretQuestionsDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.properties
    A gui/admin-gui/src/main/webapp/PageSecurityQuestions.html
    M gui/admin-gui/src/main/webapp/WEB-INF/descriptor.xml
    M gui/pom.xml
    M infra/common/pom.xml
    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/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/prism/.gitignore
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/PartiallyResolvedDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/schema/.gitignore
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M infra/util/.gitignore
    A infra/util/src/main/java/com/evolveum/midpoint/util/exception/NoFocusNameSchemaException.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAbstractRole.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedConstruction.java
    M model/model-client/src/main/java/com/evolveum/midpoint/model/client/ModelClientUtil.java
    M model/model-common/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelWebService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPath.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegment.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAbstractRoleImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedConstructionImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/CredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestClockwork.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestActivation.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMapping.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPassword.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/gensync/TestEditSchema.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/importer/ImportTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
    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/user-template-complex.xml
    A model/model-intest/src/test/resources/gensync/role-prisoner.xml
    A model/model-intest/src/test/resources/gensync/user-otis.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/impl/events/workflow/DefaultWorkflowEventCreator.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/TestDummyPrioritiesAndReadReplace.java
    A repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/UserPhotoTest.java
    A repo/repo-sql-impl-test/src/test/resources/photo/t001-add-employeeType.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t002-remove-photo.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t003-re-add-photo.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t004-change-photo.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t005-add-photo-by-add.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t006-add-photo-by-add-other.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t007-remove-photo-by-delete.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/t008-remove-other-photo-by-delete.xml
    A repo/repo-sql-impl-test/src/test/resources/photo/user.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/RUser.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
    M samples/demo-generic synchronization/resource-GenSync-CSV.xml
    M samples/demo-generic synchronization/resource-GenSync-OpenDJ.xml
    M samples/demo-rs/resource-csv-source.xml
    M samples/demo-rs/resource-csv-xxx.xml
    M samples/demo-rs/resource-ldap-opendj.xml
    M samples/demo/hr.xml
    M samples/demo/opendj.xml
    M samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/common-3.xsd
    M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
    M samples/objects/security-policy.xml
    M samples/resources/ad/ad-resource-advanced-sync.xml
    M samples/resources/ad/ad-resource-groups-advanced.xml
    M samples/resources/ad/ad-resource-groups-basic.xml
    M samples/resources/csvfile/localhost-csvfile-resource-advanced-sync-2.xml
    M samples/resources/csvfile/localhost-csvfile-resource-advanced-sync.xml
    M samples/resources/csvfile/localhost-csvfile-resource-bulk-action.xml
    M samples/resources/csvfile/localhost-csvfile-resource-import.xml
    M samples/resources/databasetable/localhost-dbtable-advanced-sync.xml
    M samples/resources/dsee/odsee-localhost-advanced-nosync.xml
    M samples/resources/dsee/odsee-localhost-advanced-sync.xml
    M samples/resources/office365/office365-federated.xml
    M samples/resources/office365/office365-managed.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/opendj/piracy/opendj-localhost-resource-sync-extension-pirates.xml
    M samples/resources/scriptedsql/localhost-scriptedsql-advanced-nosync.xml
    M samples/resources/scriptedsql/localhost-scriptedsql-advanced-sync.xml
    M samples/rest/opendj-resource-sync.xml
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
    M testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/AbstractWebserviceTest.java
    A testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/TestWSSanity.java
    A testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/TestWSSecurity.java
    R testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/WebserviceSecurityTest.java
    A testing/wstest/src/test/resources/common/resource-opendj.xml
    A testing/wstest/src/test/resources/common/user-jack.xml
    M testing/wstest/testng.xml

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


  Commit: fbf28def38a6d8437cf7a0e2ba4d0d8429f8dd80
      https://github.com/Evolveum/midpoint/commit/fbf28def38a6d8437cf7a0e2ba4d0d8429f8dd80
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  Changed paths:
    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/component/RunReportPopupPanel.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/report/extension-3.xsd
    A model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportConstants.java
    M model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportManager.java
    R model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportConstants.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportManagerImpl.java
    M testing/consistency-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java

  Log Message:
  -----------
  improving report param attributes serialization..
enabling check on cached changes in shadow


  Commit: 426ece3f7f799c58cc21b4b975cb1ee64f6826e0
      https://github.com/Evolveum/midpoint/commit/426ece3f7f799c58cc21b4b975cb1ee64f6826e0
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  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/110-report-user-list.xml

  Log Message:
  -----------
  updated "parent" reports


  Commit: 487a77f6bf7144e83759254e7794611be7e0ec03
      https://github.com/Evolveum/midpoint/commit/487a77f6bf7144e83759254e7794611be7e0ec03
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  Changed paths:
    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/111-report-reconciliation-shadow-owner.xml

  Log Message:
  -----------
  updating subreports..


  Commit: 254f1144411ead9114799d5fbb2c44d111ab670d
      https://github.com/Evolveum/midpoint/commit/254f1144411ead9114799d5fbb2c44d111ab670d
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  Changed paths:
    R config/sql/_all/h2-3.1-all.sql
    A config/sql/_all/h2-3.1.1-all.sql
    R config/sql/_all/mysql-3.1-all.sql
    A config/sql/_all/mysql-3.1.1-all.sql
    R config/sql/_all/oracle-3.1-all.sql
    A config/sql/_all/oracle-3.1.1-all.sql
    R config/sql/_all/postgresql-3.1-all.sql
    A config/sql/_all/postgresql-3.1.1-all.sql
    R config/sql/_all/sqlserver-3.1-all.sql
    A config/sql/_all/sqlserver-3.1.1-all.sql
    M config/sql/activiti/activiti.h2.create.engine.sql
    M config/sql/activiti/activiti.h2.create.history.sql
    M config/sql/activiti/activiti.mssql.create.engine.sql
    M config/sql/activiti/activiti.mssql.create.history.sql
    M config/sql/activiti/activiti.mysql.create.engine.sql
    M config/sql/activiti/activiti.mysql.create.history.sql
    R config/sql/activiti/activiti.mysql55.create.engine.sql
    R config/sql/activiti/activiti.mysql55.create.history.sql
    M config/sql/activiti/activiti.oracle.create.engine.sql
    M config/sql/activiti/activiti.oracle.create.history.sql
    M config/sql/activiti/activiti.postgres.create.engine.sql
    M config/sql/activiti/activiti.postgres.create.history.sql
    R gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageMyPasswordQuestions_en_US.utf8.properties
    A gui/admin-gui-en-US/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions_en_US.utf8.properties
    R gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.properties
    A gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword_tr_TR.utf8.properties
    A gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageMyPasswordQuestions_tr_TR.utf8.properties
    A gui/admin-gui-tr-TR/src/main/resources/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions_tr_TR.utf8.properties
    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/assignment/AssignmentTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FutureUpdateBehavior.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/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/server/dto/TaskDtoProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsPreviewDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageMyPasswordQuestions.properties
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ObjectTypeGuiDescriptor.java
    M gui/admin-gui/src/main/resources/initial-objects/020-system-configuration.xml
    M gui/admin-gui/src/main/resources/logback.xml
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M infra/common/src/main/java/com/evolveum/midpoint/common/policy/PasswordPolicyUtils.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
    M infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationChangeHook.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/OrgClosureManager.java
    A samples/objects/lookup-languages.xml
    M samples/objects/object-template-user-structured.xml
    A samples/objects/user-jack-with-password-no-oid.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/ad199f679a77...254f1144411e


More information about the midPoint-svn mailing list