[midPoint-git] midPoint branch bootstrap updated. v2.3devel-628-g5b9cfb9

Vilo Repan git at evolveum.com
Wed Dec 11 18:57:43 CET 2013


Project "midPoint" branch bootstrap has been updated
       via  5b9cfb9d983455491fa2c79e9398ebf610a0d5b7 (commit) v2.3devel-628-g5b9cfb9
       via  105541c4fbb2169d8a5973033b6293c5b3304867 (commit) v2.3devel-624-g105541c
       via  9c3291f8678985144a203629912e79d739bd846b (commit) v2.3devel-623-g9c3291f
       via  1cf435df2895402adeec323acc37a8fd51226424 (commit) v2.3devel-365-g1cf435d
       via  77b5679d5fb5863e6d70e01037948f41e36b6afe (commit) v2.3devel-622-g77b5679
       via  57be448b85eddc594c0723f94ca223a2fde00254 (commit) v2.3devel-364-g57be448
       via  fa0b59614bb8fedb6d722b52253a55978c8e4d5f (commit) v2.3devel-359-gfa0b596
       via  ca4602c640e400780e19f3b9ac62fd8c16447212 (commit) v2.3devel-621-gca4602c
       via  eb209e5c360affe8afe85281fea0a6842835d128 (commit) v2.3devel-620-geb209e5
       via  b9b18e0a0af1e3b857faddacc989f903c12df972 (commit) v2.3devel-362-gb9b18e0
       via  7e2492bcc73185381953fefb4c07e497c5e9247a (commit) v2.3devel-359-g7e2492b
       via  28cf57bb5cf36fc71619f6f89dbb756fde620802 (commit) v2.3devel-360-g28cf57b
       via  e5117b9f69ada18a19195fd624f47450fe98eba9 (commit) v2.3devel-359-ge5117b9
       via  e8e600fb9b4fdc2168293a769e9d5a46e60fe610 (commit) v2.3devel-615-ge8e600f
       via  58157c3b3af0c13755dbc240fab90026cfa41a1a (commit) v2.3devel-358-g58157c3
       via  fc3d5396b671af0db254320bf06592f260d9cac6 (commit) v2.3devel-354-gfc3d539
       via  be5995c531ebaabddf3e6b0618d7b5093ef8dedc (commit) v2.3devel-356-gbe5995c
      from  7fbc238bc5f91e4251b5bff4cc7dce3d267bed94 (commit) v2.3devel-611-g7fbc238

- Log -----------------------------------------------------------------
commit 5b9cfb9d983455491fa2c79e9398ebf610a0d5b7
Merge: 105541c 1cf435d
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Wed Dec 11 18:45:45 2013 +0100

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

commit 105541c4fbb2169d8a5973033b6293c5b3304867
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Wed Dec 11 18:45:29 2013 +0100

    minor styles udpate for tasks and role page.

commit 9c3291f8678985144a203629912e79d739bd846b
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Wed Dec 11 18:45:08 2013 +0100

    resource details styles update.

commit 77b5679d5fb5863e6d70e01037948f41e36b6afe
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Wed Dec 11 18:00:59 2013 +0100

    task list styles update.

commit ca4602c640e400780e19f3b9ac62fd8c16447212
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Wed Dec 11 17:12:38 2013 +0100

    updated wicket to 6.12

commit eb209e5c360affe8afe85281fea0a6842835d128
Merge: e8e600f b9b18e0
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Wed Dec 11 16:19:12 2013 +0100

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

