[midPoint-git] [Evolveum/midpoint] 1ce720: support for enum in extension schema..

Katarina Valalikova k.valalikova at evolveum.com
Sat Mar 7 20:04:26 CET 2015


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 1ce72041aa2181b0e56c51ecab52912c53230896
      https://github.com/Evolveum/midpoint/commit/1ce72041aa2181b0e56c51ecab52912c53230896
  Author: Katarina Valalikova (katkav) <k.valalikova at evolveum.com>
  Date:   2015-03-07 (Sat, 07 Mar 2015)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/WebMiscUtil.java
    A infra/prism/src/main/java/com/evolveum/midpoint/prism/EnumDisplayableValue.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyDefinition.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaDefinitionFactory.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/RAnyConverterStaticTest.java
    M repo/repo-sql-impl-test/src/test/resources/schema/extension.xsd
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java

  Log Message:
  -----------
  support for enum in extension schema..


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

  Changed paths:
    M build-system/pom.xml
    M dist/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/DropDownFormGroup.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageInternals.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.properties
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/InfoTooltipBehavior.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/validation/MidpointFormValidator.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/validation/MidpointFormValidatorImpl.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/validation/MidpointFormValidatorRegistry.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/validation/SimpleValidationError.java
    M gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M gui/admin-gui/src/main/resources/initial-objects/107-report-user-accounts.xml
    M gui/admin-gui/src/main/resources/initial-objects/108-report-user-orgs.xml
    M gui/admin-gui/src/main/resources/initial-objects/109-report-user-roles.xml
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    M gui/admin-gui/src/main/resources/initial-objects/111-report-reconciliation-shadow-owner.xml
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismObject.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/DeltaSetTriple.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java
    M infra/prism/src/main/resources/xml/ns/public/annotation-3.xsd
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/RelationalValueSearchQuery.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/RelationalValueSearchType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseLookupTable.java
    M infra/schema/src/test/resources/common/lookup-table.xml
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
    M infra/test-util/src/main/resources/test-data/opendj.template/config/admin-backend.ldif
    M infra/test-util/src/main/resources/test-data/opendj.template/config/admin-backend.ldif.old
    M infra/test-util/src/main/resources/test-data/opendj.template/config/admin-keystore
    M infra/test-util/src/main/resources/test-data/opendj.template/config/admin-keystore.pin
    M infra/test-util/src/main/resources/test-data/opendj.template/config/admin-truststore
    M infra/test-util/src/main/resources/test-data/opendj.template/config/ads-truststore
    M infra/test-util/src/main/resources/test-data/opendj.template/config/ads-truststore.pin
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180837Z.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180838Z.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180847Z-2.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180847Z-3.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180847Z-4.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180847Z-5.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180847Z-6.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180847Z-7.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180847Z-8.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180847Z-9.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306180847Z.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306181208Z.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306181505Z.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306181507Z.gz
    A infra/test-util/src/main/resources/test-data/opendj.template/config/archived-configs/config-20150306181728Z.gz
    M infra/test-util/src/main/resources/test-data/opendj.template/config/buildinfo
    M infra/test-util/src/main/resources/test-data/opendj.template/config/config.ldif
    M infra/test-util/src/main/resources/test-data/opendj.template/config/config.ldif.startok
    A infra/test-util/src/main/resources/test-data/opendj.template/config/http-config.json
    M infra/test-util/src/main/resources/test-data/opendj.template/config/java.properties
    R infra/test-util/src/main/resources/test-data/opendj.template/config/keystore
    R infra/test-util/src/main/resources/test-data/opendj.template/config/keystore.pin
    M infra/test-util/src/main/resources/test-data/opendj.template/config/schema/00-core.ldif
    M infra/test-util/src/main/resources/test-data/opendj.template/config/schema/01-pwpolicy.ldif
    M infra/test-util/src/main/resources/test-data/opendj.template/config/schema/02-config.ldif
    M infra/test-util/src/main/resources/test-data/opendj.template/config/schema/03-changelog.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template/config/schema/03-pwpolicyextension.ldif
    M infra/test-util/src/main/resources/test-data/opendj.template/config/schema/05-rfc4876.ldif
    A infra/test-util/src/main/resources/test-data/opendj.template/config/schema/05-samba.ldif
    M infra/test-util/src/main/resources/test-data/opendj.template/config/schema/05-solaris.ldif
    R infra/test-util/src/main/resources/test-data/opendj.template/config/servicetag/opends.uuids.properties
    R infra/test-util/src/main/resources/test-data/opendj.template/config/snmp/security/opends-snmp.security
    M infra/test-util/src/main/resources/test-data/opendj.template/config/tasks.ldif
    M infra/test-util/src/main/resources/test-data/opendj.template/config/tasks.ldif.save
    M infra/test-util/src/main/resources/test-data/opendj.template/config/tools.properties
    R infra/test-util/src/main/resources/test-data/opendj.template/config/truststore
    R infra/test-util/src/main/resources/test-data/opendj.template/config/upgrade/config.ldif.6998
    A infra/test-util/src/main/resources/test-data/opendj.template/config/upgrade/schema.ldif.-1
    R infra/test-util/src/main/resources/test-data/opendj.template/config/upgrade/schema.ldif.6998
    M infra/test-util/src/main/resources/test-data/opendj.template/config/upgrade/schema.ldif.current
    M infra/test-util/src/main/resources/test-data/opendj.template/db/userRoot/00000000.jdb
    A infra/test-util/src/main/resources/test-data/opendj.template/db/userRoot/je.config.csv
    M infra/test-util/src/main/resources/test-data/opendj.template/db/userRoot/je.info.0
    A infra/test-util/src/main/resources/test-data/opendj.template/db/userRoot/je.stat.csv
    M infra/test-util/src/main/resources/test-data/opendj.template/logs/access
    M infra/test-util/src/main/resources/test-data/opendj.template/logs/errors
    M infra/test-util/src/main/resources/test-data/opendj.template/logs/replication
    M infra/test-util/src/main/resources/test-data/opendj.template/logs/server.out
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAbstractRole.java
    A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelContext.java
    M model/model-common/pom.xml
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/Mapping.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingFactory.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/AbstractScriptTest.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestGroovyExpressions.java
    A model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/script/TestPythonExpressions.java
    M model/model-common/src/test/resources/expression/groovy/expression-objectref-variables.xml
    A model/model-common/src/test/resources/expression/groovy/expression-polystring-equals-1.xml
    A model/model-common/src/test/resources/expression/groovy/expression-polystring-equals-2.xml
    A model/model-common/src/test/resources/expression/groovy/expression-polystring-equals-stringify-1.xml
    A model/model-common/src/test/resources/expression/groovy/expression-polystring-equals-stringify-2.xml
    M model/model-common/src/test/resources/expression/javascript/expression-objectref-variables.xml
    A model/model-common/src/test/resources/expression/python/expression-func-concatname.xml
    A model/model-common/src/test/resources/expression/python/expression-func.xml
    A model/model-common/src/test/resources/expression/python/expression-list.xml
    A model/model-common/src/test/resources/expression/python/expression-objectref-variables-polystring.xml
    A model/model-common/src/test/resources/expression/python/expression-objectref-variables.xml
    A model/model-common/src/test/resources/expression/python/expression-simple.xml
    A model/model-common/src/test/resources/expression/python/expression-string-variables.xml
    A model/model-common/src/test/resources/expression/python/expression-user-extension-ship-path.xml
    A model/model-common/src/test/resources/expression/python/expression-user-extension-ship.xml
    A model/model-common/src/test/resources/expression/python/expression-user-given-name.xml
    A model/model-common/src/test/resources/expression/python/expression-user-stringify-full-name.xml
    M model/model-common/src/test/resources/expression/xpath/expression-objectref-variables.xml
    A model/model-common/src/test/resources/logback-test.xml
    M model/model-common/testng.xml
    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/Clockwork.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAbstractRoleImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignment.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ContextLoader.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/main/resources/ctx-model.xml
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestOrgStruct.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRbac.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/orgstruct/org-temp.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/BaseEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/Event.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ModelEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/ResourceObjectEvent.java
    M model/notifications-api/src/main/java/com/evolveum/midpoint/notifications/api/events/WorkflowEvent.java
    M model/report-ds-impl/pom.xml
    A model/report-ds-impl/testng.xml
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/AddResourceAssignmentAspect.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/user/AddRoleAssignmentAspect.java
    R repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/LookupTableSearchType.java
    M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-sql-impl/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 testing/conntest/pom.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdap.java
    M testing/conntest/src/test/resources/common/resource-openldap.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestVillage.java
    M testing/story/src/test/resources/science/resource-opendj-ad-simulation.xml
    M testing/story/src/test/resources/science/role-statistics.xml
    M weblogic-build/pom.xml
    M weblogic-build/src/main/app/META-INF/weblogic-application.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/b7c4d2de2dd8...0bf5b535ff18


More information about the midPoint-svn mailing list