You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/12/07 19:16:22 UTC
[3/12] ISIS-188: refactoring artifactIds - examples
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/example/application/quickstart/viewer-scimpi/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart/viewer-scimpi/pom.xml b/example/application/quickstart/viewer-scimpi/pom.xml
index f6ebd4d..77b9136 100644
--- a/example/application/quickstart/viewer-scimpi/pom.xml
+++ b/example/application/quickstart/viewer-scimpi/pom.xml
@@ -95,49 +95,47 @@
<!-- objectstore/domain service/repository implementations -->
- <!--
- - uncomment in order to use default object store
- - (also edit isis.properties)
- -
- -->
- <dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>dflt</artifactId>
- </dependency>
-
-
<!-- isis viewer -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>scimpi-servlet</artifactId>
+ <artifactId>isis-scimpi-viewer-servlet</artifactId>
</dependency>
- <!-- isis runtime -->
+ <!-- isis core -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-metamodel</artifactId>
</dependency>
+ <!-- isis default runtime -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</artifactId>
</dependency>
-
- <!-- isis security implementations -->
<dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>file</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-objectstore</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-xml-objectstore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-profilestore</artifactId>
+ </dependency>
+
+ <!-- isis defaults (other) -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-noop-security</artifactId>
</dependency>
<!-- to run using WebServer (optional) -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-webserver</artifactId>
<scope>runtime</scope>
<optional>true</optional>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/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 41538ef..696cae5 100644
--- a/example/application/quickstart_dnd_junit_bdd/dom/pom.xml
+++ b/example/application/quickstart_dnd_junit_bdd/dom/pom.xml
@@ -29,25 +29,10 @@
<artifactId>quickstart_dnd_junit_bdd-dom</artifactId>
<name>Quickstart DOM</name>
-
- <dependencyManagement>
- <dependencies>
- <!-- for DataNucleus, see below -->
- <dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>jdo</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-
<dependencies>
<dependency>
- <groupId>org.apache.isis</groupId>
- <artifactId>applib</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/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 cbb656a..0cff0ad 100644
--- a/example/application/quickstart_dnd_junit_bdd/pom.xml
+++ b/example/application/quickstart_dnd_junit_bdd/pom.xml
@@ -190,13 +190,13 @@
<!-- 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>
- <groupId>org.apache.isis</groupId>
- <artifactId>applib</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
<classifier>javadoc</classifier>
<version>${isis.version}</version>
</dependency>
@@ -208,141 +208,105 @@
<version>${isis.version}</version>
</dependency>
- <!-- isis: progmodel: wrapper -->
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>wrapper</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>wrapper-applib</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>wrapper-metamodel</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
- <!-- isis: progmodel: groovy -->
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>groovy</artifactId>
- <version>${isis.version}</version>
- </dependency>
<dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>groovy-applib</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>groovy-metamodel</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
- <!-- isis: security: dflt -->
- <dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-noop-security</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: security: ldap -->
<dependency>
<groupId>org.apache.isis.security</groupId>
- <artifactId>ldap</artifactId>
+ <artifactId>isis-ldap-security</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: security: file -->
<dependency>
<groupId>org.apache.isis.security</groupId>
- <artifactId>file</artifactId>
+ <artifactId>isis-file-security</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: runtimes: dflt -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>runtime</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-webserver</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-cglib-bytecode</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>javassist</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-javassist-bytecode</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: runtimes-dflt: objectstores: dflt -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-objectstore</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: runtimes-dflt: objectstores: jdo -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>jdo</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-jdo-objectstore</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>jdo-applib</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-jdo-objectstore-applib</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>jdo-datanucleus</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-jdo-objectstore-datanucleus</artifactId>
<version>${isis.version}</version>
</dependency>
- <!-- isis: runtimes-dflt: objectstores: mongodb and fileserver -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>nosql</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-nosql-objectstore</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: runtimes-dflt: objectstore: sql -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>sql-impl</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-sql-objectstore-impl</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: runtimes-dflt: objectstores: xml -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>xml</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-xml-objectstore</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: runtimes-dflt: profilestores: dflt -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-profilestore</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: runtimes-dflt: profilestores: xml -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
- <artifactId>xml</artifactId>
+ <groupId>org.apache.isis.profilestore</groupId>
+ <artifactId>isis-xml-profilestore</artifactId>
<version>${isis.version}</version>
</dependency>
@@ -350,55 +314,55 @@
<!-- isis: viewer: dnd -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>dnd</artifactId>
+ <artifactId>isis-dnd-viewer</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: viewer: html -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>html</artifactId>
+ <artifactId>isis-html-viewer</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: viewer: restfulobjects -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>restfulobjects</artifactId>
+ <artifactId>isis-restfulobjects-viewer</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>restfulobjects-applib</artifactId>
+ <artifactId>isis-restfulobjects-viewer-applib</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>restfulobjects-viewer</artifactId>
+ <artifactId>isis-restfulobjects-viewer-impl</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: viewer: junit -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>junit</artifactId>
+ <artifactId>isis-junit-viewer</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: viewer: bdd -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>bdd</artifactId>
+ <artifactId>isis-bdd-viewer</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>bdd-common</artifactId>
+ <artifactId>isis-bdd-viewer-common</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>bdd-concordion</artifactId>
+ <artifactId>isis-bdd-viewer-concordion</artifactId>
<version>${isis.version}</version>
</dependency>
@@ -412,17 +376,17 @@
<!-- isis: viewer: scimpi -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>scimpi</artifactId>
+ <artifactId>isis-scimpi-viewer</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>scimpi-dispatcher</artifactId>
+ <artifactId>isis-scimpi-viewer-dispatcher</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>scimpi-servlet</artifactId>
+ <artifactId>isis-scimpi-viewer-servlet</artifactId>
<version>${isis.version}</version>
</dependency>
@@ -430,32 +394,22 @@
<!-- isis: viewer: wicket -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket-applib</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket-facets</artifactId>
+ <artifactId>isis-wicket-viewer</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket-model</artifactId>
+ <artifactId>isis-wicket-viewer-model</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket-ui</artifactId>
+ <artifactId>isis-wicket-viewer-ui</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket-viewer</artifactId>
+ <artifactId>isis-wicket-viewer-impl</artifactId>
<version>${isis.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/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 4bfd5c1..226fab5 100644
--- a/example/application/quickstart_dnd_junit_bdd/tests-bdd/pom.xml
+++ b/example/application/quickstart_dnd_junit_bdd/tests-bdd/pom.xml
@@ -61,30 +61,30 @@
<artifactId>isis-metamodel</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-cglib-bytecode</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-objectstore</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-profilestore</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-noop-security</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.security</groupId>
- <artifactId>file</artifactId>
+ <artifactId>isis-file-security</artifactId>
</dependency>
<!-- BDD Viewers concordion dependencies -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>bdd-concordion</artifactId>
+ <artifactId>isis-bdd-viewer-concordion</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/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 88972f3..d365428 100644
--- a/example/application/quickstart_dnd_junit_bdd/tests-junit/pom.xml
+++ b/example/application/quickstart_dnd_junit_bdd/tests-junit/pom.xml
@@ -44,30 +44,30 @@
<artifactId>isis-metamodel</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-cglib-bytecode</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-objectstore</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-profilestore</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-noop-security</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.security</groupId>
- <artifactId>file</artifactId>
+ <artifactId>isis-file-security</artifactId>
</dependency>
<!-- isis viewers -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>junit</artifactId>
+ <artifactId>isis-junit-viewer</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/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 af0978a..442a699 100644
--- a/example/application/quickstart_dnd_junit_bdd/viewer-dnd/pom.xml
+++ b/example/application/quickstart_dnd_junit_bdd/viewer-dnd/pom.xml
@@ -101,38 +101,35 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-metamodel</artifactId>
</dependency>
-
- <!-- isis default runtime -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>runtime</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-cglib-bytecode</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-objectstore</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>xml</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-profilestore</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-noop-security</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.isis.security</groupId>
- <artifactId>dflt</artifactId>
+ <artifactId>isis-file-security</artifactId>
</dependency>
<!-- isis viewers -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>dnd</artifactId>
+ <artifactId>isis-dnd-viewer</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/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 77dd031..7c51860 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/dom/pom.xml
@@ -93,8 +93,8 @@
<dependencies>
<!-- for DataNucleus, see below -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>jdo</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-jdo-objectstore</artifactId>
<version>0.3.1-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
@@ -105,13 +105,13 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis</groupId>
- <artifactId>applib</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>jdo-applib</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-jdo-objectstore-applib</artifactId>
</dependency>
@@ -140,10 +140,8 @@
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-api-jdo</artifactId>
</dependency>
-
</dependencies>
-
<profiles>
<profile>
<id>not-m2e</id>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/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 9e4cdbe..a55ff6a 100644
--- a/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/objstore-jdo/pom.xml
@@ -38,8 +38,8 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>jdo-datanucleus</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-jdo-objectstore-datanucleus</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/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 dfdfca0..19890d0 100644
--- a/example/application/quickstart_wicket_restful_jdo/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/pom.xml
@@ -184,13 +184,13 @@
<!-- 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>
- <groupId>org.apache.isis</groupId>
- <artifactId>applib</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
<classifier>javadoc</classifier>
<version>${isis.version}</version>
</dependency>
@@ -202,141 +202,105 @@
<version>${isis.version}</version>
</dependency>
- <!-- isis: progmodel: wrapper -->
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>wrapper</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>wrapper-applib</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>wrapper-metamodel</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
- <!-- isis: progmodel: groovy -->
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>groovy</artifactId>
- <version>${isis.version}</version>
- </dependency>
<dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>groovy-applib</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>groovy-metamodel</artifactId>
- <version>${isis.version}</version>
- </dependency>
-
- <!-- isis: security: dflt -->
- <dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-noop-security</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: security: ldap -->
<dependency>
<groupId>org.apache.isis.security</groupId>
- <artifactId>ldap</artifactId>
+ <artifactId>isis-ldap-security</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: security: file -->
<dependency>
<groupId>org.apache.isis.security</groupId>
- <artifactId>file</artifactId>
+ <artifactId>isis-file-security</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: runtimes: dflt -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>runtime</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-webserver</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-cglib-bytecode</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>javassist</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-javassist-bytecode</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: runtimes-dflt: objectstores: dflt -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-objectstore</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: runtimes-dflt: objectstores: jdo -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>jdo</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-jdo-objectstore</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>jdo-applib</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-jdo-objectstore-applib</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>jdo-datanucleus</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-jdo-objectstore-datanucleus</artifactId>
<version>${isis.version}</version>
</dependency>
- <!-- isis: runtimes-dflt: objectstores: mongodb and fileserver -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>nosql</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-nosql-objectstore</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: runtimes-dflt: objectstore: sql -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>sql-impl</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-sql-objectstore-impl</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: runtimes-dflt: objectstores: xml -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>xml</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-xml-objectstore</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: runtimes-dflt: profilestores: dflt -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-profilestore</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: runtimes-dflt: profilestores: xml -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
- <artifactId>xml</artifactId>
+ <groupId>org.apache.isis.profilestore</groupId>
+ <artifactId>isis-xml-profilestore</artifactId>
<version>${isis.version}</version>
</dependency>
@@ -344,55 +308,55 @@
<!-- isis: viewer: dnd -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>dnd</artifactId>
+ <artifactId>isis-dnd-viewer</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: viewer: html -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>html</artifactId>
+ <artifactId>isis-html-viewer</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: viewer: restfulobjects -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>restfulobjects</artifactId>
+ <artifactId>isis-restfulobjects-viewer</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>restfulobjects-applib</artifactId>
+ <artifactId>isis-restfulobjects-viewer-applib</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>restfulobjects-viewer</artifactId>
+ <artifactId>isis-restfulobjects-viewer-impl</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: viewer: junit -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>junit</artifactId>
+ <artifactId>isis-junit-viewer</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- isis: viewer: bdd -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>bdd</artifactId>
+ <artifactId>isis-bdd-viewer</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>bdd-common</artifactId>
+ <artifactId>isis-bdd-viewer-common</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>bdd-concordion</artifactId>
+ <artifactId>isis-bdd-viewer-concordion</artifactId>
<version>${isis.version}</version>
</dependency>
@@ -406,17 +370,17 @@
<!-- isis: viewer: scimpi -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>scimpi</artifactId>
+ <artifactId>isis-scimpi-viewer</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>scimpi-dispatcher</artifactId>
+ <artifactId>isis-scimpi-viewer-dispatcher</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>scimpi-servlet</artifactId>
+ <artifactId>isis-scimpi-viewer-servlet</artifactId>
<version>${isis.version}</version>
</dependency>
@@ -424,32 +388,22 @@
<!-- isis: viewer: wicket -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket-applib</artifactId>
- <version>${isis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket-facets</artifactId>
+ <artifactId>isis-wicket-viewer</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket-model</artifactId>
+ <artifactId>isis-wicket-viewer-model</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket-ui</artifactId>
+ <artifactId>isis-wicket-viewer-ui</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket-viewer</artifactId>
+ <artifactId>isis-wicket-viewer-impl</artifactId>
<version>${isis.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/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 0764c1f..bc9b38b 100644
--- a/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-restfulobjects/pom.xml
@@ -121,34 +121,42 @@
<!-- isis viewer -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>restfulobjects-viewer</artifactId>
+ <artifactId>isis-restfulobjects-viewer-impl</artifactId>
</dependency>
- <!-- isis runtime -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-metamodel</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</artifactId>
</dependency>
-
- <!-- isis security implementations -->
<dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>file</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-cglib-bytecode</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-objectstore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-profilestore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-noop-security</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.security</groupId>
- <artifactId>dflt</artifactId>
+ <artifactId>isis-file-security</artifactId>
</dependency>
<!-- to run using WebServer (optional) -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-webserver</artifactId>
<scope>runtime</scope>
<optional>true</optional>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/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 3c6ddd3..fa0dbb2 100644
--- a/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml
+++ b/example/application/quickstart_wicket_restful_jdo/viewer-wicket/pom.xml
@@ -122,34 +122,42 @@
<!-- isis viewer -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket-viewer</artifactId>
+ <artifactId>isis-wicket-viewer-impl</artifactId>
</dependency>
- <!-- isis runtime -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-metamodel</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</artifactId>
</dependency>
-
- <!-- isis security implementations -->
<dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>file</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-cglib-bytecode</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-objectstore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-profilestore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-noop-security</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.security</groupId>
- <artifactId>dflt</artifactId>
+ <artifactId>isis-file-security</artifactId>
</dependency>
<!-- to run using WebServer (optional) -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-webserver</artifactId>
<scope>runtime</scope>
<optional>true</optional>
@@ -162,8 +170,6 @@
</dependency>
-
-
<!--
JDBC drivers
(if using jdo or sql object store)
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/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 ec56086..cf0027b 100644
--- a/example/domain-service/email-service/pom.xml
+++ b/example/domain-service/email-service/pom.xml
@@ -51,8 +51,8 @@
<dependencies>
<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>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/example/misc/metamodel/namefile/pom.xml
----------------------------------------------------------------------
diff --git a/example/misc/metamodel/namefile/pom.xml b/example/misc/metamodel/namefile/pom.xml
index 620fc5a..b4b4520 100644
--- a/example/misc/metamodel/namefile/pom.xml
+++ b/example/misc/metamodel/namefile/pom.xml
@@ -28,8 +28,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>runtime</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/example/misc/metamodel/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java
----------------------------------------------------------------------
diff --git a/example/misc/metamodel/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java b/example/misc/metamodel/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java
index f97e76e..77c41b7 100644
--- a/example/misc/metamodel/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java
+++ b/example/misc/metamodel/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacet.java
@@ -37,9 +37,8 @@ public class NameFileFacet extends FacetAbstract implements NamedFacet {
this.name = name;
}
- @Override
- public String value() {
- return name;
- }
+ public String value() {
+ return name;
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/example/misc/metamodel/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java
----------------------------------------------------------------------
diff --git a/example/misc/metamodel/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java b/example/misc/metamodel/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java
index ee7bc34..daaad3c 100644
--- a/example/misc/metamodel/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java
+++ b/example/misc/metamodel/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java
@@ -41,7 +41,6 @@ public class NameFileFacetFactory implements FacetFactory {
}
}
- @Override
public List<FeatureType> getFeatureTypes() {
return FeatureType.EVERYTHING_BUT_PARAMETERS;
}
@@ -49,7 +48,6 @@ public class NameFileFacetFactory implements FacetFactory {
/**
* Simply attaches a {@link NameFileFacet}.
*/
- @Override
public void process(final ProcessClassContext processClassContaxt) {
FacetUtil.addFacet(create(processClassContaxt.getCls(), processClassContaxt.getFacetHolder()));
}
@@ -62,7 +60,6 @@ public class NameFileFacetFactory implements FacetFactory {
/**
* Simply attaches a {@link NameFileFacet}.
*/
- @Override
public void process(final ProcessMethodContext processMethodContext) {
if (!(processMethodContext.getFacetHolder() instanceof IdentifiedHolder)) {
return;
@@ -78,7 +75,6 @@ public class NameFileFacetFactory implements FacetFactory {
return memberNameInFile != null ? new NameFileFacet(holder, memberNameInFile) : null;
}
- @Override
public void processParams(final ProcessParameterContext processParameterContext) {
// nothing to do
}
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/isis-parent/pom.xml
----------------------------------------------------------------------
diff --git a/isis-parent/pom.xml b/isis-parent/pom.xml
index 94642bb..2f89961 100644
--- a/isis-parent/pom.xml
+++ b/isis-parent/pom.xml
@@ -32,7 +32,7 @@
<packaging>pom</packaging>
- <name>Apache Isis</name>
+ <name>Apache Isis (Parent)</name>
<description>
Parent POM for all releasable componenets
(core framework, components, archetype, tools).
@@ -74,6 +74,8 @@
<compileSource>1.6</compileSource>
<compileTarget>1.6</compileTarget>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <isis-parent.enforcer.validate>true</isis-parent.enforcer.validate>
<!-- number of unapproved licenses -->
<rat.num>0</rat.num>
@@ -275,40 +277,6 @@
be found in the reporting section. -->
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0.1</version>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[2.2.1,)</version>
- </requireMavenVersion>
- <requireJavaVersion>
- <version>[1.6.0-11,)</version>
- </requireJavaVersion>
- <requirePluginVersions>
- <message>All plugin versions must be
- defined!</message>
- <banLatest>true</banLatest>
- <banRelease>true</banRelease>
- </requirePluginVersions>
- <DependencyConvergence/>
- </rules>
- </configuration>
- <!-- goal:enforce supposedly binds to phase:validate,
- but explicit binding seems to be required -->
- <executions>
- <execution>
- <id>validate-enforce</id>
- <phase>validate</phase>
- <goals>
- <goal>enforce</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<!-- Apache Release Audit Tool -->
<plugin>
<groupId>org.apache.rat</groupId>
@@ -790,10 +758,6 @@
and deploy plugins are automatically included because they provide the default
bindings. For the 'site' lifecycle, the site plugin is automatically included. -->
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- </plugin>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
@@ -1666,5 +1630,65 @@ archetype includes this explicit dependency.
</plugins>
</build>
</profile>
+
+ <!-- provide ability to switch off enforcer plugin -->
+ <profile>
+ <id>enforcer-validate</id>
+ <activation>
+ <property>
+ <!-- set by default -->
+ <name>isis-parent.enforcer.validate</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0.1</version>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[2.2.1,)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>[1.6.0-11,)</version>
+ </requireJavaVersion>
+ <requirePluginVersions>
+ <message>All plugin versions must be
+ defined!</message>
+ <banLatest>true</banLatest>
+ <banRelease>true</banRelease>
+ </requirePluginVersions>
+ <DependencyConvergence/>
+ </rules>
+ </configuration>
+ <!-- goal:enforce supposedly binds to phase:validate,
+ but explicit binding seems to be required -->
+ <executions>
+ <execution>
+ <id>validate-enforce</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2dcc753..0a53314 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<packaging>pom</packaging>
- <name>Apache Isis</name>
+ <name>Apache Isis (Aggregator)</name>
<description>
Convenience aggregator POM that references all
modules.
@@ -35,8 +35,7 @@
<modules>
<module>isis-parent</module>
-
-<!--
+
<module>site-skin</module>
<module>core</module>
@@ -55,8 +54,6 @@
<module>component/security/ldap</module>
<module>component/security/sql</module>
--->
-
<module>component/viewer/dnd</module>
<module>component/viewer/dnd-tck</module>
<module>component/viewer/html</module>
@@ -69,7 +66,7 @@
<module>component/viewer/junit</module>
<module>component/viewer/junit-tck</module>
-<!--
+
<module>example/application/claims</module>
<module>example/application/onlinedemo</module>
<module>example/application/quickstart</module>
@@ -80,13 +77,10 @@
<module>example/domain-service/email-service</module>
<module>example/misc/metamodel/namefile</module>
-
- <module>tool/maven-plugin</module>
--->
-
-<!--
+ <module>tool/maven-plugin</module>
+<!--
<module>example/misc/metamodel/jsr303</module>
--->
+ -->
</modules>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/tool/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tool/maven-plugin/pom.xml b/tool/maven-plugin/pom.xml
index 1dc4b61..a290c91 100644
--- a/tool/maven-plugin/pom.xml
+++ b/tool/maven-plugin/pom.xml
@@ -12,9 +12,8 @@
<groupId>org.apache.isis.tool</groupId>
<artifactId>isis-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>0.3.1-SNAPSHOT</version>
- <name>isis-maven-plugin Maven Mojo</name>
+ <name>Isis Maven Mojo (isis-maven-plugin)</name>
<url>http://maven.apache.org</url>
<prerequisites>
@@ -22,6 +21,7 @@
</prerequisites>
<properties>
+ <isis-parent.enforcer.validate>false</isis-parent.enforcer.validate>
<mavenVersion>2.0.9</mavenVersion>
</properties>
@@ -80,14 +80,8 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>runtime</artifactId>
- <version>0.3.1-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>dflt</artifactId>
- <version>0.3.1-incubating-SNAPSHOT</version>
+ <artifactId>isis-runtime</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -96,19 +90,6 @@
<version>3.0</version>
</dependency>
-<!--
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-api</artifactId>
- <version>1.8</version>
- </dependency>
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-util</artifactId>
- <version>1.8</version>
- </dependency>
- -->
-
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
@@ -142,12 +123,9 @@
<version>${mavenVersion}</version>
</dependency>
-
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/tool/maven-plugin/src/main/java/org/apache/isis/tools/mavenplugin/ValidateMojo.java
----------------------------------------------------------------------
diff --git a/tool/maven-plugin/src/main/java/org/apache/isis/tools/mavenplugin/ValidateMojo.java b/tool/maven-plugin/src/main/java/org/apache/isis/tools/mavenplugin/ValidateMojo.java
index d9685df..f87b497 100644
--- a/tool/maven-plugin/src/main/java/org/apache/isis/tools/mavenplugin/ValidateMojo.java
+++ b/tool/maven-plugin/src/main/java/org/apache/isis/tools/mavenplugin/ValidateMojo.java
@@ -36,7 +36,6 @@ import org.apache.isis.tools.mavenplugin.util.IsisMetaModels;
import org.apache.isis.tools.mavenplugin.util.Log4j;
import org.apache.isis.tools.mavenplugin.util.MavenProjects;
import org.apache.isis.tools.mavenplugin.util.Xpp3Doms;
-import org.apache.log4j.BasicConfigurator;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.plugin.AbstractMojo;
@@ -53,6 +52,7 @@ import org.codehaus.classworlds.DuplicateRealmException;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
/**
*
@@ -164,7 +164,7 @@ public class ValidateMojo extends AbstractMojo {
private List<Object> createServiceInstances(final ClassRealm isisRealm, final List<String> serviceClassNames) throws MojoFailureException {
final List<Object> serviceList = Lists.newArrayList();
- final List<String> logMessages = Lists.newArrayList();
+ final Set<String> logMessages = Sets.newLinkedHashSet();
for (String serviceClassName : serviceClassNames) {
try {
serviceList.add(isisRealm.loadClass(serviceClassName).newInstance());
@@ -191,7 +191,7 @@ public class ValidateMojo extends AbstractMojo {
return isisMetaModel;
}
- private void throwFailureException(String errorMessage, List<String> logMessages) throws MojoFailureException {
+ private void throwFailureException(String errorMessage, Set<String> logMessages) throws MojoFailureException {
logErrors(logMessages);
throw new MojoFailureException(errorMessage);
}
@@ -214,7 +214,7 @@ public class ValidateMojo extends AbstractMojo {
getLog().error("");
}
- private void logErrors(List<String> logMessages) {
+ private void logErrors(Set<String> logMessages) {
logErrors(logMessages.toArray(new String[] {}));
}