[midPoint-svn] midPoint branch gensync updated. v2.2-45-g8a2e37f

[Radovan Semancik]

Project "midPoint" branch gensync has been updated
       via  8a2e37f9574024fd87f617e2200d9ba1a0c49f3f (commit) v2.2-45-g8a2e37f
       via  b0754d353cd43faea2cde1c28a966cda40bccd11 (commit) v2.2-40-gb0754d3
       via  de2275d863366c2195a2678acf1d77a7e007dd6c (commit) v2.2-39-gde2275d
       via  dd8622e184cd4af56cd0292556bd557e27b5571f (commit) v2.2-38-gdd8622e
       via  c09b19b9a42fbd1ba3faffe16f299ce521547e57 (commit) v2.2-27-gc09b19b
       via  18d28437c6731d8f62db0a93feeb6b46c4b45847 (commit) v2.2-26-g18d2843
       via  40f05f6e8ef626a05315b68075a3bdd6fe90e4af (commit) v2.2-35-g40f05f6
       via  b4ecdda51275a13fa1f4e3bf48f4c53c01222812 (commit) v2.2-34-gb4ecdda
       via  6f493698848c96d453f1f2949e337df2abe28780 (commit) v2.2-33-g6f49369
       via  68098f683094fa1c32108ef19968c30d9933962e (commit) v2.2-32-g68098f6
       via  accb57c7a0dd35d340ca83e5ecf6aa94fda681f2 (commit) v2.2-31-gaccb57c
       via  eef5511dcf7408d6bd002064c99b2d9eef2ed1fe (commit) v2.2-30-geef5511
       via  5d702b9972d6bacdaa96fcb1264e721550dad248 (commit) v2.2-29-g5d702b9
      from  c17bdd1146c0b5f55cb84933de53cebe4a8f77d6 (commit) v2.2-32-gc17bdd1

- Log -----------------------------------------------------------------
commit 8a2e37f9574024fd87f617e2200d9ba1a0c49f3f
Merge: c17bdd1 b0754d3
Author: Radovan Semancik <radovan.semancik at evolveum.com>
Date:   Mon Sep 23 15:28:19 2013 +0200

    Merge branch 'master' into gensync
    
    Conflicts:
    	model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/AccountValuesProcessor.java
    	model/model-impl/src/main/java/com/evolveum/midpoint/model/lens/projector/Projector.java
    	model/model-impl/src/main/java/com/evolveum/midpoint/model/sync/CorrelationConfirmationEvaluator.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:
 .gitignore                                         |    1 +
 .../midpoint/web/page/admin/users/PageUser.java    |   11 +-
 .../web/page/admin/users/dto/OrgStructDto.java     |   18 +-
 .../web/util/MidPointProfilingServletFilter.java   |   39 +-
 .../common/ProfilingConfigurationManager.java      |   15 +-
 .../midpoint/prism/query/PropertyValueFilter.java  |    7 +-
 .../resources/xml/ns/public/common/common-2a.xsd   |    1 +
 .../util/aspect/AspectProfilingFilters.java        |  330 -------------
 .../util/aspect/MethodUsageStatistics.java         |   66 ++-
 .../midpoint/util/aspect/MidpointAspect.java       |   20 +-
 .../util/aspect/PerformanceStatistics.java         |  141 ++++++
 .../midpoint/util/aspect/ProfilingDataLog.java     |   82 +++-
 .../midpoint/util/aspect/ProfilingDataManager.java |  509 +++++++++++---------
 .../util/logging/ProfilingLogbackFilter.java       |    2 -
 .../lens/projector/AccountValuesProcessor.java     |   72 ++-
 .../midpoint/model/lens/projector/Projector.java   |   25 +-
 .../sync/CorrelationConfirmationEvaluator.java     |   69 +--
 .../testing/consistency/ConsistencyTest.java       |  208 +++++++-
 .../repo/{user-jack.xml => user-abom.xml}          |   17 +-
 .../repo/{user-jack.xml => user-abomba.xml}        |   17 +-
 .../repo/{user-herman.xml => user-discovery.xml}   |   72 +--
 .../src/test/resources/request/discovery.ldif}     |   12 +-
 .../resource-modify-resource-schema.xml}           |  341 ++++---------
 .../request/resource-modify-synchronization.xml    |   92 ++++
 ...ls.xml => user-modify-add-account-directly.xml} |   82 ++--
 25 files changed, 1153 insertions(+), 1096 deletions(-)
 delete mode 100644 infra/util/src/main/java/com/evolveum/midpoint/util/aspect/AspectProfilingFilters.java
 create mode 100644 infra/util/src/main/java/com/evolveum/midpoint/util/aspect/PerformanceStatistics.java
 copy testing/consistency-mechanism/src/test/resources/repo/{user-jack.xml => user-abom.xml} (78%)
 copy testing/consistency-mechanism/src/test/resources/repo/{user-jack.xml => user-abomba.xml} (78%)
 copy testing/consistency-mechanism/src/test/resources/repo/{user-herman.xml => user-discovery.xml} (78%)
 copy testing/{sanity/src/test/resources/request/elaine.ldif => consistency-mechanism/src/test/resources/request/discovery.ldif} (56%)
 copy testing/consistency-mechanism/src/test/resources/{repo/resource-opendj.xml => request/resource-modify-resource-schema.xml} (56%)
 create mode 100644 testing/consistency-mechanism/src/test/resources/request/resource-modify-synchronization.xml
 copy testing/consistency-mechanism/src/test/resources/request/{user-modify-add-account-deniels.xml => user-modify-add-account-directly.xml} (85%)


hooks/post-receive
-- 
midPoint