[midPoint-git] [Evolveum/midpoint] 6c54b7: Implementing MID-1465 (Assign approval requests al...
Pavol Mederly
mederly at evolveum.com
Thu May 1 00:13:58 CEST 2014
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 6c54b735925ca6bbfdac57577edfe27367449f8a
https://github.com/Evolveum/midpoint/commit/6c54b735925ca6bbfdac57577edfe27367449f8a
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-04-29 (Tue, 29 Apr 2014)
Changed paths:
M build-system/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdmin.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItemsClaimable.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItemsClaimable.properties
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDetailedDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContext.java
M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
M model/workflow-api/src/main/java/com/evolveum/midpoint/wf/api/WorkflowManager.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/WorkflowManagerImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/dao/WorkItemManager.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/dao/WorkItemProvider.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/users/MidPointUserManager.java
A model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/itemApproval/PrepareApprover.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/itemApproval/ProcessVariableNames.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/util/MiscDataUtil.java
M model/workflow-impl/src/main/resources/processes/ItemApproval.bpmn20.xml
Log Message:
-----------
Implementing MID-1465 (Assign approval requests also to org. units and/or roles) - not quite finished yet.
Commit: 6aea1844fb58c64e31ab0aa3e3faf03d79bdcdc8
https://github.com/Evolveum/midpoint/commit/6aea1844fb58c64e31ab0aa3e3faf03d79bdcdc8
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-04-29 (Tue, 29 Apr 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgTreeProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
A infra/prism/src/main/java/com/evolveum/midpoint/prism/query/AllFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/OrgFilter.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
M model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelController.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelUtils.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/expr/MidpointFunctionsImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ChangeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/Clockwork.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ContextFactory.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/LensContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/SpringAuthenticationInjectorInterceptor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/UserProfileServiceImpl.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractInitializedModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
M model/model-intest/src/test/resources/common/role-pirate.xml
M model/model-intest/src/test/resources/logback-test.xml
A model/model-intest/src/test/resources/security/role-prop-read-some-modify-some-req-exec.xml
A model/model-intest/src/test/resources/security/role-readonly-deep-exec.xml
A model/model-intest/src/test/resources/security/role-readonly-exec.xml
A model/model-intest/src/test/resources/security/role-readonly-req-exec.xml
A model/model-intest/src/test/resources/security/role-readonly-req.xml
A model/model-intest/src/test/resources/security/role-self-accounts-read.xml
A model/model-intest/src/test/resources/security/role-self-req.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/util/MiscDataUtil.java
M repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryService.java
M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/CleanupTest.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgStructTest.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlBaseService.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/OrgFilterQuery.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrgRestriction.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/Authorization.java
R repo/security-api/src/main/java/com/evolveum/midpoint/security/api/ItemSecurityConstraints.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/ObjectSecurityConstraints.java
A repo/security-api/src/main/java/com/evolveum/midpoint/security/api/OwnerResolver.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/UserProfileService.java
A repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/ItemSecurityConstraintsImpl.java
A repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/ObjectSecurityConstraintsImpl.java
A repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/PhaseDecisionImpl.java
M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Conflicts:
model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/util/MiscDataUtil.java
Commit: a95b92200449fa3452e58db23b12d29c6ac063f5
https://github.com/Evolveum/midpoint/commit/a95b92200449fa3452e58db23b12d29c6ac063f5
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-04-29 (Tue, 29 Apr 2014)
Changed paths:
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/util/MiscDataUtil.java
Log Message:
-----------
Fixing compile error after merging.
Commit: e4cbd89f9b955ad12b821e60154a7000785480cb
https://github.com/Evolveum/midpoint/commit/e4cbd89f9b955ad12b821e60154a7000785480cb
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-04-30 (Wed, 30 Apr 2014)
Changed paths:
M model/model-impl/src/main/java/com/evolveum/midpoint/model/security/UserProfileServiceImpl.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestPreviewChanges.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
M model/model-intest/src/test/resources/common/account-jack-dummy-red.xml
A model/model-intest/src/test/resources/security/role-self-accounts-read-write.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfDummy.java
M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryInterpreter.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/OrgRestriction.java
M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: efdd84e3b337697eda9b7a5c7e20852192d60eee
https://github.com/Evolveum/midpoint/commit/efdd84e3b337697eda9b7a5c7e20852192d60eee
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-04-30 (Wed, 30 Apr 2014)
Changed paths:
M infra/prism/src/main/resources/xml/ns/public/query-2.xsd
M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
Log Message:
-----------
Fixing schemas for query & types.
Commit: 64acf982dc9fc38f49de9092a34db32a6bf230a7
https://github.com/Evolveum/midpoint/commit/64acf982dc9fc38f49de9092a34db32a6bf230a7
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-04-30 (Wed, 30 Apr 2014)
Changed paths:
M infra/prism/src/main/java/com/evolveum/midpoint/prism/xjc/PrismForJAXBUtil.java
M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java
Log Message:
-----------
Allowing lists of references to abstract types (eliminated problems with list items instantiation).
Commit: 8f3e5dbeede39602eaef15628696799b3e664aba
https://github.com/Evolveum/midpoint/commit/8f3e5dbeede39602eaef15628696799b3e664aba
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-04-30 (Wed, 30 Apr 2014)
Changed paths:
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/users/MidPointUserManager.java
A model/workflow-impl/src/main/java/org/activiti/engine/impl/db/DbSqlSession.java
M model/workflow-impl/src/main/resources/processes/ItemApproval.bpmn20.xml
Log Message:
-----------
Fixing recent workflow problems (incl. temporary workaround for an Activiti bug).
Commit: 45766f731c4f38400b3cd7b592feb1827d656f36
https://github.com/Evolveum/midpoint/commit/45766f731c4f38400b3cd7b592feb1827d656f36
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-04-30 (Wed, 30 Apr 2014)
Changed paths:
M samples/model-client-sample/src/main/java/com/evolveum/midpoint/testing/model/client/sample/Main.java
Log Message:
-----------
Fixing client code for changes in types.xsd.
Commit: a5bf0aa5fde750f042876da056630f4e68514cd8
https://github.com/Evolveum/midpoint/commit/a5bf0aa5fde750f042876da056630f4e68514cd8
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-04-30 (Wed, 30 Apr 2014)
Changed paths:
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/WorkflowService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelController.java
Log Message:
-----------
Fixing workflows again.
Commit: 17b378a2f99324069faec9fc9accab5913642e15
https://github.com/Evolveum/midpoint/commit/17b378a2f99324069faec9fc9accab5913642e15
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-04-30 (Wed, 30 Apr 2014)
Changed paths:
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
A infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_2/XmlAsStringType.java
M infra/prism/src/main/resources/xml/ns/public/types-2.xsd
M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
M model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportManagerImpl.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportUtils.java
M model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.java
Log Message:
-----------
Fixing schema problems with reports by introducing t:XmlAsStringType.
Commit: 878c1f77c5639f90f3f5af0937009f523217c451
https://github.com/Evolveum/midpoint/commit/878c1f77c5639f90f3f5af0937009f523217c451
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-04-30 (Wed, 30 Apr 2014)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/PropertyLimitations.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinition.java
M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
M infra/common/src/test/resources/refinery/resource-complex.xml
M infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyDefinition.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/DomToSchemaProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/schema/SchemaToDomProcessor.java
M infra/schema/.gitignore
M infra/schema/src/main/resources/xml/ns/public/common/common-2a.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/SchemaProcessorTest.java
M infra/schema/src/test/resources/common/resource-opendj.xml
A infra/util/src/main/java/com/evolveum/midpoint/util/DisplayableValue.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuthorizationAction.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelInteractionService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelController.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/controller/ModelUtils.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/ChangeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ConsolidationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/ReconciliationProcessor.java
M model/model-impl/src/test/resources/common/resource-dummy-deprecated.xml
M model/model-impl/src/test/resources/common/resource-dummy.xml
M model/model-impl/src/test/resources/expr/account-xpath-evaluation.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
M model/model-intest/src/test/resources/activation/resource-dummy-khaki.xml
M model/model-intest/src/test/resources/common/resource-dummy-black.xml
M model/model-intest/src/test/resources/common/resource-dummy-blue-deprecated.xml
M model/model-intest/src/test/resources/common/resource-dummy-blue.xml
M model/model-intest/src/test/resources/common/resource-dummy-deprecated.xml
M model/model-intest/src/test/resources/common/resource-dummy-green-deprecated.xml
M model/model-intest/src/test/resources/common/resource-dummy-green.xml
M model/model-intest/src/test/resources/common/resource-dummy-red.xml
M model/model-intest/src/test/resources/common/resource-dummy-yellow.xml
M model/model-intest/src/test/resources/common/resource-dummy.xml
M model/model-intest/src/test/resources/common/resource-opendj.xml
M model/model-intest/src/test/resources/iteration/resource-dummy-magenta.xml
M model/model-intest/src/test/resources/iteration/resource-dummy-pink.xml
M model/model-intest/src/test/resources/iteration/resource-dummy-violet.xml
M model/model-intest/src/test/resources/multi/resource-dummy-beige.xml
M model/model-intest/src/test/resources/multi/resource-dummy-ivory.xml
M model/model-intest/src/test/resources/multi/resource-dummy-yellow.xml
M model/model-intest/src/test/resources/negative/resource-csvfile-broken.xml
M model/model-intest/src/test/resources/negative/resource-csvfile-notfound.xml
M model/model-intest/src/test/resources/scripthooks/resource-dummy-hook.xml
A model/model-intest/src/test/resources/security/role-self-accounts-partial-control.xml
M model/model-intest/src/test/resources/sync/resource-dummy-azure-deprecated.xml
M model/model-intest/src/test/resources/sync/resource-dummy-azure.xml
M model/model-intest/src/test/resources/sync/resource-dummy-emerald-deprecated.xml
M model/model-intest/src/test/resources/sync/resource-dummy-emerald.xml
M model/model-intest/src/test/resources/sync/resource-dummy-lime-deprecated.xml
M model/model-intest/src/test/resources/sync/resource-dummy-lime.xml
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/AccessChecker.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestDummy.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestOpenDJ.java
M provisioning/provisioning-impl/src/test/resources/impl/dummy-no-activation/resource-dummy.xml
M provisioning/provisioning-impl/src/test/resources/object/resource-dummy.xml
M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/ResourceCarefulAntUtil.java
M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
M repo/repo-sql-impl-test/src/test/resources/modify/resource-csv.xml
M repo/repo-sql-impl-test/src/test/resources/modify/resource-opendj.xml
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java
M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityEnforcer.java
M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
M samples/resources/ad/ad-resource-advanced-nosync.xml
M samples/resources/ad/ad-resource-advanced-sync.xml
M samples/resources/csvfile/localhost-csvfile-resource-advanced-multi-nosync.xml
M samples/resources/csvfile/localhost-csvfile-resource-advanced-nosync-2.xml
M samples/resources/csvfile/localhost-csvfile-resource-advanced-nosync-3.xml
M samples/resources/csvfile/localhost-csvfile-resource-advanced-nosync-4.xml
M samples/resources/csvfile/localhost-csvfile-resource-advanced-nosync-5.xml
M samples/resources/csvfile/localhost-csvfile-resource-advanced-nosync.xml
M samples/resources/csvfile/localhost-csvfile-resource-advanced-sync-2.xml
M samples/resources/databasetable/localhost-dbtable-advanced-nosync-2.xml
M samples/resources/databasetable/localhost-dbtable-advanced-nosync.xml
M samples/resources/databasetable/localhost-dbtable-advanced-sync.xml
M samples/resources/mysqluser/mysqluser-localhost-advanced-nosync.xml
M samples/resources/opendj/opendj-localhost-medium.xml
M samples/resources/opendj/opendj-localhost-resource-sync-advanced.xml
M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-2.xml
M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-test.xml
M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced.xml
M samples/rest/opendj-resource-sync.xml
M testing/consistency-mechanism/src/test/resources/repo/resource-opendj.xml
M testing/consistency-mechanism/src/test/resources/request/resource-modify-resource-schema.xml
M testing/sanity/src/test/resources/repo/resource-dummy.xml
M testing/sanity/src/test/resources/repo/resource-opendj.xml
M testing/story/src/test/resources/trafo/resource-dummy-ad.xml
M testing/story/src/test/resources/trafo/resource-dummy-mail.xml
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: 77347e2160c5a386b496ac73f3b43661091d3f98
https://github.com/Evolveum/midpoint/commit/77347e2160c5a386b496ac73f3b43661091d3f98
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-04-30 (Wed, 30 Apr 2014)
Changed paths:
M model/workflow-impl/src/test/resources/common/resource-dummy.xml
Log Message:
-----------
Merge branch 'master' of github.com:Evolveum/midpoint
Commit: f33a8eaf3a33cc1e43761b4ec2e2bdb51dc1c5a4
https://github.com/Evolveum/midpoint/commit/f33a8eaf3a33cc1e43761b4ec2e2bdb51dc1c5a4
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-05-01 (Thu, 01 May 2014)
Changed paths:
M samples/demo/hr.xml
M samples/demo/opendj.xml
M samples/resources/ad/ad-resource-advanced-nosync.xml
M samples/resources/ad/ad-resource-advanced-sync.xml
M samples/resources/csvfile/localhost-csvfile-resource-advanced-multi-nosync.xml
M samples/resources/csvfile/localhost-csvfile-resource-advanced-nosync-2.xml
M samples/resources/csvfile/localhost-csvfile-resource-advanced-nosync-3.xml
M samples/resources/csvfile/localhost-csvfile-resource-advanced-nosync-4.xml
M samples/resources/csvfile/localhost-csvfile-resource-advanced-nosync-5.xml
M samples/resources/csvfile/localhost-csvfile-resource-advanced-nosync.xml
M samples/resources/csvfile/localhost-csvfile-resource-advanced-sync-2.xml
M samples/resources/databasetable/localhost-dbtable-advanced-nosync-2.xml
M samples/resources/databasetable/localhost-dbtable-advanced-nosync.xml
M samples/resources/databasetable/localhost-dbtable-advanced-sync.xml
M samples/resources/dsee/odsee-localhost-advanced-nosync.xml
M samples/resources/dsee/odsee-localhost-advanced-sync.xml
M samples/resources/mysqluser/mysqluser-localhost-advanced-nosync.xml
M samples/resources/opendj/opendj-localhost-medium.xml
M samples/resources/opendj/opendj-localhost-resource-sync-advanced.xml
M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-2.xml
M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced-test.xml
M samples/resources/opendj/opendj-localhost-resource-sync-no-extension-advanced.xml
M samples/resources/opendj/piracy/opendj-localhost-resource-sync-extension-pirates.xml
M samples/resources/scriptedsql/localhost-scriptedsql-advanced-sync.xml
Log Message:
-----------
Fixing the samples.
Commit: 74d6f6cecd09214992fa85f5d923314ceb6c1578
https://github.com/Evolveum/midpoint/commit/74d6f6cecd09214992fa85f5d923314ceb6c1578
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2014-05-01 (Thu, 01 May 2014)
Changed paths:
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/ActivitiInterface.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/activiti/dao/WorkItemProvider.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/messages/TaskEvent.java
R model/workflow-impl/src/main/java/org/activiti/engine/impl/db/DbSqlSession.java
Log Message:
-----------
Working around Activity bug instead of patching it.
Compare: https://github.com/Evolveum/midpoint/compare/1e72114cd489...74d6f6cecd09
More information about the midPoint-svn
mailing list