[midPoint-git] [Evolveum/midpoint] 2bbe7e: Uploader (preliminary version)

Pavol Mederly mederly at evolveum.com
Wed Mar 18 00:36:50 CET 2015


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 2bbe7e716ab4c77cdbfd90cb29dc2e7332275e21
      https://github.com/Evolveum/midpoint/commit/2bbe7e716ab4c77cdbfd90cb29dc2e7332275e21
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-03-09 (Mon, 09 Mar 2015)

  Changed paths:
    A samples/model-client-sample/src/main/bin/upload.bat
    A samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Upload.java

  Log Message:
  -----------
  Uploader (preliminary version)


  Commit: 98e71603520da25235fdb6aaf3b4589bc6ff709e
      https://github.com/Evolveum/midpoint/commit/98e71603520da25235fdb6aaf3b4589bc6ff709e
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-03-16 (Mon, 16 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/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
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/Validatable.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaHandlingStep.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/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.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/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/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/component/JasperReportConfigurationPanel.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/reports/dto/JasperReportFieldDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/JasperReportParameterDto.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/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/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    M gui/admin-gui/src/main/webapp/WEB-INF/web.xml
    M gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
    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/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/xnode/PrimitiveXNode.java
    M infra/schema/pom.xml
    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/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/src/main/java/com/evolveum/midpoint/test/ldap/OpenDJController.java
    A infra/test-util/src/main/resources/test-data/ldif/example-4000.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/MakeLDIF/cities
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/MakeLDIF/example.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/MakeLDIF/first.names
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/MakeLDIF/last.names
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/MakeLDIF/states
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/MakeLDIF/streets
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/admin-backend.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/admin-backend.ldif.old
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/admin-keystore
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/admin-keystore.pin
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/admin-truststore
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/ads-truststore
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/ads-truststore.pin
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180837Z.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180838Z.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180847Z-2.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180847Z-3.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180847Z-4.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180847Z-5.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180847Z-6.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180847Z-7.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180847Z-8.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180847Z-9.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150306180847Z.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150309121334Z.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150309121447Z.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150309121449Z.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150309121523Z.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150309121529Z.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/archived-configs/config-20150309121757Z.gz
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/buildinfo
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/config.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/config.ldif.startok
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/http-config.json
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/java.properties
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/account-disabled.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/account-enabled.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/account-expired.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/account-idle-locked.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/account-permanently-locked.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/account-reset-locked.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/account-temporarily-locked.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/account-unlocked.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/password-changed.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/password-expired.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/password-expiring.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/messages/password-reset.template
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/00-core.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/01-pwpolicy.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/02-config.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/03-changelog.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/03-pwpolicyextension.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/03-rfc2713.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/03-rfc2714.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/03-rfc2739.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/03-rfc2926.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/03-rfc3112.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/03-rfc3712.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/03-uddiv3.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/04-rfc2307bis.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/05-rfc4876.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/05-samba.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/05-solaris.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/06-compat.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/schema/99-user.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/tasks.ldif
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/tasks.ldif.save
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/tools.properties
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/upgrade/schema.ldif.-1
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/upgrade/schema.ldif.current
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/config/wordlist.txt
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/00000000.jdb
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.config.csv
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.info.0
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.lck
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.stat.csv
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/locks/backend-adminRoot.lock
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/locks/backend-ads-truststore.lock
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/locks/backend-backup.lock
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/locks/backend-monitor.lock
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/locks/backend-replicationChanges.lock
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/locks/backend-schema.lock
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/locks/backend-tasks.lock
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/locks/backend-userRoot.lock
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/locks/server.lock
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/access
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/errors
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/replication
    A infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/server.out
    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-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
    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
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenDj.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdap.java
    A testing/conntest/src/test/resources/common/resource-opendj.xml
    M testing/conntest/testng.xml

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


  Commit: e47f5785d73d1b01e34a0b6eedc357ebe3d60de8
      https://github.com/Evolveum/midpoint/commit/e47f5785d73d1b01e34a0b6eedc357ebe3d60de8
  Author: Pavol Mederly <mederly 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:
  -----------
  Merge branch 'master' of https://github.com/Evolveum/midpoint


  Commit: f798c3a207dc7d7e3a1e3b99235956f73980d87f
      https://github.com/Evolveum/midpoint/commit/f798c3a207dc7d7e3a1e3b99235956f73980d87f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2015-03-17 (Tue, 17 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
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SelectorOptions.java
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/config/config.ldif
    M infra/test-util/src/main/resources/test-data/opendj.template/config/config.ldif
    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 model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.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/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/other/RLookupTableRow.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

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


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

  Changed paths:
    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/page/admin/resources/content/PageContentAccounts.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ValueDisplayUtil.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/TestUserChangeApproval.java

  Log Message:
  -----------
  Account assignment attribute values are created with strength=STRONG.
No longer generating superfluous ADD+DELETE values for account assignment attributes.


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

  Changed paths:
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java

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


Compare: https://github.com/Evolveum/midpoint/compare/3f28841330ec...d2d7f8a10995


More information about the midPoint-svn mailing list