[midPoint-git] midPoint branch restNew updated. v2.3devel-179-ge660ebd
Katka Valalikova
git at evolveum.com
Mon Nov 11 16:06:31 CET 2013
Project "midPoint" branch restNew has been updated
via e660ebd83358bec0b75ef7c31d2874bef0250e05 (commit) v2.3devel-179-ge660ebd
via 5b650fbcbd4aaa8e0ae760a65ed153f8d2485252 (commit) v2.3devel-151-g5b650fb
via 9da2b3198862069acc987095cced8c1d2ecd8c11 (commit) v2.3devel-164-g9da2b31
via 4b11c9d0e9be313cc1b7a7d1c3543fb2f81d1cf3 (commit) v2.3devel-163-g4b11c9d
via 8c88dc73030742eb5171596f713e37f0b1882e69 (commit) v2.3devel-162-g8c88dc7
via 3374c1add530ad3ac62871f88f136c5a0f2c3f03 (commit) v2.3devel-161-g3374c1a
via cfed1fe430a3367b6d4d52d7b10b3a106b7ed868 (commit) v2.3devel-160-gcfed1fe
via daf426591ea811f56f1a9ffc062f715b3a027148 (commit) v2.3devel-159-gdaf4265
via 0b54a8d5df108a92cdc1bd02bf72ea8890765811 (commit) v2.3devel-158-g0b54a8d
via 8f2988c3a147172fcf90d9b8687ccd4b4fe32b0b (commit) v2.3devel-157-g8f2988c
via 27332d6b2a6e4d21ff346a55c48593380ff3d740 (commit) v2.3devel-155-g27332d6
via a8161e36662fe830a714f62c03e9fb32ca64cde6 (commit) v2.3devel-155-ga8161e3
via c189bc619ad45fc513021dc07cf822e9e1de02d1 (commit) v2.3devel-154-gc189bc6
via 13fdf0893560f86d3546a069dbafefb06d1ddf42 (commit) v2.3devel-153-g13fdf08
via 927863440d2ff3754ed6c0aa436f0d9c5931e212 (commit) v2.3devel-151-g9278634
via 12f24f58d993887376418fd7cbe4564a4ee54045 (commit) v2.3devel-149-g12f24f5
via c142e61011b0c4d8cb3b9360e2eaf23e15caf4e6 (commit) v2.3devel-150-gc142e61
via 2b104af1464d5cd8a57165f540825ed0cbe54e84 (commit) v2.3devel-146-g2b104af
via 8291788d79983bd48673157ab9030fb4df7af2f0 (commit) v2.3devel-148-g8291788
via 0b07982e5e2b0cb7a7424c334660599b01c7a4a6 (commit) v2.3devel-147-g0b07982
via 7d19d183a14e0d2180dfaba82ccf6e5d8691a36e (commit) v2.3devel-146-g7d19d18
via f30abe086a21643c0df5e5869e997ecb4244f415 (commit) v2.3devel-145-gf30abe0
via 47ffd0faf35859208f79981cdd80e6927ba20ded (commit) v2.3devel-144-g47ffd0f
via 9fb996bc60ef57fef506e00523eb67138599f009 (commit) v2.3devel-143-g9fb996b
via c75b7cf524fb0074bb33e012390a9a901b86b4f9 (commit) v2.3devel-142-gc75b7cf
via 0a7d35d9a98e3712d39ec1b85d56742775745fda (commit) v2.3devel-141-g0a7d35d
via b78b730cf291b0925c490205322da891a2201d25 (commit) v2.3devel-140-gb78b730
via b78191ef570bc94774f2d029a2dea60152b12da8 (commit) v2.3devel-139-gb78191e
via a79d49add33ebc0b8baf098caf31af1f0dc4f95c (commit) v2.3devel-138-ga79d49a
from 5dfce0561c21bfff5452d3a62006e5fd6cee7c15 (commit) v2.3devel-150-g5dfce05
- Log -----------------------------------------------------------------
commit e660ebd83358bec0b75ef7c31d2874bef0250e05
Merge: 5b650fb 9da2b31
Author: katkav <k.valalikova at evolveum.com>
Date: Mon Nov 11 09:32:58 2013 +0100
Merge branch 'master' into restNew
commit 5b650fbcbd4aaa8e0ae760a65ed153f8d2485252
Author: katkav <k.valalikova at evolveum.com>
Date: Mon Nov 11 09:31:43 2013 +0100
adding basic JSON parsing + some rest tests..
-----------------------------------------------------------------------
(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:
.gitignore | 2 +
config/h2-schema.sql | 1781 ++-
config/h2-upgrade-2.2-to-2.3.sql | 4 +
config/mysql-schema.sql | 2059 +--
config/mysql-upgrade-2.2-to-2.3.sql | 4 +
config/oracle-schema.sql | 1784 +--
config/oracle-upgrade-2.2-to-2.3.sql | 4 +
config/postgresql-schema.sql | 1781 ++-
config/postgresql-upgrade-2.2-to-2.3.sql | 4 +
config/sqlserver-schema.sql | 1787 ++-
config/sqlserver-upgrade-2.2-to-2.3.sql | 4 +
.../web/component/assignment/ACAttributePanel.html | 2 +-
.../web/page/admin/resources/PageResource.java | 31 +-
.../web/page/admin/resources/PageResources.java | 30 +-
.../admin/resources/dto/ResourceDtoProvider.java | 15 +-
.../common/mapping/TestMappingDynamicSysVar.java | 9 +-
infra/prism/pom.xml | 11 +
.../com/evolveum/midpoint/prism/PrismContext.java | 8 +
.../midpoint/prism/PrismPropertyValue.java | 42 +-
.../com/evolveum/midpoint/prism/Recomputable.java | 5 +
.../midpoint/prism/dom/PrismDomProcessor.java | 8 +-
.../midpoint/prism/json/PrismJasonProcessor.java | 442 +
.../midpoint/prism/polystring/PolyString.java | 12 +-
.../midpoint/prism/util/JavaTypeConverter.java | 10 +
.../midpoint/prism/xml/XmlTypeConverter.java | 10 +
.../java/com/evolveum/midpoint/prism/TestDiff.java | 10 +-
infra/prism/testng.xml | 1 +
.../schema/MidPointPrismContextFactory.java | 7 +
.../schema/util/SynchronizationSituationUtil.java | 23 +-
.../resources/xml/ns/public/common/common-2a.xsd | 10 +
.../evolveum/midpoint/schema/TestJsonParsing.java | 52 +
.../src/test/resources/common/json/user-jack.json | 46 +
infra/schema/testng.xml | 1 +
model/model-impl/pom.xml | 11 +
.../evolveum/midpoint/model/ModelRestService.java | 4 +-
.../ImportAccountsFromResourceTaskHandler.java | 3 +
.../midpoint/model/importer/ObjectImporter.java | 9 +
.../midpoint/model/lens/AccountConstruction.java | 5 +-
.../midpoint/model/lens/ChangeExecutor.java | 8 +-
.../evolveum/midpoint/model/lens/Clockwork.java | 43 +-
.../midpoint/model/lens/projector/Projector.java | 2 -
.../model/lens/projector/UserPolicyProcessor.java | 136 +-
.../model/sync/ReconciliationTaskHandler.java | 85 +-
.../model/sync/SynchronizationService.java | 38 +-
.../util/AbstractSearchIterativeResultHandler.java | 21 +-
model/model-impl/src/main/resources/ctx-model.xml | 7 +-
.../AbstractConfiguredModelIntegrationTest.java | 2 +-
.../AbstractInitializedModelIntegrationTest.java | 2 +-
.../midpoint/model/intest/TestActivation.java | 6 +-
.../midpoint/model/intest/TestIteration.java | 2 +-
.../model/intest/TestLoggingConfiguration.java | 2 +-
.../midpoint/model/intest/TestUserTemplate.java | 44 +
.../model/intest/negative/TestBrokenCSV.java | 2 +-
.../sync/AbstractSynchronizationStoryTest.java | 2 +
.../intest/util/ProfilingLensDebugListener.java | 41 +-
.../test/resources/common/task-reconcile-dummy.xml | 4 -
.../resources/common/user-template-complex.xml | 16 +
.../src/test/resources/logback-test.xml | 16 +-
.../model/test/AbstractModelIntegrationTest.java | 32 +-
.../notifiers/SimpleAccountNotifier.java | 3 +-
.../ApprovalLevel.java | 0
.../ApprovalRequest.java | 0
.../ApprovalSchema.java | 0
.../{itemapproval => itemApproval}/Constants.java | 0
.../{itemapproval => itemApproval}/Decision.java | 0
.../LightweightObjectRef.java | 0
.../ProcessVariableNames.java | 0
.../ApprovalLevelImpl.java | 0
.../ApprovalRequestImpl.java | 0
.../ApprovalSchemaImpl.java | 0
.../InitializeLoopThroughApproversInLevel.java | 0
.../InitializeLoopThroughLevels.java | 0
.../PrepareResult.java | 0
.../RecordIndividualDecision.java | 0
.../SummarizeDecisionsInLevel.java | 0
.../impl/CommunicationExceptionHandler.java | 3 +-
.../midpoint/provisioning/impl/ShadowCache.java | 17 +-
.../midpoint/provisioning/impl/ShadowManager.java | 2 +-
.../ucf/impl/ConnectorInstanceIcfImpl.java | 2 +-
.../provisioning/util/ProvisioningUtil.java | 5 +-
.../midpoint/repo/sql/ConcurrencyTest.java | 3 +-
.../com/evolveum/midpoint/repo/sql/ModifyTest.java | 6 +-
.../src/test/resources/basic/objects.xml | 12 +
.../repo/sql/SqlRepositoryServiceImpl.java | 34 +
.../midpoint/repo/sql/data/common/RShadow.java | 14 +
.../RSynchronizationSituationDescription.java | 22 +-
.../midpoint/test/AbstractIntegrationTest.java | 15 +
.../task/quartzimpl/TaskManagerQuartzImpl.java | 42 +-
.../midpoint/task/quartzimpl/TaskQuartzImpl.java | 11 +-
.../quartzimpl/execution/ExecutionManager.java | 10 +-
samples/json/user-jack.json | 7 +
.../ModelClientSample/ModelClientSample.sln | 20 +
.../ModelClientSample/ModelClientSample.v11.suo | Bin 0 -> 78848 bytes
.../ModelClientSample/ModelClientSample/App.config | 22 +
.../ModelClientSample/ModelClientSample.csproj | 118 +
.../ModelClientSample/ModelClientSample/Program.cs | 85 +
.../ModelClientSample/Properties/AssemblyInfo.cs | 36 +
.../Properties/Settings.Designer.cs | 26 +
.../ModelClientSample/Properties/Settings.settings | 5 +
....midpointModelService.ObjectListType.datasource | 10 +
...mple.midpointModelService.ObjectType.datasource | 10 +
...ointModelService.OperationResultType.datasource | 10 +
...mple.midpointModelService.ShadowType.datasource | 10 +
...Sample.midpointModelService.TaskType.datasource | 10 +
...Sample.midpointModelService.UserType.datasource | 10 +
.../ModelWebServiceService.wsdl | 133 +
.../midpointModelService/Reference.cs |14634 ++++++++++++++++++++
.../midpointModelService/Reference.svcmap | 31 +
.../midpointModelService/configuration.svcinfo | 10 +
.../midpointModelService/configuration91.svcinfo | 201 +
.../midpointModelService/modelPortType.wsdl | 2867 ++++
.../ModelClientSample/WsSecurityHeaders.cs | 153 +
testing/pom.xml | 1 +
testing/{sanity => rest}/pom.xml | 94 +-
.../midpoint/testing/rest/TestRestService.java | 304 +
.../src/test/resources/ctx-rest-test-main.xml} | 95 +-
.../src/test/resources/ctx-rest-test.xml} | 82 +-
.../src/test/resources/logback-test.xml | 108 +-
.../src/test/resources/repo/resource-opendj.xml | 0
.../test/resources/repo/system-configuration.xml | 0
.../src/test/resources/repo/user-administrator.xml | 10 +-
.../src/test/resources/repo/user-template.xml | 0
testing/{sanity => rest}/testng.xml | 56 +-
123 files changed, 24910 insertions(+), 4991 deletions(-)
create mode 100644 config/h2-upgrade-2.2-to-2.3.sql
create mode 100644 config/mysql-upgrade-2.2-to-2.3.sql
create mode 100644 config/oracle-upgrade-2.2-to-2.3.sql
create mode 100644 config/postgresql-upgrade-2.2-to-2.3.sql
create mode 100644 config/sqlserver-upgrade-2.2-to-2.3.sql
create mode 100644 infra/prism/src/main/java/com/evolveum/midpoint/prism/json/PrismJasonProcessor.java
create mode 100644 infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJsonParsing.java
create mode 100644 infra/schema/src/test/resources/common/json/user-jack.json
rename model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/ApprovalLevel.java (100%)
rename model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/ApprovalRequest.java (100%)
rename model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/ApprovalSchema.java (100%)
rename model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/Constants.java (100%)
rename model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/Decision.java (100%)
rename model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/LightweightObjectRef.java (100%)
rename model/workflow-api/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/ProcessVariableNames.java (100%)
rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/ApprovalLevelImpl.java (100%)
rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/ApprovalRequestImpl.java (100%)
rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/ApprovalSchemaImpl.java (100%)
rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/InitializeLoopThroughApproversInLevel.java (100%)
rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/InitializeLoopThroughLevels.java (100%)
rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/PrepareResult.java (100%)
rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/RecordIndividualDecision.java (100%)
rename model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/processes/{itemapproval => itemApproval}/SummarizeDecisionsInLevel.java (100%)
create mode 100644 samples/json/user-jack.json
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample.sln
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample.v11.suo
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/App.config
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/ModelClientSample.csproj
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Program.cs
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Properties/AssemblyInfo.cs
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Properties/Settings.Designer.cs
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Properties/Settings.settings
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/ModelClientSample.midpointModelService.ObjectListType.datasource
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/ModelClientSample.midpointModelService.ObjectType.datasource
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/ModelClientSample.midpointModelService.OperationResultType.datasource
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/ModelClientSample.midpointModelService.ShadowType.datasource
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/ModelClientSample.midpointModelService.TaskType.datasource
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/ModelClientSample.midpointModelService.UserType.datasource
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/ModelWebServiceService.wsdl
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/Reference.cs
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/Reference.svcmap
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/configuration.svcinfo
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/configuration91.svcinfo
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/Service References/midpointModelService/modelPortType.wsdl
create mode 100644 samples/model-client-sample-dotnet/ModelClientSample/ModelClientSample/WsSecurityHeaders.cs
copy testing/{sanity => rest}/pom.xml (66%)
create mode 100644 testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestService.java
copy testing/{sanity/src/test/resources/ctx-sanity-test-main.xml => rest/src/test/resources/ctx-rest-test-main.xml} (94%)
copy testing/{sanity/src/test/resources/ctx-sanity-test.xml => rest/src/test/resources/ctx-rest-test.xml} (97%)
copy testing/{consistency-mechanism => rest}/src/test/resources/logback-test.xml (91%)
copy testing/{consistency-mechanism => rest}/src/test/resources/repo/resource-opendj.xml (100%)
copy testing/{consistency-mechanism => rest}/src/test/resources/repo/system-configuration.xml (100%)
copy testing/{consistency-mechanism => rest}/src/test/resources/repo/user-administrator.xml (75%)
copy testing/{consistency-mechanism => rest}/src/test/resources/repo/user-template.xml (100%)
copy testing/{sanity => rest}/testng.xml (86%)
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list