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
[6/12] git commit: ISIS-188: refactoring artifactIds - progmodel
ISIS-188: refactoring artifactIds - progmodel
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/2db8d8aa
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/2db8d8aa
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/2db8d8aa
Branch: refs/heads/master
Commit: 2db8d8aa6544914fc884c09735dfc3eed4e21e30
Parents: 2637c33
Author: Dan Haywood <da...@apache.org>
Authored: Fri Dec 7 12:40:27 2012 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Fri Dec 7 12:40:27 2012 +0000
----------------------------------------------------------------------
component/profilestore/sql/pom.xml | 14 ++++----
component/profilestore/xml/pom.xml | 14 ++++----
component/progmodel/groovy/applib/pom.xml | 10 +++---
component/progmodel/groovy/metamodel/pom.xml | 12 +++---
component/progmodel/groovy/pom.xml | 18 +++++-----
component/progmodel/wrapper/pom.xml | 24 +++++++-------
component/progmodel/wrapper/wrapper-applib/pom.xml | 14 ++++----
.../progmodel/wrapper/wrapper-metamodel/pom.xml | 26 +++++++-------
pom.xml | 4 +-
9 files changed, 68 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/2db8d8aa/component/profilestore/sql/pom.xml
----------------------------------------------------------------------
diff --git a/component/profilestore/sql/pom.xml b/component/profilestore/sql/pom.xml
index f99ceaa..9b529f5 100755
--- a/component/profilestore/sql/pom.xml
+++ b/component/profilestore/sql/pom.xml
@@ -27,9 +27,9 @@
<relativePath>../../../isis-parent/pom.xml</relativePath>
</parent>
- <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
- <artifactId>sql</artifactId>
- <name>Default Runtime SQL ProfileStore (jdbc)</name>
+ <groupId>org.apache.isis.profilestore</groupId>
+ <artifactId>isis-sql-profilestore</artifactId>
+ <name>Isis SQL ProfileStore</name>
<properties>
<siteBaseDir>.</siteBaseDir>
@@ -87,13 +87,13 @@
</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>
- <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>
http://git-wip-us.apache.org/repos/asf/isis/blob/2db8d8aa/component/profilestore/xml/pom.xml
----------------------------------------------------------------------
diff --git a/component/profilestore/xml/pom.xml b/component/profilestore/xml/pom.xml
index d7c3343..f7bd0ad 100644
--- a/component/profilestore/xml/pom.xml
+++ b/component/profilestore/xml/pom.xml
@@ -27,10 +27,10 @@
<relativePath>../../../isis-parent/pom.xml</relativePath>
</parent>
- <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
- <artifactId>xml</artifactId>
+ <groupId>org.apache.isis.profilestore</groupId>
+ <artifactId>isis-xml-profilestore</artifactId>
- <name>Default Runtime XML ProfileStore</name>
+ <name>Isis XML ProfileStore</name>
<properties>
<siteBaseDir>.</siteBaseDir>
@@ -95,13 +95,13 @@
</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>
- <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>
http://git-wip-us.apache.org/repos/asf/isis/blob/2db8d8aa/component/progmodel/groovy/applib/pom.xml
----------------------------------------------------------------------
diff --git a/component/progmodel/groovy/applib/pom.xml b/component/progmodel/groovy/applib/pom.xml
index a1fd534..a0da157 100644
--- a/component/progmodel/groovy/applib/pom.xml
+++ b/component/progmodel/groovy/applib/pom.xml
@@ -22,12 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>groovy</artifactId>
+ <groupId>org.apache.isis.progmodel</groupId>
+ <artifactId>isis-groovy-progmodel</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <artifactId>groovy-applib</artifactId>
+ <artifactId>isis-groovy-progmodel-applib</artifactId>
<name>Groovy ProgModel AppLib</name>
<properties>
@@ -40,8 +40,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis</groupId>
- <artifactId>applib</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
</dependency>
<!-- is marked as optional in parent, so not exported as a transitive dependency -->
http://git-wip-us.apache.org/repos/asf/isis/blob/2db8d8aa/component/progmodel/groovy/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/component/progmodel/groovy/metamodel/pom.xml b/component/progmodel/groovy/metamodel/pom.xml
index 01765f0..edbeb70 100644
--- a/component/progmodel/groovy/metamodel/pom.xml
+++ b/component/progmodel/groovy/metamodel/pom.xml
@@ -22,13 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>groovy</artifactId>
+ <groupId>org.apache.isis.progmodel</groupId>
+ <artifactId>isis-groovy-progmodel</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <artifactId>groovy-metamodel</artifactId>
- <name>Groovy ProgModel MetaModel</name>
+ <artifactId>isis-groovy-progmodel-metamodel</artifactId>
+ <name>Isis Groovy ProgModel MetaModel</name>
<properties>
<siteBaseDir>..</siteBaseDir>
@@ -40,8 +40,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>groovy-applib</artifactId>
+ <groupId>org.apache.isis.progmodel</groupId>
+ <artifactId>isis-groovy-progmodel-applib</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/2db8d8aa/component/progmodel/groovy/pom.xml
----------------------------------------------------------------------
diff --git a/component/progmodel/groovy/pom.xml b/component/progmodel/groovy/pom.xml
index 445224e..6b2a662 100644
--- a/component/progmodel/groovy/pom.xml
+++ b/component/progmodel/groovy/pom.xml
@@ -28,10 +28,10 @@
<relativePath>../../../isis-parent/pom.xml</relativePath>
</parent>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>groovy</artifactId>
+ <groupId>org.apache.isis.progmodel</groupId>
+ <artifactId>isis-groovy-progmodel</artifactId>
- <name>Groovy ProgModel</name>
+ <name>Isis Groovy ProgModel</name>
<packaging>pom</packaging>
@@ -55,20 +55,20 @@
<!-- Groovy Support -->
<dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>groovy-applib</artifactId>
+ <groupId>org.apache.isis.progmodel</groupId>
+ <artifactId>isis-groovy-progmodel-applib</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>groovy-metamodel</artifactId>
+ <groupId>org.apache.isis.progmodel</groupId>
+ <artifactId>isis-groovy-progmodel-metamodel</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
<!-- Apache Isis -->
<dependency>
- <groupId>org.apache.isis</groupId>
- <artifactId>applib</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/2db8d8aa/component/progmodel/wrapper/pom.xml
----------------------------------------------------------------------
diff --git a/component/progmodel/wrapper/pom.xml b/component/progmodel/wrapper/pom.xml
index 20f4efe..d2fd6aa 100644
--- a/component/progmodel/wrapper/pom.xml
+++ b/component/progmodel/wrapper/pom.xml
@@ -28,10 +28,10 @@
</parent>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>wrapper</artifactId>
+ <groupId>org.apache.isis.progmodel</groupId>
+ <artifactId>isis-wrapper-progmodel</artifactId>
- <name>Wrapper ProgModel</name>
+ <name>Isis Wrapper ProgModel</name>
<packaging>pom</packaging>
@@ -75,13 +75,13 @@
<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>
<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>
@@ -93,8 +93,8 @@
<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>
<type>test-jar</type>
<scope>test</scope>
@@ -109,12 +109,12 @@
<!-- wrapper applib -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>wrapper-applib</artifactId>
+ <artifactId>isis-wrapper-progmodel-applib</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>wrapper-applib</artifactId>
+ <artifactId>isis-wrapper-progmodel-applib</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
@@ -122,7 +122,7 @@
<!-- wrapper impl -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>wrapper-impl</artifactId>
+ <artifactId>isis-wrapper-progmodel-impl</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/2db8d8aa/component/progmodel/wrapper/wrapper-applib/pom.xml
----------------------------------------------------------------------
diff --git a/component/progmodel/wrapper/wrapper-applib/pom.xml b/component/progmodel/wrapper/wrapper-applib/pom.xml
index ab59a24..7436d64 100644
--- a/component/progmodel/wrapper/wrapper-applib/pom.xml
+++ b/component/progmodel/wrapper/wrapper-applib/pom.xml
@@ -21,14 +21,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>wrapper</artifactId>
+ <groupId>org.apache.isis.progmodel</groupId>
+ <artifactId>isis-wrapper-progmodel</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <artifactId>wrapper-applib</artifactId>
- <name>Wrapper ProgModel Applib</name>
- <description>Wrapper Applib</description>
+ <artifactId>isis-wrapper-progmodel-applib</artifactId>
+ <name>Isis Wrapper ProgModel Applib</name>
+ <description>Isis Wrapper ProgModel Applib</description>
<!-- shouldn't be needed, but was being built as a pom for some reason -->
@@ -69,8 +69,8 @@
<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/2db8d8aa/component/progmodel/wrapper/wrapper-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/component/progmodel/wrapper/wrapper-metamodel/pom.xml b/component/progmodel/wrapper/wrapper-metamodel/pom.xml
index 1ed5aef..341a901 100644
--- a/component/progmodel/wrapper/wrapper-metamodel/pom.xml
+++ b/component/progmodel/wrapper/wrapper-metamodel/pom.xml
@@ -21,15 +21,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>wrapper</artifactId>
+ <groupId>org.apache.isis.progmodel</groupId>
+ <artifactId>isis-wrapper-progmodel</artifactId>
<version>0.3.1-SNAPSHOT</version>
</parent>
- <artifactId>wrapper-metamodel</artifactId>
+ <artifactId>isis-wrapper-progmodel-metamodel</artifactId>
- <name>Wrapper ProgModel MetaModel</name>
- <description>Wrapper Metamodel</description>
+ <name>Isis Wrapper ProgModel MetaModel</name>
+ <description>Isis Wrapper Programming Model Metamodel Support</description>
<properties>
@@ -67,13 +67,13 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.progmodels</groupId>
- <artifactId>wrapper-applib</artifactId>
+ <groupId>org.apache.isis.progmodel</groupId>
+ <artifactId>isis-wrapper-progmodel-applib</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>runtime</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</artifactId>
</dependency>
<dependency>
@@ -83,15 +83,15 @@
<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>
<type>test-jar</type>
<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>
<scope>test</scope>
<version>0.3.1-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/2db8d8aa/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8540706..0455e20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,6 @@
<!--
<module>site-skin</module>
--->
<module>core</module>
@@ -46,10 +45,11 @@
<module>component/objectstore/sql</module>
<module>component/objectstore/nosql</module>
<module>component/objectstore/jdo</module>
-<!--
+-->
<module>component/progmodel/wrapper</module>
<module>component/progmodel/groovy</module>
+<!--
<module>component/profilestore/xml</module>
<module>component/profilestore/sql</module>