Updated Branches: refs/heads/master 9cd5e7334 -> 49afe37dc
ISIS-188: getting build through * after moving bdd, junit and dnd viewers into same structure as the other viewers Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/49afe37d Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/49afe37d Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/49afe37d Branch: refs/heads/master Commit: 49afe37dc19be1ddbe109c24608dee7744cd8c93 Parents: f1b95ff Author: Dan Haywood <danhayw...@apache.org> Authored: Sat Dec 8 14:29:54 2012 +0000 Committer: Dan Haywood <danhayw...@apache.org> Committed: Sat Dec 8 14:43:32 2012 +0000 ---------------------------------------------------------------------- component/objectstore/jdo/pom.xml | 2 +- component/progmodel/groovy/applib/pom.xml | 2 +- component/viewer/bdd/common/pom.xml | 2 +- component/viewer/bdd/concordion/pom.xml | 2 +- component/viewer/bdd/pom.xml | 2 +- component/viewer/bdd/tck/pom.xml | 6 +- component/viewer/dnd/tck/pom.xml | 6 +- component/viewer/html/monitoring/pom.xml | 7 +- component/viewer/html/pom.xml | 5 - component/viewer/html/tck/pom.xml | 6 +- component/viewer/junit/tck/pom.xml | 6 +- component/viewer/restfulobjects/applib/pom.xml | 2 +- component/viewer/restfulobjects/pom.xml | 2 +- component/viewer/restfulobjects/tck/pom.xml | 2 +- component/viewer/scimpi/tck/pom.xml | 2 +- component/viewer/wicket/impl/pom.xml | 2 +- component/viewer/wicket/pom.xml | 4 +- component/viewer/wicket/tck/pom.xml | 2 +- core/metamodel/pom.xml | 2 +- example/application/claims/pom.xml | 12 +- example/application/claims/viewer-dnd/pom.xml | 8 +- example/application/claims/viewer-html/pom.xml | 2 +- example/application/onlinedemo/pom.xml | 2 +- example/application/onlinedemo/webapp/pom.xml | 2 +- example/application/quickstart/pom.xml | 4 +- example/application/quickstart/viewer-dnd/pom.xml | 2 +- example/application/quickstart/viewer-html/pom.xml | 2 +- .../quickstart_dnd_junit_bdd/dom/pom.xml | 2 +- .../quickstart_dnd_junit_bdd/fixture/pom.xml | 2 +- .../application/quickstart_dnd_junit_bdd/pom.xml | 8 +- .../quickstart_dnd_junit_bdd/tests-bdd/pom.xml | 2 +- .../quickstart_dnd_junit_bdd/tests-junit/pom.xml | 4 +- .../quickstart_dnd_junit_bdd/viewer-dnd/pom.xml | 4 +- .../quickstart_wicket_restful_jdo/dom/pom.xml | 2 +- .../quickstart_wicket_restful_jdo/fixture/pom.xml | 2 +- .../objstore-jdo/pom.xml | 2 +- .../quickstart_wicket_restful_jdo/pom.xml | 8 +- .../viewer-restfulobjects/pom.xml | 2 +- .../viewer-wicket/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 4 +- example/domain-service/email-service/pom.xml | 6 + pom.xml | 125 +-------------- 42 files changed, 72 insertions(+), 201 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/component/objectstore/jdo/pom.xml ---------------------------------------------------------------------- diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml index e4ab8cd..bb09de0 100644 --- a/component/objectstore/jdo/pom.xml +++ b/component/objectstore/jdo/pom.xml @@ -24,7 +24,7 @@ <groupId>org.apache.isis.objectstore</groupId> <artifactId>isis-jdo-objectstore</artifactId> - <name>Default Runtime JDO ObjectStore</name> + <name>Isis JDO ObjectStore</name> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/component/progmodel/groovy/applib/pom.xml ---------------------------------------------------------------------- diff --git a/component/progmodel/groovy/applib/pom.xml b/component/progmodel/groovy/applib/pom.xml index a0da157..eb0ac74 100644 --- a/component/progmodel/groovy/applib/pom.xml +++ b/component/progmodel/groovy/applib/pom.xml @@ -28,7 +28,7 @@ </parent> <artifactId>isis-groovy-progmodel-applib</artifactId> - <name>Groovy ProgModel AppLib</name> + <name>Isis Groovy ProgModel AppLib</name> <properties> <siteBaseDir>..</siteBaseDir> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/component/viewer/bdd/common/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/bdd/common/pom.xml b/component/viewer/bdd/common/pom.xml index 86f2c1f..fec42db 100755 --- a/component/viewer/bdd/common/pom.xml +++ b/component/viewer/bdd/common/pom.xml @@ -27,7 +27,7 @@ </parent> <artifactId>isis-bdd-viewer-common</artifactId> - <name>BDD Viewers: Common</name> + <name>Isis BDD Viewer (Common)</name> <properties> <siteBaseDir>..</siteBaseDir> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/component/viewer/bdd/concordion/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/bdd/concordion/pom.xml b/component/viewer/bdd/concordion/pom.xml index 493e143..6c698fb 100755 --- a/component/viewer/bdd/concordion/pom.xml +++ b/component/viewer/bdd/concordion/pom.xml @@ -27,7 +27,7 @@ </parent> <artifactId>isis-bdd-viewer-concordion</artifactId> - <name>Isis BDD Viewers (Concordion)</name> + <name>Isis BDD Viewer (Concordion)</name> <properties> <siteBaseDir>..</siteBaseDir> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/component/viewer/bdd/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/bdd/pom.xml b/component/viewer/bdd/pom.xml index 214a5bc..1cc8536 100644 --- a/component/viewer/bdd/pom.xml +++ b/component/viewer/bdd/pom.xml @@ -30,7 +30,7 @@ <groupId>org.apache.isis.viewer</groupId> <artifactId>isis-bdd-viewer</artifactId> - <name>Isis BDD Viewers</name> + <name>Isis BDD Viewer</name> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/component/viewer/bdd/tck/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/bdd/tck/pom.xml b/component/viewer/bdd/tck/pom.xml index bc3a745..49aead1 100644 --- a/component/viewer/bdd/tck/pom.xml +++ b/component/viewer/bdd/tck/pom.xml @@ -29,7 +29,7 @@ <groupId>org.apache.isis.viewer</groupId> <artifactId>isis-bdd-viewer-concordion-tck</artifactId> - <name>Isis BDD (Concordion) Tests against TCK</name> + <name>Isis BDD Viewer (Concordion) TCK tests</name> <properties> <maven.test.skip>true</maven.test.skip> @@ -59,8 +59,8 @@ <!-- this project's dependencies --> <dependency> - <groupId>org.apache.isis.tck</groupId> - <artifactId>tck-fixture</artifactId> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis-tck-fixture</artifactId> <version>0.3.1-SNAPSHOT</version> </dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/component/viewer/dnd/tck/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/dnd/tck/pom.xml b/component/viewer/dnd/tck/pom.xml index d8722b5..a198d21 100644 --- a/component/viewer/dnd/tck/pom.xml +++ b/component/viewer/dnd/tck/pom.xml @@ -28,12 +28,12 @@ <groupId>org.apache.isis.core</groupId> <artifactId>isis-tck</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../core/tck/pom.xml</relativePath> + <relativePath>../../../../core/tck/pom.xml</relativePath> </parent> <groupId>org.apache.isis.viewer</groupId> <artifactId>isis-dnd-viewer-tck</artifactId> - <name>Isis Drag-n-Drop Viewer TCK</name> + <name>Isis Drag-n-Drop Viewer TCK tests</name> <properties> <siteBaseDir>..</siteBaseDir> @@ -101,7 +101,7 @@ <!-- isis viewers --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-dnd-viewer</artifactId> + <artifactId>isis-dnd-viewer-impl</artifactId> <version>0.3.1-SNAPSHOT</version> </dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/component/viewer/html/monitoring/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/html/monitoring/pom.xml b/component/viewer/html/monitoring/pom.xml index f5bc7ab..1c38a03 100644 --- a/component/viewer/html/monitoring/pom.xml +++ b/component/viewer/html/monitoring/pom.xml @@ -21,13 +21,11 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.isis</groupId> - <artifactId>isis-parent</artifactId> + <groupId>org.apache.isis.viewer</groupId> + <artifactId>isis-html-viewer</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../isis-parent/pom.xml</relativePath> </parent> - <groupId>org.apache.isis.viewer</groupId> <artifactId>isis-html-viewer-monitoring</artifactId> <name>Isis HTML Viewer Monitoring</name> @@ -41,7 +39,6 @@ <dependency> <groupId>org.apache.isis.core</groupId> <artifactId>isis-runtime</artifactId> - <version>0.3.1-SNAPSHOT</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/component/viewer/html/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/html/pom.xml b/component/viewer/html/pom.xml index a40bdca..f6a87e6 100644 --- a/component/viewer/html/pom.xml +++ b/component/viewer/html/pom.xml @@ -107,11 +107,6 @@ <version>0.3.1-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-html-viewer-monitoring</artifactId> - <version>0.3.1-SNAPSHOT</version> - </dependency> </dependencies> </dependencyManagement> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/component/viewer/html/tck/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/html/tck/pom.xml b/component/viewer/html/tck/pom.xml index e94b552..56e29a5 100644 --- a/component/viewer/html/tck/pom.xml +++ b/component/viewer/html/tck/pom.xml @@ -23,12 +23,12 @@ <groupId>org.apache.isis.core</groupId> <artifactId>isis-tck</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../core/tck/pom.xml</relativePath> + <relativePath>../../../../core/tck/pom.xml</relativePath> </parent> <groupId>org.apache.isis.viewer</groupId> <artifactId>isis-html-viewer-tck</artifactId> - <name>HTML Viewer for TCK</name> + <name>Isis Html Viewer TCK tests</name> <properties> <siteBaseDir>..</siteBaseDir> @@ -89,7 +89,7 @@ <!-- isis viewer --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-html-viewer</artifactId> + <artifactId>isis-html-viewer-impl</artifactId> <version>0.3.1-SNAPSHOT</version> </dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/component/viewer/junit/tck/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/junit/tck/pom.xml b/component/viewer/junit/tck/pom.xml index 59ba77e..c409422 100644 --- a/component/viewer/junit/tck/pom.xml +++ b/component/viewer/junit/tck/pom.xml @@ -23,12 +23,12 @@ <groupId>org.apache.isis.core</groupId> <artifactId>isis-tck</artifactId> <version>0.3.1-SNAPSHOT</version> - <relativePath>../../../core/tck/pom.xml</relativePath> + <relativePath>../../../../core/tck/pom.xml</relativePath> </parent> <groupId>org.apache.isis.viewer</groupId> <artifactId>isis-junit-viewer-tck</artifactId> - <name>JUnit Tests for TCK</name> + <name>Isis JUnit Tests TCK tests</name> <properties> <maven.test.skip>true</maven.test.skip> @@ -74,7 +74,7 @@ <!-- isis viewers --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-junit-viewer</artifactId> + <artifactId>isis-junit-viewer-impl</artifactId> <version>0.3.1-SNAPSHOT</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/component/viewer/restfulobjects/applib/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/restfulobjects/applib/pom.xml b/component/viewer/restfulobjects/applib/pom.xml index ac0c9a9..3c0f40f 100644 --- a/component/viewer/restfulobjects/applib/pom.xml +++ b/component/viewer/restfulobjects/applib/pom.xml @@ -27,7 +27,7 @@ </parent> <artifactId>isis-restfulobjects-viewer-applib</artifactId> - <name>RestfulObjects AppLib</name> + <name>Isis RestfulObjects Viewer AppLib</name> <properties> <siteBaseDir>..</siteBaseDir> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/component/viewer/restfulobjects/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/restfulobjects/pom.xml b/component/viewer/restfulobjects/pom.xml index 26187af..9e80ad4 100644 --- a/component/viewer/restfulobjects/pom.xml +++ b/component/viewer/restfulobjects/pom.xml @@ -31,7 +31,7 @@ <groupId>org.apache.isis.viewer</groupId> <artifactId>isis-restfulobjects-viewer</artifactId> - <name>RestfulObjects Viewer</name> + <name>Isis RestfulObjects Viewer</name> <packaging>pom</packaging> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/component/viewer/restfulobjects/tck/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/restfulobjects/tck/pom.xml b/component/viewer/restfulobjects/tck/pom.xml index 9a3e695..f66d19b 100644 --- a/component/viewer/restfulobjects/tck/pom.xml +++ b/component/viewer/restfulobjects/tck/pom.xml @@ -28,7 +28,7 @@ <groupId>org.apache.isis.viewer</groupId> <artifactId>isis-restfulobjects-viewer-tck</artifactId> - <name>RestfulObjects TCK</name> + <name>Isis RestfulObjects Viewer TCK tests</name> <packaging>war</packaging> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/component/viewer/scimpi/tck/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/scimpi/tck/pom.xml b/component/viewer/scimpi/tck/pom.xml index c60cf0a..e60e30b 100644 --- a/component/viewer/scimpi/tck/pom.xml +++ b/component/viewer/scimpi/tck/pom.xml @@ -29,7 +29,7 @@ <groupId>org.apache.isis.core</groupId> <artifactId>isis-scimpi-viewer-tck</artifactId> - <name>Isis Scimpi Viewer for TCK</name> + <name>Isis Scimpi Viewer TCK tests</name> <properties> <siteBaseDir>..</siteBaseDir> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/component/viewer/wicket/impl/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/impl/pom.xml b/component/viewer/wicket/impl/pom.xml index 8216992..d155a34 100644 --- a/component/viewer/wicket/impl/pom.xml +++ b/component/viewer/wicket/impl/pom.xml @@ -27,7 +27,7 @@ <version>0.3.1-SNAPSHOT</version> </parent> - <name>Wicket Viewer Implementation</name> + <name>Isis Wicket Viewer Implementation</name> <artifactId>isis-wicket-viewer-impl</artifactId> <properties> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/component/viewer/wicket/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml index f1f9be5..fe2d038 100644 --- a/component/viewer/wicket/pom.xml +++ b/component/viewer/wicket/pom.xml @@ -124,8 +124,8 @@ <!-- Apache Isis --> <dependency> - <groupId>org.apache.isis</groupId> - <artifactId>applib</artifactId> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis-applib</artifactId> <version>0.3.1-SNAPSHOT</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/component/viewer/wicket/tck/pom.xml ---------------------------------------------------------------------- diff --git a/component/viewer/wicket/tck/pom.xml b/component/viewer/wicket/tck/pom.xml index 64d4860..a785442 100644 --- a/component/viewer/wicket/tck/pom.xml +++ b/component/viewer/wicket/tck/pom.xml @@ -29,7 +29,7 @@ <groupId>org.apache.isis.viewer</groupId> <artifactId>isis-wicket-viewer-tck</artifactId> - <name>Isis Wicket Viewer for TCK</name> + <name>Isis Wicket Viewer TCK tests</name> <properties> <jetty.version>6.1.4</jetty.version> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/core/metamodel/pom.xml ---------------------------------------------------------------------- diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml index 5b79bd2..788e362 100644 --- a/core/metamodel/pom.xml +++ b/core/metamodel/pom.xml @@ -20,7 +20,7 @@ <groupId>org.apache.isis.core</groupId> <artifactId>isis-metamodel</artifactId> - <name>Core MetaModel</name> + <name>Isis Core MetaModel</name> <properties> <siteBaseDir>..</siteBaseDir> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/claims/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/claims/pom.xml b/example/application/claims/pom.xml index eaf2270..3f5c564 100644 --- a/example/application/claims/pom.xml +++ b/example/application/claims/pom.xml @@ -317,7 +317,7 @@ <!-- isis: viewer: html --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-html-viewer</artifactId> + <artifactId>isis-html-viewer-impl</artifactId> <version>${isis.version}</version> </dependency> @@ -341,14 +341,14 @@ <!-- isis: viewer: junit --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-junit-viewer</artifactId> + <artifactId>isis-junit-viewer-impl</artifactId> <version>${isis.version}</version> </dependency> <!-- isis: viewer: dnd --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-dnd-viewer</artifactId> + <artifactId>isis-dnd-viewer-impl</artifactId> <version>${isis.version}</version> </dependency> @@ -401,12 +401,6 @@ <version>${isis.version}</version> </dependency> - <dependency> - <groupId>org.apache.isis.core</groupId> - <artifactId>isis-webserver</artifactId> - <version>${isis.version}</version> - </dependency> - </dependencies> </dependencyManagement> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/claims/viewer-dnd/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/claims/viewer-dnd/pom.xml b/example/application/claims/viewer-dnd/pom.xml index 8d7c25a..945833b 100644 --- a/example/application/claims/viewer-dnd/pom.xml +++ b/example/application/claims/viewer-dnd/pom.xml @@ -110,12 +110,12 @@ <!-- isis viewers --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-dnd-viewer</artifactId> + <artifactId>isis-dnd-viewer-impl</artifactId> </dependency> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-html-viewer</artifactId> + <artifactId>isis-html-viewer-impl</artifactId> </dependency> <dependency> <groupId>org.apache.isis.viewer</groupId> @@ -125,7 +125,7 @@ <!-- JUnit Viewer dependencies --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-junit-viewer</artifactId> + <artifactId>isis-junit-viewer-impl</artifactId> <scope>test</scope> </dependency> @@ -304,7 +304,7 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>claims-viewer-wicket</artifactId> - <version>${parent.version}</version> + <version>${project.version}</version> </dependency> <!-- Wicket Viewer --> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/claims/viewer-html/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/claims/viewer-html/pom.xml b/example/application/claims/viewer-html/pom.xml index dc8cd31..f794445 100644 --- a/example/application/claims/viewer-html/pom.xml +++ b/example/application/claims/viewer-html/pom.xml @@ -71,7 +71,7 @@ <!-- isis viewer --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-html-viewer</artifactId> + <artifactId>isis-html-viewer-impl</artifactId> </dependency> <!-- isis runtime --> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/onlinedemo/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/onlinedemo/pom.xml b/example/application/onlinedemo/pom.xml index d072a26..144d982 100644 --- a/example/application/onlinedemo/pom.xml +++ b/example/application/onlinedemo/pom.xml @@ -278,7 +278,7 @@ <!-- isis: viewer: html --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-html-viewer</artifactId> + <artifactId>isis-html-viewer-impl</artifactId> <version>${isis.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/onlinedemo/webapp/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/onlinedemo/webapp/pom.xml b/example/application/onlinedemo/webapp/pom.xml index 579a7cc..2a3065a 100644 --- a/example/application/onlinedemo/webapp/pom.xml +++ b/example/application/onlinedemo/webapp/pom.xml @@ -73,7 +73,7 @@ <!-- isis viewer --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-html-viewer</artifactId> + <artifactId>isis-html-viewer-impl</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/quickstart/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart/pom.xml b/example/application/quickstart/pom.xml index 9f04067..5e90bc7 100644 --- a/example/application/quickstart/pom.xml +++ b/example/application/quickstart/pom.xml @@ -320,14 +320,14 @@ <!-- isis: viewer: dnd --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-dnd-viewer</artifactId> + <artifactId>isis-dnd-viewer-impl</artifactId> <version>${isis.version}</version> </dependency> <!-- isis: viewer: html --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-html-viewer</artifactId> + <artifactId>isis-html-viewer-impl</artifactId> <version>${isis.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/quickstart/viewer-dnd/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart/viewer-dnd/pom.xml b/example/application/quickstart/viewer-dnd/pom.xml index b9885aa..283019b 100644 --- a/example/application/quickstart/viewer-dnd/pom.xml +++ b/example/application/quickstart/viewer-dnd/pom.xml @@ -129,7 +129,7 @@ <!-- isis viewers --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-dnd-viewer</artifactId> + <artifactId>isis-dnd-viewer-impl</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/quickstart/viewer-html/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart/viewer-html/pom.xml b/example/application/quickstart/viewer-html/pom.xml index b3a1ec9..94770c8 100644 --- a/example/application/quickstart/viewer-html/pom.xml +++ b/example/application/quickstart/viewer-html/pom.xml @@ -112,7 +112,7 @@ <!-- isis viewer --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-html-viewer</artifactId> + <artifactId>isis-html-viewer-impl</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/quickstart_dnd_junit_bdd/dom/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart_dnd_junit_bdd/dom/pom.xml b/example/application/quickstart_dnd_junit_bdd/dom/pom.xml index 696cae5..92f43e3 100644 --- a/example/application/quickstart_dnd_junit_bdd/dom/pom.xml +++ b/example/application/quickstart_dnd_junit_bdd/dom/pom.xml @@ -27,7 +27,7 @@ </parent> <artifactId>quickstart_dnd_junit_bdd-dom</artifactId> - <name>Quickstart DOM</name> + <name>Quickstart DnD/Junit/BDD DOM</name> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/quickstart_dnd_junit_bdd/fixture/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart_dnd_junit_bdd/fixture/pom.xml b/example/application/quickstart_dnd_junit_bdd/fixture/pom.xml index 5fab844..530bf0f 100644 --- a/example/application/quickstart_dnd_junit_bdd/fixture/pom.xml +++ b/example/application/quickstart_dnd_junit_bdd/fixture/pom.xml @@ -27,7 +27,7 @@ </parent> <artifactId>quickstart_dnd_junit_bdd-fixture</artifactId> - <name>Quickstart Fixtures</name> + <name>Quickstart DnD/Junit/BDD Fixtures</name> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/quickstart_dnd_junit_bdd/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart_dnd_junit_bdd/pom.xml b/example/application/quickstart_dnd_junit_bdd/pom.xml index 0cff0ad..6ca426f 100644 --- a/example/application/quickstart_dnd_junit_bdd/pom.xml +++ b/example/application/quickstart_dnd_junit_bdd/pom.xml @@ -25,7 +25,7 @@ <artifactId>quickstart_dnd_junit_bdd</artifactId> <version>0.3.1-SNAPSHOT</version> - <name>Quickstart (JUnit/BDD) App</name> + <name>Quickstart DnD/Junit/BDD (JUnit/BDD) App</name> <packaging>pom</packaging> @@ -314,14 +314,14 @@ <!-- isis: viewer: dnd --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-dnd-viewer</artifactId> + <artifactId>isis-dnd-viewer-impl</artifactId> <version>${isis.version}</version> </dependency> <!-- isis: viewer: html --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-html-viewer</artifactId> + <artifactId>isis-html-viewer-impl</artifactId> <version>${isis.version}</version> </dependency> @@ -345,7 +345,7 @@ <!-- isis: viewer: junit --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-junit-viewer</artifactId> + <artifactId>isis-junit-viewer-impl</artifactId> <version>${isis.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/quickstart_dnd_junit_bdd/tests-bdd/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart_dnd_junit_bdd/tests-bdd/pom.xml b/example/application/quickstart_dnd_junit_bdd/tests-bdd/pom.xml index 226fab5..797753b 100644 --- a/example/application/quickstart_dnd_junit_bdd/tests-bdd/pom.xml +++ b/example/application/quickstart_dnd_junit_bdd/tests-bdd/pom.xml @@ -28,7 +28,7 @@ <artifactId>quickstart_dnd_junit_bdd-tests-bdd</artifactId> - <name>Quickstart BDD (Concordion) Tests</name> + <name>Quickstart DnD/Junit/BDD BDD (Concordion) Tests</name> <build> <plugins> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/quickstart_dnd_junit_bdd/tests-junit/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart_dnd_junit_bdd/tests-junit/pom.xml b/example/application/quickstart_dnd_junit_bdd/tests-junit/pom.xml index d365428..f76471e 100644 --- a/example/application/quickstart_dnd_junit_bdd/tests-junit/pom.xml +++ b/example/application/quickstart_dnd_junit_bdd/tests-junit/pom.xml @@ -27,7 +27,7 @@ </parent> <artifactId>quickstart_dnd_junit_bdd-tests-junit</artifactId> - <name>Quickstart JUnit Tests</name> + <name>Quickstart DnD/Junit/BDD JUnit Tests</name> <dependencies> @@ -67,7 +67,7 @@ <!-- isis viewers --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-junit-viewer</artifactId> + <artifactId>isis-junit-viewer-impl</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/quickstart_dnd_junit_bdd/viewer-dnd/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart_dnd_junit_bdd/viewer-dnd/pom.xml b/example/application/quickstart_dnd_junit_bdd/viewer-dnd/pom.xml index 442a699..b295503 100644 --- a/example/application/quickstart_dnd_junit_bdd/viewer-dnd/pom.xml +++ b/example/application/quickstart_dnd_junit_bdd/viewer-dnd/pom.xml @@ -27,7 +27,7 @@ </parent> <artifactId>quickstart_dnd_junit_bdd-viewer-dnd</artifactId> - <name>Quickstart Viewer DnD</name> + <name>Quickstart DnD/Junit/BDD Viewer DnD</name> <description>This module runs Isis' DnD viewer, intended for exploration, prototyping and design. By default the viewer is configured to run with the in-memory object store, @@ -129,7 +129,7 @@ <!-- isis viewers --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-dnd-viewer</artifactId> + <artifactId>isis-dnd-viewer-impl</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/quickstart_wicket_restful_jdo/dom/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart_wicket_restful_jdo/dom/pom.xml b/example/application/quickstart_wicket_restful_jdo/dom/pom.xml index 7c51860..7888c25 100644 --- a/example/application/quickstart_wicket_restful_jdo/dom/pom.xml +++ b/example/application/quickstart_wicket_restful_jdo/dom/pom.xml @@ -27,7 +27,7 @@ </parent> <artifactId>quickstart_wicket_restful_jdo-dom</artifactId> - <name>Quickstart DOM</name> + <name>Quickstart Wicket/Restful/JDO DOM</name> <build> <plugins> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/quickstart_wicket_restful_jdo/fixture/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart_wicket_restful_jdo/fixture/pom.xml b/example/application/quickstart_wicket_restful_jdo/fixture/pom.xml index 0076f9f..4f6a7e7 100644 --- a/example/application/quickstart_wicket_restful_jdo/fixture/pom.xml +++ b/example/application/quickstart_wicket_restful_jdo/fixture/pom.xml @@ -27,7 +27,7 @@ </parent> <artifactId>quickstart_wicket_restful_jdo-fixture</artifactId> - <name>Quickstart Fixtures</name> + <name>Quickstart Wicket/Restful/JDO Fixtures</name> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml b/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml index a55ff6a..06a05b0 100644 --- a/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml +++ b/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml @@ -27,7 +27,7 @@ </parent> <artifactId>quickstart_wicket_restful_jdo-objstore-jdo</artifactId> - <name>Quickstart Repositories (for JDO)</name> + <name>Quickstart Wicket/Restful/JDO Repositories (for JDO)</name> <dependencies> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/quickstart_wicket_restful_jdo/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart_wicket_restful_jdo/pom.xml b/example/application/quickstart_wicket_restful_jdo/pom.xml index 19890d0..f04a6a6 100644 --- a/example/application/quickstart_wicket_restful_jdo/pom.xml +++ b/example/application/quickstart_wicket_restful_jdo/pom.xml @@ -25,7 +25,7 @@ <artifactId>quickstart_wicket_restful_jdo</artifactId> <version>0.3.1-SNAPSHOT</version> - <name>Quickstart App</name> + <name>Quickstart Wicket/Restful/JDO App</name> <packaging>pom</packaging> @@ -308,14 +308,14 @@ <!-- isis: viewer: dnd --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-dnd-viewer</artifactId> + <artifactId>isis-dnd-viewer-impl</artifactId> <version>${isis.version}</version> </dependency> <!-- isis: viewer: html --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-html-viewer</artifactId> + <artifactId>isis-html-viewer-impl</artifactId> <version>${isis.version}</version> </dependency> @@ -339,7 +339,7 @@ <!-- isis: viewer: junit --> <dependency> <groupId>org.apache.isis.viewer</groupId> - <artifactId>isis-junit-viewer</artifactId> + <artifactId>isis-junit-viewer-impl</artifactId> <version>${isis.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/pom.xml b/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/pom.xml index bc9b38b..4ec0834 100644 --- a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/pom.xml +++ b/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/pom.xml @@ -27,7 +27,7 @@ </parent> <artifactId>quickstart_wicket_restful_jdo-viewer-restfulobjects</artifactId> - <name>Quickstart Restful Objects Viewer</name> + <name>Quickstart Wicket/Restful/JDO Restful Objects Viewer</name> <description>This module runs Isis' Restful Objects viewer, configured to run using the datanucleus object store. It also includes a demonstrator single-page JQueryMobile app. http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml index fa0dbb2..d21a682 100644 --- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml +++ b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml @@ -26,7 +26,7 @@ </parent> <artifactId>quickstart_wicket_restful_jdo-viewer-wicket</artifactId> - <name>QuickStart Wicket Viewer</name> + <name>Quickstart Wicket/Restful/JDO Wicket Viewer</name> <description>This module runs Isis' Wicket webapp viewer, configured to run using the datanucleus object store. See other viewer modules for more persistence options.</description> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/archetype/quickstart/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/example/archetype/quickstart/src/main/resources/archetype-resources/pom.xml b/example/archetype/quickstart/src/main/resources/archetype-resources/pom.xml index 098898e..bc5c2fd 100644 --- a/example/archetype/quickstart/src/main/resources/archetype-resources/pom.xml +++ b/example/archetype/quickstart/src/main/resources/archetype-resources/pom.xml @@ -185,8 +185,8 @@ <!-- isis: applib --> <dependency> - <groupId>org.apache.isis</groupId> - <artifactId>applib</artifactId> + <groupId>org.apache.isis.core</groupId> + <artifactId>isis-applib</artifactId> <version>${isis.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/example/domain-service/email-service/pom.xml ---------------------------------------------------------------------- diff --git a/example/domain-service/email-service/pom.xml b/example/domain-service/email-service/pom.xml index cf0027b..095a0ef 100644 --- a/example/domain-service/email-service/pom.xml +++ b/example/domain-service/email-service/pom.xml @@ -21,6 +21,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.isis</groupId> + <artifactId>isis-parent</artifactId> + <version>0.3.1-SNAPSHOT</version> + <relativePath>../../../isis-parent/pom.xml</relativePath> + </parent> <name>Email service</name> <groupId>org.apache.isis.example.domainservice</groupId> http://git-wip-us.apache.org/repos/asf/isis/blob/49afe37d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7862452..e1f0462 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,6 @@ </description> <modules> -<!-- <module>isis-parent</module> <module>site-skin</module> @@ -54,7 +53,7 @@ <module>component/security/file</module> <module>component/security/ldap</module> <module>component/security/sql</module> ---> + <module>component/viewer/dnd</module> <module>component/viewer/html</module> <module>component/viewer/scimpi</module> @@ -75,132 +74,12 @@ <module>example/domain-service/email-service</module> <module>example/misc/metamodel/namefile</module> <module>tool/maven-plugin</module> + <!-- <module>example/misc/metamodel/jsr303</module> --> - </modules> - <profiles> - <profile> - <id>modules-site</id> - <!-- modules that make up the site --> - <activation> - <property> - <name>modules</name> - <value>site</value> - </property> - </activation> - <modules> - <module>applib</module> - <module>core</module> - <module>runtimes</module> - <module>progmodels</module> - <module>security</module> - <module>viewer</module> - </modules> - </profile> - - <profile> - <id>modules-skin</id> - <!-- prereq for running site-deploy --> - <activation> - <property> - <name>modules</name> - <value>skin</value> - </property> - </activation> - <modules> - <module>site-skin</module> - </modules> - </profile> - - <profile> - <id>modules-applib</id> - <!-- To quickly build --> - <activation> - <property> - <name>modules</name> - <value>applib</value> - </property> - </activation> - <modules> - <module>applib</module> - </modules> - </profile> - <profile> - <id>modules-core</id> - <activation> - <property> - <name>modules</name> - <value>core</value> - </property> - </activation> - <modules> - <module>core</module> - </modules> - </profile> - <profile> - <id>modules-runtimes</id> - <activation> - <property> - <name>modules</name> - <value>runtimes</value> - </property> - </activation> - <modules> - <module>runtimes</module> - </modules> - </profile> - <profile> - <id>modules-progmodels</id> - <activation> - <property> - <name>modules</name> - <value>progmodels</value> - </property> - </activation> - <modules> - <module>progmodels</module> - </modules> - </profile> - <profile> - <id>modules-security</id> - <activation> - <property> - <name>modules</name> - <value>security</value> - </property> - </activation> - <modules> - <module>security</module> - </modules> - </profile> - <profile> - <id>modules-viewers</id> - <activation> - <property> - <name>modules</name> - <value>viewers</value> - </property> - </activation> - <modules> - <module>viewer</module> - </modules> - </profile> - <profile> - <id>modules-quickstart-archetype</id> - <activation> - <property> - <name>modules</name> - <value>quickstart-archetype</value> - </property> - </activation> - <modules> - <module>quickstart-archetype</module> - </modules> - </profile> - </profiles> </project>
