You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ke...@apache.org on 2010/10/17 11:18:59 UTC
svn commit: r1023442 - in /incubator/isis/trunk/support: ./ archetypes/
archetypes/application/
archetypes/application/src/main/resources/archetype-resources/
archetypes/application/src/main/resources/archetype-resources/commandline/
archetypes/applica...
Author: kevin
Date: Sun Oct 17 09:18:58 2010
New Revision: 1023442
URL: http://svn.apache.org/viewvc?rev=1023442&view=rev
Log:
Updated pom.xml and other resources to build exploration archetype under Apache Isis.
Added:
incubator/isis/trunk/support/src/site/apt/jottings.apt
Modified:
incubator/isis/trunk/support/archetypes/application/pom.xml
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/commandline/pom.xml
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/pom.xml
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/webapp/pom.xml
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/support/archetypes/exploration/pom.xml
incubator/isis/trunk/support/archetypes/exploration/src/main/resources/archetype-resources/pom.xml
incubator/isis/trunk/support/archetypes/exploration/src/main/resources/archetype-resources/src/main/assembly/scripts/nakedobjects.bat
incubator/isis/trunk/support/archetypes/exploration/src/main/resources/archetype-resources/src/main/assembly/scripts/nakedobjects.sh
incubator/isis/trunk/support/archetypes/hibernate-support/pom.xml
incubator/isis/trunk/support/archetypes/hibernate-support/src/main/resources/archetype-resources/hibernate/pom.xml
incubator/isis/trunk/support/archetypes/pom.xml
incubator/isis/trunk/support/archetypes/scimpi/src/main/resources/archetype-resources/pom.xml
incubator/isis/trunk/support/pom.xml
Modified: incubator/isis/trunk/support/archetypes/application/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/pom.xml?rev=1023442&r1=1023441&r2=1023442&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/pom.xml (original)
+++ incubator/isis/trunk/support/archetypes/application/pom.xml Sun Oct 17 09:18:58 2010
@@ -2,7 +2,7 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>[[NAME]] application archetype</name>
+ <name>Apache Isis application archetype</name>
<groupId>org.apache.isis</groupId>
<artifactId>application-archetype</artifactId>
<version>0.1-SNAPSHOT</version>
@@ -43,13 +43,13 @@
<distributionManagement>
<snapshotRepository>
<id>snapshot-repository</id>
- <name>[[NAME]] Build Server</name>
+ <name>Apache Isis Build Server</name>
<url>file:///srv/repo/snapshot</url>
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
<repository>
<id>repository</id>
- <name>[[NAME]] Repository</name>
+ <name>Apache Isis Repository</name>
<url>sftp://www.apache.isis.dev/htdocs/m2-repo/release</url>
</repository>
</distributionManagement>
Modified: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/commandline/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/commandline/pom.xml?rev=1023442&r1=1023441&r2=1023442&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/commandline/pom.xml (original)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/commandline/pom.xml Sun Oct 17 09:18:58 2010
@@ -60,7 +60,7 @@
<artifactId>${rootArtifactId}-fixture</artifactId>
</dependency>
- <!-- [[NAME]] -->
+ <!-- Apache Isis -->
<dependency>
<groupId>org.apache.isis.core</groupId>
Modified: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/pom.xml?rev=1023442&r1=1023441&r2=1023442&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/pom.xml Sun Oct 17 09:18:58 2010
@@ -2,7 +2,7 @@
<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>
- <name>[[NAME]] Application</name>
+ <name>Apache Isis Application</name>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
@@ -124,7 +124,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<aggregate>true</aggregate>
- <doctitle>[[NAME]] Application</doctitle>
+ <doctitle>Apache Isis Application</doctitle>
<splitindex>false</splitindex>
</configuration>
</plugin>
@@ -183,7 +183,7 @@
<checksumPolicy>fail</checksumPolicy>
</snapshots>
<id>snapshots</id>
- <name>[[NAME]] Snapshots</name>
+ <name>Apache Isis Snapshots</name>
<url>http://isis.apache.org/m2-repo/snapshot/</url>
<layout>default</layout>
</repository>
Modified: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/webapp/pom.xml?rev=1023442&r1=1023441&r2=1023442&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/webapp/pom.xml (original)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/webapp/pom.xml Sun Oct 17 09:18:58 2010
@@ -30,7 +30,7 @@
</dependency>
- <!-- [[NAME]] -->
+ <!-- Apache Isis -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>bytecode-cglib</artifactId>
Modified: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml?rev=1023442&r1=1023441&r2=1023442&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/web.xml Sun Oct 17 09:18:58 2010
@@ -3,7 +3,7 @@
"http://java.sun.com/dtd/web-app_2_3.dtd" >
<web-app>
- <display-name>[[NAME]] HTML Viewer</display-name>
+ <display-name>Apache Isis HTML Viewer</display-name>
<filter>
<filter-name>IsisSessionFilter</filter-name>
Modified: incubator/isis/trunk/support/archetypes/exploration/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/exploration/pom.xml?rev=1023442&r1=1023441&r2=1023442&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/exploration/pom.xml (original)
+++ incubator/isis/trunk/support/archetypes/exploration/pom.xml Sun Oct 17 09:18:58 2010
@@ -2,7 +2,7 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>[[NAME]] exploration archetype</name>
+ <name>Apache Isis exploration archetype</name>
<groupId>org.apache.isis</groupId>
<artifactId>exploration-archetype</artifactId>
<version>0.1-SNAPSHOT</version>
@@ -43,13 +43,13 @@
<distributionManagement>
<snapshotRepository>
<id>snapshot-repository</id>
- <name>[[NAME]] Build Server</name>
+ <name>Apache Isis Build Server</name>
<url>file:///srv/repo/snapshot</url>
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
<repository>
<id>repository</id>
- <name>[[NAME]] Repository</name>
+ <name>Apache Isis Repository</name>
<url>sftp://www.apache.isis.dev/htdocs/m2-repo/release</url>
</repository>
</distributionManagement>
Modified: incubator/isis/trunk/support/archetypes/exploration/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/exploration/src/main/resources/archetype-resources/pom.xml?rev=1023442&r1=1023441&r2=1023442&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/exploration/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/isis/trunk/support/archetypes/exploration/src/main/resources/archetype-resources/pom.xml Sun Oct 17 09:18:58 2010
@@ -2,7 +2,7 @@
<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>
- <name>[[NAME]] exploration application</name>
+ <name>Apache Isis exploration application</name>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
@@ -52,48 +52,29 @@
</build>
<dependencies>
- <!-- [[NAME]] -->
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>bytecode-cglib</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>bytecode-javassist</artifactId>
- </dependency>
+ <!-- Apache Isis -->
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>remoting</artifactId>
+ <groupId>org.apache.isis.defaults</groupId>
+ <artifactId>bytecode</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>html</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.plugins</groupId>
- <artifactId>html-viewer</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.plugins</groupId>
- <artifactId>http-remoting-client</artifactId>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>webserver</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.isis.plugins</groupId>
- <artifactId>http-remoting-server</artifactId>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>dnd</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.isis.plugins</groupId>
- <artifactId>headless-embedded</artifactId>
- </dependency>
+ <!-- To be tested: -->
+ <!--
<dependency>
- <groupId>org.apache.isis.plugins</groupId>
- <artifactId>xml-persistor</artifactId>
+ <groupId>org.apache.isis.alternatives.objectstore</groupId>
+ <artifactId>xml</artifactId>
</dependency>
-
+ -->
</dependencies>
</project>
Modified: incubator/isis/trunk/support/archetypes/exploration/src/main/resources/archetype-resources/src/main/assembly/scripts/nakedobjects.bat
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/exploration/src/main/resources/archetype-resources/src/main/assembly/scripts/nakedobjects.bat?rev=1023442&r1=1023441&r2=1023442&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/exploration/src/main/resources/archetype-resources/src/main/assembly/scripts/nakedobjects.bat (original)
+++ incubator/isis/trunk/support/archetypes/exploration/src/main/resources/archetype-resources/src/main/assembly/scripts/nakedobjects.bat Sun Oct 17 09:18:58 2010
@@ -1,12 +1,12 @@
@echo off
rem
-rem update DEPLOYMENT_FLAGS to customize the way that [[NAME]] is run for a particular
+rem update DEPLOYMENT_FLAGS to customize the way that Apache Isis is run for a particular
rem deployment. For example, to run as a client in client/server mode, use:
rem
rem DEPLOYMENT_FLAGS=--type client --connector encoding-sockets
rem
-rem Consult the [[NAME]] documentation for the various options available.
+rem Consult the Apache Isis documentation for the various options available.
rem
set DEPLOYMENT_FLAGS=
Modified: incubator/isis/trunk/support/archetypes/exploration/src/main/resources/archetype-resources/src/main/assembly/scripts/nakedobjects.sh
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/exploration/src/main/resources/archetype-resources/src/main/assembly/scripts/nakedobjects.sh?rev=1023442&r1=1023441&r2=1023442&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/exploration/src/main/resources/archetype-resources/src/main/assembly/scripts/nakedobjects.sh (original)
+++ incubator/isis/trunk/support/archetypes/exploration/src/main/resources/archetype-resources/src/main/assembly/scripts/nakedobjects.sh Sun Oct 17 09:18:58 2010
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# update DEPLOYMENT_FLAGS to customize the way that [[NAME]] is run for a particular
+# update DEPLOYMENT_FLAGS to customize the way that Apache Isis is run for a particular
# deployment. For example, to run as a client in client/server mode, use:
#
# DEPLOYMENT_FLAGS=--type client --connector encoding-sockets
#
-# Consult the [[NAME]] documentation for the various options available.
+# Consult the Apache Isis documentation for the various options available.
#
DEPLOYMENT_FLAGS=
Modified: incubator/isis/trunk/support/archetypes/hibernate-support/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/hibernate-support/pom.xml?rev=1023442&r1=1023441&r2=1023442&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/hibernate-support/pom.xml (original)
+++ incubator/isis/trunk/support/archetypes/hibernate-support/pom.xml Sun Oct 17 09:18:58 2010
@@ -8,10 +8,10 @@
<version>0.1-SNAPSHOT</version>
<parent>
- <groupId>org.apache.isis</groupId>
- <artifactId>isis-parent</artifactId>
- <version>7</version>
- <relativePath>../pom/pom.xml</relativePath>
+ <groupId>org.apache.isis</groupId>
+ <artifactId>isis-parent</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<scm>
Modified: incubator/isis/trunk/support/archetypes/hibernate-support/src/main/resources/archetype-resources/hibernate/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/hibernate-support/src/main/resources/archetype-resources/hibernate/pom.xml?rev=1023442&r1=1023441&r2=1023442&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/hibernate-support/src/main/resources/archetype-resources/hibernate/pom.xml (original)
+++ incubator/isis/trunk/support/archetypes/hibernate-support/src/main/resources/archetype-resources/hibernate/pom.xml Sun Oct 17 09:18:58 2010
@@ -25,7 +25,7 @@
</dependency>
- <!-- [[NAME]]' hibernate support -->
+ <!-- Apache Isis' hibernate support -->
<dependency>
<groupId>${isis.groupId}</groupId>
<artifactId>hibernate</artifactId>
Modified: incubator/isis/trunk/support/archetypes/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/pom.xml?rev=1023442&r1=1023441&r2=1023442&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/pom.xml (original)
+++ incubator/isis/trunk/support/archetypes/pom.xml Sun Oct 17 09:18:58 2010
@@ -4,14 +4,14 @@
<name>Archetypes</name>
<groupId>org.apache.isis.archetypes</groupId>
<artifactId>archetypes</artifactId>
- <version>4.0</version>
+ <version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.apache.isis</groupId>
<artifactId>isis-parent</artifactId>
- <version>7</version>
- <relativePath>../../pom/pom.xml</relativePath>
+ <version>0.1-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<scm>
@@ -23,8 +23,12 @@
<modules>
<!--
the 'application' module is intentionally not referenced;
- it should be released separately after the main release.
- -->
+ it should be released separately after the main release.
+ [Check this]
+ -->
+ <module>application</module>
+ <module>exploration</module>
+ <module>scimpi</module>
<module>hibernate-support</module>
</modules>
</project>
Modified: incubator/isis/trunk/support/archetypes/scimpi/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/scimpi/src/main/resources/archetype-resources/pom.xml?rev=1023442&r1=1023441&r2=1023442&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/scimpi/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/isis/trunk/support/archetypes/scimpi/src/main/resources/archetype-resources/pom.xml Sun Oct 17 09:18:58 2010
@@ -56,7 +56,7 @@
<artifactId>${parent.artifactId}-fixture</artifactId>
</dependency>
- <!-- [[NAME]] -->
+ <!-- Apache Isis -->
<dependency>
<groupId>org.apache.isis.core</groupId>
Modified: incubator/isis/trunk/support/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/pom.xml?rev=1023442&r1=1023441&r2=1023442&view=diff
==============================================================================
--- incubator/isis/trunk/support/pom.xml (original)
+++ incubator/isis/trunk/support/pom.xml Sun Oct 17 09:18:58 2010
@@ -11,7 +11,7 @@
<parent>
<groupId>org.apache.isis</groupId>
- <artifactId>trunk</artifactId>
+ <artifactId>isis-parent</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
@@ -40,7 +40,9 @@
<modules>
<module>archetypes</module>
+ <!--
<module>domain-services</module>
+ -->
</modules>
<build>
@@ -98,19 +100,19 @@
<type>test-jar</type>
</dependency>
- <!-- domainservices -->
+ <!-- domainservices -->
<dependency>
- <groupId>org.apache.isis.support</groupId>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>domainservices</artifactId>
<version>0.1-SNAPSHOT</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>domainservices</artifactId>
<version>0.1-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
-
+
</dependencies>
</dependencyManagement>
Added: incubator/isis/trunk/support/src/site/apt/jottings.apt
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/src/site/apt/jottings.apt?rev=1023442&view=auto
==============================================================================
--- incubator/isis/trunk/support/src/site/apt/jottings.apt (added)
+++ incubator/isis/trunk/support/src/site/apt/jottings.apt Sun Oct 17 09:18:58 2010
@@ -0,0 +1,58 @@
+~~ 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.
+
+Exploration Archetype
+
+
+ To review:
+ The banner.png in
+ support/archetypes/exploration/src/main/resources/archetype-resources/src/main/webapp/images
+ still refers to Naked Objects
+
+Building an exploration application from archetype
+ I am assuming that you are building from source. Perhaps this works if you are using Maven managed
+ binaries too?
+
+ At the command prompt...
+
+ [In all cases, you can use "mvn -o ..." to force maven to run offline.
+
+
+ In the trunk/support directory: Run "mvn install" to install the archetypes.
+ Thereafter, run "mvn archetype:crawl" to populate your local archetype catalogue.
+
+ To create the project, either use the Eclipse "File -> New -> Project -> Maven -> Maven Project" route
+ or do it from the command line. Since the Eclipse route didn't populate all the builders, I used
+ the command line:
+ In your (future) Eclipse workspace directory, run the following:
+
+ "mvn archetype:generate -DarchetypeGroupId=org.apache.isis -DarchetypeArtifactId=exploration-archetype"
+
+ When prompted, for groupId, specify your package name. For artifactId, specify your application name.
+ Use the defaults for the next questions (version, package, accept).
+
+ Change into your newly created appliction directory.
+
+ Create the Eclipse project files with: "mvn eclipse:eclipse"
+
+ In eclipse, import the project using "File ->Import -> General -> Existing Projects into Workspace"
+ and navigate to the directory where you created the application from the archetype.
+
+ To enable full Maven integration, right-click on the project in Eclipse and choose
+ "M2 Maven -> Enable dependency management".
+
+ KM 2010-10-17
\ No newline at end of file