[midPoint-git] midPoint branch bootstrap updated. v2.3devel-515-g4e09a8a
Vilo Repan
git at evolveum.com
Tue Dec 3 09:49:29 CET 2013
Project "midPoint" branch bootstrap has been updated
via 4e09a8af231e087c503291432c73d79695965862 (commit) v2.3devel-515-g4e09a8a
via f6910f05dfedede07f0a9a8913e39d19faec6e40 (commit) v2.3devel-283-gf6910f0
via de628786bbdd5c72d28f9c23c36be8305dad6295 (commit) v2.3devel-282-gde62878
via 58317478e9337e031973d0bd6776f650a1a62ced (commit) v2.3devel-281-g5831747
via 782c3c62d41a434f50095556de9706e9753b6e72 (commit) v2.3devel-280-g782c3c6
via 2d2838a60f0f99a81f4f5fa6c876e76f25c94209 (commit) v2.3devel-279-g2d2838a
via a1b21c14bac145d3bee51f2cb378819143b5f7bd (commit) v2.3devel-278-ga1b21c1
via 2cb0d41a4c7f19afd0efb6b6a7d1c7e50f62a57c (commit) v2.3devel-277-g2cb0d41
via 8cfa4477411e35afd59e374ce76b5511e44b0a6d (commit) v2.3devel-274-g8cfa447
via 7a8b1f4280e6e4c19b0c66fc1d2e4991ffd58403 (commit) v2.3devel-275-g7a8b1f4
via 194d16e6db3eb9551f741dcce532f36dfe6065f7 (commit) v2.3devel-271-g194d16e
via fe41bdc64b8e71ca7b3df09e9519415918db99d1 (commit) v2.3devel-273-gfe41bdc
via bef2f95b0bad61f023a90a51474eb71e03602306 (commit) v2.3devel-272-gbef2f95
via fa75a7a4b984b47df4551e335509cda2a9e6582f (commit) v2.3devel-271-gfa75a7a
via ae820b25cbbc66677dee5b534520bf3de4d35484 (commit) v2.3devel-270-gae820b2
via 4c3b65102d7449737fc09f9ff869bd91f2d3b181 (commit) v2.3devel-269-g4c3b651
via 3350ed25e792f85e07f55fb96042c67a5a5c3925 (commit) v2.3devel-265-g3350ed2
via 47d74ca2f38b44fa017a3521abe892c67195ad73 (commit) v2.3devel-264-g47d74ca
via dccd0eaf883949ce572f86ef2ea1af1e0b28ef59 (commit) v2.3devel-262-gdccd0ea
via 6cd4641372d075ab7e7e09802ea04c60f04b4afb (commit) v2.3devel-261-g6cd4641
via 05fd8dc17bb27ab1c657efd7d24c3770c9a3a261 (commit) v2.3devel-257-g05fd8dc
from 5dafc9da2e61d17d51c457f04255e2c5ee1a2152 (commit) v2.3devel-494-g5dafc9d
- Log -----------------------------------------------------------------
commit 4e09a8af231e087c503291432c73d79695965862
Merge: 5dafc9d f6910f0
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Tue Dec 3 09:30:45 2013 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap
-----------------------------------------------------------------------
(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:
.../midpoint/2.2/h2/h2-upgrade-2.2-to-2.2.1.sql | 4 +-
.../sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql | 2 +
.../2.2/mysql/mysql-upgrade-2.2-to-2.2.1.sql | 2 +
.../2.2/mysql/mysql-upgrade-2.2-to-2.3.sql | 2 +
.../2.2/oracle/oracle-upgrade-2.2-to-2.2.1.sql | 2 +
.../2.2/oracle/oracle-upgrade-2.2-to-2.3.sql | 1 +
.../postgresql/postgresql-upgrade-2.2-to-2.2.1.sql | 2 +
.../postgresql/postgresql-upgrade-2.2-to-2.3.sql | 2 +
.../sqlserver/sqlserver-upgrade-2.2-to-2.2.1.sql | 2 +
.../2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql | 2 +
config/sql/midpoint/2.3/h2/h2-2.3.sql | 2 +
config/sql/midpoint/2.3/mysql/mysql-2.3.sql | 2 +
config/sql/midpoint/2.3/oracle/oracle-2.3.sql | 2 +
.../sql/midpoint/2.3/postgresql/postgresql-2.3.sql | 2 +
.../sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql | 2 +
.../main/webapp}/styles/midpoint_base_styles.jrtx | 0
.../evolveum/icf/dummy/resource/DummyResource.java | 6 +-
.../java/com/evolveum/midpoint/common/Clock.java | 11 +
.../evolveum/midpoint/prism/util/PrismAsserts.java | 20 +
.../resources/xml/ns/public/common/common-2a.xsd | 2 +-
.../midpoint/model/lens/ChangeExecutor.java | 30 +-
.../evolveum/midpoint/model/lens/Clockwork.java | 5 +
.../com/evolveum/midpoint/model/lens/LensUtil.java | 76 +-
.../lens/projector/AccountValuesProcessor.java | 2 +-
.../model/lens/projector/ActivationProcessor.java | 26 +-
.../model/lens/projector/AssignmentProcessor.java | 20 +
.../lens/projector/ConsolidationProcessor.java | 2 +-
.../model/lens/projector/ContextLoader.java | 42 +-
.../model/lens/projector/InboundProcessor.java | 7 +-
.../AbstractInternalModelIntegrationTest.java | 2 +-
.../midpoint/model/lens/TestDependencies.java | 2 +-
.../AbstractInitializedModelIntegrationTest.java | 14 +-
.../midpoint/model/intest/TestActivation.java | 2 +-
.../midpoint/model/intest/TestIteration.java | 6 +-
.../midpoint/model/intest/TestMultiConnector.java | 2 +-
.../midpoint/model/intest/TestMultiResource.java | 322 +-
.../midpoint/model/intest/importer/ImportTest.java | 2 +-
.../model/intest/negative/TestBrokenCSV.java | 2 +-
.../model/intest/sync/AbstractInboundSyncTest.java | 2 +-
.../model/intest/sync/TestImportRecon.java | 4 +-
.../src/test/resources/logback-test.xml | 1 -
.../test/resources/multi/resource-dummy-david.xml | 11 +
.../model/test/AbstractModelIntegrationTest.java | 99 +-
.../evolveum/midpoint/report/DataSourceReport.java | 57 +-
.../com/evolveum/midpoint/report/ModelReport.java | 765 ++
.../midpoint/report/ReportCreateTaskHandler.java | 78 +
.../evolveum/midpoint/report/ReportManager.java | 130 +
.../midpoint/report/ReportManagerImpl.java | 88 +
.../report-impl/src/main/resources/ctx-report.xml | 9 +-
.../evolveum/midpoint/report/BasicReportTest.java | 664 +-
.../src/test/resources/ctx-report-test-main.xml | 1 +
.../resources/reports/reportDataSourceTest.jrxml | 20 +-
.../resources/styles/midpoint_base_styles.jrtx | 2 +-
.../provisioning/impl/ProvisioningServiceImpl.java | 2 +-
.../midpoint/provisioning/impl/ShadowCache.java | 35 -
.../midpoint/provisioning/impl/ShadowManager.java | 94 +-
.../provisioning/test/impl/AbstractDummyTest.java | 7 +-
.../midpoint/provisioning/test/impl/TestDummy.java | 85 +-
.../test/impl/TestDummyCaseIgnore.java | 16 +
.../test/impl/TestDummyUuidNonUniqueName.java | 6 +
.../provisioning/test/ucf/TestUcfDummy.java | 2 +-
repo/repo-sql-impl-test/sql-procedures/mysql.sql | 3 +-
.../sql-procedures/postgresql.sql | 1 +
.../sql-procedures/sqlserver.sql | 1 +
.../midpoint/repo/sql/BaseSQLRepoTest.java | 60 +
.../evolveum/midpoint/repo/sql/OrgClosureTest.java | 246 +
.../midpoint/repo/sql/QueryInterpreterTest.java | 49 +-
.../src/test/resources/basic/objects.xml | 1 +
.../test/resources/orgstruct/org-simple-test.xml | 8004 ++++++++++++++++++++
repo/repo-sql-impl-test/testng.xml | 1 +
.../midpoint/repo/sql/data/common/ROrgClosure.java | 4 +-
.../sql/query/{QueryException.java => Query.java} | 18 +-
.../midpoint/repo/sql/query/QueryCriteriaImpl.java | 55 +
.../midpoint/repo/sql/query/QueryHQLImpl.java | 54 +
.../repo/sql/query/restriction/OrgRestriction.java | 3 +-
.../midpoint/test/AbstractIntegrationTest.java | 118 +-
.../midpoint/test/DummyResourceContoller.java | 49 +-
testing/pom.xml | 3 +-
testing/{longtest => story}/pom.xml | 2 +-
.../evolveum/midpoint/testing/story/TestTrafo.java | 1163 +++
.../src/test/resources/common/role-superuser.xml | 0
.../test/resources/common/system-configuration.xml | 0
.../test/resources/common/task-trigger-scanner.xml | 0
.../resources/common/task-validity-scanner.xml | 4 +-
.../test/resources/common/user-administrator.xml | 0
.../story/src/test/resources/common}/user-jack.xml | 6 -
.../src/test/resources/ctx-story-test-main.xml} | 2 +-
.../src/test/resources/ctx-story-test.xml} | 82 +-
.../story}/src/test/resources/logback-test.xml | 1 -
.../story/src/test/resources/schema/extension.xsd | 16 +-
.../src/test/resources/trafo/resource-dummy-ad.xml | 552 ++
.../test/resources/trafo/resource-dummy-mail.xml | 627 ++
.../src/test/resources/trafo/role-employee.xml | 14 +-
.../src/test/resources/trafo/user-angelica.xml | 29 +-
.../src/test/resources/trafo/user-smith-111.xml | 31 +-
.../src/test/resources/trafo/user-smith-222.xml | 31 +-
{infra/test-util => testing/story}/testng.xml | 5 +-
97 files changed, 12852 insertions(+), 1195 deletions(-)
copy {model/report-impl/src/test/resources => gui/admin-gui/src/main/webapp}/styles/midpoint_base_styles.jrtx (100%)
create mode 100644 model/report-impl/src/main/java/com/evolveum/midpoint/report/ModelReport.java
create mode 100644 model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportCreateTaskHandler.java
create mode 100644 model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportManager.java
create mode 100644 model/report-impl/src/main/java/com/evolveum/midpoint/report/ReportManagerImpl.java
copy repo/repo-sql-impl/src/main/resources/ctx-repository.xml => model/report-impl/src/main/resources/ctx-report.xml (75%)
create mode 100644 repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/OrgClosureTest.java
create mode 100644 repo/repo-sql-impl-test/src/test/resources/orgstruct/org-simple-test.xml
copy repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/{QueryException.java => Query.java} (67%)
create mode 100644 repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryCriteriaImpl.java
create mode 100644 repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/QueryHQLImpl.java
copy testing/{longtest => story}/pom.xml (99%)
create mode 100644 testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestTrafo.java
copy {model/model-intest => testing/story}/src/test/resources/common/role-superuser.xml (100%)
copy {model/model-intest => testing/story}/src/test/resources/common/system-configuration.xml (100%)
copy {model/model-intest => testing/story}/src/test/resources/common/task-trigger-scanner.xml (100%)
copy {model/model-intest => testing/story}/src/test/resources/common/task-validity-scanner.xml (92%)
copy {model/model-intest => testing/story}/src/test/resources/common/user-administrator.xml (100%)
copy {infra/common/src/test/resources/expression/expression => testing/story/src/test/resources/common}/user-jack.xml (87%)
copy testing/{sanity/src/test/resources/ctx-sanity-test-main.xml => story/src/test/resources/ctx-story-test-main.xml} (95%)
copy testing/{rest/src/test/resources/ctx-rest-test.xml => story/src/test/resources/ctx-story-test.xml} (97%)
copy {model/model-intest => testing/story}/src/test/resources/logback-test.xml (95%)
copy model/model-impl/src/test/resources/schema/piracy.xsd => testing/story/src/test/resources/schema/extension.xsd (80%)
create mode 100644 testing/story/src/test/resources/trafo/resource-dummy-ad.xml
create mode 100644 testing/story/src/test/resources/trafo/resource-dummy-mail.xml
copy model/model-intest/src/test/resources/multi/role-fight.xml => testing/story/src/test/resources/trafo/role-employee.xml (75%)
copy model/model-intest/src/test/resources/common/user-herman.xml => testing/story/src/test/resources/trafo/user-angelica.xml (66%)
copy model/model-intest/src/test/resources/common/user-herman.xml => testing/story/src/test/resources/trafo/user-smith-111.xml (64%)
copy model/model-intest/src/test/resources/common/user-herman.xml => testing/story/src/test/resources/trafo/user-smith-222.xml (64%)
copy {infra/test-util => testing/story}/testng.xml (82%)
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list