[midPoint-git] midPoint branch bootstrap updated. v2.2-133-g7de352b

[Vilo Repan]

Project "midPoint" branch bootstrap has been updated
       via  7de352b2927376fbd12ac05d56a6555dbf459bef (commit) v2.2-133-g7de352b
       via  5eceafebd341cef0f5682f973a43970f292a73b1 (commit) v2.2-132-g5eceafe
       via  f6ee6942719d20055f53afea00c7af6d0fe307f3 (commit) v2.2-131-gf6ee694
       via  2cfbc43086c37608dc6b9130f44ad55c6b5a87d3 (commit) v2.2-130-g2cfbc43
       via  4535bbcc2ae37ae78bc4436845f97fbf6f03633c (commit) v2.2-129-g4535bbc
       via  0347abf6d1a0ddd72f4426a183cefdc1f4eeda31 (commit) v2.2-91-g0347abf
       via  792710c91aa6b433ca540e29f67501a29a6ddeff (commit) v2.2-90-g792710c
       via  0caec14ef3e55722e1d4d6e559e0459cdaa885ad (commit) v2.2-89-g0caec14
       via  508adfcf34c67899a1f361715cdf4d7f73cefe5c (commit) v2.2-88-g508adfc
       via  696bafd16739abfba46b02eb39277b8f56482d32 (commit) v2.2-124-g696bafd
       via  9ac516ade7233d713ba0f3fa3eeb0b3552506373 (commit) v2.2-123-g9ac516a
       via  0a58f2d47252f0f55e51aa84181bb3594cebf3b4 (commit) v2.2-87-g0a58f2d
      from  7440d2dbd3f0661c150bb8a11bf44a8e0bfbccc6 (commit) v2.2-121-g7440d2d

- Log -----------------------------------------------------------------
commit 7de352b2927376fbd12ac05d56a6555dbf459bef
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Sat Oct 5 23:44:04 2013 +0200

    object import done.

commit 5eceafebd341cef0f5682f973a43970f292a73b1
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Sat Oct 5 23:09:49 2013 +0200

    object import, not finished yet.

commit f6ee6942719d20055f53afea00c7af6d0fe307f3
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Sat Oct 5 22:11:44 2013 +0200

    internal accounts moved to configuration as shadow details.

commit 2cfbc43086c37608dc6b9130f44ad55c6b5a87d3
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Sat Oct 5 22:06:48 2013 +0200

    internal accounts updated.

commit 4535bbcc2ae37ae78bc4436845f97fbf6f03633c
Merge: 696bafd 0347abf
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Sat Oct 5 14:36:08 2013 +0200

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

commit 696bafd16739abfba46b02eb39277b8f56482d32
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Fri Oct 4 13:13:56 2013 +0200

    bootswatch integration and sample, minor paging and table css fixes

commit 9ac516ade7233d713ba0f3fa3eeb0b3552506373
Merge: 7440d2d 0a58f2d
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Fri Oct 4 12:14:56 2013 +0200

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

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

(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:
 .../ImportOptionsPanel_en_US.utf8.properties       |    2 +-
 .../PageContentAccounts_en_US.utf8.properties      |    2 +
 .../PageContentAccounts_sk_SK.utf8.properties      |    2 +
 .../{AjaxButton.java => AjaxSubmitButton.java}     |   18 +-
 .../midpoint/web/component/data/CountToolbar.html  |    5 +-
 .../web/component/data/paging/NavigatorPanel.java  |    7 -
 .../midpoint/web/page/admin/PageAdmin.java         |    3 +-
 .../admin/configuration/ImportOptionsPanel.html    |   86 ++--
 .../admin/configuration/ImportOptionsPanel.java    |    2 +
 .../configuration/ImportOptionsPanel.properties    |    5 +-
 .../web/page/admin/configuration/PageAccounts.html |   87 ++++
 .../{internal => configuration}/PageAccounts.java  |    6 +-
 .../PageAccounts.properties                        |   17 +-
 .../page/admin/configuration/PageImportObject.html |   62 ++-
 .../page/admin/configuration/PageImportObject.java |  497 ++++++++++----------
 .../configuration/PageImportObject.properties      |   15 +-
 .../dto/ResourceItemDto.java                       |    2 +-
 .../web/page/admin/internal/PageAccounts.html      |   71 ---
 .../web/page/admin/reports/PageReports.java        |   16 +-
 .../admin/reports/component/AuditPopupPanel.java   |    8 -
 .../component/ReconciliationPopupPanel.java        |    2 +-
 .../resources/content/PageContentAccounts.java     |   28 ++
 .../content/PageContentAccounts.properties         |    2 +
 .../midpoint/web/security/PageUrlMapping.java      |    5 +-
 .../src/main/webapp/less/bootstrap/bootstrap.less  |    4 +
 .../src/main/webapp/less/custom/bootswatch.less    |  324 +++++++++++++
 .../less/{bootstrap => custom}/variables.less      |  238 +++++-----
 .../refinery/RefinedObjectClassDefinition.java     |    3 +
 .../midpoint/model/controller/ModelController.java |   33 +-
 .../ImportAccountsFromResourceTaskHandler.java     |  109 +++--
 .../sync/FocusValidityScannerTaskHandler.java      |   16 +-
 .../midpoint/model/sync/RecomputeTaskHandler.java  |    4 +-
 .../sync/SynchronizeAccountResultHandler.java      |   15 +-
 .../model/trigger/TriggerScannerTaskHandler.java   |   37 +-
 .../model/util/AbstractScannerResultHandler.java   |   40 ++
 .../model/util/AbstractScannerTaskHandler.java     |   22 +-
 .../util/AbstractSearchIterativeTaskHandler.java   |   78 +--
 .../model/intest/sync/TestImportRecon.java         |  141 ++++--
 .../account-stan-dummy.xml}                        |   10 +-
 .../solaris/deimos-solaris-resource-redhat.xml     |   17 +-
 40 files changed, 1306 insertions(+), 735 deletions(-)
 copy gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/button/{AjaxButton.java => AjaxSubmitButton.java} (58%)
 create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.html
 rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/{internal => configuration}/PageAccounts.java (99%)
 rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/{internal => configuration}/PageAccounts.properties (65%)
 rename gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/{internal => configuration}/dto/ResourceItemDto.java (94%)
 delete mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/internal/PageAccounts.html
 create mode 100644 gui/admin-gui/src/main/webapp/less/custom/bootswatch.less
 copy gui/admin-gui/src/main/webapp/less/{bootstrap => custom}/variables.less (68%)
 create mode 100644 model/model-impl/src/main/java/com/evolveum/midpoint/model/util/AbstractScannerResultHandler.java
 copy model/model-intest/src/test/resources/{common/account-jack-dummy.xml => sync/account-stan-dummy.xml} (84%)


hooks/post-receive
-- 
midPoint