[midPoint-git] midPoint branch bootstrap updated. v2.3devel-711-g3692639
Vilo Repan
git at evolveum.com
Wed Jan 1 11:24:21 CET 2014
Project "midPoint" branch bootstrap has been updated
via 36926398f7d73086eff4319a141741dd91ff3990 (commit) v2.3devel-711-g3692639
via 1e11f4f47b9cc716ca9f3a80b5d8a13be95e5009 (commit) v2.3devel-702-g1e11f4f
via e84a8cc712d51871abb78608c22ac9a7f4ca4df2 (commit) v2.3devel-409-ge84a8cc
via 53de5e09e5b933788cd19eec514e85ae17139e81 (commit) v2.3devel-408-g53de5e0
via 0b268da1b1cd4411e0b8ffb0cd7c1917176902ce (commit) v2.3devel-407-g0b268da
via c9ef470fd8b9606070e2041b69e6508437a00a6c (commit) v2.3devel-406-gc9ef470
via 2eb22d049f2fcc010ad49aebccef86f98ae3b99a (commit) v2.3devel-405-g2eb22d0
via fb9271fae7f1c2e135dfd880b1def4d3df68e4e6 (commit) v2.3devel-404-gfb9271f
via 736efd67d2c1dec98fe62aaa809a42a28ed90eac (commit) v2.3devel-403-g736efd6
via 070aa7bf4d40dede046f7cbd628a8a579e55a30d (commit) v2.3devel-402-g070aa7b
from 90975c015486898bc1ed7626922cb0f78fc68ae6 (commit) v2.3devel-701-g90975c0
- Log -----------------------------------------------------------------
commit 36926398f7d73086eff4319a141741dd91ff3990
Merge: 1e11f4f e84a8cc
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Wed Jan 1 11:21:32 2014 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap
Conflicts:
gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/UserChangesDto.java
repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddGetObjectTest.java
commit 1e11f4f47b9cc716ca9f3a80b5d8a13be95e5009
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Wed Jan 1 11:07:07 2014 +0100
minor jaxb/dom processor parsing test
-----------------------------------------------------------------------
(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:
build-system/pom.xml | 25 +-
config/sql/midpoint/2.3/oracle/oracle-2.3.sql | 2 +-
.../component/model/delta/ContainerItemDto.java | 2 +-
.../operationStatus/ModelOperationStatusDto.java | 3 +-
.../web/component/prism/ContainerWrapper.java | 10 +-
.../web/component/prism/ItemWrapperComparator.java | 2 +-
.../web/component/prism/ObjectWrapper.java | 4 +-
.../web/component/prism/PrismValuePanel.java | 4 +-
.../web/component/prism/PropertyWrapper.java | 4 +-
.../resources/content/PageContentAccounts.java | 2 +-
icf-connectors/dummy-connector-fake/pom.xml | 4 +-
icf-connectors/dummy-connector/pom.xml | 4 +-
.../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 +-
.../evolveum/midpoint/common/mapping/Mapping.java | 2 +-
.../refinery/LayerRefinedAttributeDefinition.java | 10 -
.../LayerRefinedObjectClassDefinition.java | 4 -
.../refinery/RefinedAttributeDefinition.java | 7 +-
.../refinery/RefinedObjectClassDefinition.java | 4 +-
.../midpoint/common/expression/TestExpression.java | 2 +-
.../common/expression/TestStaticValues.java | 4 +-
.../expression/script/AbstractScriptTest.java | 2 +-
.../expression/script/TestScriptCaching.java | 2 +-
.../midpoint/common/mapping/TestMappingTime.java | 10 +-
.../common/refinery/TestRefinedSchema.java | 2 +-
.../midpoint/prism/ComplexTypeDefinition.java | 14 +-
.../com/evolveum/midpoint/prism/Definition.java | 28 +-
.../java/com/evolveum/midpoint/prism/Item.java | 52 ++--
.../evolveum/midpoint/prism/ItemDefinition.java | 27 +-
.../java/com/evolveum/midpoint/prism/Itemable.java | 2 +-
.../evolveum/midpoint/prism/PrismContainer.java | 29 +-
.../midpoint/prism/PrismContainerDefinition.java | 23 +-
.../midpoint/prism/PrismContainerValue.java | 42 +--
.../com/evolveum/midpoint/prism/PrismObject.java | 16 +-
.../midpoint/prism/PrismObjectDefinition.java | 10 +-
.../com/evolveum/midpoint/prism/PrismProperty.java | 35 +--
.../midpoint/prism/PrismPropertyDefinition.java | 8 +-
.../midpoint/prism/PrismPropertyValue.java | 4 +-
.../evolveum/midpoint/prism/PrismReference.java | 21 +-
.../midpoint/prism/PrismReferenceDefinition.java | 8 +-
.../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 | 23 +-
.../midpoint/prism/json/PrismJasonProcessor.java | 7 +-
.../midpoint/prism/query/EqualsFilter.java | 2 +-
.../midpoint/prism/schema/PrismSchema.java | 14 +-
.../prism/schema/SchemaDefinitionFactory.java | 6 +-
.../midpoint/prism/schema/SchemaRegistry.java | 2 +-
.../evolveum/midpoint/prism/util/PrismAsserts.java | 12 +-
.../midpoint/prism/xml/PrismJaxbProcessor.java | 18 +-
.../com/evolveum/midpoint/prism/TestDelta.java | 30 +-
.../prism/TestPrismObjectConstruction.java | 22 +-
.../evolveum/midpoint/prism/TestPrismParsing.java | 16 +-
.../evolveum/midpoint/schema/DeltaConvertor.java | 13 +-
.../evolveum/midpoint/schema/QueryConvertor.java | 16 +-
.../processor/MidPointSchemaDefinitionFactory.java | 4 +-
.../ObjectClassComplexTypeDefinition.java | 8 +-
.../schema/processor/ResourceAttribute.java | 6 +-
.../processor/ResourceAttributeContainer.java | 9 +-
.../ResourceAttributeContainerDefinition.java | 4 +-
.../processor/ResourceAttributeDefinition.java | 8 +-
.../midpoint/schema/processor/ResourceSchema.java | 3 +-
.../midpoint/schema/TestParseGenericObject.java | 2 +-
.../midpoint/schema/TestParseObjectTemplate.java | 12 +-
.../com/evolveum/midpoint/test/util/TestUtil.java | 2 +-
model/model-client/pom.xml | 14 +
.../midpoint/model/expr/ExpressionHandler.java | 4 +-
.../ImportAccountsFromResourceTaskHandler.java | 2 +-
.../importer/ImportObjectsFromFileTaskHandler.java | 2 +-
.../midpoint/model/lens/AccountConstruction.java | 5 +-
.../midpoint/model/lens/ChangeExecutor.java | 2 +-
.../midpoint/model/lens/LensProjectionContext.java | 2 +-
.../com/evolveum/midpoint/model/lens/LensUtil.java | 5 +-
.../model/lens/ShadowConstraintsChecker.java | 11 +-
.../lens/projector/AccountValuesProcessor.java | 14 +-
.../model/lens/projector/ActivationProcessor.java | 6 +-
.../model/lens/projector/InboundProcessor.java | 4 +-
.../evolveum/midpoint/model/migrator/Migrator.java | 4 +-
.../sync/CorrelationConfirmationEvaluator.java | 28 +-
.../midpoint/model/sync/action/AddUserAction.java | 6 +-
.../midpoint/model/sync/action/BaseAction.java | 4 +-
.../model/util/AbstractScannerTaskHandler.java | 2 +-
.../com/evolveum/midpoint/model/util/Utils.java | 2 +-
.../AbstractInternalModelIntegrationTest.java | 6 +-
.../midpoint/model/expr/TestModelExpressions.java | 8 +-
.../midpoint/model/lens/TestProjector.java | 5 +-
.../midpoint/model/migrator/TestMigrator.java | 2 +-
.../midpoint/notifications/NotificationsUtil.java | 2 +-
.../api/transports/SimpleSmsTransport.java | 2 +-
.../notifications/formatters/TextFormatter.java | 6 +-
.../notifications/handlers/BaseHandler.java | 4 +-
.../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 | 8 +-
.../midpoint/wf/jobs/JobCreationInstruction.java | 2 +-
.../InitializeLoopThroughApproversInLevel.java | 4 +-
.../processors/general/GeneralChangeProcessor.java | 4 +-
.../primary/user/AddRoleAssignmentWrapper.java | 2 +-
pom.xml | 14 +
provisioning/provisioning-impl/pom.xml | 4 +-
.../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 | 41 ++-
.../provisioning/util/ProvisioningUtil.java | 2 +-
.../impl/TestDummyResourceAndSchemaCaching.java | 2 +-
.../test/impl/TestDummyUuidNonUniqueName.java | 2 +-
.../provisioning/test/ucf/TestUcfDummy.java | 2 -
.../provisioning/test/ucf/TestUcfOpenDj.java | 14 +-
.../audit/impl/LoggerAuditServiceImpl.java | 5 +-
.../midpoint/repo/sql/AddGetObjectTest.java | 37 ++-
.../repo/sql/SqlRepositoryServiceImpl.java | 2 +-
.../repo/sql/data/common/RAnyConverter.java | 6 +-
.../repo/sql/data/common/RObjectTemplate.java | 8 +-
.../midpoint/test/IntegrationTestTools.java | 2 +-
.../midpoint/task/quartzimpl/TaskQuartzImpl.java | 18 +-
.../task/quartzimpl/cluster/NodeRegistrar.java | 4 +-
.../task/quartzimpl/MockSingleTaskHandler.java | 4 +-
.../quartzimpl/TestQuartzTaskManagerContract.java | 8 +-
samples/model-client-sample/pom.xml | 15 +
134 files changed, 879 insertions(+), 864 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
More information about the midPoint-svn
mailing list