commit e8e600fb9b4fdc2168293a769e9d5a46e60fe610
Merge: 7fbc238 58157c3
Author: Viliam Repan <vilo.repan at evolveum.com>
Date:   Wed Dec 11 11:58:59 2013 +0100

    Merge branch '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:
 build-system/pom.xml                               |    9 +-
 .../web/page/admin/resources/PageResource.html     |  173 ++--
 .../web/page/admin/resources/PageResource.java     |   45 +-
 .../page/admin/resources/PageResource.properties   |    1 -
 .../midpoint/web/page/admin/roles/PageRole.html    |    4 +-
 .../midpoint/web/page/admin/server/PageTasks.html  |   31 +-
 .../midpoint/web/page/admin/server/PageTasks.java  |  221 +++--
 .../web/page/admin/server/PageTasks.properties     |    4 -
 infra/pom.xml                                      |    1 +
 .../gui-i18n => infra/prism-maven-plugin}/pom.xml  |   57 +-
 .../midpoint/prism/maven/PathGenerator.java        |  106 +++
 .../midpoint/prism/maven/SchemaDocMojo.java        |  289 ++++++
 .../midpoint/prism/ComplexTypeDefinition.java      |    5 +
 .../com/evolveum/midpoint/prism/Definition.java    |   34 +-
 .../evolveum/midpoint/prism/ItemDefinition.java    |   48 +-
 .../midpoint/prism/PrismContainerDefinition.java   |    5 +
 .../midpoint/prism/PrismObjectDefinition.java      |    5 +
 .../midpoint/prism/PrismPropertyDefinition.java    |    5 +-
 .../midpoint/prism/PrismReferenceDefinition.java   |    5 +
 .../prism/schema/DomToSchemaProcessor.java         |   27 +-
 .../midpoint/prism/schema/PrismSchema.java         |    8 +
 .../midpoint/prism/schema/SchemaRegistry.java      |    9 +-
 .../midpoint/prism/xml/PrismJaxbProcessor.java     |    2 +-
 infra/schema/pom.xml                               |   21 +
 .../schemadoc/templates/complex-type-definition.vm |   14 +
 .../src/main/schemadoc/templates/footer.html       |    2 +
 .../src/main/schemadoc/templates/header.html       |    3 +
 .../src/main/schemadoc/templates/items-inc.vm      |   40 +
 .../main/schemadoc/templates/object-definition.vm  |   14 +
 .../src/main/schemadoc/templates/schema-index.vm   |   11 +
 .../schema/src/main/schemadoc/templates/schema.vm  |   33 +
 .../java/com/evolveum/midpoint/util/DOMUtil.java   |    5 +-
 .../evolveum/midpoint/report/DataSourceReport.java |   72 +-
 .../com/evolveum/midpoint/report/ModelReport.java  | 1005 --------------------
 .../midpoint/report/ReportCreateTaskHandler.java   |  227 +++++
 .../evolveum/midpoint/report/ReportManager.java    |  100 +-
 .../midpoint/report/ReportManagerImpl.java         |  809 ++++++++++------
 .../report-impl/src/main/resources/ctx-report.xml  |    4 +-
 .../evolveum/midpoint/report/BasicReportTest.java  |  755 ++++++++-------
 .../resources/reports/reportDataSourceTest.jrxml   |   71 +-
 model/report-impl/testng.xml                       |    2 +-
 41 files changed, 2182 insertions(+), 2100 deletions(-)
 copy {tools/gui-i18n => infra/prism-maven-plugin}/pom.xml (52%)
 create mode 100644 infra/prism-maven-plugin/src/main/java/com/evolveum/midpoint/prism/maven/PathGenerator.java
 create mode 100644 infra/prism-maven-plugin/src/main/java/com/evolveum/midpoint/prism/maven/SchemaDocMojo.java
 create mode 100644 infra/schema/src/main/schemadoc/templates/complex-type-definition.vm
 create mode 100644 infra/schema/src/main/schemadoc/templates/footer.html
 create mode 100644 infra/schema/src/main/schemadoc/templates/header.html
 create mode 100644 infra/schema/src/main/schemadoc/templates/items-inc.vm
 create mode 100644 infra/schema/src/main/schemadoc/templates/object-definition.vm
 create mode 100644 infra/schema/src/main/schemadoc/templates/schema-index.vm
 create mode 100644 infra/schema/src/main/schemadoc/templates/schema.vm
 delete mode 100644 model/report-impl/src/main/java/com/evolveum/midpoint/report/ModelReport.java


hooks/post-receive
-- 
midPoint


More information about the midPoint-svn mailing list