[midPoint-git] midPoint branch bootstrap updated. v2.3devel-494-g5dafc9d
Vilo Repan
git at evolveum.com
Fri Nov 29 15:34:54 CET 2013
Project "midPoint" branch bootstrap has been updated
via 5dafc9da2e61d17d51c457f04255e2c5ee1a2152 (commit) v2.3devel-494-g5dafc9d
via 278ff74fce951e15b3dc9275ebb82787620bacd4 (commit) v2.3devel-493-g278ff74
via bf88a306a3d4564cf1cabe3c7395c5e23baf33d7 (commit) v2.3devel-492-gbf88a30
via c98e9cb5c676452bd10569cadbf283f467441cc9 (commit) v2.3devel-263-gc98e9cb
via a9274a715b6275d6c705f0c5badcece459e850ae (commit) v2.3devel-261-ga9274a7
via b02f19513b6a4a08343d74f0553b3b28853c83ec (commit) v2.3devel-261-gb02f195
via 458f3afc9ad8898eb6759c81310f7a883b9ac565 (commit) v2.3devel-260-g458f3af
via b0ee7e71610597f89d76caa6f30ccfb95d151b6c (commit) v2.3devel-259-gb0ee7e7
via 93c494afedac9f7499247bfc862872d9f8b3f828 (commit) v2.3devel-258-g93c494a
via a2fea962f28bd919bda632d8a641a805e6a3dfd9 (commit) v2.3devel-257-ga2fea96
via fb06dc45c42f242e9cadee06fd0708063597debd (commit) v2.3devel-256-gfb06dc4
via b33c6b5fabe970ad5bf43427c5be23a74da156c2 (commit) v2.3devel-255-gb33c6b5
via ff5327cd63828fa4f94e190ccc11de2cd093dc0f (commit) v2.3devel-254-gff5327c
via 6c91fa08fd057fe59a4f595bb60230808c4a3abc (commit) v2.3devel-253-g6c91fa0
via ed4b79d27fd4fc0ec373011b7f2ba8268fc03022 (commit) v2.3devel-252-ged4b79d
via 9f20924165ab3b12607bd76602fb182279dc4bc9 (commit) v2.3devel-249-g9f20924
via 8a445fb0d3374e8840e5518fe0aa16b449753bc7 (commit) v2.3devel-250-g8a445fb
via ee8d50a48b07ef8151d00882e2045bcb47b13cef (commit) v2.3devel-245-gee8d50a
via 8194c1584dbe18ab4b82320da8eb9a46b6e76b1b (commit) v2.3devel-248-g8194c15
via 7eb5289707e0ec5bc7e2a35832bab02477e75d41 (commit) v2.3devel-247-g7eb5289
via f7be75b108c1a91105c5331e81956b5fb231ebbe (commit) v2.3devel-246-gf7be75b
via 63250ce90c8fc886fa8932f6b31ff73d1f99c443 (commit) v2.3devel-241-g63250ce
via 57da8cc92f37553fc48951ef6758e3f7d00ab2db (commit) v2.3devel-244-g57da8cc
via 951d62be80f0a3ca862ed9b60e5a7afff8aa680a (commit) v2.3devel-241-g951d62b
via e63d7d8a5078842cdf4071ccda6ed7d02a94941a (commit) v2.3devel-240-ge63d7d8
via befedce93b76ca3f177618edc51ce47a44f29982 (commit) v2.3devel-239-gbefedce
from ccb428372b0673e41b0bd9da1d15c0dbde603983 (commit) v2.3devel-468-gccb4283
- Log -----------------------------------------------------------------
commit 5dafc9da2e61d17d51c457f04255e2c5ee1a2152
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Fri Nov 29 15:24:24 2013 +0100
fixed logging.
commit 278ff74fce951e15b3dc9275ebb82787620bacd4
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Fri Nov 29 15:23:57 2013 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap
Conflicts:
infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.java
commit bf88a306a3d4564cf1cabe3c7395c5e23baf33d7
Merge: ccb4283 c98e9cb
Author: Viliam Repan <vilo.repan at evolveum.com>
Date: Fri Nov 29 15:23:48 2013 +0100
Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap
Conflicts:
infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/ObjectTypes.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:
build-system/pom.xml | 4 +-
config/h2-upgrade-2.2-to-2.3.sql | 8 -
config/mysql-upgrade-2.2-to-2.3.sql | 8 -
config/oracle-upgrade-2.2-to-2.3.sql | 8 -
config/postgresql-upgrade-2.2-to-2.3.sql | 8 -
.../activiti/activiti.db2.create.engine.sql | 0
.../activiti/activiti.db2.create.history.sql | 0
.../activiti/activiti.db2.create.identity.sql | 0
.../activiti/activiti.db2.drop.engine.sql | 0
.../activiti/activiti.db2.drop.history.sql | 0
.../activiti/activiti.db2.drop.identity.sql | 0
.../activiti/activiti.h2.create.engine.sql | 0
.../activiti/activiti.h2.create.history.sql | 0
.../activiti/activiti.h2.create.identity.sql | 0
.../{ => sql}/activiti/activiti.h2.drop.engine.sql | 0
.../activiti/activiti.h2.drop.history.sql | 0
.../activiti/activiti.h2.drop.identity.sql | 0
.../activiti/activiti.mssql.create.engine.sql | 0
.../activiti/activiti.mssql.create.history.sql | 0
.../activiti/activiti.mssql.create.identity.sql | 0
.../activiti/activiti.mssql.drop.engine.sql | 0
.../activiti/activiti.mssql.drop.history.sql | 0
.../activiti/activiti.mssql.drop.identity.sql | 0
.../activiti/activiti.mysql.create.engine.sql | 0
.../activiti/activiti.mysql.create.history.sql | 0
.../activiti/activiti.mysql.create.identity.sql | 0
.../activiti/activiti.mysql.drop.engine.sql | 0
.../activiti/activiti.mysql.drop.history.sql | 0
.../activiti/activiti.mysql.drop.identity.sql | 0
.../activiti/activiti.oracle.create.engine.sql | 0
.../activiti/activiti.oracle.create.history.sql | 0
.../activiti/activiti.oracle.create.identity.sql | 0
.../activiti/activiti.oracle.drop.engine.sql | 0
.../activiti/activiti.oracle.drop.history.sql | 0
.../activiti/activiti.oracle.drop.identity.sql | 0
.../activiti/activiti.postgres.create.engine.sql | 0
.../activiti/activiti.postgres.create.history.sql | 0
.../activiti/activiti.postgres.create.identity.sql | 0
.../activiti/activiti.postgres.drop.engine.sql | 0
.../activiti/activiti.postgres.drop.history.sql | 0
.../activiti/activiti.postgres.drop.identity.sql | 0
.../midpoint/2.2/h2/h2-2.2.sql} | 24 +-
.../midpoint/2.2/h2}/h2-upgrade-2.2-to-2.2.1.sql | 0
.../sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql | 34 +
.../midpoint/2.2/mysql/mysql-2.2.sql} | 39 +-
.../2.2/mysql}/mysql-upgrade-2.2-to-2.2.1.sql | 0
.../2.2/mysql/mysql-upgrade-2.2-to-2.3.sql | 34 +
.../midpoint/2.2/oracle/oracle-2.2.sql} | 27 +-
.../2.2/oracle}/oracle-upgrade-2.2-to-2.2.1.sql | 0
.../2.2/oracle/oracle-upgrade-2.2-to-2.3.sql | 34 +
.../midpoint/2.2/postgresql/postgresql-2.2.sql} | 24 +-
.../postgresql-upgrade-2.2-to-2.2.1.sql | 0
.../postgresql/postgresql-upgrade-2.2-to-2.3.sql | 33 +
.../midpoint/2.2/sqlserver/sqlserver-2.2.sql} | 24 +-
.../sqlserver}/sqlserver-upgrade-2.2-to-2.2.1.sql | 0
.../2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql | 34 +
.../midpoint/2.3/h2/h2-2.3.sql} | 25 +
.../midpoint/2.3/mysql/mysql-2.3.sql} | 29 +
.../midpoint/2.3/oracle/oracle-2.3.sql} | 25 +
.../midpoint/2.3/postgresql/postgresql-2.3.sql} | 25 +
.../midpoint/2.3/sqlserver/sqlserver-2.3.sql} | 25 +
config/{ => sql}/quartz/tables_h2.sql | 0
config/{ => sql}/quartz/tables_mysql.sql | 0
config/{ => sql}/quartz/tables_mysql_innodb.sql | 0
config/{ => sql}/quartz/tables_oracle.sql | 0
config/{ => sql}/quartz/tables_postgres.sql | 0
config/{ => sql}/quartz/tables_sqlServer.sql | 0
config/sqlserver-upgrade-2.2-to-2.3.sql | 8 -
.../configuration/PageSystemConfiguration.java | 10 +-
.../midpoint/web/util/ObjectTypeGuiDescriptor.java | 4 +-
.../icf/dummy/connector/DummyConnector.java | 60 +-
.../evolveum/icf/dummy/resource/DummyObject.java | 2 +-
.../evaluator/PathExpressionEvaluator.java | 6 +-
.../script/xpath/LazyXPathVariableResolver.java | 40 +-
.../script/xpath/XPathScriptEvaluator.java | 8 +-
.../evolveum/midpoint/common/mapping/Mapping.java | 8 +
.../refinery/ResourceShadowDiscriminator.java | 3 +
.../common/mapping/TestMappingDynamicSimple.java | 32 +
...ong.xml => mapping-path-extension-variable.xml} | 8 +-
.../evolveum/midpoint/prism/delta/ChangeType.java | 16 +
.../evolveum/midpoint/prism/delta/ItemDelta.java | 12 +-
.../prism/delta/PrismValueDeltaSetTriple.java | 19 +-
.../evolveum/midpoint/prism/dom/DomSerializer.java | 3 +
.../evolveum/midpoint/prism/util/PrismAsserts.java | 15 +-
.../midpoint/schema/constants/ObjectTypes.java | 4 +-
.../midpoint/schema/constants/SchemaConstants.java | 3 +
.../resources/xml/ns/public/common/common-2a.xsd | 304 ++++++-
.../resources/xml/ns/public/model/model-1.wsdl | 45 +
.../com/evolveum/midpoint/model/api/ModelPort.java | 1 +
.../evolveum/midpoint/model/ModelWebService.java | 131 ++-
.../evolveum/midpoint/model/lens/Clockwork.java | 4 +-
.../evolveum/midpoint/model/lens/LensContext.java | 15 +-
.../midpoint/model/lens/LensFocusContext.java | 18 +
.../midpoint/model/lens/LensProjectionContext.java | 7 +
.../com/evolveum/midpoint/model/lens/LensUtil.java | 64 ++
.../model/lens/projector/ActivationProcessor.java | 18 +-
.../model/lens/projector/ValueMatcher.java | 3 +
.../model/sync/action/ModifyUserAction.java | 2 +
.../midpoint/model/intest/TestActivation.java | 60 +-
.../midpoint/model/intest/TestMultiResource.java | 203 ++++-
.../intest/util/ProfilingLensDebugListener.java | 9 +-
.../src/test/resources/logback-test.xml | 2 +
.../model/test/AbstractModelIntegrationTest.java | 4 +
model/report-impl/pom.xml | 12 +
.../evolveum/midpoint/report/DataSourceReport.java | 129 +++
.../evolveum/midpoint/report/BasicReportTest.java | 943 +++++++++++++++++++-
.../src/test/resources}/reports/logo.jpg | Bin 22159 -> 22159 bytes
.../resources/reports/reportDataSourceTest.jrxml | 152 ++++
.../resources/styles/midpoint_base_styles.jrtx | 28 +
.../api/ChangeNotificationDispatcher.java | 6 +-
.../provisioning/api/ResourceEventDescription.java | 137 +++
.../provisioning/api/ResourceEventListener.java | 16 +
.../impl/ChangeNotificationDispatcherImpl.java | 68 +-
.../provisioning/impl/ProvisioningServiceImpl.java | 241 ++---
.../impl/ResourceEventListenerImpl.java | 160 ++++
.../midpoint/provisioning/impl/ShadowCache.java | 304 ++++++-
.../midpoint/provisioning/impl/ShadowManager.java | 43 +-
.../midpoint/provisioning/ucf/api/Change.java | 7 +
.../ucf/impl/ConnectorInstanceIcfImpl.java | 6 +-
.../provisioning/ProvisioningTestUtil.java | 7 +
.../provisioning/test/impl/AbstractDummyTest.java | 9 +
.../midpoint/provisioning/test/impl/TestDummy.java | 87 +-
.../test/impl/TestDummyCaseIgnore.java | 18 +
.../impl/dummy-case-ignore/resource-dummy.xml | 6 +
.../src/test/resources/logback-test.xml | 1 +
.../src/test/resources/basic/objects.xml | 35 +
.../midpoint/repo/sql/data/common/RReport.java | 272 ++++++
.../repo/sql/data/common/enums/RExportType.java | 53 ++
.../sql/data/common/enums/ROrientationType.java | 24 +
.../repo/sql/data/common/other/RContainerType.java | 1 +
.../midpoint/repo/sql/util/ClassMapper.java | 1 +
.../midpoint/test/IntegrationTestTools.java | 43 +-
.../midpoint/testing/sanity/TestSanity.java | 219 ++++-
.../test/resources/request/account-angelika.xml} | 71 +-
.../src/test/resources/request/angelika.ldif} | 8 +-
135 files changed, 4295 insertions(+), 435 deletions(-)
delete mode 100644 config/h2-upgrade-2.2-to-2.3.sql
delete mode 100644 config/mysql-upgrade-2.2-to-2.3.sql
delete mode 100644 config/oracle-upgrade-2.2-to-2.3.sql
delete mode 100644 config/postgresql-upgrade-2.2-to-2.3.sql
rename config/{ => sql}/activiti/activiti.db2.create.engine.sql (100%)
rename config/{ => sql}/activiti/activiti.db2.create.history.sql (100%)
rename config/{ => sql}/activiti/activiti.db2.create.identity.sql (100%)
rename config/{ => sql}/activiti/activiti.db2.drop.engine.sql (100%)
rename config/{ => sql}/activiti/activiti.db2.drop.history.sql (100%)
rename config/{ => sql}/activiti/activiti.db2.drop.identity.sql (100%)
rename config/{ => sql}/activiti/activiti.h2.create.engine.sql (100%)
rename config/{ => sql}/activiti/activiti.h2.create.history.sql (100%)
rename config/{ => sql}/activiti/activiti.h2.create.identity.sql (100%)
rename config/{ => sql}/activiti/activiti.h2.drop.engine.sql (100%)
rename config/{ => sql}/activiti/activiti.h2.drop.history.sql (100%)
rename config/{ => sql}/activiti/activiti.h2.drop.identity.sql (100%)
rename config/{ => sql}/activiti/activiti.mssql.create.engine.sql (100%)
rename config/{ => sql}/activiti/activiti.mssql.create.history.sql (100%)
rename config/{ => sql}/activiti/activiti.mssql.create.identity.sql (100%)
rename config/{ => sql}/activiti/activiti.mssql.drop.engine.sql (100%)
rename config/{ => sql}/activiti/activiti.mssql.drop.history.sql (100%)
rename config/{ => sql}/activiti/activiti.mssql.drop.identity.sql (100%)
rename config/{ => sql}/activiti/activiti.mysql.create.engine.sql (100%)
rename config/{ => sql}/activiti/activiti.mysql.create.history.sql (100%)
rename config/{ => sql}/activiti/activiti.mysql.create.identity.sql (100%)
rename config/{ => sql}/activiti/activiti.mysql.drop.engine.sql (100%)
rename config/{ => sql}/activiti/activiti.mysql.drop.history.sql (100%)
rename config/{ => sql}/activiti/activiti.mysql.drop.identity.sql (100%)
rename config/{ => sql}/activiti/activiti.oracle.create.engine.sql (100%)
rename config/{ => sql}/activiti/activiti.oracle.create.history.sql (100%)
rename config/{ => sql}/activiti/activiti.oracle.create.identity.sql (100%)
rename config/{ => sql}/activiti/activiti.oracle.drop.engine.sql (100%)
rename config/{ => sql}/activiti/activiti.oracle.drop.history.sql (100%)
rename config/{ => sql}/activiti/activiti.oracle.drop.identity.sql (100%)
rename config/{ => sql}/activiti/activiti.postgres.create.engine.sql (100%)
rename config/{ => sql}/activiti/activiti.postgres.create.history.sql (100%)
rename config/{ => sql}/activiti/activiti.postgres.create.identity.sql (100%)
rename config/{ => sql}/activiti/activiti.postgres.drop.engine.sql (100%)
rename config/{ => sql}/activiti/activiti.postgres.drop.history.sql (100%)
rename config/{ => sql}/activiti/activiti.postgres.drop.identity.sql (100%)
copy config/{h2-schema.sql => sql/midpoint/2.2/h2/h2-2.2.sql} (98%)
rename config/{ => sql/midpoint/2.2/h2}/h2-upgrade-2.2-to-2.2.1.sql (100%)
create mode 100644 config/sql/midpoint/2.2/h2/h2-upgrade-2.2-to-2.3.sql
copy config/{mysql-schema.sql => sql/midpoint/2.2/mysql/mysql-2.2.sql} (98%)
rename config/{ => sql/midpoint/2.2/mysql}/mysql-upgrade-2.2-to-2.2.1.sql (100%)
create mode 100644 config/sql/midpoint/2.2/mysql/mysql-upgrade-2.2-to-2.3.sql
copy config/{oracle-schema.sql => sql/midpoint/2.2/oracle/oracle-2.2.sql} (98%)
rename config/{ => sql/midpoint/2.2/oracle}/oracle-upgrade-2.2-to-2.2.1.sql (100%)
create mode 100644 config/sql/midpoint/2.2/oracle/oracle-upgrade-2.2-to-2.3.sql
copy config/{postgresql-schema.sql => sql/midpoint/2.2/postgresql/postgresql-2.2.sql} (98%)
rename config/{ => sql/midpoint/2.2/postgresql}/postgresql-upgrade-2.2-to-2.2.1.sql (100%)
create mode 100644 config/sql/midpoint/2.2/postgresql/postgresql-upgrade-2.2-to-2.3.sql
copy config/{sqlserver-schema.sql => sql/midpoint/2.2/sqlserver/sqlserver-2.2.sql} (98%)
rename config/{ => sql/midpoint/2.2/sqlserver}/sqlserver-upgrade-2.2-to-2.2.1.sql (100%)
create mode 100644 config/sql/midpoint/2.2/sqlserver/sqlserver-upgrade-2.2-to-2.3.sql
rename config/{h2-schema.sql => sql/midpoint/2.3/h2/h2-2.3.sql} (97%)
rename config/{mysql-schema.sql => sql/midpoint/2.3/mysql/mysql-2.3.sql} (97%)
rename config/{oracle-schema.sql => sql/midpoint/2.3/oracle/oracle-2.3.sql} (97%)
rename config/{postgresql-schema.sql => sql/midpoint/2.3/postgresql/postgresql-2.3.sql} (97%)
rename config/{sqlserver-schema.sql => sql/midpoint/2.3/sqlserver/sqlserver-2.3.sql} (97%)
rename config/{ => sql}/quartz/tables_h2.sql (100%)
rename config/{ => sql}/quartz/tables_mysql.sql (100%)
rename config/{ => sql}/quartz/tables_mysql_innodb.sql (100%)
rename config/{ => sql}/quartz/tables_oracle.sql (100%)
rename config/{ => sql}/quartz/tables_postgres.sql (100%)
rename config/{ => sql}/quartz/tables_sqlServer.sql (100%)
delete mode 100644 config/sqlserver-upgrade-2.2-to-2.3.sql
copy infra/common/src/test/resources/mapping/{mapping-path-system-variables-polystring-long.xml => mapping-path-extension-variable.xml} (83%)
create mode 100644 model/report-impl/src/main/java/com/evolveum/midpoint/report/DataSourceReport.java
copy {gui/admin-gui/src/main/webapp => model/report-impl/src/test/resources}/reports/logo.jpg (100%)
create mode 100644 model/report-impl/src/test/resources/reports/reportDataSourceTest.jrxml
create mode 100644 model/report-impl/src/test/resources/styles/midpoint_base_styles.jrtx
create mode 100644 provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ResourceEventDescription.java
create mode 100644 provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ResourceEventListener.java
create mode 100644 provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceEventListenerImpl.java
create mode 100644 repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RReport.java
create mode 100644 repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/enums/RExportType.java
create mode 100644 repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/enums/ROrientationType.java
copy testing/{consistency-mechanism/src/test/resources/repo/account-chuck.xml => sanity/src/test/resources/request/account-angelika.xml} (80%)
copy testing/{consistency-mechanism/src/test/resources/request/elaine.ldif => sanity/src/test/resources/request/angelika.ldif} (72%)
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list