[midPoint-git] midPoint branch parser updated. v2.3devel-1253-gaec3813
Radovan Semancik
git at evolveum.com
Fri Mar 7 18:00:31 CET 2014
Project "midPoint" branch parser has been updated
via aec38139ee5124d8a931bac61b9f8e2d0b728286 (commit) v2.3devel-1253-gaec3813
from 9b67c98482f104a679810625662e1394f9c0cc86 (commit) v2.3devel-1252-g9b67c98
- Log -----------------------------------------------------------------
commit aec38139ee5124d8a931bac61b9f8e2d0b728286
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date: Fri Mar 7 18:00:13 2014 +0100
Fixing query converters. Couple of new 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:
.../web/page/admin/resources/PageResourceEdit.java | 3 +-
.../evolveum/midpoint/prism/PrismConstants.java | 1 +
.../com/evolveum/midpoint/prism/PrismContext.java | 2 +-
.../evolveum/midpoint/prism/parser/DomParser.java | 33 +++-
.../midpoint/prism/parser/DomSerializer.java | 6 +
.../midpoint/prism/parser/JaxbDomHack.java | 4 +-
.../midpoint/prism/parser/QueryConvertor.java | 7 +-
.../evolveum/midpoint/prism/query/AndFilter.java | 7 +-
.../midpoint/prism/query/EqualsFilter.java | 6 +-
.../midpoint/prism/query}/PagingConvertor.java | 11 +-
.../midpoint/prism/query}/QueryJaxbConvertor.java | 82 +++++++-
.../evolveum/midpoint/prism/util/JaxbTestUtil.java | 3 +
.../evolveum/midpoint/prism/util/PrismAsserts.java | 63 +++++++
.../midpoint/prism/util/PrismTestUtil.java | 40 ++++
.../midpoint/prism/xjc/PrismForJAXBUtil.java | 2 +-
.../evolveum/midpoint/prism/xnode/MapXNode.java | 25 +++
.../xml/ns/_public/query_2/ObjectFactory.java | 39 ++--
.../prism/xml/ns/_public/query_2/QueryType.java | 33 +++-
.../xml/ns/_public/query_2/SearchFilterType.java | 41 +++-
.../src/main/resources/xml/ns/public/query-2.xsd | 3 +
.../midpoint/prism/PrismInternalTestUtil.java | 2 +
.../prism/{ => query}/TestObjectQuery.java | 4 +-
.../midpoint/prism/query/TestQueryConvertors.java | 185 ++++++++++++++++++
.../root-foo.xml => query/filter-user-and.xml} | 62 +++---
.../root-foo.xml => query/filter-user-name.xml} | 56 +++---
infra/prism/testng.xml | 3 +-
.../midpoint/schema/TestParseResource.java | 2 +-
.../midpoint/schema/TestQueryConvertor.java | 198 +++++++++-----------
.../src/test/resources/common/resource-opendj.xml | 3 -
...ter-account-by-attributes-and-resource-ref.xml} | 32 ++--
.../{query.xml => filter-account.xml} | 11 +-
...uery-and-generic.xml => filter-and-generic.xml} | 10 +-
...or-by-type.xml => filter-connector-by-type.xml} | 4 +-
...ry-or-composite.xml => filter-or-composite.xml} | 8 +-
...by-fullName.xml => filter-user-by-fullName.xml} | 6 +-
...ry-user-by-name.xml => filter-user-by-name.xml} | 6 +-
...Name.xml => filter-user-substring-fullName.xml} | 6 +-
.../java/com/evolveum/midpoint/util/DOMUtil.java | 4 +
.../com/evolveum/midpoint/util/DomAsserts.java | 52 +++++
.../AbstractSearchExpressionEvaluator.java | 2 +-
.../evolveum/midpoint/model/ModelRestService.java | 2 +-
.../evolveum/midpoint/model/ModelWebService.java | 4 +-
.../midpoint/model/importer/ObjectImporter.java | 2 +-
.../sync/CorrelationConfirmationEvaluator.java | 2 +-
.../midpoint/model/sync/RecomputeTaskHandler.java | 3 +-
.../com/evolveum/midpoint/model/util/Utils.java | 2 +-
.../sync/TestCorrelationConfiramtionEvaluator.java | 2 +-
.../evolveum/midpoint/report/DataSourceReport.java | 2 +-
.../provisioning/test/impl/TestOpenDJ.java | 2 +-
.../midpoint/repo/sql/BaseSQLRepoTest.java | 2 +-
.../midpoint/testing/sanity/TestSanity.java | 2 +-
51 files changed, 817 insertions(+), 275 deletions(-)
rename infra/{schema/src/main/java/com/evolveum/midpoint/schema => prism/src/main/java/com/evolveum/midpoint/prism/query}/PagingConvertor.java (85%)
rename infra/{schema/src/main/java/com/evolveum/midpoint/schema => prism/src/main/java/com/evolveum/midpoint/prism/query}/QueryJaxbConvertor.java (61%)
rename infra/prism/src/test/java/com/evolveum/midpoint/prism/{ => query}/TestObjectQuery.java (97%)
create mode 100644 infra/prism/src/test/java/com/evolveum/midpoint/prism/query/TestQueryConvertors.java
copy infra/prism/src/test/resources/{common/root-foo.xml => query/filter-user-and.xml} (64%)
copy infra/prism/src/test/resources/{common/root-foo.xml => query/filter-user-name.xml} (69%)
rename infra/schema/src/test/resources/queryconvertor/{query-account-by-attributes-and-resource-ref.xml => filter-account-by-attributes-and-resource-ref.xml} (61%)
rename infra/schema/src/test/resources/queryconvertor/{query.xml => filter-account.xml} (69%)
rename infra/schema/src/test/resources/queryconvertor/{query-and-generic.xml => filter-and-generic.xml} (76%)
rename infra/schema/src/test/resources/queryconvertor/{query-connector-by-type.xml => filter-connector-by-type.xml} (90%)
rename infra/schema/src/test/resources/queryconvertor/{query-or-composite.xml => filter-or-composite.xml} (84%)
rename infra/schema/src/test/resources/queryconvertor/{query-user-by-fullName.xml => filter-user-by-fullName.xml} (83%)
rename infra/schema/src/test/resources/queryconvertor/{query-user-by-name.xml => filter-user-by-name.xml} (83%)
rename infra/schema/src/test/resources/queryconvertor/{query-user-substring-fullName.xml => filter-user-substring-fullName.xml} (84%)
create mode 100644 infra/util/src/main/java/com/evolveum/midpoint/util/DomAsserts.java
hooks/post-receive
--
midPoint
More information about the midPoint-svn
mailing list