[midPoint-git] midPoint branch gensync updated. v2.3devel-450-g16f739f

[Radovan Semancik]

Project "midPoint" branch gensync has been updated
       via  16f739f9a1c30873b2168305a46658c2bb6ba26d (commit) v2.3devel-450-g16f739f
       via  859406f94f1bff311ab7a278d9445e8a4a734992 (commit) v2.3devel-449-g859406f
       via  e84a8cc712d51871abb78608c22ac9a7f4ca4df2 (commit) v2.3devel-409-ge84a8cc
       via  53de5e09e5b933788cd19eec514e85ae17139e81 (commit) v2.3devel-408-g53de5e0
      from  ec16fd66f635d0bc5c196e5d6c76a70eadc64944 (commit) v2.3devel-446-gec16fd6

- Log -----------------------------------------------------------------
commit 16f739f9a1c30873b2168305a46658c2bb6ba26d
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Tue Dec 31 14:14:04 2013 +0100

    Post-merge compilation fix

commit 859406f94f1bff311ab7a278d9445e8a4a734992
Merge: ec16fd6 e84a8cc
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Tue Dec 31 14:07:09 2013 +0100

    Merge branch 'master' into gensync
    
    Conflicts:
    	model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensProjectionContext.java
    	model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/CorrelationConfirmationEvaluator.java
    	model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/action/AddUserAction.java
    	model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/action/BaseAction.java
    	model/model-impl/src/test/java/com/evolveum/midpoint/model/AbstractInternalModelIntegrationTest.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:
 .../component/model/delta/ContainerItemDto.java    |    2 +-
 .../operationStatus/ModelOperationStatusDto.java   |    3 +-
 .../web/component/prism/ContainerWrapper.java      |    8 +-
 .../web/component/prism/ObjectWrapper.java         |    4 +-
 .../web/component/prism/PrismValuePanel.java       |    4 +-
 .../web/component/prism/PropertyWrapper.java       |    4 +-
 .../resources/content/PageContentAccounts.java     |    2 +-
 .../midpoint/common/ResourceObjectPattern.java     |    4 +-
 .../midpoint/common/crypto/CryptoUtil.java         |    4 +-
 .../midpoint/common/expression/ItemDeltaItem.java  |    6 +-
 .../functions/BasicExpressionFunctions.java        |    8 +-
 .../script/xpath/LazyXPathVariableResolver.java    |   15 +-
 .../java/com/evolveum/midpoint/prism/Item.java     |   52 ++--
 .../java/com/evolveum/midpoint/prism/Itemable.java |    2 +-
 .../evolveum/midpoint/prism/PrismContainer.java    |   29 +-
 .../midpoint/prism/PrismContainerValue.java        |   42 +--
 .../com/evolveum/midpoint/prism/PrismObject.java   |   16 +-
 .../com/evolveum/midpoint/prism/PrismProperty.java |   35 +--
 .../midpoint/prism/PrismPropertyValue.java         |    4 +-
 .../evolveum/midpoint/prism/PrismReference.java    |   21 +-
 .../midpoint/prism/PrismReferenceValue.java        |    3 +-
 .../midpoint/prism/delta/ContainerDelta.java       |    6 +-
 .../evolveum/midpoint/prism/delta/ItemDelta.java   |   45 ++-
 .../midpoint/prism/delta/PropertyDelta.java        |    9 +-
 .../evolveum/midpoint/prism/dom/DomSerializer.java |   18 +-
 .../prism/dom/ElementPrismAbstractImpl.java        |    4 +-
 .../prism/dom/ElementPrismPropertyImpl.java        |    6 +-
 .../prism/dom/NodeListPrismContainerImpl.java      |    8 +-
 .../midpoint/prism/dom/PrismDomProcessor.java      |   17 +-
 .../midpoint/prism/json/PrismJasonProcessor.java   |    7 +-
 .../midpoint/prism/query/EqualsFilter.java         |    2 +-
 .../evolveum/midpoint/prism/util/PrismAsserts.java |   12 +-
 .../midpoint/prism/xml/PrismJaxbProcessor.java     |   10 +-
 .../prism/TestPrismObjectConstruction.java         |   22 +-
 .../evolveum/midpoint/prism/TestPrismParsing.java  |   16 +-
 .../evolveum/midpoint/schema/DeltaConvertor.java   |   13 +-
 .../evolveum/midpoint/schema/QueryConvertor.java   |   16 +-
 .../schema/processor/ResourceAttribute.java        |    6 +-
 .../processor/ResourceAttributeContainer.java      |    9 +-
 .../midpoint/schema/TestParseGenericObject.java    |    2 +-
 .../midpoint/schema/TestParseObjectTemplate.java   |   12 +-
 .../midpoint/model/lens/AccountConstruction.java   |    5 +-
 .../midpoint/model/lens/LensProjectionContext.java |    2 +-
 .../model/lens/ShadowConstraintsChecker.java       |   11 +-
 .../lens/projector/AccountValuesProcessor.java     |    8 +-
 .../model/lens/projector/InboundProcessor.java     |    4 +-
 .../evolveum/midpoint/model/migrator/Migrator.java |    4 +-
 .../sync/CorrelationConfirmationEvaluator.java     |   23 +-
 .../midpoint/model/sync/action/BaseAction.java     |    2 -
 .../com/evolveum/midpoint/model/util/Utils.java    |    2 +-
 .../AbstractInternalModelIntegrationTest.java      |    6 +-
 .../midpoint/model/lens/TestProjector.java         |    5 +-
 .../midpoint/model/migrator/TestMigrator.java      |    2 +-
 .../midpoint/notifications/NotificationsUtil.java  |    2 +-
 .../notifications/formatters/TextFormatter.java    |    6 +-
 .../midpoint/report/ReportCreateTaskHandler.java   |   28 +-
 .../midpoint/report/ReportManagerImpl.java         |   85 +++++-
 .../evolveum/midpoint/report/BasicReportTest.java  |  298 +++++++++++++-------
 .../src/test/resources/common/task-report.xml      |   17 +-
 .../reports/report-test-without-design.xml         |   71 +++++
 .../src/test/resources/reports/report-test.xml     |    2 +-
 .../midpoint/wf/jobs/JobCreationInstruction.java   |    2 +-
 .../primary/user/AddRoleAssignmentWrapper.java     |    2 +-
 .../midpoint/provisioning/impl/AccessChecker.java  |   10 +-
 .../provisioning/impl/EntitlementConverter.java    |    6 +-
 .../provisioning/impl/ResourceObjectConverter.java |   30 +-
 .../midpoint/provisioning/impl/ShadowCache.java    |    5 +-
 .../midpoint/provisioning/impl/ShadowManager.java  |   22 +-
 .../ucf/impl/ConnectorInstanceIcfImpl.java         |   39 ++-
 .../provisioning/test/ucf/TestUcfOpenDj.java       |   14 +-
 .../audit/impl/LoggerAuditServiceImpl.java         |    5 +-
 .../midpoint/repo/sql/AddGetObjectTest.java        |   21 +-
 .../repo/sql/SqlRepositoryServiceImpl.java         |    2 +-
 .../repo/sql/data/common/RAnyConverter.java        |    2 +-
 .../repo/sql/data/common/RObjectTemplate.java      |    8 +-
 .../repo/sql/data/common/RSystemConfiguration.java |    2 +-
 .../midpoint/test/IntegrationTestTools.java        |    2 +-
 .../midpoint/task/quartzimpl/TaskQuartzImpl.java   |   18 +-
 .../task/quartzimpl/cluster/NodeRegistrar.java     |    4 +-
 .../quartzimpl/TestQuartzTaskManagerContract.java  |    4 +-
 80 files changed, 653 insertions(+), 636 deletions(-)
 copy samples/tasks/task-user-recompute.xml => model/report-impl/src/test/resources/common/task-report.xml (67%)
 create mode 100644 model/report-impl/src/test/resources/reports/report-test-without-design.xml


hooks/post-receive
-- 
midPoint