[midPoint-git] midPoint branch parser updated. v2.3devel-1157-gc83c8b5
Radovan Semancik
git at evolveum.com
Thu Feb 6 17:49:22 CET 2014
Project "midPoint" branch parser has been updated
via c83c8b59e6433bb70e5ac18e3ca8c0d3ab345673 (commit) v2.3devel-1157-gc83c8b5
via 1e0ca6816290d7e9a65dcae0ae7f5dcc02c28381 (commit) v2.3devel-1080-g1e0ca68
via 41825eb66084b382c50ad6aa413a03ed2a01db6f (commit) v2.3devel-1079-g41825eb
via 32f22554d5881840369c585e6eb6b5e68da00db5 (commit) v2.3devel-1078-g32f2255
via abf7e352ca187fb362a64186b1e18ef96281497d (commit) v2.3devel-1077-gabf7e35
via 3ddd5a4c6952220f960a11e7add7a2e53299e429 (commit) v2.3devel-1076-g3ddd5a4
via 63cf8a6488cf2e9718714f6b97f1b2d20d59d9a6 (commit) v2.3devel-1074-g63cf8a6
via e08118ca4b314b2c58b4e0d6e7e51bc4bee086fd (commit) v2.3devel-1074-ge08118c
via 1c0e056672ef5c73c9f85df8feda401cd30c73c8 (commit) v2.3devel-1073-g1c0e056
via 8ca24acd7c36566318d97d9899dd190057f24ca2 (commit) v2.3devel-1072-g8ca24ac
via a313f2be33e70d97f13bdd56ee331ef42fae69b7 (commit) v2.3devel-1071-ga313f2b
via 8f1c670a546449aff4b7a6cd2fe845c8f57976a6 (commit) v2.3devel-1070-g8f1c670
via 66b4386500d0cd829b7ac2bc66be8c97e5e05978 (commit) v2.3devel-1068-g66b4386
via 5eb601cebad9ee6a63a67b87cc929ba0e1f4f8e6 (commit) v2.3devel-1068-g5eb601c
via 4e9ae1fb20f559c65743e5b512513612c347bd67 (commit) v2.3devel-1067-g4e9ae1f
via c80a66a91ee76964f88fb69882787a7b24fb2ce8 (commit) v2.3devel-1066-gc80a66a
via 6382e97c4f9193584f4011f41cb29b2a056d79f1 (commit) v2.3devel-1065-g6382e97
via 73f03d649c10cbfa74f159cd9416ba1c64e1fe63 (commit) v2.3devel-1064-g73f03d6
via e2bda6474159156161308eb25f00504e4268ff4e (commit) v2.3devel-1063-ge2bda64
via 6d32ae7a1458c6bc2ad56ed24cf087d53685d749 (commit) v2.3devel-1062-g6d32ae7
via 1b7bb6cb9fb204185292f80b5c5b74586cf840cb (commit) v2.3devel-1061-g1b7bb6c
via 5dc60e28a8852038c37e33f618f0c5bd8c9098d2 (commit) v2.3devel-1060-g5dc60e2
via acc05155320a4e382753ecc377ea2303ca34e6a3 (commit) v2.3devel-1059-gacc0515
via 1af5b0e7ca88682bc79e49c9b2780f38211c8053 (commit) v2.3devel-1058-g1af5b0e
via 4424103f87425cd9e3e71d7ec2c0653cd8f5d633 (commit) v2.3devel-1057-g4424103
via 0c9c3bc84b36e1396f43a3f479642e001b5bc8a7 (commit) v2.3devel-1056-g0c9c3bc
via d773fa7f5d85201f00f8898d1e65d8d8a7965bff (commit) v2.3devel-1055-gd773fa7
via 2b485c980976ac1ab479e5bd6ef287eb6214aedb (commit) v2.3devel-1054-g2b485c9
via 50179a1e704ceb899b30d63db16654aafd2caa89 (commit) v2.3devel-1053-g50179a1
via d02088baa72e5b953f8ef0546c48b88c62aa84d1 (commit) v2.3devel-1052-gd02088b
via bff43c2fc1d01107da7a93a0dd7cc5181b08b572 (commit) v2.3devel-1051-gbff43c2
via 1786349fa9e0315e56f9874562e174bd31a97d3e (commit) v2.3devel-1050-g1786349
via bdf6ce9bef484dff8f4d88d64c9fe571ed8978ad (commit) v2.3devel-1049-gbdf6ce9
via 813fbdb670e8cd1939d943c6050df34b5d4601f6 (commit) v2.3devel-1048-g813fbdb
via 4209d344a4638df9ce59b7072361643f616d4b69 (commit) v2.3devel-1047-g4209d34
via 716fa86e0ff3e72f46cfec0e60216b6fa0b3e296 (commit) v2.3devel-1045-g716fa86
via 10819f111aa739ccd78c3dc55359454fe751b1cf (commit) v2.3devel-1045-g10819f1
via c832cdb63f44708406c231ace9f49cdc16f12827 (commit) v2.3devel-1044-gc832cdb
via a04ab0f9f1d3bc2b235ee10e237c056e989fa502 (commit) v2.3devel-1042-ga04ab0f
via 54474f9c877ff905a71f4535286e3f2072f5b145 (commit) v2.3devel-1041-g54474f9
via 01c796f8ca3d12c256164b2a0158f553d8c33872 (commit) v2.3devel-1040-g01c796f
via 8b0da035c26fe59f2ba0d66326928d180ba52a00 (commit) v2.3devel-1040-g8b0da03
via 64991a08b795b062805aed2559fc70e219343fb0 (commit) v2.3devel-1039-g64991a0
via 6f10127e406755513b65e4d7c97bd40b9159389d (commit) v2.3devel-1038-g6f10127
via 8ba9d0756828a64334030a7ef958ff7aac2c0e61 (commit) v2.3devel-1037-g8ba9d07
via d6eeb0ad5495e91a971e3c30ea14e41b6f7a76b8 (commit) v2.3devel-1036-gd6eeb0a
via 26a469f4a7aeff40b4b7d0e51144261abf424958 (commit) v2.3devel-1035-g26a469f
via 77143287cc64fe7494d352b9030dfcf29384f9be (commit) v2.3devel-1034-g7714328
via 96f54ab143c890c8cffc1ce26e6f0456bf0af8f3 (commit) v2.3devel-1033-g96f54ab
via ab2b4b4cd4fc819e22d4d307d99a428dd5adcfa1 (commit) v2.3devel-1031-gab2b4b4
via 00a0ac5bbb93562b0179fd33a8a3d9425bb5b949 (commit) v2.3devel-1028-g00a0ac5
via ef6ee15b55406b6cb68a4bd4cec5a16a27fd6a23 (commit) v2.3devel-1030-gef6ee15
via 459f09b5e40a927b35d9aec908c7d8b838ebd919 (commit) v2.3devel-1027-g459f09b
via 8dbb8441a71cbe881779e2e85c4137c5081aa543 (commit) v2.3devel-1028-g8dbb844
via b0170eb88e88339ee3aed034159932bd49f1cfce (commit) v2.3devel-1027-gb0170eb
via f0d85e9d4c99ecc71568879b8d81424018b8589e (commit) v2.3devel-1026-gf0d85e9
via 594d5af309c7554709f50efbe78486e51e9f0ab5 (commit) v2.3devel-1025-g594d5af
via 8e49c228189d0e7ba52354b85b9d5e67da771ce4 (commit) v2.3devel-1023-g8e49c22
via b315f5727df9240cc9841fe010dc99c870212c8f (commit) v2.3devel-1023-gb315f57
via 907f31a67b575f5af1ab3bce0d2e4ef40a04d077 (commit) v2.3devel-1022-g907f31a
via 6f3f0cbdfbb916460648b4d5ee899615f1388495 (commit) v2.3devel-1021-g6f3f0cb
via 2a956290fa05421ea8ab74693b48547292e4bb6d (commit) v2.3devel-1020-g2a95629
via ccdd5575ae90df7c2c30798cef5a8c7b9eeeb750 (commit) v2.3devel-1019-gccdd557
via 0f010832ef60d84f1d3372bd416de00a8a07bf63 (commit) v2.3devel-1018-g0f01083
via 4a3dd55b5f0023e59728149a792478d02d56a38b (commit) v2.3devel-1017-g4a3dd55
via 240b420e4c7988659dd617392bd232c30b6d888d (commit) v2.3devel-1016-g240b420
via a25812f1a1f0b147391db4792e5a1e7f092fa9ba (commit) v2.3devel-1015-ga25812f
via 1dc59be203829d8af6c98a93b28d670d1ee6e7ae (commit) v2.3devel-1014-g1dc59be
via 0eb250d5778a6a88fc61826d575858315f1fd129 (commit) v2.3devel-1013-g0eb250d
via 5fbdf14553a1fed331a51b4d3a92bae158283e4f (commit) v2.3devel-1012-g5fbdf14
from 0959e822335cc2fec24bb31e8b5ff05ffeca64cd (commit) v2.3devel-1087-g0959e82
- Log -----------------------------------------------------------------
commit c83c8b59e6433bb70e5ac18e3ca8c0d3ab345673
Merge: 0959e82 1e0ca68
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: Thu Feb 6 17:43:24 2014 +0100
Merge branch 'master' into parser
Conflicts:
infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismPropertyValue.java
model/report-impl/src/main/java/com/evolveum/midpoint/report/DataSourceReport.java
model/report-impl/src/test/java/com/evolveum/midpoint/report/BasicReportTest.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:
.../sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql | 43 +-
.../2.2/mysql/mysql-upgrade-2.2-to-2.3.sql | 45 +-
.../2.2/oracle/oracle-upgrade-2.2-to-2.3.sql | 39 +-
.../postgresql/postgresql-upgrade-2.2-to-2.3.sql | 39 +-
.../2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql | 39 +-
config/sql/midpoint/2.3/h2/h2-2.3.sql | 14 +-
config/sql/midpoint/2.3/mysql/mysql-2.3.sql | 254 ++---
config/sql/midpoint/2.3/oracle/oracle-2.3.sql | 284 +++---
.../sql/midpoint/2.3/postgresql/postgresql-2.3.sql | 14 +-
.../sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql | 14 +-
.../midpoint/web/component/AjaxSubmitButton.java | 9 +-
.../{DateInput.java => TreeThemeBasic.java} | 16 +-
.../web/component/dialog/ConfirmationDialog.java | 1 +
.../web/component/dialog/UserBrowserDialog.java | 1 +
.../web/component/form/DropDownFormGroup.java | 16 +-
.../component/input/ListMultipleChoicePanel.java | 10 +
.../component/wizard/resource/CapabilityStep.html | 169 +++-
.../component/wizard/resource/CapabilityStep.java | 9 +
.../wizard/resource/CapabilityStep.properties | 2 +
.../wizard/resource/ConfigurationStep.html | 5 +-
.../web/component/wizard/resource/NameStep.html | 25 +-
.../web/component/wizard/resource/NameStep.java | 163 +--
.../component/wizard/resource/NameStep.properties | 2 +-
.../wizard/resource/SchemaHandlingStep.java | 9 +
.../web/component/wizard/resource/SchemaStep.html | 8 +-
.../web/component/wizard/resource/SchemaStep.java | 6 +-
.../wizard/resource/SynchronizationStep.java | 9 +
.../wizard/resource/dto/CapabilityDto.java | 65 ++
.../{ => dto}/ConnectorHostTypeComparator.java | 2 +-
.../{ => dto}/ConnectorTypeComparator.java | 2 +-
.../evolveum/midpoint/web/page/PageBase.properties | 1 +
.../midpoint/web/page/admin/PageAdmin.java | 1 -
.../page/admin/configuration/PageDebugList.html | 7 +-
.../page/admin/configuration/PageDebugList.java | 37 +
.../web/page/admin/configuration/PageLogging.html | 210 ----
.../web/page/admin/configuration/PageLogging.java | 1043 --------------------
.../configuration/PageSystemConfiguration.java | 7 +-
.../configuration/component/ChooseTypeDialog.java | 1 +
.../component/LoggingConfigPanel.html | 32 +-
.../component/LoggingConfigPanel.java | 297 +++++-
.../component/LoggingConfigPanel.properties | 1 +
.../page/admin/configuration/dto/LoggingDto.java | 1 +
.../web/page/admin/reports/PageCreatedReports.html | 9 +-
.../web/page/admin/reports/PageCreatedReports.java | 83 +-
.../web/page/admin/reports/PageReport.java | 2 +-
.../page/admin/reports/dto/ReportOutputDto.java | 2 -
.../page/admin/resources/PageAdminResources.java | 84 ++
.../web/page/admin/resources/PageResource.html | 1 +
.../web/page/admin/resources/PageResource.java | 32 +-
.../page/admin/resources/PageResource.properties | 4 +-
.../page/admin/resources/PageResourceWizard.java | 6 +-
.../web/page/admin/resources/PageResources.html | 7 +-
.../web/page/admin/resources/PageResources.java | 98 +-
.../page/admin/resources/PageResources.properties | 1 +
.../resources/content/PageContentAccounts.html | 9 +-
.../resources/content/PageContentAccounts.java | 249 ++++-
.../content/PageContentAccounts.properties | 10 +-
.../admin/resources/dto/ResourceController.java | 52 +-
.../web/page/admin/resources/dto/ResourceDto.java | 16 +-
.../admin/resources/dto/ResourceDtoProvider.java | 130 ---
.../page/admin/resources/dto/ResourceState.java | 84 +-
.../page/admin/resources/dto/ResourceStatus.java | 40 -
.../midpoint/web/page/admin/roles/PageRoles.html | 25 +-
.../midpoint/web/page/admin/roles/PageRoles.java | 205 +++-
.../web/page/admin/roles/PageRoles.properties | 5 +
.../web/page/admin/roles/dto/RolesSearchDto.java | 76 ++
.../web/page/admin/server/PageTaskAdd.html | 15 +-
.../web/page/admin/server/PageTaskAdd.java | 29 +-
.../web/page/admin/server/PageTaskAdd.properties | 2 +
.../web/page/admin/server/PageTaskEdit.html | 15 +-
.../web/page/admin/server/PageTaskEdit.java | 111 ++-
.../web/page/admin/server/PageTaskEdit.properties | 2 +
.../midpoint/web/page/admin/server/PageTasks.html | 6 +
.../midpoint/web/page/admin/server/PageTasks.java | 69 +-
.../server/dto/OperationResultStatusIcon.java | 94 ++
.../web/page/admin/server/dto/TaskAddDto.java | 13 +-
.../web/page/admin/server/dto/TaskDto.java | 29 +
.../midpoint/web/page/admin/users/PageUser.html | 27 +
.../midpoint/web/page/admin/users/PageUsers.html | 7 +-
.../midpoint/web/page/admin/users/PageUsers.java | 57 +-
.../web/page/admin/users/PageUsers.properties | 1 +
.../page/admin/users/component/OrgUnitBrowser.java | 1 +
.../midpoint/web/page/error/PageError.java | 13 +-
.../web/security/MidPointApplication.properties | 4 +
.../web/session/ResourceContentStorage.java | 53 +
.../{ResourcesStorage.java => RolesStorage.java} | 28 +-
.../midpoint/web/session/SessionStorage.java | 24 +
.../{ResourcesStorage.java => TasksStorage.java} | 28 +-
.../src/main/webapp/WEB-INF/descriptor.xml | 4 -
gui/admin-gui/src/main/webapp/img/placeholder.png | Bin 0 -> 1349 bytes
.../src/main/webapp/js/midpoint/midpoint.js | 12 +-
.../less/midpoint/capabilities.less} | 20 +-
.../src/main/webapp/less/midpoint/midpoint.less | 14 +
.../midpoint/{tree.less => tree-theme-basic.less} | 69 +-
.../refinery/RefinedAssociationDefinition.java | 4 +-
.../evolveum/midpoint/prism/ItemDefinition.java | 9 +
.../midpoint/prism/PrismContainerDefinition.java | 3 +-
.../midpoint/prism/PrismPropertyValue.java | 72 +-
.../resources/xml/ns/public/common/common-2a.xsd | 113 +--
.../src/test/resources/diff/user-jack-after.xml | 1 +
.../src/test/resources/diff/user-jack-before.xml | 1 +
.../midpoint/test/ldap/OpenDJController.java | 4 +
.../midpoint/model/controller/ModelController.java | 3 +-
.../evolveum/midpoint/model/lens/Assignment.java | 22 +-
.../midpoint/model/lens/AssignmentEvaluator.java | 4 +-
.../model/lens/projector/AssignmentProcessor.java | 6 +-
.../sync/CorrelationConfirmationEvaluator.java | 1 -
.../model/lens/TestAssignmentEvaluator.java | 2 +-
.../model/intest/TestModelServiceContract.java | 9 +-
.../model/intest/TestResourceModifications.java | 38 +-
.../model/test/AbstractModelIntegrationTest.java | 61 ++
.../notifications/api/events/BaseEvent.java | 8 +-
.../notifications/api/events/WorkItemEvent.java | 4 +-
.../evolveum/midpoint/report/DataSourceReport.java | 13 +-
.../report/HibernateQueryDataSourceReport.java | 82 ++
.../midpoint/report/ReportCreateTaskHandler.java | 122 ++-
.../midpoint/report/ReportManagerImpl.java | 62 +-
.../com/evolveum/midpoint/report/ReportUtils.java | 277 +++++-
.../evolveum/midpoint/report/BasicReportTest.java | 204 ++--
.../src/test/resources/reports/report-sample.xml | 338 +++++++
.../reports/reportAuditLogs-with-datasource.xml | 114 +++
.../src/test/resources/reports/reportAuditLogs.xml | 224 ++++-
model/report-impl/testng.xml | 2 +-
.../provisioning/impl/ResourceManager.java | 6 +-
.../midpoint/provisioning/impl/ShadowCache.java | 3 +-
.../midpoint/provisioning/ucf/impl/IcfUtil.java | 15 +
repo/repo-sql-impl-test/.gitignore | 1 +
.../evolveum/midpoint/repo/sql/OrgStructTest.java | 30 +
.../src/test/resources/basic/objects.xml | 147 ++-
.../midpoint/repo/sql/data/common/RReport.java | 504 +++++-----
.../repo/sql/data/common/RReportOutput.java | 8 +-
.../midpoint/repo/sql/data/common/RUser.java | 15 +
.../repo/sql/data/common/embedded/RDataSource.java | 97 ++
.../midpoint/repo/sql/query/QueryInterpreter.java | 18 +-
.../midpoint/test/IntegrationTestTools.java | 3 +
.../midpoint/testing/story/TestOrgSync.java | 369 +++++++
testing/story/src/test/resources/logback-test.xml | 14 +-
.../src/test/resources/orgsync/booty-lookout.ldif | 5 +
.../story/src/test/resources/orgsync/booty.ldif | 5 +
.../src/test/resources/orgsync/resource-opendj.xml | 90 +-
.../story/src/test/resources/orgsync/scabb.ldif | 5 +
141 files changed, 5146 insertions(+), 2921 deletions(-)
copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/{DateInput.java => TreeThemeBasic.java} (65%)
create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/CapabilityDto.java
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/{ => dto}/ConnectorHostTypeComparator.java (97%)
rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/{ => dto}/ConnectorTypeComparator.java (94%)
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageLogging.html
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageLogging.java
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceDtoProvider.java
delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/dto/ResourceStatus.java
create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/dto/RolesSearchDto.java
create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/OperationResultStatusIcon.java
create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ResourceContentStorage.java
copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/{ResourcesStorage.java => RolesStorage.java} (53%)
copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/{ResourcesStorage.java => TasksStorage.java} (57%)
create mode 100644 gui/admin-gui/src/main/webapp/img/placeholder.png
copy gui/admin-gui/src/main/{java/com/evolveum/midpoint/web/component/prism/ValueStatus.java => webapp/less/midpoint/capabilities.less} (69%)
copy gui/admin-gui/src/main/webapp/less/midpoint/{tree.less => tree-theme-basic.less} (72%)
create mode 100644 model/report-impl/src/main/java/com/evolveum/midpoint/report/HibernateQueryDataSourceReport.java
create mode 100644 model/report-impl/src/test/resources/reports/report-sample.xml
create mode 100644 model/report-impl/src/test/resources/reports/reportAuditLogs-with-datasource.xml
create mode 100644 repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/embedded/RDataSource.java
create mode 100644 testing/story/src/test/resources/orgsync/booty-lookout.ldif
create mode 100644 testing/story/src/test/resources/orgsync/booty.ldif
create mode 100644 testing/story/src/test/resources/orgsync/scabb.ldif
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list