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
[2/12] git commit: ISIS-188: refactoring artifactIds - examples
ISIS-188: refactoring artifactIds - examples
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/789c6196
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/789c6196
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/789c6196
Branch: refs/heads/master
Commit: 789c61968b5e222931bbc3c33f2756b3e94edb04
Parents: 1db49cf
Author: Dan Haywood <da...@apache.org>
Authored: Fri Dec 7 18:15:35 2012 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Fri Dec 7 18:15:35 2012 +0000
----------------------------------------------------------------------
component/viewer/dnd-tck/pom.xml | 6 +-
example/application/claims/dom/pom.xml | 12 +-
example/application/claims/fixture/pom.xml | 2 +-
.../application/claims/objstore-default/pom.xml | 42 ----
.../dflt/claim/ClaimRepositoryDefault.java | 136 -----------
.../dflt/employee/EmployeeRepositoryDefault.java | 62 -----
example/application/claims/objstore-jdo/pom.xml | 20 +-
example/application/claims/pom.xml | 173 +++++----------
example/application/claims/viewer-bdd/pom.xml | 27 +--
example/application/claims/viewer-dnd/pom.xml | 38 ++--
.../isis/example/claims/junit/AbstractTest.java | 4 +-
example/application/claims/viewer-html/pom.xml | 31 ++--
.../claims/viewer-restfulobjects/pom.xml | 26 +-
example/application/claims/viewer-scimpi/pom.xml | 30 ++--
example/application/claims/viewer-wicket/pom.xml | 72 +++---
example/application/onlinedemo/dom/pom.xml | 4 +-
example/application/onlinedemo/pom.xml | 104 +++------
example/application/onlinedemo/webapp/pom.xml | 32 ++--
example/application/quickstart/dom/pom.xml | 4 +-
example/application/quickstart/pom.xml | 146 ++++--------
example/application/quickstart/viewer-dnd/pom.xml | 26 +--
example/application/quickstart/viewer-html/pom.xml | 40 ++--
.../application/quickstart/viewer-scimpi/pom.xml | 46 ++--
.../quickstart_dnd_junit_bdd/dom/pom.xml | 19 +--
.../application/quickstart_dnd_junit_bdd/pom.xml | 144 ++++--------
.../quickstart_dnd_junit_bdd/tests-bdd/pom.xml | 20 +-
.../quickstart_dnd_junit_bdd/tests-junit/pom.xml | 20 +-
.../quickstart_dnd_junit_bdd/viewer-dnd/pom.xml | 27 +--
.../quickstart_wicket_restful_jdo/dom/pom.xml | 14 +-
.../objstore-jdo/pom.xml | 4 +-
.../quickstart_wicket_restful_jdo/pom.xml | 144 ++++--------
.../viewer-restfulobjects/pom.xml | 34 ++-
.../viewer-wicket/pom.xml | 36 ++--
example/domain-service/email-service/pom.xml | 4 +-
example/misc/metamodel/namefile/pom.xml | 4 +-
.../examples/facets/namefile/NameFileFacet.java | 7 +-
.../facets/namefile/NameFileFacetFactory.java | 4 -
isis-parent/pom.xml | 102 ++++++----
pom.xml | 18 +-
tool/maven-plugin/pom.xml | 30 +---
.../isis/tools/mavenplugin/ValidateMojo.java | 8 +-
41 files changed, 613 insertions(+), 1109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/component/viewer/dnd-tck/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/dnd-tck/pom.xml b/component/viewer/dnd-tck/pom.xml
index 5dfd1b5..d8722b5 100644
--- a/component/viewer/dnd-tck/pom.xml
+++ b/component/viewer/dnd-tck/pom.xml
@@ -33,7 +33,7 @@
<groupId>org.apache.isis.viewer</groupId>
<artifactId>isis-dnd-viewer-tck</artifactId>
- <name>Viewer DnD for TCK</name>
+ <name>Isis Drag-n-Drop Viewer TCK</name>
<properties>
<siteBaseDir>..</siteBaseDir>
@@ -69,8 +69,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.tck</groupId>
- <artifactId>tck-fixture</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-tck-fixture</artifactId>
<version>0.3.1-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/example/application/claims/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/dom/pom.xml b/example/application/claims/dom/pom.xml
index e2e26bc..fd2d3ea 100644
--- a/example/application/claims/dom/pom.xml
+++ b/example/application/claims/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>
@@ -104,13 +104,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>
<!-- DataNucleus (horrid, but needed to run the enhancer)-->
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/example/application/claims/fixture/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/fixture/pom.xml b/example/application/claims/fixture/pom.xml
index 09df481..62a9435 100644
--- a/example/application/claims/fixture/pom.xml
+++ b/example/application/claims/fixture/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>claims-objstore-dflt</artifactId>
+ <artifactId>claims-dom</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/example/application/claims/objstore-default/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/objstore-default/pom.xml b/example/application/claims/objstore-default/pom.xml
deleted file mode 100644
index e6e490e..0000000
--- a/example/application/claims/objstore-default/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.isis.example.application</groupId>
- <artifactId>claims</artifactId>
- <version>0.3.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>claims-objstore-dflt</artifactId>
- <name>Example Claims App Repositories (for ObjectStore Default)</name>
-
- <dependencies>
-
- <!-- other modules in this project -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>claims-dom</artifactId>
- </dependency>
-
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/example/application/claims/objstore-default/src/main/java/org/apache/isis/example/claims/objstore/dflt/claim/ClaimRepositoryDefault.java
----------------------------------------------------------------------
diff --git a/example/application/claims/objstore-default/src/main/java/org/apache/isis/example/claims/objstore/dflt/claim/ClaimRepositoryDefault.java b/example/application/claims/objstore-default/src/main/java/org/apache/isis/example/claims/objstore/dflt/claim/ClaimRepositoryDefault.java
deleted file mode 100644
index 3497cb0..0000000
--- a/example/application/claims/objstore-default/src/main/java/org/apache/isis/example/claims/objstore/dflt/claim/ClaimRepositoryDefault.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.example.claims.objstore.dflt.claim;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.apache.isis.applib.AbstractFactoryAndRepository;
-import org.apache.isis.applib.filter.Filter;
-import org.apache.isis.applib.value.Date;
-import org.apache.isis.example.claims.dom.claim.Claim;
-import org.apache.isis.example.claims.dom.claim.ClaimRepository;
-import org.apache.isis.example.claims.dom.claim.Claimant;
-
-public class ClaimRepositoryDefault extends AbstractFactoryAndRepository implements ClaimRepository {
-
- // {{ Id, iconName
- @Override
- public String getId() {
- return "claims";
- }
-
- public String iconName() {
- return "ClaimRepository";
- }
-
- // }}
-
- // {{ action: allClaims
- @Override
- public List<Claim> allClaims() {
- return allInstances(Claim.class);
- }
-
- // }}
-
- // {{ action: findClaims
- @Override
- public List<Claim> findClaims(final String description) {
- return allMatches(Claim.class, description);
- }
-
- // }}
-
- // {{ action: claimsFor
- @Override
- public List<Claim> claimsFor(final Claimant claimant) {
- final Claim pattern = newTransientInstance(Claim.class);
- pattern.setDescription(null);
- pattern.setApprover(null);
- pattern.setStatus(null);
- pattern.setDate(null);
- pattern.setClaimant(claimant);
- return allMatches(Claim.class, pattern);
- }
-
- // }}
-
- // {{ action: newClaim
- @Override
- public Claim newClaim(final Claimant claimant) {
- final Claim claim = newTransientInstance(Claim.class);
- if (claimant != null) {
- claim.setClaimant(claimant);
- claim.setApprover(claimant.getDefaultApprover());
- }
- return claim;
- }
-
- // }}
-
- // {{ action: newClaimWithDescription
- @Override
- public Claim newClaimWithDescription(final Claimant claimant, final String description) {
- final Claim claim = newClaim(claimant);
- claim.setDescription(description);
- return claim;
- }
-
- // }}
-
- // {{ action: claimsSince
- @Override
- public List<Claim> claimsSince(final Claimant claimant, final Date since) {
- return allMatches(Claim.class, new Filter<Claim>() {
-
- @Override
- public boolean accept(final Claim pojo) {
- return pojo.getClaimant() == claimant && pojo.getDate() != null && pojo.getDate().isGreaterThan(since);
- }
- });
- }
-
- public String validateClaimsSince(final Claimant claimant, final Date since) {
- final Date today = new Date();
- return since.isGreaterThan(today) ? "cannot be after today" : null;
- }
-
- // }}
-
- @Override
- public int countClaimsFor(final Claimant claimant) {
- return claimsFor(claimant).size();
- }
-
- @Override
- public Claim mostRecentClaim(final Claimant claimant) {
- final List<Claim> claims = claimsFor(claimant);
- Collections.sort(claims, new Comparator<Claim>() {
- @Override
- public int compare(final Claim o1, final Claim o2) {
- return o1.getDate().isLessThan(o2.getDate()) ? +1 : -1;
- }
- });
- return claims.size() > 0 ? claims.get(0) : null;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/example/application/claims/objstore-default/src/main/java/org/apache/isis/example/claims/objstore/dflt/employee/EmployeeRepositoryDefault.java
----------------------------------------------------------------------
diff --git a/example/application/claims/objstore-default/src/main/java/org/apache/isis/example/claims/objstore/dflt/employee/EmployeeRepositoryDefault.java b/example/application/claims/objstore-default/src/main/java/org/apache/isis/example/claims/objstore/dflt/employee/EmployeeRepositoryDefault.java
deleted file mode 100644
index 2454157..0000000
--- a/example/application/claims/objstore-default/src/main/java/org/apache/isis/example/claims/objstore/dflt/employee/EmployeeRepositoryDefault.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.example.claims.objstore.dflt.employee;
-
-import java.util.List;
-
-import org.apache.isis.applib.AbstractFactoryAndRepository;
-import org.apache.isis.example.claims.dom.employee.Employee;
-import org.apache.isis.example.claims.dom.employee.EmployeeRepository;
-import org.apache.isis.example.claims.dom.employee.EmployeeTakeOn;
-
-public class EmployeeRepositoryDefault extends AbstractFactoryAndRepository implements EmployeeRepository {
-
- // {{ Id, iconName
- @Override
- public String getId() {
- return "claimants";
- }
-
- public String iconName() {
- return "EmployeeRepository";
- }
-
- // }}
-
- // {{ action: allEmployees
- @Override
- public List<Employee> allEmployees() {
- return allInstances(Employee.class);
- }
-
- // }}
-
- // {{ action: findEmployees
- @Override
- public List<Employee> findEmployees(final String name) {
- return allMatches(Employee.class, name);
- }
-
- // }}
- @Override
- public EmployeeTakeOn newEmployee() {
- return newTransientInstance(EmployeeTakeOn.class);
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/example/application/claims/objstore-jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/objstore-jdo/pom.xml b/example/application/claims/objstore-jdo/pom.xml
index 6b81137..b44a71f 100644
--- a/example/application/claims/objstore-jdo/pom.xml
+++ b/example/application/claims/objstore-jdo/pom.xml
@@ -29,6 +29,16 @@
<artifactId>claims-objstore-jdo</artifactId>
<name>Example Claims App Repositories (for JDO ObjectStore)</name>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.4</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<!-- other modules in this project -->
@@ -38,14 +48,8 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
- <artifactId>jdo-datanucleus</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.4</version>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-jdo-objectstore-datanucleus</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/example/application/claims/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/pom.xml b/example/application/claims/pom.xml
index 373b99e..eaf2270 100644
--- a/example/application/claims/pom.xml
+++ b/example/application/claims/pom.xml
@@ -129,7 +129,6 @@
<modules>
<module>dom</module>
<module>fixture</module>
- <module>objstore-default</module>
<module>objstore-jdo</module>
<module>viewer-html</module>
<module>viewer-restfulobjects</module>
@@ -137,9 +136,6 @@
<module>viewer-scimpi</module>
<module>viewer-bdd</module>
<module>viewer-dnd</module>
- <!--
- <module>viewer-wicket</module>
- -->
</modules>
<dependencyManagement>
@@ -154,31 +150,19 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>claims-domsvc</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>claims-fixture</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>claims-objstore-dflt</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>viewer-html</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>viewer-json</artifactId>
+ <artifactId>viewer-restfulobjects</artifactId>
<version>${project.version}</version>
</dependency>
@@ -205,174 +189,127 @@
<artifactId>viewer-scimpi</artifactId>
<version>${project.version}</version>
</dependency>
- <!--
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>viewer-wicket</artifactId>
<version>${project.version}</version>
</dependency>
- -->
<!-- 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>
- <!-- isis: core -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-metamodel</artifactId>
<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-file-security</artifactId>
<version>${isis.version}</version>
</dependency>
- <!-- isis: security: file -->
<dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>file</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</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-html-viewer-monitoring</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>monitoring</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-webserver</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>isis-webserver</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>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-javassist-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-inmemory-objectstore</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-profilestore</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: 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: 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: profilestores: dflt -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.profilestore</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>
@@ -380,92 +317,92 @@
<!-- 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: dnd -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>dnd</artifactId>
+ <artifactId>isis-dnd-viewer</artifactId>
<version>${isis.version}</version>
</dependency>
<!-- 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>
<!-- isis: viewer: wicket -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket</artifactId>
+ <artifactId>isis-wicket-viewer</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket-applib</artifactId>
+ <artifactId>isis-wicket-viewer-applib</artifactId>
<version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket-metamodel</artifactId>
+ <artifactId>isis-wicket-viewer-metamodel</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>
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-webserver</artifactId>
<version>${isis.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/example/application/claims/viewer-bdd/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/viewer-bdd/pom.xml b/example/application/claims/viewer-bdd/pom.xml
index 9501a7b..227d9f5 100644
--- a/example/application/claims/viewer-bdd/pom.xml
+++ b/example/application/claims/viewer-bdd/pom.xml
@@ -57,10 +57,6 @@
<groupId>org.apache.isis.example.application</groupId>
<artifactId>claims-dom</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.isis.example.application</groupId>
- <artifactId>claims-objstore-dflt</artifactId>
- </dependency>
<!-- isis core -->
<dependency>
@@ -70,33 +66,32 @@
<!-- isis default runtime -->
<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.objectstore</groupId>
+ <artifactId>isis-xml-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>
- <!-- isis defaults (other) -->
<dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-noop-security</artifactId>
</dependency>
<!-- BDD Viewers concordion dependencies -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>bdd-concordion</artifactId>
+ <artifactId>isis-bdd-viewer-concordion</artifactId>
<version>0.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/example/application/claims/viewer-dnd/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/viewer-dnd/pom.xml b/example/application/claims/viewer-dnd/pom.xml
index 13b457f..8d7c25a 100644
--- a/example/application/claims/viewer-dnd/pom.xml
+++ b/example/application/claims/viewer-dnd/pom.xml
@@ -78,54 +78,54 @@
<!-- isis default runtime -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-webserver</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.objectstore</groupId>
+ <artifactId>isis-xml-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.runtimes.dflt.profilestores</groupId>
- <artifactId>xml</artifactId>
+ <groupId>org.apache.isis.profilestore</groupId>
+ <artifactId>isis-xml-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>
<!-- isis viewers -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>dnd</artifactId>
+ <artifactId>isis-dnd-viewer</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>html</artifactId>
+ <artifactId>isis-html-viewer</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>restfulobjects-viewer</artifactId>
+ <artifactId>isis-restfulobjects-viewer-impl</artifactId>
</dependency>
<!-- JUnit Viewer dependencies -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>junit</artifactId>
+ <artifactId>isis-junit-viewer</artifactId>
<scope>test</scope>
</dependency>
@@ -310,11 +310,11 @@
<!-- Wicket Viewer -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket-viewer</artifactId>
+ <artifactId>isis-wicket-viewer-impl</artifactId>
</dependency>
<!-- to run using WebServer -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-webserver</artifactId>
</dependency>
<!-- JETTY DEPENDENCIES FOR RUNNING webapp viewers in packaged JAR -->
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/example/application/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/AbstractTest.java
----------------------------------------------------------------------
diff --git a/example/application/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/AbstractTest.java b/example/application/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/AbstractTest.java
index b800001..69f5a76 100644
--- a/example/application/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/AbstractTest.java
+++ b/example/application/claims/viewer-dnd/src/test/java/org/apache/isis/example/claims/junit/AbstractTest.java
@@ -25,10 +25,10 @@ import org.junit.runner.RunWith;
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.example.claims.dom.claim.ClaimRepository;
+import org.apache.isis.example.claims.dom.claim.ClaimRepositoryDefault;
import org.apache.isis.example.claims.dom.employee.Employee;
import org.apache.isis.example.claims.dom.employee.EmployeeRepository;
-import org.apache.isis.example.claims.objstore.dflt.claim.ClaimRepositoryDefault;
-import org.apache.isis.example.claims.objstore.dflt.employee.EmployeeRepositoryDefault;
+import org.apache.isis.example.claims.dom.employee.EmployeeRepositoryDefault;
import org.apache.isis.progmodel.wrapper.applib.WrapperFactory;
import org.apache.isis.progmodel.wrapper.applib.WrapperObject;
import org.apache.isis.viewer.junit.IsisTestRunner;
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/example/application/claims/viewer-html/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/viewer-html/pom.xml b/example/application/claims/viewer-html/pom.xml
index d448c2f..dc8cd31 100644
--- a/example/application/claims/viewer-html/pom.xml
+++ b/example/application/claims/viewer-html/pom.xml
@@ -71,44 +71,43 @@
<!-- isis viewer -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>html</artifactId>
+ <artifactId>isis-html-viewer</artifactId>
</dependency>
<!-- isis runtime -->
<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.objectstore</groupId>
+ <artifactId>isis-xml-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.runtimes.dflt.profilestores</groupId>
- <artifactId>xml</artifactId>
+ <groupId>org.apache.isis.profilestore</groupId>
+ <artifactId>isis-xml-profilestore</artifactId>
</dependency>
- <!-- isis security implementations -->
<dependency>
<groupId>org.apache.isis.security</groupId>
- <artifactId>file</artifactId>
+ <artifactId>isis-file-security</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>dflt</artifactId>
+ <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/claims/viewer-restfulobjects/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/viewer-restfulobjects/pom.xml b/example/application/claims/viewer-restfulobjects/pom.xml
index 53bbf6c..a8f5920 100644
--- a/example/application/claims/viewer-restfulobjects/pom.xml
+++ b/example/application/claims/viewer-restfulobjects/pom.xml
@@ -70,40 +70,40 @@
<!-- 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-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.objectstore</groupId>
+ <artifactId>isis-xml-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>
<!-- isis security implementations -->
<dependency>
<groupId>org.apache.isis.security</groupId>
- <artifactId>file</artifactId>
+ <artifactId>isis-file-security</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-noop-security</artifactId>
</dependency>
<!-- to run using WebServer -->
<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/claims/viewer-scimpi/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/viewer-scimpi/pom.xml b/example/application/claims/viewer-scimpi/pom.xml
index daabd23..3e23ef9 100644
--- a/example/application/claims/viewer-scimpi/pom.xml
+++ b/example/application/claims/viewer-scimpi/pom.xml
@@ -59,44 +59,44 @@
<!-- Isis -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>scimpi-servlet</artifactId>
+ <artifactId>isis-scimpi-viewer-servlet</artifactId>
</dependency>
<!-- isis runtime -->
<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.objectstore</groupId>
+ <artifactId>isis-xml-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.runtimes.dflt.profilestores</groupId>
- <artifactId>xml</artifactId>
+ <groupId>org.apache.isis.profilestore</groupId>
+ <artifactId>isis-xml-profilestore</artifactId>
</dependency>
<!-- isis security implementations -->
<dependency>
<groupId>org.apache.isis.security</groupId>
- <artifactId>file</artifactId>
+ <artifactId>isis-file-security</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-noop-security</artifactId>
</dependency>
<!-- to run using WebServer -->
<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/claims/viewer-wicket/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/claims/viewer-wicket/pom.xml b/example/application/claims/viewer-wicket/pom.xml
index 6d94446..440f765 100644
--- a/example/application/claims/viewer-wicket/pom.xml
+++ b/example/application/claims/viewer-wicket/pom.xml
@@ -55,27 +55,27 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
</plugin>
- <!-- mvn package -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <transformers>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>org.apache.isis.WebServer</mainClass>
- </transformer>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <!-- mvn package -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <transformers>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <mainClass>org.apache.isis.WebServer</mainClass>
+ </transformer>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -98,44 +98,44 @@
<!-- Wicket 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-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.objectstore</groupId>
+ <artifactId>isis-xml-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.runtimes.dflt.profilestores</groupId>
- <artifactId>xml</artifactId>
+ <groupId>org.apache.isis.profilestore</groupId>
+ <artifactId>isis-xml-profilestore</artifactId>
</dependency>
<!-- isis security implementations -->
<dependency>
<groupId>org.apache.isis.security</groupId>
- <artifactId>file</artifactId>
+ <artifactId>isis-file-security</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-noop-security</artifactId>
</dependency>
<!-- to run using WebServer -->
<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/onlinedemo/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/onlinedemo/dom/pom.xml b/example/application/onlinedemo/dom/pom.xml
index 7de676e..c86d328 100644
--- a/example/application/onlinedemo/dom/pom.xml
+++ b/example/application/onlinedemo/dom/pom.xml
@@ -35,8 +35,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/789c6196/example/application/onlinedemo/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/onlinedemo/pom.xml b/example/application/onlinedemo/pom.xml
index 5eeafb5..d072a26 100644
--- a/example/application/onlinedemo/pom.xml
+++ b/example/application/onlinedemo/pom.xml
@@ -173,13 +173,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>
@@ -191,127 +191,86 @@
<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>
- <artifactId>monitoring</artifactId>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>isis-html-viewer-monitoring</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: 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: 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: 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>
- <version>${isis.version}</version>
- </dependency>
-
- <!-- isis: runtimes: embedded -->
- <dependency>
- <groupId>org.apache.isis.runtimes</groupId>
- <artifactId>embedded</artifactId>
+ <groupId>org.apache.isis.profilestore</groupId>
+ <artifactId>isis-xml-profilestore</artifactId>
<version>${isis.version}</version>
</dependency>
@@ -319,24 +278,25 @@
<!-- 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>
http://git-wip-us.apache.org/repos/asf/isis/blob/789c6196/example/application/onlinedemo/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/onlinedemo/webapp/pom.xml b/example/application/onlinedemo/webapp/pom.xml
index 7efdeec..579a7cc 100644
--- a/example/application/onlinedemo/webapp/pom.xml
+++ b/example/application/onlinedemo/webapp/pom.xml
@@ -73,50 +73,50 @@
<!-- isis viewer -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>html</artifactId>
+ <artifactId>isis-html-viewer</artifactId>
</dependency>
<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-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.objectstore</groupId>
+ <artifactId>isis-xml-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.runtimes.dflt.profilestores</groupId>
- <artifactId>xml</artifactId>
+ <groupId>org.apache.isis.profilestore</groupId>
+ <artifactId>isis-xml-profilestore</artifactId>
</dependency>
<!-- isis security implementations -->
<dependency>
<groupId>org.apache.isis.security</groupId>
- <artifactId>file</artifactId>
+ <artifactId>isis-file-security</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>dflt</artifactId>
+ <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/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart/dom/pom.xml b/example/application/quickstart/dom/pom.xml
index 0a93910..18fa138 100644
--- a/example/application/quickstart/dom/pom.xml
+++ b/example/application/quickstart/dom/pom.xml
@@ -32,8 +32,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/789c6196/example/application/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart/pom.xml b/example/application/quickstart/pom.xml
index c72d183..9f04067 100644
--- a/example/application/quickstart/pom.xml
+++ b/example/application/quickstart/pom.xml
@@ -189,20 +189,20 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tests-junit</artifactId>
+ <artifactId>quickstart-tests-junit</artifactId>
<version>${project.version}</version>
</dependency>
<!-- 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>
@@ -214,141 +214,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>
@@ -356,55 +320,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>
@@ -418,17 +382,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>
@@ -436,32 +400,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/viewer-dnd/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart/viewer-dnd/pom.xml b/example/application/quickstart/viewer-dnd/pom.xml
index 16bc718..b9885aa 100644
--- a/example/application/quickstart/viewer-dnd/pom.xml
+++ b/example/application/quickstart/viewer-dnd/pom.xml
@@ -104,36 +104,32 @@
<!-- isis default runtime -->
<dependency>
- <groupId>org.apache.isis.runtimes.dflt</groupId>
- <artifactId>runtime</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-runtime</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.objectstore</groupId>
+ <artifactId>isis-xml-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>
<!-- isis defaults (other) -->
<dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>dflt</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-noop-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/viewer-html/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/quickstart/viewer-html/pom.xml b/example/application/quickstart/viewer-html/pom.xml
index 83c0503..b3a1ec9 100644
--- a/example/application/quickstart/viewer-html/pom.xml
+++ b/example/application/quickstart/viewer-html/pom.xml
@@ -104,43 +104,52 @@
-->
<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>
<!-- isis viewer -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>html</artifactId>
+ <artifactId>isis-html-viewer</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>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-inmemory-objectstore</artifactId>
</dependency>
-
- <!-- isis security implementations -->
<dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>file</artifactId>
+ <groupId>org.apache.isis.objectstore</groupId>
+ <artifactId>isis-xml-objectstore</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.security</groupId>
- <artifactId>dflt</artifactId>
+ <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>
@@ -153,7 +162,6 @@
</dependency>
-
<!--
JDBC drivers
(if using jdo or sql object store)