[midPoint-git] midPoint branch master updated. v2.3devel-1105-gff5d3ce

Radovan Semancik git at evolveum.com
Tue Feb 11 19:41:27 CET 2014


Project "midPoint" branch master has been updated
       via  ff5d3ced2279710e5ccb5789d37b77608d2d7eea (commit) v2.3devel-1105-gff5d3ce
       via  c9ec913797a582d219eea7a480f883eb0d37418e (commit) v2.3devel-1104-gc9ec913
       via  c3c7f8fd694fb2036ff3257a86664ec4caf83e06 (commit) v2.3devel-1102-gc3c7f8f
       via  8cc5045ea7fffb329d20e7dd573d06dd64f1c933 (commit) v2.3devel-1101-g8cc5045
       via  7e225c0335910494f34afee78848b9e595d259e2 (commit) v2.3devel-1100-g7e225c0
       via  8d604949b1c337a15c8e19e401ac837d4f0aa963 (commit) v2.3devel-1099-g8d60494
       via  bb5f6a1f1382863e51397609fd6c9d5c94560890 (commit) v2.3devel-1094-gbb5f6a1
       via  80faa39b0f3bb5e5471dad37ced656bdc636b548 (commit) v2.3devel-1093-g80faa39
      from  48eec5fce88a117d5ce08aa60a36b9d09045780d (commit) v2.3devel-1097-g48eec5f

- Log -----------------------------------------------------------------
commit ff5d3ced2279710e5ccb5789d37b77608d2d7eea
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Tue Feb 11 19:34:38 2014 +0100

    Post-merge fix

commit c9ec913797a582d219eea7a480f883eb0d37418e
Merge: c3c7f8f 48eec5f
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Tue Feb 11 19:13:05 2014 +0100

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint
    
    Conflicts:
    	model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportUtils.java

commit c3c7f8fd694fb2036ff3257a86664ec4caf83e06
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Tue Feb 11 19:10:00 2014 +0100

    Fixing the debugDump

commit 8cc5045ea7fffb329d20e7dd573d06dd64f1c933
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Tue Feb 11 19:04:27 2014 +0100

    "Medium difficulty" opendj resource sample.

commit 7e225c0335910494f34afee78848b9e595d259e2
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Tue Feb 11 19:03:58 2014 +0100

    Fix for optional intent in schema handling account definition.

commit 8d604949b1c337a15c8e19e401ac837d4f0aa963
Merge: bb5f6a1 1ca0e81
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Tue Feb 11 18:20:31 2014 +0100

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint

commit bb5f6a1f1382863e51397609fd6c9d5c94560890
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Tue Feb 11 18:19:45 2014 +0100

    DebugDump cleanup, part 2

commit 80faa39b0f3bb5e5471dad37ced656bdc636b548
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Tue Feb 11 15:00:34 2014 +0100

    Reworking Debug, part 1

-----------------------------------------------------------------------

(Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full)

