[midPoint-git] midPoint branch parser updated. v2.3devel-1193-gfe14785
Radovan Semancik
git at evolveum.com
Tue Feb 11 19:55:58 CET 2014
Project "midPoint" branch parser has been updated
via fe14785b9dc1213bb2c676e0f4b2a200bd86639d (commit) v2.3devel-1193-gfe14785
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 48eec5fce88a117d5ce08aa60a36b9d09045780d (commit) v2.3devel-1097-g48eec5f
via 8d604949b1c337a15c8e19e401ac837d4f0aa963 (commit) v2.3devel-1099-g8d60494
via bb5f6a1f1382863e51397609fd6c9d5c94560890 (commit) v2.3devel-1094-gbb5f6a1
via 1ca0e81d01a4716616e7b247c9f1606f9910f5c6 (commit) v2.3devel-1096-g1ca0e81
via 7e472254b3bc7f7475d8ce0118bdb860fc04ef16 (commit) v2.3devel-1095-g7e47225
via 80faa39b0f3bb5e5471dad37ced656bdc636b548 (commit) v2.3devel-1093-g80faa39
via 2c716def7a058986123a9700c8f749f58f158fba (commit) v2.3devel-1094-g2c716de
via 059f1d2a777e198ad09431e70aae159fff485711 (commit) v2.3devel-1092-g059f1d2
via 16877bb60a66fee0501f326ba69863313a0b849d (commit) v2.3devel-1092-g16877bb
via 35e76f22d0af97a6979e0dfb5b904e51b5cb6a81 (commit) v2.3devel-1091-g35e76f2
via 7564db9e05ff4da5fb5a6374411f00e4fe1e48ac (commit) v2.3devel-1090-g7564db9
via 13fe832367901feb9dbce789ee4db923c6c61fbf (commit) v2.3devel-1085-g13fe832
via bed73b4848ead2107510e99827e608bc65701f67 (commit) v2.3devel-1084-gbed73b4
via 6266128b050613566ef31980f6cf29026e2bf89c (commit) v2.3devel-1087-g6266128
via add9aba34284e1581583bb134daef23dc93b39e0 (commit) v2.3devel-1083-gadd9aba
via 65523b90fff6c5899f986ecc5ec866a0c3cb483b (commit) v2.3devel-1085-g65523b9
via 4eba2969fd63c0cace7298dd97b2714dc01c06ea (commit) v2.3devel-1083-g4eba296
via bc29674dbd6ac982f2bf67daa61de4922b3c0d37 (commit) v2.3devel-1082-gbc29674
via c7893080ec21c0d0514df7138a64ee5b965a53f6 (commit) v2.3devel-1082-gc789308
via b7154e826076118fa12c20eb122b5d25d948c848 (commit) v2.3devel-1081-gb7154e8
from 7661bb2515c52e43eb31ca6541b76f4afa35ea5c (commit) v2.3devel-1167-g7661bb2
- Log -----------------------------------------------------------------
commit fe14785b9dc1213bb2c676e0f4b2a200bd86639d
Merge: 7661bb2 ff5d3ce
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: Tue Feb 11 19:49:13 2014 +0100
Merge branch 'master' into parser
Conflicts:
infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerValue.java
infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDom.java
infra/prism/src/test/java/com/evolveum/midpoint/prism/TestExtraSchema.java
infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismContext.java
infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJsonParsing.java
-----------------------------------------------------------------------
(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 +-
.../WfDeltasPanel.html => input/UploadPanel.html} | 24 +--
.../midpoint/web/component/input/UploadPanel.java | 87 ++++++++++
.../web/component/input/UploadPanel.properties} | 7 +-
.../web/component/prism/ContainerWrapper.java | 2 +-
.../web/component/prism/ObjectWrapper.java | 27 +++
.../web/component/prism/PrismValuePanel.java | 34 ++++
.../configuration/PageSystemConfiguration.java | 6 +-
.../component/LoggingConfigPanel.html | 1 +
.../component/LoggingConfigPanel.java | 53 +++++-
.../component/LoggingConfigPanel.properties | 16 +-
.../dto/{ClassLogger.java => StandardLogger.java} | 55 ++++---
.../configuration/dto/StandardLoggerType.java | 49 ++++++
.../web/page/admin/reports/PageReport.java | 71 +++-----
.../web/page/admin/reports/PageReport.properties | 6 +-
.../web/page/admin/reports/PageReports.java | 120 ++++++--------
.../component/DefaultReportPanel.properties | 17 --
...ortPanel.html => ReportConfigurationPanel.html} | 9 +-
...ortPanel.java => ReportConfigurationPanel.java} | 45 +++--
.../component/ReportConfigurationPanel.properties} | 1 +
.../page/admin/resources/PageAdminResources.java | 2 +-
.../midpoint/web/page/admin/users/PageOrgTree.java | 11 +-
.../midpoint/web/page/admin/users/PageUser.html | 16 +-
.../midpoint/web/page/admin/users/PageUser.java | 76 ++++++++-
.../admin/users/component/OrgTreeProvider.java | 2 +-
.../web/security/MidPointApplication.properties | 14 ++
gui/admin-gui/src/main/resources/objects.xml | 11 ++
.../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 +-
.../evolveum/midpoint/prism/TestExtraSchema.java | 14 +-
.../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/util/ReportTypeUtil.java | 57 +++++++
.../ns/public/model/context/model-context-2.xsd | 7 +
.../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 | 8 +-
.../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 +-
.../midpoint/model/api/hooks/HookRegistry.java | 4 +
.../midpoint/model/api/hooks/ReadHook.java | 55 +++++++
.../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 +-
.../midpoint/model/ModelObjectResolver.java | 12 ++
.../evolveum/midpoint/model/ModelWebService.java | 8 +-
.../midpoint/model/controller/ModelController.java | 38 ++++-
.../model/controller/ModelDiagController.java | 2 +-
.../midpoint/model/expr/MidpointFunctionsImpl.java | 2 +-
.../midpoint/model/hooks/HookRegistryImpl.java | 32 ++--
.../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/Clockwork.java | 1 -
.../evolveum/midpoint/model/lens/Construction.java | 8 +-
.../midpoint/model/lens/ItemValueWithOrigin.java | 8 +-
.../evolveum/midpoint/model/lens/LensContext.java | 35 +++-
.../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 | 5 +-
.../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 +-
.../AbstractInitializedModelIntegrationTest.java | 2 +-
.../intest/negative/TestAssignmentErrors.java | 119 ++++++++++++-
.../model/intest/sync/AbstractInboundSyncTest.java | 2 +-
.../sync/AbstractSynchronizationStoryTest.java | 2 +-
.../model/intest/sync/TestImportRecon.java | 18 +-
.../intest/util/ProfilingLensDebugListener.java | 7 +
.../model/test/AbstractModelIntegrationTest.java | 12 +-
.../notifications/AccountOperationListener.java | 2 +-
.../notifiers/SimpleAccountNotifier.java | 2 +-
.../midpoint/notifications/TestTextFormatter.java | 6 +-
model/report-impl/pom.xml | 5 +
.../report/HibernateQueryDataSourceReport.java | 2 +-
.../midpoint/report/ReportCreateTaskHandler.java | 4 +-
.../midpoint/report/ReportManagerImpl.java | 39 ++++-
.../com/evolveum/midpoint/report/ReportUtils.java | 174 ++++++++++++++++----
.../evolveum/midpoint/report/BasicReportTest.java | 32 +++-
.../src/test/resources/reports/reportAuditLogs.xml | 103 +++++++++++-
.../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 | 24 ++-
.../midpoint/test/IntegrationTestTools.java | 34 ++--
.../java/com/evolveum/midpoint/task/api/Task.java | 6 +-
.../evolveum/midpoint/task/api/TaskListener.java | 67 ++++++++
.../evolveum/midpoint/task/api/TaskManager.java | 16 ++
.../task/quartzimpl/TaskManagerQuartzImpl.java | 62 +++++++
.../midpoint/task/quartzimpl/TaskQuartzImpl.java | 14 +-
.../task/quartzimpl/execution/JobExecutor.java | 21 ++-
.../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 -
253 files changed, 2311 insertions(+), 1435 deletions(-)
copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/{wf/WfDeltasPanel.html => input/UploadPanel.html} (57%)
create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadPanel.java
copy gui/{admin-gui-sk-SK/src/main/resources/com/evolveum/midpoint/web/component/prism/PrismValuePanel_sk_SK.utf8.properties => admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadPanel.properties} (81%)
copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/{ClassLogger.java => StandardLogger.java} (51%)
create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/StandardLoggerType.java
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/DefaultReportPanel.properties
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/{DefaultReportPanel.html => ReportConfigurationPanel.html} (82%)
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/{DefaultReportPanel.java => ReportConfigurationPanel.java} (53%)
copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/{component/wf/WorkItemsPanel.properties => page/admin/reports/component/ReportConfigurationPanel.properties} (93%)
create mode 100644 infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ReportTypeUtil.java
delete mode 100644 infra/util/src/main/java/com/evolveum/midpoint/util/Dumpable.java
create mode 100644 model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/ReadHook.java
create mode 100644 repo/task-api/src/main/java/com/evolveum/midpoint/task/api/TaskListener.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