[midPoint-git] midPoint branch v2.2-support updated. v2.2-41-g4877a60

[Erik Suta]

Project "midPoint" branch v2.2-support has been updated
       via  4877a60a8fe9022d6c63ee10ffcb37eb869661ce (commit) v2.2-41-g4877a60
       via  7f53ae233109cef00d3bdd23aeef872f596031cc (commit) v2.2-39-g7f53ae2
       via  f6fc6845c0a0c1ec3ad89a5d9ec0603d55cf078a (commit) v2.2-38-gf6fc684
       via  e7d3e4ef2855ba4fe481ed9477f922a28e81df92 (commit) v2.2-37-ge7d3e4e
       via  b72eb40c0f0d4d5f688b64df12acadafbdea310f (commit) v2.2-36-gb72eb40
       via  5329145841a65397bf62f1840cd87cf92b7464ab (commit) v2.2-35-g5329145
       via  89aadc742cd6929da08e53ec3899cdddedd7cbb1 (commit) v2.2-34-g89aadc7
       via  000b797add85ff85648e2c4ebab8b99256f8b5be (commit) v2.2-33-g000b797
       via  911aa5cd8078a935122a1c14e31a8818aa825faf (commit) v2.2-32-g911aa5c
       via  0c9684787c7f3a311d87306a39e5f6fe0a52297f (commit) v2.2-31-g0c96847
       via  d11ecf963fac0256ecb42fa758dc2471ea7f10ca (commit) v2.2-30-gd11ecf9
      from  26dfa9069040bd2546c8ff38c8829e480f82b587 (commit) v2.2-30-g26dfa90

- Log -----------------------------------------------------------------
commit 4877a60a8fe9022d6c63ee10ffcb37eb869661ce
Merge: 7f53ae2 26dfa90
Author: Erik Suta <erik.suta at evolveum.com>
Date:   Fri Sep 27 17:05:42 2013 +0200

    Merge branch 'v2.2-support' of git.evolveum.com:/srv/git/projects/midpoint into v2.2-support

commit 7f53ae233109cef00d3bdd23aeef872f596031cc
Author: Erik Suta <erik.suta at evolveum.com>
Date:   Fri Sep 27 12:28:55 2013 +0200

    Fix for MID-1614.
    (cherry picked from commit b8bc8a3)

commit f6fc6845c0a0c1ec3ad89a5d9ec0603d55cf078a
Author: Erik Suta <erik.suta at evolveum.com>
Date:   Fri Sep 27 12:05:21 2013 +0200

    GUI for profiling + some minor improvements.
    (cherry picked from commit 124d661)

commit e7d3e4ef2855ba4fe481ed9477f922a28e81df92
Author: Erik Suta <erik.suta at evolveum.com>
Date:   Wed Sep 25 13:24:41 2013 +0200

    Fix for deployement problem.
    (cherry picked from commit f41b8a7)

commit b72eb40c0f0d4d5f688b64df12acadafbdea310f
Author: Erik Suta <erik.suta at evolveum.com>
Date:   Mon Sep 23 14:49:14 2013 +0200

    Some minor improvements in profiling based on notes from Vilo.
    (cherry picked from commit b0754d3)

commit 5329145841a65397bf62f1840cd87cf92b7464ab
Author: Erik Suta <erik.suta at evolveum.com>
Date:   Mon Sep 23 10:29:18 2013 +0200

    ServletFilter improvements - logs are now processed and logged in similar way as other logs from subsystem profiling.
    (cherry picked from commit 40f05f6)

commit 89aadc742cd6929da08e53ec3899cdddedd7cbb1
Author: Erik Suta <erik.suta at evolveum.com>
Date:   Fri Sep 20 17:38:11 2013 +0200

    Refactoring after code review by Vilo. Added basic. perf. attr. profiling.
    (cherry picked from commit 6f49369)