Summary of changes:
 .../evolveum/midpoint/init/InitialDataImport.java  |    2 +-
 .../assignment/AssignmentEditorPanel.java          |    2 +-
 .../web/component/prism/ContainerWrapper.java      |    2 +-
 .../configuration/PageSystemConfiguration.java     |    2 +-
 .../page/admin/resources/PageAdminResources.java   |    2 +-
 .../midpoint/web/page/admin/users/PageUser.java    |    2 +-
 .../admin/users/component/OrgTreeProvider.java     |    2 +-
 .../icf/dummy/connector/DummyConnector.java        |    6 +-
 .../evolveum/icf/dummy/resource/DummyAccount.java  |    1 -
 .../evolveum/icf/dummy/resource/DummyGroup.java    |    1 -
 .../evolveum/icf/dummy/resource/DummyObject.java   |   10 +-
 .../icf/dummy/resource/DummyPrivilege.java         |   14 +-
 .../evolveum/icf/dummy/resource/DummyResource.java |   14 +-
 .../refinery/LayerRefinedAttributeDefinition.java  |    5 -
 .../LayerRefinedObjectClassDefinition.java         |    5 -
 .../refinery/LayerRefinedResourceSchema.java       |    5 -
 .../common/refinery/PropertyLimitations.java       |   12 +-
 .../refinery/RefinedAttributeDefinition.java       |    3 +-
 .../refinery/RefinedObjectClassDefinition.java     |   12 +-
 .../common/refinery/RefinedResourceSchema.java     |    3 +-
 .../midpoint/common/security/Authorization.java    |   13 +-
 .../common/security/MidPointPrincipal.java         |   13 +-
 .../common/refinery/TestRefinedSchema.java         |   26 ++--
 .../common/test/PasswordPolicyValidatorTest.java   |   20 +--
 .../validator/test/BasicValidatorTest.java         |   22 ++--
 .../com/evolveum/midpoint/prism/Definition.java    |    8 +-
 .../java/com/evolveum/midpoint/prism/Item.java     |   19 ++-
 .../evolveum/midpoint/prism/PrismContainer.java    |   39 +++---
 .../midpoint/prism/PrismContainerValue.java        |   34 +++--
 .../com/evolveum/midpoint/prism/PrismObject.java   |   10 +-
 .../com/evolveum/midpoint/prism/PrismProperty.java |   94 ++++++++++++--
 .../midpoint/prism/PrismPropertyValue.java         |   39 +++---
 .../evolveum/midpoint/prism/PrismReference.java    |   57 ++++----
 .../midpoint/prism/PrismReferenceValue.java        |   19 +--
 .../com/evolveum/midpoint/prism/PrismValue.java    |    5 +-
 .../midpoint/prism/delta/DeltaSetTriple.java       |   12 +-
 .../evolveum/midpoint/prism/delta/ItemDelta.java   |   28 ++--
 .../evolveum/midpoint/prism/delta/ObjectDelta.java |   10 +-
 .../prism/delta/PrismValueDeltaSetTriple.java      |    3 +-
 .../com/evolveum/midpoint/prism/path/ItemPath.java |    2 +-
 .../midpoint/prism/path/NameItemPathSegment.java   |    3 +-
 .../midpoint/prism/polystring/PolyString.java      |   10 +-
 .../evolveum/midpoint/prism/query/AndFilter.java   |    6 -
 .../midpoint/prism/query/EqualsFilter.java         |    7 +-
 .../midpoint/prism/query/GreaterFilter.java        |    5 -
 .../evolveum/midpoint/prism/query/InFilter.java    |   21 ++-
 .../evolveum/midpoint/prism/query/InOidFilter.java |   21 ++-
 .../evolveum/midpoint/prism/query/LessFilter.java  |    5 -
 .../midpoint/prism/query/NaryLogicalFilter.java    |    6 -
 .../evolveum/midpoint/prism/query/NotFilter.java   |    7 +-
 .../midpoint/prism/query/ObjectFilter.java         |    3 +-
 .../midpoint/prism/query/ObjectPaging.java         |    8 +-
 .../evolveum/midpoint/prism/query/ObjectQuery.java |    8 +-
 .../evolveum/midpoint/prism/query/OrFilter.java    |    8 +-
 .../evolveum/midpoint/prism/query/OrgFilter.java   |    7 +-
 .../evolveum/midpoint/prism/query/RefFilter.java   |    5 -
 .../midpoint/prism/query/SubstringFilter.java      |    7 +-
 .../midpoint/prism/schema/PrismSchema.java         |   10 +-
 .../midpoint/prism/schema/SchemaDescription.java   |   18 ++-
 .../midpoint/prism/schema/SchemaRegistry.java      |   30 +++--
 .../evolveum/midpoint/prism/util/PrismAsserts.java |    6 +-
 .../prism/xml/DynamicNamespacePrefixMapper.java    |    6 +-
 .../xml/GlobalDynamicNamespacePrefixMapper.java    |   26 ++--
 .../xml/ns/_public/types_2/PolyStringType.java     |    9 +-
 .../com/evolveum/midpoint/prism/TestCompare.java   |    2 +-
 .../com/evolveum/midpoint/prism/TestDelta.java     |   54 ++++----
 .../java/com/evolveum/midpoint/prism/TestDiff.java |    4 +-
 .../java/com/evolveum/midpoint/prism/TestDom.java  |    4 +-
 .../evolveum/midpoint/prism/TestExtraSchema.java   |   18 +--
 .../evolveum/midpoint/prism/TestObjectQuery.java   |    2 +-
 .../evolveum/midpoint/prism/TestPrismContext.java  |    8 +-
 .../prism/TestPrismObjectConstruction.java         |    8 +-
 .../evolveum/midpoint/prism/TestPrismParsing.java  |   28 ++--
 .../prism/TestPrismSchemaConstruction.java         |    4 +-
 .../midpoint/schema/ObjectDeltaOperation.java      |   10 +-
 .../midpoint/schema/result/OperationResult.java    |    9 +-
 .../midpoint/schema/util/ObjectTypeUtil.java       |    2 +-
 .../midpoint/schema/TestDeltaConverter.java        |   16 +--
 .../midpoint/schema/TestDynamicSchema.java         |    2 +-
 .../evolveum/midpoint/schema/TestJaxbParsing.java  |    6 +-
 .../evolveum/midpoint/schema/TestJaxbSanity.java   |    6 +-
 .../evolveum/midpoint/schema/TestJsonParsing.java  |    2 +-
 .../midpoint/schema/TestParseDiffPatch.java        |   30 ++---
 .../midpoint/schema/TestParseGenericObject.java    |   10 +-
 .../midpoint/schema/TestParseObjectTemplate.java   |    4 +-
 .../midpoint/schema/TestParseResource.java         |   18 +--
 .../evolveum/midpoint/schema/TestParseTask.java    |   12 +-
 .../evolveum/midpoint/schema/TestParseUser.java    |   14 +-
 .../midpoint/schema/TestQueryConvertor.java        |    8 +-
 .../midpoint/schema/TestSchemaRegistry.java        |    8 +-
 .../evolveum/midpoint/schema/TestSchemaSanity.java |   22 ++--
 .../schema/processor/SchemaProcessorTest.java      |    8 +-
 .../schema/processor/TestResourceSchema.java       |   14 +-
 .../com/evolveum/midpoint/test/util/TestUtil.java  |   16 +--
 .../java/com/evolveum/midpoint/util/DebugUtil.java |   34 ++++-
 .../java/com/evolveum/midpoint/util/Dumpable.java  |   36 ------
 .../midpoint/model/api/context/ModelContext.java   |    5 +-
 .../model/api/context/ModelElementContext.java     |    5 +-
 .../model/common/expression/ExpressionUtil.java    |    2 +-
 .../common/expression/ExpressionVariables.java     |   12 +-
 .../model/common/expression/ObjectDeltaObject.java |   10 +-
 .../midpoint/model/common/expression/Source.java   |    8 +-
 .../AbstractSearchExpressionEvaluator.java         |    8 +-
 ...ractValueTransformationExpressionEvaluator.java |    4 +-
 .../script/xpath/LazyXPathVariableResolver.java    |   10 +-
 .../midpoint/model/common/mapping/Mapping.java     |    8 +-
 .../common/mapping/TestMappingDynamicSysVar.java   |    4 +-
 .../evolveum/midpoint/model/ModelCrudService.java  |    2 +-
 .../evolveum/midpoint/model/ModelWebService.java   |    8 +-
 .../midpoint/model/controller/ModelController.java |    6 +-
 .../model/controller/ModelDiagController.java      |    2 +-
 .../midpoint/model/expr/MidpointFunctionsImpl.java |    2 +-
 .../ImportAccountsFromResourceTaskHandler.java     |    2 +-
 .../midpoint/model/importer/ObjectImporter.java    |    2 +-
 .../evolveum/midpoint/model/lens/Assignment.java   |    8 +-
 .../midpoint/model/lens/ChangeExecutor.java        |    6 +-
 .../evolveum/midpoint/model/lens/Construction.java |    8 +-
 .../midpoint/model/lens/ItemValueWithOrigin.java   |    8 +-
 .../evolveum/midpoint/model/lens/LensContext.java  |    5 -
 .../midpoint/model/lens/LensFocusContext.java      |    5 -
 .../midpoint/model/lens/LensProjectionContext.java |    5 -
 .../com/evolveum/midpoint/model/lens/LensUtil.java |    6 +-
 .../midpoint/model/lens/ObjectDeltaWaves.java      |   10 +-
 .../model/lens/ShadowConstraintsChecker.java       |    4 +-
 .../model/lens/projector/AssignmentProcessor.java  |    2 +-
 .../lens/projector/ConsolidationProcessor.java     |    6 +-
 .../model/lens/projector/ContextLoader.java        |    2 +-
 .../model/lens/projector/InboundProcessor.java     |    4 +-
 .../model/lens/projector/OutboundProcessor.java    |    2 +-
 .../model/security/UserDetailsServiceImpl.java     |    2 +-
 .../sync/CorrelationConfirmationEvaluator.java     |    6 +-
 .../sync/FocusValidityScannerTaskHandler.java      |    2 +-
 .../midpoint/model/sync/RecomputeTaskHandler.java  |    4 +-
 .../model/sync/ReconciliationTaskHandler.java      |    2 +-
 .../model/sync/ReconciliationTaskResult.java       |    9 +-
 .../model/sync/SynchronizationService.java         |    2 +-
 .../sync/SynchronizeAccountResultHandler.java      |    2 +-
 .../model/trigger/RecomputeTriggerHandler.java     |    2 +-
 .../util/AbstractSearchIterativeResultHandler.java |    2 +-
 .../util/AbstractSearchIterativeTaskHandler.java   |    2 +-
 .../com/evolveum/midpoint/model/util/Utils.java    |    2 +-
 .../model/controller/ControllerAddObjectTest.java  |    6 +-
 .../model/controller/ControllerGetObjectTest.java  |    2 +-
 .../ControllerListAccountShadowOwnerTest.java      |    4 +-
 .../controller/ControllerListObjectsTest.java      |    2 +-
 .../model/expr/ExpressionHandlerImplTest.java      |    4 +-
 .../model/lens/TestAssignmentEvaluator.java        |    2 +-
 .../midpoint/model/lens/TestProjectorAddUser.java  |    2 +-
 .../model/util/mock/MockClockworkHook.java         |   13 +-
 .../model/util/mock/MockLensDebugListener.java     |    4 +-
 .../model/intest/sync/AbstractInboundSyncTest.java |    2 +-
 .../sync/AbstractSynchronizationStoryTest.java     |    2 +-
 .../model/intest/sync/TestImportRecon.java         |   18 +--
 .../model/test/AbstractModelIntegrationTest.java   |   12 +-
 .../notifications/AccountOperationListener.java    |    2 +-
 .../notifiers/SimpleAccountNotifier.java           |    2 +-
 .../midpoint/notifications/TestTextFormatter.java  |    6 +-
 .../com/evolveum/midpoint/report/ReportUtils.java  |    9 +-
 .../evolveum/midpoint/wf/WorkflowManagerImpl.java  |    2 +-
 .../evolveum/midpoint/wf/jobs/JobController.java   |    2 +-
 .../midpoint/wf/jobs/JobCreationInstruction.java   |    3 -
 .../BaseModelInvocationProcessingHelper.java       |    4 +-
 .../primary/user/AddRoleAssignmentWrapper.java     |    2 +-
 .../midpoint/wf/TestUserChangeApproval.java        |    2 +-
 .../wf/general/TestGeneralChangeProcessor.java     |    2 +-
 .../provisioning/api/ResourceEventDescription.java |    8 +-
 .../api/ResourceObjectShadowChangeDescription.java |    8 +-
 .../api/ResourceOperationDescription.java          |    8 +-
 .../consistency/impl/GenericErrorHandler.java      |    2 +-
 .../impl/ChangeNotificationDispatcherImpl.java     |   10 +-
 .../provisioning/impl/ConnectorManager.java        |    2 +-
 .../provisioning/impl/ProvisioningServiceImpl.java |    8 +-
 .../impl/ResourceEventListenerImpl.java            |    2 +-
 .../provisioning/impl/ResourceManager.java         |    4 +-
 .../midpoint/provisioning/impl/ShadowCache.java    |   14 +-
 .../provisioning/impl/ShadowCacheReconciler.java   |    6 +-
 .../midpoint/provisioning/impl/ShadowManager.java  |   10 +-
 .../ucf/impl/ConnectorInstanceIcfImpl.java         |   10 +-
 .../provisioning/ucf/query/ValueOperation.java     |    4 +-
 .../provisioning/test/impl/AbstractDummyTest.java  |    6 +-
 .../test/impl/TestConnectorDiscovery.java          |    2 +-
 .../provisioning/test/impl/TestDBTable.java        |    2 +-
 .../midpoint/provisioning/test/impl/TestDummy.java |   20 +--
 .../test/impl/TestDummySchemaless.java             |    4 +-
 .../test/impl/TestDummyUuidNonUniqueName.java      |    2 +-
 .../provisioning/test/impl/TestOpenDJ.java         |   22 ++--
 .../provisioning/test/ucf/TestUcfDummy.java        |    2 +-
 .../provisioning/test/ucf/TestUcfOpenDj.java       |    4 +-
 .../midpoint/audit/api/AuditEventRecord.java       |   10 +-
 .../midpoint/repo/cache/RepositoryCache.java       |    2 +-
 .../midpoint/repo/sql/AddGetObjectTest.java        |    6 +-
 .../evolveum/midpoint/repo/sql/EncodingTest.java   |    2 +-
 .../com/evolveum/midpoint/repo/sql/ModifyTest.java |   22 ++--
 .../midpoint/repo/sql/QueryInterpreterTest.java    |    2 +-
 .../midpoint/repo/sql/util/SimpleTaskAdapter.java  |    7 +-
 .../repo/sql/SqlRepositoryServiceImpl.java         |   10 +-
 .../repo/sql/query/QueryDefinitionRegistry.java    |   19 ++-
 .../midpoint/repo/sql/query/QueryInterpreter.java  |    2 +-
 .../repo/sql/query/definition/Definition.java      |   10 +-
 .../query/restriction/NaryLogicalRestriction.java  |    4 +-
 .../repo/sql/query/restriction/OrgRestriction.java |    2 +-
 .../query/restriction/UnaryLogicalRestriction.java |    4 +-
 .../midpoint/test/AbstractIntegrationTest.java     |    2 +-
 .../evolveum/midpoint/test/DummyAuditService.java  |    8 +-
 .../midpoint/test/IntegrationTestTools.java        |   34 ++---
 .../java/com/evolveum/midpoint/task/api/Task.java  |    6 +-
 .../midpoint/task/quartzimpl/TaskQuartzImpl.java   |   14 +-
 .../quartzimpl/TestQuartzTaskManagerContract.java  |   62 ++++-----
 .../opendj/opendj-localhost-medium.xml}            |  136 ++++++++------------
 .../midpoint/samples/test/TestSamples.java         |    2 +-
 .../testing/consistency/ConsistencyTest.java       |    6 +-
 .../midpoint/testing/sanity/TestSanity.java        |    4 +-
 .../src/test/resources/repo/resource-opendj.xml    |    1 -
 213 files changed, 962 insertions(+), 1141 deletions(-)
 delete mode 100644 infra/util/src/main/java/com/evolveum/midpoint/util/Dumpable.java
 copy samples/{rest/opendj-resource-sync.xml => resources/opendj/opendj-localhost-medium.xml} (84%)


hooks/post-receive
-- 
midPoint


More information about the midPoint-svn mailing list