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 2010/10/21 19:40:08 UTC
svn commit: r1026077 - in /incubator/isis/trunk: examples/restful-testapp/
examples/restful-testapp/dom/ examples/restful-testapp/exploration/
examples/restful-testapp/exploration/ide/eclipse/launch/
examples/restful-testapp/fixture/ examples/restful-t...
Author: danhaywood
Date: Thu Oct 21 17:40:08 2010
New Revision: 1026077
URL: http://svn.apache.org/viewvc?rev=1026077&view=rev
Log:
restful POMs updated
Modified:
incubator/isis/trunk/examples/restful-testapp/dom/pom.xml
incubator/isis/trunk/examples/restful-testapp/exploration/ide/eclipse/launch/exploration-jetty (restful).launch
incubator/isis/trunk/examples/restful-testapp/exploration/pom.xml
incubator/isis/trunk/examples/restful-testapp/fixture/pom.xml
incubator/isis/trunk/examples/restful-testapp/pom.xml
incubator/isis/trunk/examples/restful-testapp/service/pom.xml
incubator/isis/trunk/release/pom.xml
incubator/isis/trunk/viewer/restful/impl/applib/pom.xml
incubator/isis/trunk/viewer/restful/impl/pom.xml
incubator/isis/trunk/viewer/restful/impl/viewer/pom.xml
Modified: incubator/isis/trunk/examples/restful-testapp/dom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/restful-testapp/dom/pom.xml?rev=1026077&r1=1026076&r2=1026077&view=diff
==============================================================================
--- incubator/isis/trunk/examples/restful-testapp/dom/pom.xml (original)
+++ incubator/isis/trunk/examples/restful-testapp/dom/pom.xml Thu Oct 21 17:40:08 2010
@@ -3,12 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>restful-testapp-claims</artifactId>
+ <groupId>org.apache.isis.examples.apps</groupId>
+ <artifactId>restful-claims</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>restful-testapp-claims-dom</artifactId>
+ <artifactId>restful-claims-dom</artifactId>
<name>Restful Viewer TestApp: Claims DOM</name>
<dependencies>
Modified: incubator/isis/trunk/examples/restful-testapp/exploration/ide/eclipse/launch/exploration-jetty (restful).launch
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/restful-testapp/exploration/ide/eclipse/launch/exploration-jetty%20%28restful%29.launch?rev=1026077&r1=1026076&r2=1026077&view=diff
==============================================================================
--- incubator/isis/trunk/examples/restful-testapp/exploration/ide/eclipse/launch/exploration-jetty (restful).launch (original)
+++ incubator/isis/trunk/examples/restful-testapp/exploration/ide/eclipse/launch/exploration-jetty (restful).launch Thu Oct 21 17:40:08 2010
@@ -9,9 +9,7 @@
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8"?> <sourceLookupDirector> <sourceContainers duplicates="true"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;default/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.webserver.WebServer"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--viewer jetty --type exploration"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.extensions.restful-testapp-claims-commandline"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/>
</launchConfiguration>
Modified: incubator/isis/trunk/examples/restful-testapp/exploration/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/restful-testapp/exploration/pom.xml?rev=1026077&r1=1026076&r2=1026077&view=diff
==============================================================================
--- incubator/isis/trunk/examples/restful-testapp/exploration/pom.xml (original)
+++ incubator/isis/trunk/examples/restful-testapp/exploration/pom.xml Thu Oct 21 17:40:08 2010
@@ -3,12 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>restful-testapp-claims</artifactId>
+ <groupId>org.apache.isis.examples.apps</groupId>
+ <artifactId>restful-claims</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>restful-testapp-claims-commandline</artifactId>
+ <artifactId>restful-claims-commandline</artifactId>
<name>Restful Viewer TestApp: Claims Commandline</name>
<packaging>war</packaging>
@@ -63,47 +63,44 @@
<!-- other modules in this project -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>restful-testapp-claims-fixture</artifactId>
+ <artifactId>restful-claims-fixture</artifactId>
</dependency>
<!-- Isis Restful Viewer -->
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>restful-viewer</artifactId>
</dependency>
<!-- Isis -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>bytecode-cglib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>bytecode-javassist</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>webserver</artifactId>
</dependency>
-
+
<dependency>
- <groupId>org.apache.isis.plugins</groupId>
- <artifactId>dnd-viewer</artifactId>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>dnd</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.plugins</groupId>
- <artifactId>html-viewer</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.plugins</groupId>
- <artifactId>headless-embedded</artifactId>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>html</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.defaults</groupId>
+ <artifactId>bytecode</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.alternatives.bytecode</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
<dependency>
- <groupId>org.apache.isis.plugins</groupId>
- <artifactId>xml-persistor</artifactId>
+ <groupId>org.apache.isis.alternatives.objectstore</groupId>
+ <artifactId>xml</artifactId>
</dependency>
</dependencies>
Modified: incubator/isis/trunk/examples/restful-testapp/fixture/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/restful-testapp/fixture/pom.xml?rev=1026077&r1=1026076&r2=1026077&view=diff
==============================================================================
--- incubator/isis/trunk/examples/restful-testapp/fixture/pom.xml (original)
+++ incubator/isis/trunk/examples/restful-testapp/fixture/pom.xml Thu Oct 21 17:40:08 2010
@@ -3,18 +3,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>restful-testapp-claims</artifactId>
+ <groupId>org.apache.isis.examples.apps</groupId>
+ <artifactId>restful-claims</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>restful-testapp-claims-fixture</artifactId>
+ <artifactId>restful-claims-fixture</artifactId>
<name>Restful Viewer TestApp: Claim Fixtures</name>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>restful-testapp-claims-service</artifactId>
+ <artifactId>restful-claims-service</artifactId>
</dependency>
</dependencies>
Modified: incubator/isis/trunk/examples/restful-testapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/restful-testapp/pom.xml?rev=1026077&r1=1026076&r2=1026077&view=diff
==============================================================================
--- incubator/isis/trunk/examples/restful-testapp/pom.xml (original)
+++ incubator/isis/trunk/examples/restful-testapp/pom.xml Thu Oct 21 17:40:08 2010
@@ -8,8 +8,8 @@
<version>0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>restful-testapp-claims</artifactId>
+ <groupId>org.apache.isis.examples.apps</groupId>
+ <artifactId>restful-claims</artifactId>
<version>0.1-SNAPSHOT</version>
<name>Restful Viewer TestApp: Claims</name>
@@ -82,38 +82,38 @@
<!-- this project's own modules -->
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>restful-testapp-claims-commandline</artifactId>
+ <groupId>org.apache.isis.examples.apps</groupId>
+ <artifactId>restful-claims-commandline</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>restful-testapp-claims-dom</artifactId>
+ <groupId>org.apache.isis.examples.apps</groupId>
+ <artifactId>restful-claims-dom</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>restful-testapp-claims-fixture</artifactId>
+ <groupId>org.apache.isis.examples.apps</groupId>
+ <artifactId>restful-claims-fixture</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>restful-testapp-claims-service</artifactId>
+ <groupId>org.apache.isis.examples.apps</groupId>
+ <artifactId>restful-claims-service</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Isis Restful Viewer -->
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>restful-applib</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
+ <groupId>org.apache.isis.examples.apps</groupId>
<artifactId>restful-viewer</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
Modified: incubator/isis/trunk/examples/restful-testapp/service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/restful-testapp/service/pom.xml?rev=1026077&r1=1026076&r2=1026077&view=diff
==============================================================================
--- incubator/isis/trunk/examples/restful-testapp/service/pom.xml (original)
+++ incubator/isis/trunk/examples/restful-testapp/service/pom.xml Thu Oct 21 17:40:08 2010
@@ -3,12 +3,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>restful-testapp-claims</artifactId>
+ <groupId>org.apache.isis.examples.apps</groupId>
+ <artifactId>restful-claims</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>restful-testapp-claims-service</artifactId>
+ <artifactId>restful-claims-service</artifactId>
<name>Restful Viewer TestApp: Claims Services</name>
<dependencies>
@@ -16,7 +16,7 @@
<!-- other modules in this project -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>restful-testapp-claims-dom</artifactId>
+ <artifactId>restful-claims-dom</artifactId>
</dependency>
</dependencies>
Modified: incubator/isis/trunk/release/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/release/pom.xml?rev=1026077&r1=1026076&r2=1026077&view=diff
==============================================================================
--- incubator/isis/trunk/release/pom.xml (original)
+++ incubator/isis/trunk/release/pom.xml Thu Oct 21 17:40:08 2010
@@ -30,6 +30,7 @@
<isis.viewer-html.version>0.1-SNAPSHOT</isis.viewer-html.version>
<isis.viewer-scimpi.version>0.1-SNAPSHOT</isis.viewer-scimpi.version>
<isis.viewer-wicket.version>0.1-SNAPSHOT</isis.viewer-wicket.version>
+ <isis.viewer-restful.version>0.1-SNAPSHOT</isis.viewer-restful.version>
<isis.viewer-junit.version>0.1-SNAPSHOT</isis.viewer-junit.version>
<isis.alternatives-objectstore-xml.version>0.1-SNAPSHOT</isis.alternatives-objectstore-xml.version>
@@ -187,6 +188,23 @@
<version>${isis.viewer-wicket.version}</version>
</dependency>
+ <!-- viewer: restful -->
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>restful</artifactId>
+ <version>${isis.viewer-restful.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>restful-applib</artifactId>
+ <version>${isis.viewer-restful.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>restful-viewer</artifactId>
+ <version>${isis.viewer-restful.version}</version>
+ </dependency>
+
<!-- alternatives: bytecode -->
<dependency>
Modified: incubator/isis/trunk/viewer/restful/impl/applib/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/impl/applib/pom.xml?rev=1026077&r1=1026076&r2=1026077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/impl/applib/pom.xml (original)
+++ incubator/isis/trunk/viewer/restful/impl/applib/pom.xml Thu Oct 21 17:40:08 2010
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.extensions</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>restful</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
Modified: incubator/isis/trunk/viewer/restful/impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/impl/pom.xml?rev=1026077&r1=1026076&r2=1026077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/impl/pom.xml (original)
+++ incubator/isis/trunk/viewer/restful/impl/pom.xml Thu Oct 21 17:40:08 2010
@@ -5,11 +5,11 @@
<parent>
<groupId>org.apache.isis</groupId>
- <artifactId>plugins</artifactId>
+ <artifactId>viewer</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.isis.extensions</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>restful</artifactId>
<version>0.1-SNAPSHOT</version>
@@ -52,23 +52,23 @@
<!-- Restful Viewer -->
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>restful-applib</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>restful-applib</artifactId>
<version>0.1-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>restful-viewer</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>restful-viewer</artifactId>
<version>0.1-SNAPSHOT</version>
<type>test-jar</type>
Modified: incubator/isis/trunk/viewer/restful/impl/viewer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/impl/viewer/pom.xml?rev=1026077&r1=1026076&r2=1026077&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/restful/impl/viewer/pom.xml (original)
+++ incubator/isis/trunk/viewer/restful/impl/viewer/pom.xml Thu Oct 21 17:40:08 2010
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.extensions</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>restful</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
@@ -14,7 +14,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.extensions</groupId>
+ <groupId>org.apache.isis.viewer</groupId>
<artifactId>restful-applib</artifactId>
</dependency>