commit 000b797add85ff85648e2c4ebab8b99256f8b5be
Author: Erik Suta <erik.suta at evolveum.com>
Date:   Thu Sep 19 11:57:59 2013 +0200

    Fixes for last issues. Subsystem profiling is active now.
    (cherry picked from commit 5d702b9)

commit 911aa5cd8078a935122a1c14e31a8818aa825faf
Author: Erik Suta <erik.suta at evolveum.com>
Date:   Wed Sep 18 17:32:37 2013 +0200

    Subsystem Profiling implementation. Few minor things still need to be added.
    (cherry picked from commit ede203d)

commit 0c9684787c7f3a311d87306a39e5f6fe0a52297f
Author: Erik Suta <erik.suta at evolveum.com>
Date:   Mon Sep 16 15:58:04 2013 +0200

    Some small fixes in profiling subsystem + fix for failing logger tests
    (cherry picked from commit 947d00f)

commit d11ecf963fac0256ecb42fa758dc2471ea7f10ca
Author: Erik Suta <erik.suta at evolveum.com>
Date:   Fri Sep 13 17:05:16 2013 +0200

    Subsystem profiling - initial implementation commint - DO NOT USE YET, work still in progress.
    (cherry picked from commit ade15e8)

-----------------------------------------------------------------------

(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:
 .../PageLogging_en_US.utf8.properties              |   13 +
 .../PageLogging_sk_SK.utf8.properties              |   13 +
 .../web/page/admin/configuration/PageLogging.html  |   85 ++++
 .../web/page/admin/configuration/PageLogging.java  |   84 +++-
 .../admin/configuration/PageLogging.properties     |   15 +-
 .../page/admin/configuration/dto/LoggingDto.java   |  132 +++++-
 .../web/util/MidPointProfilingServletFilter.java   |   41 +-
 gui/admin-gui/src/main/resources/logback.xml       |    6 +-
 .../{misc => src/main/webapp/img}/flag/en.png      |  Bin 599 -> 599 bytes
 .../src/main/webapp/img/flag}/sk.png               |  Bin 562 -> 562 bytes
 .../src/main/webapp/img/flag}/us.png               |  Bin 609 -> 609 bytes
 .../common/LoggingConfigurationManager.java        |    3 +-
 .../common/ProfilingConfigurationManager.java      |  100 ++++-
 .../resources/xml/ns/public/common/common-2a.xsd   |   13 +-
 .../util/aspect/MethodUsageStatistics.java         |  185 ++++++++
 .../midpoint/util/aspect/MidpointAspect.java       |  348 ++++++++-------
 .../util/aspect/PerformanceStatistics.java         |  141 ++++++
 .../midpoint/util/aspect/ProfilingDataLog.java     |  187 ++++++++
 .../midpoint/util/aspect/ProfilingDataManager.java |  464 ++++++++++++++++++++
 .../util/logging/ProfilingLogbackFilter.java       |    6 +
 .../controller/SystemConfigurationHandler.java     |    3 +-
 .../task/quartzimpl/cluster/ClusterManager.java    |    2 -
 22 files changed, 1643 insertions(+), 198 deletions(-)
 copy gui/admin-gui/{misc => src/main/webapp/img}/flag/en.png (100%)
 copy gui/{admin-gui-sk-SK/src/main/resources => admin-gui/src/main/webapp/img/flag}/sk.png (100%)
 copy gui/{admin-gui-en-US/src/main/resources => admin-gui/src/main/webapp/img/flag}/us.png (100%)
 mode change 100755 => 100644
 create mode 100644 infra/util/src/main/java/com/evolveum/midpoint/util/aspect/MethodUsageStatistics.java
 create mode 100644 infra/util/src/main/java/com/evolveum/midpoint/util/aspect/PerformanceStatistics.java
 create mode 100644 infra/util/src/main/java/com/evolveum/midpoint/util/aspect/ProfilingDataLog.java
 create mode 100644 infra/util/src/main/java/com/evolveum/midpoint/util/aspect/ProfilingDataManager.java


hooks/post-receive
-- 
midPoint