[midPoint-git] [Evolveum/midpoint] 6a9076: fix XML

gpalos gustav.palos at gmail.com
Fri Jun 12 13:10:57 CEST 2015 

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 6a90760eb8c5f94f1cec4243fcf78371e059a3c5
      https://github.com/Evolveum/midpoint/commit/6a90760eb8c5f94f1cec4243fcf78371e059a3c5
  Author: gpalos <gustav.palos at gmail.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M samples/demo/orgs-objectType.xml
    M samples/demo/projects-objectType.xml

  Log Message:
  -----------
  fix XML


  Commit: 204a734773efa0f47c457a60c8035784937aa185
      https://github.com/Evolveum/midpoint/commit/204a734773efa0f47c457a60c8035784937aa185
  Author: gpalos <gustav.palos at gmail.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M build-system/pom.xml
    M icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/monitor/InternalMonitor.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.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/query/ObjectQuery.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/SearchResultMetadata.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/MidPointConstants.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/MidPointSchemaDefinitionFactory.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinition.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-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/resource/annotation-3.xsd
    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/TestUtil.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-4000.template/config/config.ldif.startok
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/config/tasks.ldif
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/config/tasks.ldif.save
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/00000000.jdb
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.config.csv
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.info.0
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/db/userRoot/je.stat.csv
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/access
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/errors
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/replication
    M infra/test-util/src/main/resources/test-data/opendj-4000.template/logs/server.out
    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/evaluator/AbstractSearchExpressionEvaluator.java
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelCrudService.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/importer/ImportAccountsFromResourceTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/LiveSyncTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/ReconciliationTaskHandler.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/Utils.java
    M model/model-impl/src/test/resources/common/task-reconcile-dummy.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
    M model/model-intest/src/test/resources/common/resource-dummy-green.xml
    M model/model-intest/src/test/resources/common/task-dumy-blue-livesync.xml
    M model/model-intest/src/test/resources/common/task-dumy-green-livesync.xml
    M model/model-intest/src/test/resources/common/task-dumy-livesync.xml
    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/importer/import-ref.xml
    M model/model-intest/src/test/resources/sync/task-dummy-byzantine-livesync.xml
    M model/model-intest/src/test/resources/sync/task-dummy-byzantine-recon.xml
    M model/model-intest/src/test/resources/sync/task-dummy-emerald-livesync.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
    M model/model-intest/src/test/resources/sync/task-reconcile-dummy-uuid.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
    M provisioning/provisioning-impl/pom.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.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/ResourceManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.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/ShadowManager.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.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/impl/IcfConvertor.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfNameMapper.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/query/FilterInterpreter.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/ProvisioningTestUtil.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/AbstractOpenDJTest.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/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/TestDummyCaseIgnore.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyCaseIgnoreUpcaseName.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyExtra.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyNoActivation.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyPrioritiesAndReadReplace.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummyReadReplaceForAll.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/TestDummyUuid.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/impl/TestSynchronization.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 provisioning/provisioning-impl/src/test/resources/impl/opendj/account-bad.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-delete-repo.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-delete.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-disable-simulated-opendj.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-modify-password.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-modify-repo.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-modify.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-morgan.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-disabled.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-enabled.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new-with-password.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-new.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-opendj-no-sn.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-search-iterative.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account-search.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account1-repo.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/account1.xml
    M provisioning/provisioning-impl/src/test/resources/impl/opendj/group-swashbucklers.xml
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/query-complex-filter.xml
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/resource-opendj-bad-bind-dn.xml
    A provisioning/provisioning-impl/src/test/resources/impl/opendj/resource-opendj-bad-credentials.xml
    R 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/logback-test.xml
    A provisioning/provisioning-impl/src/test/resources/logging.properties
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-bad.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-initialized.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-create.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-delete.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-read.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj-no-update.xml
    M provisioning/provisioning-impl/src/test/resources/object/resource-opendj.xml
    M provisioning/provisioning-impl/src/test/resources/ucf/connector-ldap.xml
    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/DummyResourceContoller.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
    M samples/resources/opendj/opendj-localhost-basic.xml
    M samples/resources/opendj/opendj-localhost-medium.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/opendj-resource-genericsync.xml
    M samples/resources/openldap/olcAccess.ldif
    M testing/conntest/pom.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    A testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/Test389DsLocalhost.java
    M 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/389ds/resource-localhost.xml
    A testing/conntest/src/test/resources/389ds/task-sync.xml
    R testing/conntest/src/test/resources/common/resource-opendj.xml
    R testing/conntest/src/test/resources/common/resource-openldap.xml
    M testing/conntest/src/test/resources/common/system-configuration.xml
    M testing/conntest/src/test/resources/logback-test.xml
    M testing/conntest/src/test/resources/logging.properties
    A testing/conntest/src/test/resources/opendj/resource.xml
    A testing/conntest/src/test/resources/opendj/task-sync-inetorgperson.xml
    A testing/conntest/src/test/resources/opendj/task-sync.xml
    A testing/conntest/src/test/resources/openldap/resource.xml
    A testing/conntest/src/test/resources/openldap/task-sync-inetorgperson.xml
    A testing/conntest/src/test/resources/openldap/task-sync.xml
    M testing/longtest/pom.xml
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/longtest/src/test/resources/common/resource-opendj-complex.xml
    M testing/longtest/src/test/resources/common/resource-opendj-generic-sync.xml
    M testing/longtest/src/test/resources/common/resource-opendj-university.xml
    M testing/longtest/src/test/resources/common/resource-opendj-vlv.xml
    M testing/longtest/src/test/resources/common/resource-opendj.xml
    M testing/longtest/src/test/resources/ldap/role-pirate.xml
    M testing/longtest/src/test/resources/logging.properties
    M testing/sanity/pom.xml
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java
    M testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanityLegacy.java
    M testing/sanity/src/test/resources/logback-test.xml
    M testing/sanity/src/test/resources/repo/resource-opendj-legacy.xml
    M testing/sanity/src/test/resources/repo/resource-opendj.xml
    M testing/sanity/src/test/resources/repo/task-derby-reconciliation.xml
    M testing/sanity/src/test/resources/repo/task-opendj-reconciliation-legacy.xml
    M testing/sanity/src/test/resources/repo/task-opendj-reconciliation.xml
    M testing/sanity/src/test/resources/repo/task-opendj-sync-legacy.xml
    M testing/sanity/src/test/resources/repo/task-opendj-sync.xml
    M testing/sanity/src/test/resources/request/account-angelika.xml
    M testing/sanity/src/test/resources/request/user-modify-add-account.xml
    M testing/sanity/testng.xml
    M testing/story/pom.xml
    M testing/story/src/test/resources/orgsync/resource-opendj.xml
    M testing/story/src/test/resources/orgsync/task-reconcile-opendj-default-single.xml
    M testing/story/src/test/resources/science/resource-opendj-ad-simulation.xml
    M testing/story/src/test/resources/uuid/resource-opendj.xml
    M testing/story/src/test/resources/uuid/role-client.xml
    M testing/story/src/test/resources/village/resource-opendj.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/ca0cc8aa53ca...204a734773ef

More information about the midPoint-svn mailing list