[midPoint-git] [Evolveum/midpoint] c9ea47: fixing objectDeltaType
katkav
k.valalikova at evolveum.com
Mon Apr 7 00:16:57 CEST 2014
Branch: refs/heads/parser
Home: https://github.com/Evolveum/midpoint
Commit: c9ea4772564df48790df1ca4e7a6c3ba363e9f06
https://github.com/Evolveum/midpoint/commit/c9ea4772564df48790df1ca4e7a6c3ba363e9f06
Author: katkav <k.valalikova at evolveum.com>
Date: 2014-04-06 (Sun, 06 Apr 2014)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Referencable.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/RawTypeUtil.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectDeltaType.java
M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/xpath/XPathScriptEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/ModelCrudService.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestClockwork.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/util/mock/MockClockworkHook.java
M model/model-impl/src/test/resources/lens/user-jack-modify-add-assignment-account-dummy.xml
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/audit/RObjectDeltaOperation.java
Log Message:
-----------
fixing objectDeltaType
Commit: 16f085aed7781ff6c490ec66f7d78087e81816ad
https://github.com/Evolveum/midpoint/commit/16f085aed7781ff6c490ec66f7d78087e81816ad
Author: katkav <k.valalikova at evolveum.com>
Date: 2014-04-06 (Sun, 06 Apr 2014)
Changed paths:
M infra/common/src/main/java/com/evolveum/midpoint/common/StaticExpressionUtil.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/Definition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismConstants.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/DomParser.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeSerializer.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathHolder.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XPathSegment.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/path/ItemPath.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/PrismSchema.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaRegistry.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/CloneUtil.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xml/XsdTypeMapper.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/ListXNode.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/PrimitiveXNode.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/RootXNode.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/SchemaXNode.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectFactory.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/ObjectReferenceType.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
M infra/prism/src/main/resources/xml/ns/test/foo-1.xsd
M infra/prism/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestCompare.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestPrismParsing.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/crypto/TestProtector.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/foo/AccountConstructionType.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/AbstractParserTest.java
A infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestProtectedString.java
M infra/prism/src/test/resources/common/json/user-jack-adhoc.json
M infra/prism/src/test/resources/common/json/user-jack-modified.json
M infra/prism/src/test/resources/common/json/user-jack-object.json
M infra/prism/src/test/resources/common/json/user-jack.json
M infra/prism/src/test/resources/common/xml/user-jack-adhoc.xml
M infra/prism/src/test/resources/common/xml/user-jack-modified.xml
M infra/prism/src/test/resources/common/xml/user-jack-object.xml
M infra/prism/src/test/resources/common/xml/user-jack.xml
M infra/prism/src/test/resources/common/yaml/user-jack-adhoc.yaml
M infra/prism/src/test/resources/common/yaml/user-jack-modified.yaml
M infra/prism/src/test/resources/common/yaml/user-jack-object.yaml
M infra/prism/src/test/resources/common/yaml/user-jack.yaml
M infra/prism/testng.xml
M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbSanity.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/test/XPathTest.java
M infra/schema/src/test/resources/common/user-barbossa-modify-delete-assignment-account-opendj-attr.xml
M infra/schema/src/test/resources/common/user-barbossa.xml
A infra/schema/src/test/resources/deltaconverter/role-modify-inducement.xml
M infra/schema/src/test/resources/deltaconverter/user-modify-add-account.xml
M infra/schema/src/test/resources/deltaconverter/user-modify-add-role-pirate.xml
M infra/util/src/main/java/com/evolveum/midpoint/util/DOMUtil.java
M model/model-intest/src/test/resources/common/resource-dummy.xml
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestCsvFile.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfOpenDj.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ModifyTest.java
M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-add-assignment.xml
M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-add-inducement.xml
M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-assignment.xml
M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-delete-add-assignment.xml
M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-delete-assignment.xml
M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-delete-inducement.xml
M repo/repo-sql-impl-test/src/test/resources/modify/assignment/modify-inducement.xml
M repo/repo-sql-impl-test/src/test/resources/modify/modify-user-add-roles.xml
M repo/repo-sql-impl-test/src/test/resources/modify/role-modify-change.xml
M repo/repo-sql-impl-test/testng.xml
M repo/task-quartz-impl/src/test/java/com/evolveum/midpoint/task/quartzimpl/MockSingleTaskHandler.java
M repo/task-quartz-impl/src/test/resources/schema/whatever-extension.xsd
Log Message:
-----------
Merge branch 'parser' of github.com:Evolveum/midpoint into parser
Conflicts:
infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
Commit: 084bdf91165384a0bc2aba96a953d535a071e642
https://github.com/Evolveum/midpoint/commit/084bdf91165384a0bc2aba96a953d535a071e642
Author: katkav <k.valalikova at evolveum.com>
Date: 2014-04-07 (Mon, 07 Apr 2014)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/JaxbDomHack.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/PrismBeanConverter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/util/RawTypeUtil.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/AnyArrayList.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xnode/MapXNode.java
M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/RawType.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/parser/TestProtectedString.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestDeltaConverter.java
M model/model-common/src/test/resources/mapping/mapping-value-multi-deep.xml
M model/model-common/src/test/resources/mapping/mapping-value-single-deep.xml
M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ChangeExecutor.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/ModelWebServiceTest.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/controller/ControllerAddObjectTest.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/expr/ExpressionHandlerImplTest.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/lens/TestClockwork.java
M model/model-impl/src/test/resources/lens/user-barbossa-modify-add-assignment-account-dummy-attr.xml
M model/model-impl/src/test/resources/lens/user-barbossa-modify-assignment-replace-ac.xml
M model/model-impl/src/test/resources/lens/user-barbossa-modify-delete-assignment-account-dummy-attr.xml
M model/model-impl/src/test/resources/lens/user-jack-modify-add-assignment-account-dummy-attr.xml
M model/model-impl/src/test/resources/lens/user-jack-modify-add-assignment-account-dummy.xml
M model/model-impl/src/test/resources/lens/user-jack-modify-delete-assignment-account-dummy.xml
Log Message:
-----------
fixing model-impl tests..
Compare: https://github.com/Evolveum/midpoint/compare/7a53ee81ade0...084bdf911653
More information about the midPoint-svn
mailing list