[midPoint-git] midPoint branch bootstrap updated. v2.2-152-gd56cfff

[Vilo Repan]

Project "midPoint" branch bootstrap has been updated
       via  d56cfff543b39b6346a3d80e2d1c1c4ee3011faa (commit) v2.2-152-gd56cfff
       via  b8b544de4b2f17f31805baaea8ecaad6077455b1 (commit) v2.2-148-gb8b544d
       via  022d9c65f74f68001ac5c889523e674d8e641221 (commit) v2.2-96-g022d9c6
       via  d887542b30ec319f99bf65d093033afea38293b6 (commit) v2.2-95-gd887542
       via  1185b853da07ed1b3befe67b468041ea7daf3dc3 (commit) v2.2-94-g1185b85
      from  c558541d68820554305745b771f6c5064a9ebb99 (commit) v2.2-147-gc558541

- Log -----------------------------------------------------------------
commit d56cfff543b39b6346a3d80e2d1c1c4ee3011faa
Merge: b8b544d 022d9c6
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Wed Oct 9 15:19:37 2013 +0200

    Merge branch 'master' of git.evolveum.com:/srv/git/projects/midpoint into bootstrap

commit b8b544de4b2f17f31805baaea8ecaad6077455b1
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Wed Oct 9 15:19:01 2013 +0200

    inline menu implementation + sample, more less/css fixes.

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

(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:
 .../PageDebugList_en_US.utf8.properties            |    7 +
 .../PageDebugList_sk_SK.utf8.properties            |    7 +
 .../web/component/dialog/ConfirmationDialog.java   |    5 +
 .../web/component/menu/cog/InlineMenu.html         |   35 +
 .../web/component/menu/cog/InlineMenu.java         |  154 +-
 .../web/component/menu/cog/InlineMenuItem.java     |   65 +
 .../component/menu/cog/InlineMenuItemAction.java   |   24 +
 .../evolveum/midpoint/web/page/PageBootstrap.html  |   10 +-
 .../evolveum/midpoint/web/page/PageBootstrap.java  |   18 +
 .../midpoint/web/page/PageBootstrap.properties     |    3 +
 .../page/admin/configuration/PageDebugList.html    |    2 +
 .../page/admin/configuration/PageDebugList.java    |  184 +-
 .../admin/configuration/PageDebugList.properties   |    7 +
 gui/admin-gui/src/main/webapp/WEB-INF/wro.xml      |    7 +-
 .../src/main/webapp/less/bootstrap/bootstrap.less  |    4 +-
 .../src/main/webapp/less/custom/bootswatch.less    |    5 +-
 .../src/main/webapp/less/custom/variables.less     |    6 +
 .../less/{evolveum.less => evolveum-obsolete.less} |    1 -
 gui/admin-gui/src/main/webapp/less/lesshat.less    | 2198 --------------------
 .../webapp/less/midpoint/bootstrap-override.less   |   36 +-
 .../src/main/webapp/less/midpoint/midpoint.less    |    4 +
 .../webapp/less/midpoint/page-user-details.less    |    2 +-
 .../src/main/webapp/less/midpoint/variables.less   |   30 -
 .../src/main/webapp/less/midpoint/wizard.less      |    2 +-
 .../functions/BasicExpressionFunctions.java        |    4 +
 .../midpoint/common/monitor/InternalMonitor.java   |   93 +
 .../midpoint/prism/delta/DeltaSetTriple.java       |    4 +
 .../prism/delta/PrismValueDeltaSetTriple.java      |    4 +-
 .../evolveum/midpoint/model/lens/Clockwork.java    |   42 +-
 .../lens/projector/ConsolidationProcessor.java     |   86 +-
 .../midpoint/model/sync/action/BaseAction.java     |    7 +-
 .../midpoint/model/lens/TestClockwork.java         |   14 +
 .../midpoint/model/lens/TestProjector.java         |   15 +
 .../model-impl/src/test/resources/logback-test.xml |    1 +
 .../midpoint/model/intest/TestMapping.java         |   10 +-
 .../model/intest/TestModelServiceContract.java     |  292 ++-
 .../midpoint/model/intest/TestStrangeCases.java    |    2 +-
 .../model/intest/sync/AbstractInboundSyncTest.java |    8 +-
 .../model/intest/sync/TestImportRecon.java         |   70 +
 .../src/test/resources/logback-test.xml            |   12 +-
 .../provisioning/impl/EntitlementConverter.java    |   11 +-
 .../provisioning/impl/ProvisioningServiceImpl.java |   21 +-
 .../provisioning/impl/ResourceObjectConverter.java |   74 +-
 .../midpoint/provisioning/impl/ShadowCache.java    |   26 +-
 .../provisioning/ucf/api/ConnectorInstance.java    |    5 +-
 .../ucf/impl/ConnectorFactoryIcfImpl.java          |    6 +-
 .../ucf/impl/ConnectorInstanceIcfImpl.java         |  100 +-
 .../midpoint/provisioning/ucf/impl/IcfUtil.java    |    2 +-
 .../provisioning/util/ProvisioningUtil.java        |   56 +
 .../provisioning/test/impl/AbstractDummyTest.java  |   78 +-
 .../midpoint/provisioning/test/impl/TestDummy.java |   51 +-
 .../provisioning/test/ucf/TestUcfDummy.java        |    6 +-
 .../provisioning/test/ucf/TestUcfOpenDj.java       |    4 +-
 .../midpoint/test/AbstractIntegrationTest.java     |   95 +-
 54 files changed, 1372 insertions(+), 2643 deletions(-)
 create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
 create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItemAction.java
 rename gui/admin-gui/src/main/webapp/less/{evolveum.less => evolveum-obsolete.less} (99%)
 delete mode 100755 gui/admin-gui/src/main/webapp/less/lesshat.less


hooks/post-receive
-- 
midPoint