[midPoint-git] [Evolveum/midpoint] 8af4cc: Fix for bug with incorrect comparison of ItemPathT...

Radovan Semancik radovan.semancik at evolveum.com
Mon Mar 16 16:36:36 CET 2015 

  Branch: refs/heads/ldap
  Home:   https://github.com/Evolveum/midpoint
  Commit: 8af4cc748c69b7e96833c1c8c09207f465a40647
      https://github.com/Evolveum/midpoint/commit/8af4cc748c69b7e96833c1c8c09207f465a40647
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

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

  Log Message:
  -----------
  Fix for bug with incorrect comparison of ItemPathType attribute references in resource wizard.


  Commit: 399649cdc3e2ae27a9d23805eadbc739c59d6c32
      https://github.com/Evolveum/midpoint/commit/399649cdc3e2ae27a9d23805eadbc739c59d6c32
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M config/sql/midpoint/3.1.1/h2/h2-3.1.1.sql
    M config/sql/midpoint/3.1.1/h2/h2-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/mysql/mysql-3.1.1.sql
    M config/sql/midpoint/3.1.1/mysql/mysql-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/oracle/oracle-3.1.1.sql
    M config/sql/midpoint/3.1.1/oracle/oracle-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/postgresql/postgresql-3.1.1.sql
    M config/sql/midpoint/3.1.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/sqlserver/sqlserver-3.1.1.sql
    M config/sql/midpoint/3.1.1/sqlserver/sqlserver-upgrade-3.1-3.1.1.sql
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/RelationalValueSearchQuery.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/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RLookupTable.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/container/Container.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RLookupTableRowId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RLookupTableRow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/PrismIdentifierGenerator.java

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


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

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    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/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    A model/model-intest/src/test/resources/common/lookup-languages.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

  Log Message:
  -----------
  Tests for lookup table (some failing)


  Commit: 1926375fe3ab804eed9e2b11ad03a07c2e8e19f4
      https://github.com/Evolveum/midpoint/commit/1926375fe3ab804eed9e2b11ad03a07c2e8e19f4
  Author: Erik Suta <erik.suta at evolveum.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

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

  Log Message:
  -----------
  MID-2266 fix. Improved handling of partial connector errors in assignment tables.


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

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

  Log Message:
  -----------
  MID-2266 improvement. Users are now informed, when something is wrong with one or more resources.


  Commit: 19ba11ec0fb6aa0c484b89b3b96c2f0a04aa01b7
      https://github.com/Evolveum/midpoint/commit/19ba11ec0fb6aa0c484b89b3b96c2f0a04aa01b7
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M gui/admin-gui/pom.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/QueryJaxbConvertor.java
    M infra/schema/src/main/resources/xml/ns/public/report/report-3.wsdl
    A model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportService.java
    M model/report-ds-impl/pom.xml
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointDataSource.java
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointQueryExecutor.java
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointQueryExecutorFactory.java
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteQueryExecutor.java
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteQueryExecutorFactory.java
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidpointDataSourceProvider.java
    A model/report-ds-impl/src/main/resources/jasperreports.properties
    R model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointDataSource.java
    R model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointDataSourceProvider.java
    R model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointQueryExecutor.java
    R model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointQueryExecutorFactory.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportServiceImpl.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebService.java
    M model/report-impl/src/main/resources/jasperreports.properties
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestReport.java

  Log Message:
  -----------
  jasperreport query executers - local + remote..remote for jaspersorft studio integration..


  Commit: 02f96c3b7f37c3da6a39549735e01ea9987dfd13
      https://github.com/Evolveum/midpoint/commit/02f96c3b7f37c3da6a39549735e01ea9987dfd13
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M config/sql/midpoint/3.1.1/h2/h2-3.1.1.sql
    M config/sql/midpoint/3.1.1/h2/h2-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/mysql/mysql-3.1.1.sql
    M config/sql/midpoint/3.1.1/mysql/mysql-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/oracle/oracle-3.1.1.sql
    M config/sql/midpoint/3.1.1/oracle/oracle-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/postgresql/postgresql-3.1.1.sql
    M config/sql/midpoint/3.1.1/postgresql/postgresql-upgrade-3.1-3.1.1.sql
    M config/sql/midpoint/3.1.1/sqlserver/sqlserver-3.1.1.sql
    M config/sql/midpoint/3.1.1/sqlserver/sqlserver-upgrade-3.1-3.1.1.sql
    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/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    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/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignablePopupContent.java
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/RelationalValueSearchQuery.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    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/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    A model/model-intest/src/test/resources/common/lookup-languages.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 repo/repo-sql-impl-test/src/test/resources/basic/objects.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/RLookupTable.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/container/Container.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/id/RLookupTableRowId.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/other/RLookupTableRow.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/PrismIdentifierGenerator.java

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


  Commit: 8a0ef2ca8ffd70414ca4ca7d83e267b7ab79c6cf
      https://github.com/Evolveum/midpoint/commit/8a0ef2ca8ffd70414ca4ca7d83e267b7ab79c6cf
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/DisplayableValueImpl.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/RoleSelectionSpecification.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.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/AbstractGenericSyncTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    A model/model-intest/src/test/resources/gensync/lookup-role-type.xml
    M model/model-intest/src/test/resources/gensync/object-template-role.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 repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Support for getting role types, work in progress (MID-2257)


  Commit: 67d4a95fb7e86618fe4c03337a6d6311b03ea849
      https://github.com/Evolveum/midpoint/commit/67d4a95fb7e86618fe4c03337a6d6311b03ea849
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M model/pom.xml

  Log Message:
  -----------
  removing report datasource from build


  Commit: fd320562ef218f6ce770c3eaf566f54ae10d4ab2
      https://github.com/Evolveum/midpoint/commit/fd320562ef218f6ce770c3eaf566f54ae10d4ab2
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-12 (Thu, 12 Mar 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/DisplayableValueImpl.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/RoleSelectionSpecification.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.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/AbstractGenericSyncTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    A model/model-intest/src/test/resources/gensync/lookup-role-type.xml
    M model/model-intest/src/test/resources/gensync/object-template-role.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 repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

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


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.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-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

  Log Message:
  -----------
  Improving roleType implementation.


  Commit: f4362537b0bac9d121732dda5b8e8b8396523831
      https://github.com/Evolveum/midpoint/commit/f4362537b0bac9d121732dda5b8e8b8396523831
  Author: erik <erik.suta at evolveum.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueChoosePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.java
    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/component/ChooseTypeDialog.html
    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.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/component/UserOrgReferenceChoosePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/UserOrgReferenceChoosePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/UserOrgReferenceChoosePanel.properties

  Log Message:
  -----------
  Adding ownerRef chooser component to role editor.


  Commit: b8d237f04fa04d3f105706966e60f9503ad8a2b9
      https://github.com/Evolveum/midpoint/commit/b8d237f04fa04d3f105706966e60f9503ad8a2b9
  Author: erik <erik.suta at evolveum.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/UserOrgReferenceChoosePanel.properties

  Log Message:
  -----------
  adding forgotten license header to .properties file.


  Commit: 6c7438fb9c12a1921219c5d229d5e491d035d505
      https://github.com/Evolveum/midpoint/commit/6c7438fb9c12a1921219c5d229d5e491d035d505
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/private/fake/fake-1-report.wsdl
    M model/pom.xml
    M model/report-ds-impl/pom.xml
    M model/report-ds-impl/src/compile/resources/catalog.xml
    M model/report-ds-impl/src/compile/resources/jax-ws-catalog.xml
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointDataSource.java
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointQueryExecutor.java
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteQueryExecutor.java
    M model/report-impl/src/main/resources/xml/ns/META-INF/jax-ws-catalog.xml

  Log Message:
  -----------
  added report data source to the build


  Commit: 62a5a1519c12f82debbce92c44c76b03bb6f8acb
      https://github.com/Evolveum/midpoint/commit/62a5a1519c12f82debbce92c44c76b03bb6f8acb
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueChoosePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.java
    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/component/ChooseTypeDialog.html
    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.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/component/UserOrgReferenceChoosePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/UserOrgReferenceChoosePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/UserOrgReferenceChoosePanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.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-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

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


  Commit: 9b9b993cbf22a8b906f8f38af94df57859fdf153
      https://github.com/Evolveum/midpoint/commit/9b9b993cbf22a8b906f8f38af94df57859fdf153
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-15 (Sun, 15 Mar 2015)

  Changed paths:
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportDto.java
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M infra/schema/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ReportTypeUtil.java
    M infra/schema/src/main/resources/META-INF/catalog-compile-time.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog-compile-time.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog-model-context.xml
    A infra/schema/src/main/resources/META-INF/jax-ws-catalog-report.xml
    M model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportPort.java
    R model/report-ds-impl/src/compile/resources/catalog.xml
    R model/report-ds-impl/src/compile/resources/jax-ws-catalog.xml
    M model/report-impl/pom.xml
    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/ReportUtils.java

  Log Message:
  -----------
  fixing build and deploy


  Commit: 7d322c33907648f7f00ded17a989305c9c7d6a6b
      https://github.com/Evolveum/midpoint/commit/7d322c33907648f7f00ded17a989305c9c7d6a6b
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M build-system/pom.xml
    M infra/test-util/pom.xml
    M infra/test-util/src/test/java/com/evolveum/midpoint/test/util/DerbyControllerTest.java

  Log Message:
  -----------
  Fixing Derby


  Commit: 22722ebc1ee9687db26f544e4ec1934d250ad6ad
      https://github.com/Evolveum/midpoint/commit/22722ebc1ee9687db26f544e4ec1934d250ad6ad
  Author: erik <erik.suta at evolveum.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

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

  Log Message:
  -----------
  Adding approverRef chooser component to role editor.


  Commit: 41924f9b65a06b4385d08340147bd95e0f4f68d3
      https://github.com/Evolveum/midpoint/commit/41924f9b65a06b4385d08340147bd95e0f4f68d3
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/RoleSelectionSpecification.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  ModelInteractionService.getAssignableRoleSpecification(...) extended


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

  Changed paths:
    M build-system/pom.xml
    M gui/admin-gui/pom.xml
    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/form/multivalue/MultiValueChoosePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueChoosePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/TwoStateBooleanPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/capability/CapabilityActivationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypeDialog.html
    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/reports/dto/JasperReportDto.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/component/UserOrgReferenceChoosePanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/UserOrgReferenceChoosePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/component/UserOrgReferenceChoosePanel.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/component/AssignablePopupContent.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/DisplayableValueImpl.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/QueryJaxbConvertor.java
    M infra/schema/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ReportTypeUtil.java
    M infra/schema/src/main/resources/META-INF/catalog-compile-time.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog-compile-time.xml
    M infra/schema/src/main/resources/META-INF/jax-ws-catalog-model-context.xml
    A infra/schema/src/main/resources/META-INF/jax-ws-catalog-report.xml
    M infra/schema/src/main/resources/xml/ns/private/fake/fake-1-report.wsdl
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/report/report-3.wsdl
    M infra/test-util/pom.xml
    M infra/test-util/src/test/java/com/evolveum/midpoint/test/util/DerbyControllerTest.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/RoleSelectionSpecification.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.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/AbstractInitializedModelIntegrationTest.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/AbstractGenericSyncTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    A model/model-intest/src/test/resources/common/lookup-languages.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    A model/model-intest/src/test/resources/gensync/lookup-role-type.xml
    M model/model-intest/src/test/resources/gensync/object-template-role.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/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportPort.java
    A model/report-api/src/main/java/com/evolveum/midpoint/report/api/ReportService.java
    M model/report-ds-impl/pom.xml
    R model/report-ds-impl/src/compile/resources/catalog.xml
    R model/report-ds-impl/src/compile/resources/jax-ws-catalog.xml
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointDataSource.java
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointQueryExecutor.java
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointQueryExecutorFactory.java
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteQueryExecutor.java
    A model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidPointRemoteQueryExecutorFactory.java
    M model/report-ds-impl/src/main/java/com/evolveum/midpoint/report/ds/impl/MidpointDataSourceProvider.java
    A model/report-ds-impl/src/main/resources/jasperreports.properties
    M model/report-impl/pom.xml
    R model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointDataSource.java
    R model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointDataSourceProvider.java
    R model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointQueryExecutor.java
    R model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/MidPointQueryExecutorFactory.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportCreateTaskHandler.java
    A model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportServiceImpl.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportUtils.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportWebService.java
    M model/report-impl/src/main/resources/jasperreports.properties
    M model/report-impl/src/main/resources/xml/ns/META-INF/jax-ws-catalog.xml
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestReport.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java

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


Compare: https://github.com/Evolveum/midpoint/compare/987876713aeb...cc3ff18509b5

More information about the midPoint-svn mailing list