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
[7/12] git commit: ISIS-188: refactoring artifactIds - core and
objectstore
ISIS-188: refactoring artifactIds - core and objectstore
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2637c33f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2637c33f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2637c33f
Branch: refs/heads/master
Commit: 2637c33f8b0f5f4da876cb28616b737d53420aac
Parents: 255ef51
Author: Dan Haywood <da...@apache.org>
Authored: Fri Dec 7 12:28:34 2012 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Fri Dec 7 12:28:34 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 ++--
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 +-
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 | 16 ++--
pom.xml | 16 ++-
site-skin/pom.xml | 9 +-
130 files changed, 4411 insertions(+), 373 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/component/objectstore/jdo/jdo-applib/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/pom.xml b/component/objectstore/jdo/jdo-applib/pom.xml
index 14c32a1..222ae39 100644
--- a/component/objectstore/jdo/jdo-applib/pom.xml
+++ b/component/objectstore/jdo/jdo-applib/pom.xml
@@ -21,13 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <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>
</parent>
- <artifactId>jdo-applib</artifactId>
- <name>JDO ObjectStore AppLib</name>
+ <artifactId>isis-jdo-objectstore-applib</artifactId>
+ <name>Isis JDO ObjectStore AppLib</name>
<properties>
<siteBaseDir>..</siteBaseDir>
@@ -103,8 +103,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>
@@ -115,8 +115,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis</groupId>
- <artifactId>applib</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
</dependency>
<!-- DataNucleus (horrid, but needed to run the enhancer)-->
@@ -152,7 +152,6 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
-
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/component/objectstore/jdo/jdo-datanucleus/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/pom.xml b/component/objectstore/jdo/jdo-datanucleus/pom.xml
index 2185b18..0051c31 100644
--- a/component/objectstore/jdo/jdo-datanucleus/pom.xml
+++ b/component/objectstore/jdo/jdo-datanucleus/pom.xml
@@ -21,13 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <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>
</parent>
- <artifactId>jdo-datanucleus</artifactId>
- <name>JDO DataNucleus ObjectStore</name>
+ <artifactId>isis-jdo-objectstore-datanucleus</artifactId>
+ <name>Isis JDO ObjectStore DataNucleus impl</name>
<properties>
<siteBaseDir>..</siteBaseDir>
@@ -54,8 +54,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>jdo-metamodel</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-jdo-objectstore-metamodel</artifactId>
</dependency>
<dependency>
@@ -97,11 +97,11 @@
</dependency>
<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</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-integtestsupport</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/component/objectstore/jdo/jdo-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-metamodel/pom.xml b/component/objectstore/jdo/jdo-metamodel/pom.xml
index b7a365c..475335f 100644
--- a/component/objectstore/jdo/jdo-metamodel/pom.xml
+++ b/component/objectstore/jdo/jdo-metamodel/pom.xml
@@ -21,13 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <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>
</parent>
- <artifactId>jdo-metamodel</artifactId>
- <name>JDO ObjectStore MetaModel Support</name>
+ <artifactId>isis-jdo-objectstore-metamodel</artifactId>
+ <name>Isis JDO ObjectStore MetaModel Support</name>
<properties>
<siteBaseDir>..</siteBaseDir>
@@ -39,8 +39,8 @@
<dependencies>
<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>
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/component/objectstore/jdo/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/pom.xml b/component/objectstore/jdo/pom.xml
index 53ff0ce..e4ab8cd 100644
--- a/component/objectstore/jdo/pom.xml
+++ b/component/objectstore/jdo/pom.xml
@@ -21,8 +21,8 @@
<relativePath>../../../isis-parent/pom.xml</relativePath>
</parent>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>jdo</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-jdo-objectstore</artifactId>
<name>Default Runtime JDO ObjectStore</name>
@@ -69,25 +69,25 @@
<dependencyManagement>
<dependencies>
<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>0.3.1-SNAPSHOT</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>0.3.1-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>jdo-metamodel</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-jdo-objectstore-metamodel</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>jdo-metamodel</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-jdo-objectstore-metamodel</artifactId>
<version>0.3.1-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
@@ -95,8 +95,8 @@
<!-- isis core -->
<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>
@@ -118,12 +118,12 @@
<scope>test</scope>
</dependency>
<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>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-integtestsupport</artifactId>
<version>0.3.1-SNAPSHOT</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/component/objectstore/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/pom.xml b/component/objectstore/nosql/pom.xml
index 54682bd..4b890d3 100644
--- a/component/objectstore/nosql/pom.xml
+++ b/component/objectstore/nosql/pom.xml
@@ -27,20 +27,20 @@
<relativePath>../../../isis-parent/pom.xml</relativePath>
</parent>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>nosql</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-nosql-objectstore</artifactId>
- <name>Default Runtime NOSQL ObjectStore</name>
+ <name>Isis NOSQL ObjectStore</name>
<description>
- Provides file based persistence for a standalone application using a NOSQL database.
+ Provides file-based or MongoDB-based persistence for a standalone application using a NOSQL database.
</description>
<properties>
<siteBaseDir>.</siteBaseDir>
<relativeUrl/>
- <docbkxGuideTitle>Apache Isis Default Runtime NOSQL ObjectStore</docbkxGuideTitle>
+ <docbkxGuideTitle>Apache Isis NOSQL ObjectStore</docbkxGuideTitle>
<docbkxGuideSubTitle>Configuration and Deployment Guide</docbkxGuideSubTitle>
<docbkxGuideName>isis-nosql-objectstore</docbkxGuideName>
</properties>
@@ -101,7 +101,6 @@
</plugins>
</build>
-
<reporting>
<plugins>
<plugin>
@@ -128,17 +127,6 @@
</plugins>
</reporting>
- <repositories>
- <repository>
- <id>Maven Central Repository (UK Mirror)</id>
- <url>http://uk.maven.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
-
- </repositories>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -162,10 +150,9 @@
<dependencies>
<!-- compile 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>
@@ -199,37 +186,37 @@
</dependency>
<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>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-integtestsupport</artifactId>
<version>0.3.1-SNAPSHOT</version>
<scope>test</scope>
</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>0.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-objectstore</artifactId>
<version>0.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-objectstore</artifactId>
<version>0.3.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/component/objectstore/sql/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/pom.xml b/component/objectstore/sql/pom.xml
index 372fff8..9d30a0d 100644
--- a/component/objectstore/sql/pom.xml
+++ b/component/objectstore/sql/pom.xml
@@ -19,10 +19,10 @@
<relativePath>../../../isis-parent/pom.xml</relativePath>
</parent>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>sql</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-sql-objectstore</artifactId>
- <name>Default Runtime SQL ObjectStore</name>
+ <name>Isis SQL ObjectStore</name>
<description>
Provides JDBC-based persistence.
@@ -85,8 +85,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>
@@ -97,7 +97,7 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-integtestsupport</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
@@ -105,53 +105,60 @@
<!-- Required for TestProxy -->
<!-- Isis defaults -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-objectstore</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-objectstore</artifactId>
<version>0.3.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</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>0.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<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>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>sql-tests-common</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-sql-objectstore-tests-common</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>sql-tests-common</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-sql-objectstore-tests-common</artifactId>
<version>0.3.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>sql-tests-served</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-sql-objectstore-tests-served</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.tck</groupId>
- <artifactId>tck-dom</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-tck-dom</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
+ <!-- Required to support the XML cross-test -->
+ <dependency>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-xml-objectstore</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
+ </dependency>
+
<!-- Test environment -->
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/component/objectstore/sql/sql-impl/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/pom.xml b/component/objectstore/sql/sql-impl/pom.xml
index 87477ef..00a70fe 100644
--- a/component/objectstore/sql/sql-impl/pom.xml
+++ b/component/objectstore/sql/sql-impl/pom.xml
@@ -13,13 +13,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>sql</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-sql-objectstore</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <artifactId>sql-impl</artifactId>
- <name>Default Runtime SQL ObjectStore Implementation</name>
+ <artifactId>isis-sql-objectstore-impl</artifactId>
+ <name>Isis SQL ObjectStore Implementation</name>
<description>SQL Objectstire Implementation. Uses jdbc for maximum compatibility.</description>
<properties>
@@ -57,8 +57,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>runtime</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</artifactId>
</dependency>
<!-- Test dependencies -->
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/component/objectstore/sql/sql-tests-common/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-tests-common/pom.xml b/component/objectstore/sql/sql-tests-common/pom.xml
index 316a5d9..49e01b4 100644
--- a/component/objectstore/sql/sql-tests-common/pom.xml
+++ b/component/objectstore/sql/sql-tests-common/pom.xml
@@ -22,14 +22,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>sql</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-sql-objectstore</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <artifactId>sql-tests-common</artifactId>
+ <artifactId>isis-sql-objectstore-tests-common</artifactId>
- <name>Default Runtime SQL ObjectStore Integration Tests - Common</name>
+ <name>Isis SQL ObjectStore Integration Tests - Common</name>
<properties>
<siteBaseDir>..</siteBaseDir>
@@ -106,42 +106,42 @@
</dependency>
<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</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-integtestsupport</artifactId>
</dependency>
<!-- Required for TestProxy -->
<!-- Isis defaults -->
<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>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-objectstore</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-cglib-bytecode</artifactId>
<scope>test</scope>
</dependency>
<!-- Isis Object store -->
<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>
</dependency>
<dependency>
- <groupId>org.apache.isis.tck</groupId>
- <artifactId>tck-dom</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-tck-dom</artifactId>
</dependency>
@@ -152,8 +152,8 @@
</dependency>
<!-- Required to support the XML cross-test -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>xml</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-xml-objectstore</artifactId>
</dependency>
<!-- others -->
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/component/objectstore/sql/sql-tests-served/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-tests-served/pom.xml b/component/objectstore/sql/sql-tests-served/pom.xml
index d03067a..ec8a724 100644
--- a/component/objectstore/sql/sql-tests-served/pom.xml
+++ b/component/objectstore/sql/sql-tests-served/pom.xml
@@ -22,14 +22,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>sql</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-sql-objectstore</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <artifactId>sql-tests-served</artifactId>
+ <artifactId>isis-sql-objectstore-tests-served</artifactId>
- <name>Default Runtime SQL ObjectStore Integration Tests - Served</name>
+ <name>Isis SQL ObjectStore Integration Tests - Served</name>
<properties>
<siteBaseDir>..</siteBaseDir>
@@ -88,19 +88,10 @@ Just add your server implementation to org.apache.isis.extensions.sql.objectstor
<!-- SQL integration tests common -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>sql-tests-common</artifactId>
+ <artifactId>isis-sql-objectstore-tests-common</artifactId>
<version>${project.version}</version>
</dependency>
- <!-- Required to support the XML cross-test -->
- <!--
- <dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>xml</artifactId>
- <version>${xml-objectstore.version}</version>
- </dependency>
- -->
-
<!-- JDBC drivers -->
<dependency>
<groupId>postgresql</groupId>
@@ -118,24 +109,24 @@ Just add your server implementation to org.apache.isis.extensions.sql.objectstor
<dependencies>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>runtime</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</artifactId>
</dependency>
<!-- Required for TestProxy -->
<!-- Isis defaults -->
<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>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-objectstore</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-cglib-bytecode</artifactId>
<scope>test</scope>
</dependency>
@@ -143,17 +134,17 @@ Just add your server implementation to org.apache.isis.extensions.sql.objectstor
<!-- Isis Object store -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>sql-impl</artifactId>
+ <artifactId>isis-sql-objectstore-impl</artifactId>
</dependency>
<!-- Test common -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>sql-tests-common</artifactId>
+ <artifactId>isis-sql-objectstore-tests-common</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>sql-tests-common</artifactId>
+ <artifactId>isis-sql-objectstore-tests-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/component/objectstore/xml/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/pom.xml b/component/objectstore/xml/pom.xml
index 2fa3b26..8e98c83 100644
--- a/component/objectstore/xml/pom.xml
+++ b/component/objectstore/xml/pom.xml
@@ -27,10 +27,10 @@
<relativePath>../../../isis-parent/pom.xml</relativePath>
</parent>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>xml</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-xml-objectstore</artifactId>
- <name>Default Runtime XML ObjectStore</name>
+ <name>Isis XML ObjectStore</name>
<properties>
<siteBaseDir>.</siteBaseDir>
@@ -95,26 +95,26 @@
</dependency>
<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>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-integtestsupport</artifactId>
<version>0.3.1-SNAPSHOT</version>
<scope>test</scope>
</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>0.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.isis.tck</groupId>
- <artifactId>tck-dom</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-tck-dom</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/core/applib/pom.xml
----------------------------------------------------------------------
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 7deb6fe..81a909e 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -21,14 +21,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis</groupId>
- <artifactId>core</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <artifactId>applib</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
- <name>Isis AppLib</name>
+ <name>Isis Core AppLib</name>
<description>
Isis application library, defining annotations and utilities for the
default (Java) programming model.
@@ -82,17 +83,6 @@
</plugins>
</reporting>
- <dependencyManagement>
- <dependencies>
- <!-- JodaTime -->
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.1</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>joda-time</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/core/bytecode-cglib/pom.xml
----------------------------------------------------------------------
diff --git a/core/bytecode-cglib/pom.xml b/core/bytecode-cglib/pom.xml
index e0df187..3c08b87 100644
--- a/core/bytecode-cglib/pom.xml
+++ b/core/bytecode-cglib/pom.xml
@@ -21,14 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis</groupId>
- <artifactId>core</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>dflt</artifactId>
- <name>Default Runtime Default Bytecode (CgLib)</name>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-cglib-bytecode</artifactId>
+ <name>Isis Core CgLib Bytecode</name>
<properties>
<siteBaseDir>..</siteBaseDir>
@@ -65,12 +65,12 @@
<dependencies>
<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</groupId>
- <artifactId>runtime</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/core/bytecode-javassist/pom.xml
----------------------------------------------------------------------
diff --git a/core/bytecode-javassist/pom.xml b/core/bytecode-javassist/pom.xml
index 9606b91..7239f23 100644
--- a/core/bytecode-javassist/pom.xml
+++ b/core/bytecode-javassist/pom.xml
@@ -21,15 +21,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis</groupId>
- <artifactId>core</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>javassist</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-javassist-bytecode</artifactId>
- <name>Default Runtime Javassist Bytecode Implementation</name>
+ <name>Isis Core Javassist Bytecode</name>
<properties>
<siteBaseDir>..</siteBaseDir>
@@ -72,12 +72,12 @@
<dependencies>
<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</groupId>
- <artifactId>runtime</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/core/integtestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 9428929..331dcf4 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -21,14 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis</groupId>
- <artifactId>core</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
<artifactId>isis-integtestsupport</artifactId>
- <name>Default Runtime Test Support</name>
+ <name>Isis Core Integration Testing Support</name>
<properties>
<siteBaseDir>..</siteBaseDir>
@@ -70,8 +69,8 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-cglib-bytecode</artifactId>
<scope>test</scope>
</dependency>
@@ -96,36 +95,29 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.tck</groupId>
- <artifactId>tck-dom</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-tck-dom</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>dflt</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-noop-security</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-objectstore</artifactId>
</dependency>
-<!--
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-profilestore</artifactId>
</dependency>
--->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>runtime</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/core/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index b6dde15..5b79bd2 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -13,8 +13,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis</groupId>
- <artifactId>core</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
@@ -63,16 +63,17 @@
</dependency>
<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</groupId>
- <artifactId>applib</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/core/objectstore-inmemory/pom.xml
----------------------------------------------------------------------
diff --git a/core/objectstore-inmemory/pom.xml b/core/objectstore-inmemory/pom.xml
index 48ab8ac..ae53646 100644
--- a/core/objectstore-inmemory/pom.xml
+++ b/core/objectstore-inmemory/pom.xml
@@ -21,14 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis</groupId>
- <artifactId>core</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>dflt</artifactId>
- <name>Default Runtime Default ObjectStore (In-Memory)</name>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-objectstore</artifactId>
+ <name>Isis Core In-Memory ObjectStore</name>
<properties>
<siteBaseDir>..</siteBaseDir>
@@ -68,22 +68,19 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-unittestsupport</artifactId>
- <version>0.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-metamodel</artifactId>
- <version>0.3.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>runtime</artifactId>
- <version>0.3.1-SNAPSHOT</version>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index c218482..c3b029b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -19,14 +19,13 @@
<relativePath>../isis-parent/pom.xml</relativePath>
</parent>
- <artifactId>core</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
<name>Isis Core</name>
<description>
Core framework, providing metamodel, runtime and core APIs.
- Does not include default implementations of those APIs, nor any viewers to
- render the metamodel.
</description>
<packaging>pom</packaging>
@@ -120,13 +119,13 @@
<!-- applib -->
<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>
- <groupId>org.apache.isis</groupId>
- <artifactId>applib</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
<version>0.3.1-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
@@ -146,13 +145,13 @@
<!-- runtime -->
<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>
<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>
<type>test-jar</type>
<scope>test</scope>
@@ -160,46 +159,46 @@
<!-- bytecode-cglib -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-cglib-bytecode</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
<!-- bytecode-javassist -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>javassist</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-javassist-bytecode</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
<!-- isis-webserver -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-webserver</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
<!-- isis-integtestsupport -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-integtestsupport</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
<!-- default implementations -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-objectstore</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-profilestore</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-noop-security</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/core/profilestore-inmemory/pom.xml
----------------------------------------------------------------------
diff --git a/core/profilestore-inmemory/pom.xml b/core/profilestore-inmemory/pom.xml
index 737d73c..bec4114 100644
--- a/core/profilestore-inmemory/pom.xml
+++ b/core/profilestore-inmemory/pom.xml
@@ -21,14 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis</groupId>
- <artifactId>core</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
- <artifactId>dflt</artifactId>
- <name>Default ProfileStore (In-Memory)</name>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-profilestore</artifactId>
+ <name>Isis Core In-memory ProfileStore</name>
<properties>
<siteBaseDir>..</siteBaseDir>
@@ -79,12 +79,12 @@
</dependency>
<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</groupId>
- <artifactId>runtime</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index c5550ee..947952c 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -21,14 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis</groupId>
- <artifactId>core</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>runtime</artifactId>
- <name>Default Runtime Runtime</name>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</artifactId>
+ <name>Isis Core Runtime</name>
<properties>
<siteBaseDir>..</siteBaseDir>
@@ -81,8 +81,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis</groupId>
- <artifactId>applib</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/core/security-noop/pom.xml
----------------------------------------------------------------------
diff --git a/core/security-noop/pom.xml b/core/security-noop/pom.xml
index d791d1b..0d35572 100644
--- a/core/security-noop/pom.xml
+++ b/core/security-noop/pom.xml
@@ -21,14 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis</groupId>
- <artifactId>core</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>dflt</artifactId>
- <name>Default Security (No-op)</name>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-noop-security</artifactId>
+ <name>Isis No-op Security</name>
<properties>
<siteBaseDir>..</siteBaseDir>
@@ -66,12 +66,12 @@
<dependencies>
<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</groupId>
- <artifactId>runtime</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/core/tck/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/pom.xml b/core/tck/pom.xml
index 4898791..7eaa788 100644
--- a/core/tck/pom.xml
+++ b/core/tck/pom.xml
@@ -21,18 +21,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis</groupId>
- <artifactId>core</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.isis.tck</groupId>
- <artifactId>tck</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-tck</artifactId>
- <name>TCK App</name>
+ <name>Isis Core TCK App</name>
<packaging>pom</packaging>
-
<repositories>
<repository>
@@ -145,92 +144,71 @@
<!-- this project's own modules -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tck-dom</artifactId>
+ <artifactId>isis-tck-dom</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tck-fixture</artifactId>
+ <artifactId>isis-tck-fixture</artifactId>
<version>${project.version}</version>
</dependency>
- <!-- isis: applib -->
- <dependency>
- <groupId>org.apache.isis</groupId>
- <artifactId>applib</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis</groupId>
- <artifactId>applib</artifactId>
- <classifier>javadoc</classifier>
- <version>0.3.1-SNAPSHOT</version>
- </dependency>
-
- <!-- isis: core -->
+ <!-- isis -->
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>commons</artifactId>
+ <artifactId>isis-applib</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>progmodel</artifactId>
+ <artifactId>isis-applib</artifactId>
+ <classifier>javadoc</classifier>
<version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>runtime</artifactId>
+ <artifactId>isis-metamodel</artifactId>
<version>0.3.1-SNAPSHOT</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>0.3.1-SNAPSHOT</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>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-webserver</artifactId>
<version>0.3.1-SNAPSHOT</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>0.3.1-SNAPSHOT</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>0.3.1-SNAPSHOT</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>0.3.1-SNAPSHOT</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>0.3.1-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/core/tck/tck-dom/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-dom/pom.xml b/core/tck/tck-dom/pom.xml
index 99ddbd4..49480d7 100644
--- a/core/tck/tck-dom/pom.xml
+++ b/core/tck/tck-dom/pom.xml
@@ -20,13 +20,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.tck</groupId>
- <artifactId>tck</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-tck</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <artifactId>tck-dom</artifactId>
- <name>TCK DOM</name>
+ <artifactId>isis-tck-dom</artifactId>
+ <name>Isis Core TCK DOM</name>
<profiles>
<profile>
@@ -103,13 +103,31 @@
</plugins>
</pluginManagement>
</build>
+ <dependencies>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-core</artifactId>
+ <version>3.1.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-enhancer</artifactId>
+ <version>3.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.datanucleus</groupId>
+ <artifactId>datanucleus-api-jdo</artifactId>
+ <version>3.1.2</version>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
<dependencies>
<dependency>
- <groupId>org.apache.isis</groupId>
- <artifactId>applib</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
</dependency>
<!-- necessary, since we have JDO annotations in the code -->
@@ -126,25 +144,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-core</artifactId>
- <version>3.1.2</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-enhancer</artifactId>
- <version>3.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-api-jdo</artifactId>
- <version>3.1.2</version>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/core/tck/tck-fixture/pom.xml
----------------------------------------------------------------------
diff --git a/core/tck/tck-fixture/pom.xml b/core/tck/tck-fixture/pom.xml
index 47b087e..ea5a3df 100644
--- a/core/tck/tck-fixture/pom.xml
+++ b/core/tck/tck-fixture/pom.xml
@@ -20,19 +20,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.tck</groupId>
- <artifactId>tck</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-tck</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <artifactId>tck-fixture</artifactId>
- <name>TCK Fixtures</name>
+ <artifactId>isis-tck-fixture</artifactId>
+ <name>Isis Core TCK Fixtures</name>
<dependencies>
<dependency>
- <groupId>org.apache.isis.tck</groupId>
- <artifactId>tck-dom</artifactId>
- <version>0.3.1-SNAPSHOT</version>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-tck-dom</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/core/unittestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 3620fb5..28943b6 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -21,14 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis</groupId>
- <artifactId>core</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-unittestsupport</artifactId>
- <name>Core Test Support</name>
+ <name>Isis Core Unit Test Support</name>
<description>
Support for writing unit tests; should be added as a dependency
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/core/webserver/pom.xml
----------------------------------------------------------------------
diff --git a/core/webserver/pom.xml b/core/webserver/pom.xml
index 46cfe87..f81cadf 100644
--- a/core/webserver/pom.xml
+++ b/core/webserver/pom.xml
@@ -21,14 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis</groupId>
- <artifactId>core</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-webserver</artifactId>
- <name>Default Runtime WebServer (Jetty)</name>
+ <name>Isis Core WebServer</name>
<properties>
<siteBaseDir>..</siteBaseDir>
@@ -66,8 +66,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>runtime</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/idea/applib.iml
----------------------------------------------------------------------
diff --git a/idea/applib.iml b/idea/applib.iml
new file mode 100644
index 0000000..61be463
--- /dev/null
+++ b/idea/applib.iml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/../core/applib/target/classes" />
+ <output-test url="file://$MODULE_DIR$/../core/applib/target/test-classes" />
+ <content url="file://$MODULE_DIR$/../core/applib">
+ <sourceFolder url="file://$MODULE_DIR$/../core/applib/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../core/applib/src/main/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../core/applib/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/../core/applib/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: joda-time:joda-time:2.1" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:13.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-junit4:2.5.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock:2.5.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-legacy:2.5.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.2.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+ </component>
+</module>
+
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/idea/bdd-common.iml
----------------------------------------------------------------------
diff --git a/idea/bdd-common.iml b/idea/bdd-common.iml
new file mode 100644
index 0000000..1a403ea
--- /dev/null
+++ b/idea/bdd-common.iml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/../component/viewer/bdd/common/target/classes" />
+ <output-test url="file://$MODULE_DIR$/../component/viewer/bdd/common/target/test-classes" />
+ <content url="file://$MODULE_DIR$/../component/viewer/bdd/common">
+ <sourceFolder url="file://$MODULE_DIR$/../component/viewer/bdd/common/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../component/viewer/bdd/common/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/../component/viewer/bdd/common/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="isis-metamodel" />
+ <orderEntry type="module" module-name="applib" />
+ <orderEntry type="library" name="Maven: joda-time:joda-time:2.1" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:13.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+ <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.7" level="project" />
+ <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
+ <orderEntry type="library" name="Maven: com.google.inject:guice:3.0" level="project" />
+ <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="module" module-name="runtime" />
+ <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+ <orderEntry type="module" module-name="dflt (2) (org.apache.isis.runtimes.dflt.objectstores)" />
+ <orderEntry type="module" module-name="dflt (3) (org.apache.isis.runtimes.dflt.profilestores)" />
+ <orderEntry type="module" module-name="dflt (4) (org.apache.isis.security)" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-junit4:2.5.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock:2.5.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit-dep:4.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-legacy:2.5.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.2.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+ </component>
+</module>
+
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/idea/bdd-concordion-tck.iml
----------------------------------------------------------------------
diff --git a/idea/bdd-concordion-tck.iml b/idea/bdd-concordion-tck.iml
new file mode 100644
index 0000000..e050b4b
--- /dev/null
+++ b/idea/bdd-concordion-tck.iml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/../component/viewer/bdd/concordion-tck/target/classes" />
+ <output-test url="file://$MODULE_DIR$/../component/viewer/bdd/concordion-tck/target/test-classes" />
+ <content url="file://$MODULE_DIR$/../component/viewer/bdd/concordion-tck">
+ <sourceFolder url="file://$MODULE_DIR$/../component/viewer/bdd/concordion-tck/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/../component/viewer/bdd/concordion-tck/src/test/resources" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/../component/viewer/bdd/concordion-tck/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="tck-fixture" />
+ <orderEntry type="module" module-name="tck-dom" />
+ <orderEntry type="module" module-name="applib" />
+ <orderEntry type="library" name="Maven: joda-time:joda-time:2.1" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:13.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+ <orderEntry type="library" name="Maven: javax.jdo:jdo-api:3.0.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.datanucleus:datanucleus-core:3.1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.datanucleus:datanucleus-enhancer:3.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.0" level="project" />
+ <orderEntry type="library" name="Maven: org.datanucleus:datanucleus-api-jdo:3.1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1" level="project" />
+ <orderEntry type="module" module-name="isis-metamodel" />
+ <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.7" level="project" />
+ <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
+ <orderEntry type="library" name="Maven: com.google.inject:guice:3.0" level="project" />
+ <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="module" module-name="dflt (1) (org.apache.isis.runtimes.dflt.bytecode)" />
+ <orderEntry type="module" module-name="runtime" />
+ <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+ <orderEntry type="library" name="Maven: asm:asm:3.3.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.2.2" level="project" />
+ <orderEntry type="module" module-name="dflt (2) (org.apache.isis.runtimes.dflt.objectstores)" />
+ <orderEntry type="module" module-name="dflt (3) (org.apache.isis.runtimes.dflt.profilestores)" />
+ <orderEntry type="module" module-name="dflt (4) (org.apache.isis.security)" />
+ <orderEntry type="module" module-name="bdd-concordion" scope="TEST" />
+ <orderEntry type="module" module-name="bdd-common" scope="TEST" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.concordion:concordion:1.4.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: ognl:ognl:2.6.9" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
+ <orderEntry type="library" name="Maven: xom:xom:1.2.5" level="project" />
+ <orderEntry type="library" name="Maven: xerces:xercesImpl:2.8.0" level="project" />
+ <orderEntry type="library" name="Maven: xalan:xalan:2.7.0" level="project" />
+ <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.3.03" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-junit4:2.5.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock:2.5.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-legacy:2.5.1" level="project" />
+ </component>
+</module>
+
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/idea/bdd-concordion.iml
----------------------------------------------------------------------
diff --git a/idea/bdd-concordion.iml b/idea/bdd-concordion.iml
new file mode 100644
index 0000000..087bf1d
--- /dev/null
+++ b/idea/bdd-concordion.iml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/../component/viewer/bdd/concordion/target/classes" />
+ <output-test url="file://$MODULE_DIR$/../component/viewer/bdd/concordion/target/test-classes" />
+ <content url="file://$MODULE_DIR$/../component/viewer/bdd/concordion">
+ <sourceFolder url="file://$MODULE_DIR$/../component/viewer/bdd/concordion/src/main/java" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/../component/viewer/bdd/concordion/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="bdd-common" />
+ <orderEntry type="module" module-name="isis-metamodel" />
+ <orderEntry type="module" module-name="applib" />
+ <orderEntry type="library" name="Maven: joda-time:joda-time:2.1" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:13.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+ <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.7" level="project" />
+ <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
+ <orderEntry type="library" name="Maven: com.google.inject:guice:3.0" level="project" />
+ <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="module" module-name="runtime" />
+ <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+ <orderEntry type="module" module-name="dflt (2) (org.apache.isis.runtimes.dflt.objectstores)" />
+ <orderEntry type="module" module-name="dflt (3) (org.apache.isis.runtimes.dflt.profilestores)" />
+ <orderEntry type="module" module-name="dflt (4) (org.apache.isis.security)" />
+ <orderEntry type="library" name="Maven: org.concordion:concordion:1.4.2" level="project" />
+ <orderEntry type="library" name="Maven: ognl:ognl:2.6.9" level="project" />
+ <orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-junit4:2.5.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock:2.5.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit-dep:4.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-legacy:2.5.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.2.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+ </component>
+</module>
+
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/idea/bdd.iml
----------------------------------------------------------------------
diff --git a/idea/bdd.iml b/idea/bdd.iml
new file mode 100644
index 0000000..a68f1be
--- /dev/null
+++ b/idea/bdd.iml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/../component/viewer/bdd/target/classes" />
+ <output-test url="file://$MODULE_DIR$/../component/viewer/bdd/target/test-classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$/../component/viewer/bdd">
+ <excludeFolder url="file://$MODULE_DIR$/../component/viewer/bdd/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:13.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-junit4:2.5.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock:2.5.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit-dep:4.4" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-legacy:2.5.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: cglib:cglib-nodep:2.2.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.2" level="project" />
+ </component>
+</module>
+
http://git-wip-us.apache.org/repos/asf/isis/blob/2637c33f/idea/claims-dom.iml
----------------------------------------------------------------------
diff --git a/idea/claims-dom.iml b/idea/claims-dom.iml
new file mode 100644
index 0000000..e53487e
--- /dev/null
+++ b/idea/claims-dom.iml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/../example/application/claims/dom/target/classes" />
+ <output-test url="file://$MODULE_DIR$/../example/application/claims/dom/target/test-classes" />
+ <content url="file://$MODULE_DIR$/../example/application/claims/dom">
+ <sourceFolder url="file://$MODULE_DIR$/../example/application/claims/dom/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../example/application/claims/dom/src/main/resources" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/../example/application/claims/dom/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="applib" />
+ <orderEntry type="library" name="Maven: joda-time:joda-time:2.1" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:13.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+ <orderEntry type="module" module-name="jdo-applib" />
+ <orderEntry type="library" name="Maven: javax.jdo:jdo-api:3.0.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.datanucleus:datanucleus-core:3.1.2" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.datanucleus:datanucleus-enhancer:3.1.1" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.ow2.asm:asm:4.0" level="project" />
+ <orderEntry type="library" name="Maven: org.datanucleus:datanucleus-jodatime:3.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.datanucleus:datanucleus-api-jdo:3.1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1" level="project" />
+ </component>
+</module>
+