You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by rm...@apache.org on 2012/12/08 12:18:51 UTC

[1/3] git commit: Merge branch 'master' of http://git.apache.org/isis

Updated Branches:
  refs/heads/master 782a86bb2 -> 9cd5e7334


Merge branch 'master' of http://git.apache.org/isis


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9cd5e733
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9cd5e733
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9cd5e733

Branch: refs/heads/master
Commit: 9cd5e7334f15691f10b788c1e5f0fe78c6d195be
Parents: 7966ce5 782a86b
Author: Robert Matthews <rm...@nakedobjects.org>
Authored: Sat Dec 8 10:37:33 2012 +0000
Committer: Robert Matthews <rm...@nakedobjects.org>
Committed: Sat Dec 8 10:37:33 2012 +0000

----------------------------------------------------------------------
 component/objectstore/jdo/jdo-applib/pom.xml       |   17 +-
 component/objectstore/jdo/jdo-datanucleus/pom.xml  |   18 +-
 component/objectstore/jdo/jdo-metamodel/pom.xml    |   12 +-
 component/objectstore/jdo/pom.xml                  |   30 ++--
 component/objectstore/nosql/pom.xml                |   45 ++---
 component/objectstore/sql/pom.xml                  |   51 +++--
 component/objectstore/sql/sql-impl/pom.xml         |   12 +-
 component/objectstore/sql/sql-tests-common/pom.xml |   38 ++--
 component/objectstore/sql/sql-tests-served/pom.xml |   41 ++--
 component/objectstore/xml/pom.xml                  |   20 +-
 component/profilestore/sql/pom.xml                 |   14 +-
 component/profilestore/xml/pom.xml                 |   14 +-
 component/progmodel/groovy/applib/pom.xml          |   10 +-
 component/progmodel/groovy/metamodel/pom.xml       |   12 +-
 component/progmodel/groovy/pom.xml                 |   18 +-
 component/progmodel/wrapper/pom.xml                |   24 +-
 component/progmodel/wrapper/wrapper-applib/pom.xml |   14 +-
 .../progmodel/wrapper/wrapper-metamodel/pom.xml    |   26 +-
 component/security/file/pom.xml                    |   14 +-
 component/security/ldap/pom.xml                    |   12 +-
 component/security/sql/pom.xml                     |   12 +-
 component/viewer/bdd/common/pom.xml                |   20 +-
 component/viewer/bdd/concordion-tck/pom.xml        |   30 ++--
 component/viewer/bdd/concordion/pom.xml            |    8 +-
 component/viewer/bdd/pom.xml                       |   26 +-
 component/viewer/dnd-tck/pom.xml                   |   34 ++--
 component/viewer/dnd/pom.xml                       |   22 +-
 component/viewer/html-monitoring/pom.xml           |   11 +-
 component/viewer/html-tck/pom.xml                  |   45 ++--
 component/viewer/html/pom.xml                      |   18 +-
 component/viewer/junit-tck/pom.xml                 |   29 ++--
 component/viewer/junit/pom.xml                     |   26 +-
 component/viewer/restfulobjects/pom.xml            |   19 +-
 .../restfulobjects/restfulobjects-applib/pom.xml   |    8 +-
 .../restfulobjects/restfulobjects-tck/pom.xml      |   41 ++--
 .../restfulobjects/restfulobjects-viewer/pom.xml   |   16 +-
 component/viewer/scimpi/pom.xml                    |   12 +-
 component/viewer/scimpi/scimpi-dispatcher/pom.xml  |   10 +-
 component/viewer/scimpi/scimpi-servlet/pom.xml     |    9 +-
 component/viewer/scimpi/scimpi-tck/pom.xml         |   49 ++--
 component/viewer/wicket/pom.xml                    |   20 +-
 component/viewer/wicket/wicket-model/pom.xml       |   11 +-
 component/viewer/wicket/wicket-tck/pom.xml         |   44 ++--
 component/viewer/wicket/wicket-ui/pom.xml          |    8 +-
 component/viewer/wicket/wicket-viewer/pom.xml      |   17 +-
 core/applib/pom.xml                                |   20 +--
 core/bytecode-cglib/pom.xml                        |   18 +-
 core/bytecode-javassist/pom.xml                    |   18 +-
 core/integtestsupport/pom.xml                      |   38 ++--
 core/metamodel/pom.xml                             |   13 +-
 core/objectstore-inmemory/pom.xml                  |   17 +-
 core/pom.xml                                       |   45 ++--
 core/profilestore-inmemory/pom.xml                 |   18 +-
 core/runtime/pom.xml                               |   14 +-
 core/security-noop/pom.xml                         |   18 +-
 core/tck/pom.xml                                   |   72 ++----
 core/tck/tck-dom/pom.xml                           |   47 ++--
 core/tck/tck-fixture/pom.xml                       |   13 +-
 core/unittestsupport/pom.xml                       |    6 +-
 core/webserver/pom.xml                             |   12 +-
 example/application/claims/dom/pom.xml             |   12 +-
 .../claims/dom/claim/ClaimRepositoryDefault.java   |  133 +++++++++++
 .../dom/employee/EmployeeRepositoryDefault.java    |   59 +++++
 example/application/claims/fixture/pom.xml         |    2 +-
 .../application/claims/objstore-default/pom.xml    |   42 ----
 .../dflt/claim/ClaimRepositoryDefault.java         |  136 -----------
 .../dflt/employee/EmployeeRepositoryDefault.java   |   62 -----
 example/application/claims/objstore-jdo/pom.xml    |   20 +-
 example/application/claims/pom.xml                 |  173 +++++----------
 example/application/claims/viewer-bdd/pom.xml      |   27 +--
 example/application/claims/viewer-dnd/pom.xml      |   38 ++--
 .../isis/example/claims/junit/AbstractTest.java    |    4 +-
 example/application/claims/viewer-html/pom.xml     |   31 ++--
 .../claims/viewer-restfulobjects/pom.xml           |   26 +-
 example/application/claims/viewer-scimpi/pom.xml   |   30 ++--
 example/application/claims/viewer-wicket/pom.xml   |   72 +++---
 example/application/onlinedemo/dom/pom.xml         |    4 +-
 example/application/onlinedemo/pom.xml             |  104 +++------
 example/application/onlinedemo/webapp/pom.xml      |   32 ++--
 example/application/quickstart/dom/pom.xml         |    4 +-
 example/application/quickstart/pom.xml             |  146 ++++--------
 example/application/quickstart/viewer-dnd/pom.xml  |   26 +--
 example/application/quickstart/viewer-html/pom.xml |   40 ++--
 .../application/quickstart/viewer-scimpi/pom.xml   |   46 ++--
 .../quickstart_dnd_junit_bdd/dom/pom.xml           |   19 +--
 .../application/quickstart_dnd_junit_bdd/pom.xml   |  144 ++++--------
 .../quickstart_dnd_junit_bdd/tests-bdd/pom.xml     |   20 +-
 .../quickstart_dnd_junit_bdd/tests-junit/pom.xml   |   20 +-
 .../quickstart_dnd_junit_bdd/viewer-dnd/pom.xml    |   27 +--
 .../quickstart_wicket_restful_jdo/dom/pom.xml      |   14 +-
 .../objstore-jdo/pom.xml                           |    4 +-
 .../quickstart_wicket_restful_jdo/pom.xml          |  144 ++++--------
 .../viewer-restfulobjects/pom.xml                  |   34 ++-
 .../viewer-wicket/pom.xml                          |   36 ++--
 example/domain-service/email-service/pom.xml       |    4 +-
 example/misc/metamodel/namefile/pom.xml            |    4 +-
 .../examples/facets/namefile/NameFileFacet.java    |    7 +-
 .../facets/namefile/NameFileFacetFactory.java      |    4 -
 idea/applib.iml                                    |   27 +++
 idea/bdd-common.iml                                |   40 ++++
 idea/bdd-concordion-tck.iml                        |   57 +++++
 idea/bdd-concordion.iml                            |   42 ++++
 idea/bdd.iml                                       |   25 ++
 idea/claims-dom.iml                                |   29 +++
 idea/claims-fixture.iml                            |   30 +++
 idea/claims-objstore-dflt.iml                      |   29 +++
 idea/claims-objstore-jdo.iml                       |   43 ++++
 idea/claims-viewer-bdd.iml                         |   59 +++++
 idea/claims-viewer-dnd.iml                         |   86 +++++++
 idea/claims-viewer-html.iml                        |   58 +++++
 idea/claims-viewer-restfulobjects.iml              |   70 ++++++
 idea/claims-viewer-scimpi.iml                      |   63 ++++++
 idea/claims-viewer-wicket.iml                      |   73 ++++++
 idea/claims.iml                                    |   14 ++
 idea/classic-skin.iml                              |   14 ++
 idea/core.iml                                      |   24 ++
 ...1) (org.apache.isis.runtimes.dflt.bytecode).iml |   38 ++++
 ...org.apache.isis.runtimes.dflt.objectstores).iml |   38 ++++
 ...rg.apache.isis.runtimes.dflt.profilestores).iml |   38 ++++
 idea/dflt (4) (org.apache.isis.security).iml       |   36 +++
 idea/dnd-tck.iml                                   |   50 ++++
 idea/dnd.iml                                       |   54 +++++
 idea/email-domainservice.iml                       |   27 +++
 idea/file.iml                                      |   36 +++
 idea/groovy-applib.iml                             |   27 +++
 idea/groovy-metamodel.iml                          |   35 +++
 idea/groovy.iml                                    |   24 ++
 idea/html-tck.iml                                  |   58 +++++
 idea/html.iml                                      |   54 +++++
 idea/isis-integtestsupport.iml                     |   49 ++++
 idea/isis-maven-plugin.iml                         |   81 +++++++
 idea/isis-metamodel.iml                            |   38 ++++
 idea/isis-parent.iml                               |   24 ++
 idea/isis-unittestsupport.iml                      |   25 ++
 idea/isis-webserver.iml                            |   39 ++++
 idea/isis.iml                                      |   14 ++
 idea/javassist.iml                                 |   37 +++
 idea/jdo-applib.iml                                |   34 +++
 idea/jdo-datanucleus.iml                           |   55 +++++
 idea/jdo-metamodel.iml                             |   46 ++++
 idea/jdo.iml                                       |   24 ++
 idea/junit-tck.iml                                 |   51 +++++
 idea/junit.iml                                     |   46 ++++
 idea/ldap.iml                                      |   37 +++
 idea/metamodel-jsr303.iml                          |   35 +++
 idea/metamodel-namefile.iml                        |   37 +++
 idea/monitoring.iml                                |   36 +++
 idea/nosql.iml                                     |   57 +++++
 idea/onlinedemo-dom.iml                            |   21 ++
 idea/onlinedemo-fixture.iml                        |   22 ++
 idea/onlinedemo-objstore-dflt.iml                  |   21 ++
 idea/onlinedemo-webapp.iml                         |   73 ++++++
 idea/onlinedemo.iml                                |   14 ++
 idea/quickstart-archetype.iml                      |   25 ++
 idea/quickstart-dom.iml                            |   21 ++
 idea/quickstart-fixture.iml                        |   21 ++
 idea/quickstart-viewer-dnd.iml                     |   47 ++++
 idea/quickstart-viewer-html.iml                    |   50 ++++
 idea/quickstart-viewer-scimpi.iml                  |   55 +++++
 idea/quickstart.iml                                |   14 ++
 idea/quickstart_dnd_junit_bdd-dom.iml              |   21 ++
 idea/quickstart_dnd_junit_bdd-fixture.iml          |   21 ++
 idea/quickstart_dnd_junit_bdd-tests-bdd.iml        |   48 ++++
 idea/quickstart_dnd_junit_bdd-tests-junit.iml      |   46 ++++
 idea/quickstart_dnd_junit_bdd-viewer-dnd.iml       |   47 ++++
 idea/quickstart_dnd_junit_bdd.iml                  |   14 ++
 idea/quickstart_wicket_restful_jdo-dom.iml         |   29 +++
 idea/quickstart_wicket_restful_jdo-fixture.iml     |   29 +++
 .../quickstart_wicket_restful_jdo-objstore-jdo.iml |   43 ++++
 ...rt_wicket_restful_jdo-viewer-restfulobjects.iml |   76 +++++++
 ...quickstart_wicket_restful_jdo-viewer-wicket.iml |   75 +++++++
 idea/quickstart_wicket_restful_jdo.iml             |   14 ++
 idea/restfulobjects-applib.iml                     |   48 ++++
 idea/restfulobjects-tck.iml                        |   71 ++++++
 idea/restfulobjects-viewer.iml                     |   53 +++++
 idea/restfulobjects.iml                            |   24 ++
 idea/runtime.iml                                   |   40 ++++
 idea/scimpi-dispatcher.iml                         |   40 ++++
 idea/scimpi-servlet.iml                            |   42 ++++
 idea/scimpi-tck.iml                                |   63 ++++++
 idea/scimpi.iml                                    |   24 ++
 ...org.apache.isis.runtimes.dflt.objectstores).iml |   24 ++
 ...rg.apache.isis.runtimes.dflt.profilestores).iml |   39 ++++
 idea/sql (3) (org.apache.isis.security).iml        |   38 ++++
 idea/sql-impl.iml                                  |   37 +++
 idea/sql-tests-common.iml                          |   55 +++++
 idea/sql-tests-served.iml                          |   58 +++++
 idea/tck-dom.iml                                   |   33 +++
 idea/tck-fixture.iml                               |   33 +++
 idea/tck.iml                                       |   24 ++
 idea/wicket-model.iml                              |   42 ++++
 idea/wicket-tck.iml                                |   72 ++++++
 idea/wicket-ui.iml                                 |   53 +++++
 idea/wicket-viewer.iml                             |   55 +++++
 idea/wicket.iml                                    |   24 ++
 idea/wrapper-applib.iml                            |   26 +++
 idea/wrapper-metamodel.iml                         |   48 ++++
 idea/wrapper.iml                                   |   24 ++
 ...org.apache.isis.runtimes.dflt.objectstores).iml |   51 +++++
 ...rg.apache.isis.runtimes.dflt.profilestores).iml |   39 ++++
 isis-parent/pom.xml                                |  118 ++++++----
 pom.xml                                            |   21 +-
 site-skin/pom.xml                                  |    9 +-
 tool/maven-plugin/pom.xml                          |   30 +---
 .../isis/tools/mavenplugin/ValidateMojo.java       |    8 +-
 205 files changed, 5551 insertions(+), 1831 deletions(-)
----------------------------------------------------------------------