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 18:03:13 UTC
svn commit: r1023517 - in /incubator/isis/trunk/support:
archetypes/application/src/main/resources/META-INF/maven/
archetypes/application/src/main/resources/archetype-resources/
archetypes/application/src/main/resources/archetype-resources/scimpi/ arch...
Author: kevin
Date: Sun Oct 17 16:03:12 2010
New Revision: 1023517
URL: http://svn.apache.org/viewvc?rev=1023517&view=rev
Log:
Merged scimpi archetype into application archetype.
Added:
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/ide/
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/ide/eclipse/
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/ide/eclipse/launch/
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/ide/eclipse/launch/WebServer.launch
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/pom.xml
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/resources/
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/resources/images/
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/resources/images/Default.png (with props)
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/META-INF/
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/META-INF/MANIFEST.MF
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/allow
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/isis.properties
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/logging.properties
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/passwords
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/action.shtml
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/collection.shtml
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/edit.shtml
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/object.shtml
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/Default.png (with props)
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/banner-bg.png (with props)
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/banner.png (with props)
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/bg-button.gif (with props)
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/logo.png (with props)
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/index.shtml
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/login.shtml
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/style/
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/style/screen.css
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/style/template.shtml
incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/site/
Modified:
incubator/isis/trunk/support/archetypes/application/src/main/resources/META-INF/maven/archetype-metadata.xml
incubator/isis/trunk/support/archetypes/application/src/main/resources/META-INF/maven/archetype.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/src/site/apt/jottings.apt
Modified: incubator/isis/trunk/support/archetypes/application/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1023517&r1=1023516&r2=1023517&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/META-INF/maven/archetype-metadata.xml (original)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/META-INF/maven/archetype-metadata.xml Sun Oct 17 16:03:12 2010
@@ -125,5 +125,30 @@
</fileSet>
</fileSets>
</module>
+ <module id="${rootArtifactId}-scimpi" dir="scimpi" name="${rootArtifactId}-scimpi">
+ <fileSets>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/main/webapp</directory>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.shtml</include>
+ <include>**/*.properties</include>
+ <include>**/allow</include>
+ <include>**/passwords</include>
+ </includes>
+ </fileSet>
+ <fileSet encoding="UTF-8">
+ <directory>src/main/webapp</directory>
+ <includes>
+ <include>**/*.</include>
+ <include>**/*.jpg</include>
+ <include>**/*.MF</include>
+ <include>**/*.png</include>
+ <include>**/*.css</include>
+ <include>**/*.gif</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ </module>
</modules>
</archetype-descriptor>
Modified: incubator/isis/trunk/support/archetypes/application/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/META-INF/maven/archetype.xml?rev=1023517&r1=1023516&r2=1023517&view=diff
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/META-INF/maven/archetype.xml (original)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/META-INF/maven/archetype.xml Sun Oct 17 16:03:12 2010
@@ -40,5 +40,25 @@
<resource>webapp/src/main/webapp/WEB-INF/web.xml</resource>
<resource>webapp/src/main/webapp/default.css</resource>
<resource>webapp/pom.xml</resource>
+ <resource>scimpi/pom.xml</resource>
+ <resource>scimpi/src/main/webapp/login.shtml</resource>
+ <resource>scimpi/src/main/webapp/index.shtml</resource>
+ <resource>scimpi/src/main/webapp/generic/action.shtml</resource>
+ <resource>scimpi/src/main/webapp/generic/collection.shtml</resource>
+ <resource>scimpi/src/main/webapp/generic/edit.shtml</resource>
+ <resource>scimpi/src/main/webapp/generic/object.shtml</resource>
+ <resource>scimpi/src/main/webapp/images/banner.png</resource>
+ <resource>scimpi/src/main/webapp/images/bg-button.gif</resource>
+ <resource>scimpi/src/main/webapp/images/banner-bg.png</resource>
+ <resource>scimpi/src/main/webapp/images/Default.png</resource>
+ <resource>scimpi/src/main/webapp/images/logo.png</resource>
+ <resource>scimpi/src/main/webapp/META-INF/MANIFEST.MF</resource>
+ <resource>scimpi/src/main/webapp/style/screen.css</resource>
+ <resource>scimpi/src/main/webapp/style/template.shtml</resource>
+ <resource>scimpi/src/main/webapp/WEB-INF/logging.properties</resource>
+ <resource>scimpi/src/main/webapp/WEB-INF/web.xml</resource>
+ <resource>scimpi/src/main/webapp/WEB-INF/isis.properties</resource>
+ <resource>scimpi/src/main/webapp/WEB-INF/allow</resource>
+ <resource>scimpi/src/main/webapp/WEB-INF/passwords</resource>
</resources>
</archetype>
\ No newline at end of file
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=1023517&r1=1023516&r2=1023517&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 16:03:12 2010
@@ -165,6 +165,14 @@
<artifactId>${rootArtifactId}-webapp</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <!-- Scimpi -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${rootArtifactId}-scimpi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/ide/eclipse/launch/WebServer.launch
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/ide/eclipse/launch/WebServer.launch?rev=1023517&view=auto
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/ide/eclipse/launch/WebServer.launch (added)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/ide/eclipse/launch/WebServer.launch Sun Oct 17 16:03:12 2010
@@ -0,0 +1,16 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/${rootArtifactId}-webapp"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.webserver.WebServer"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--type exploration"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="${rootArtifactId}-webapp"/>
+</launchConfiguration>
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/pom.xml?rev=1023517&view=auto
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/pom.xml (added)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/pom.xml Sun Oct 17 16:03:12 2010
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>Scimpi Web App</name>
+ <artifactId>${artifactId}</artifactId>
+ <packaging>war</packaging>
+
+ <parent>
+ <groupId>${groupId}</groupId>
+ <artifactId>${rootArtifactId}</artifactId>
+ <version>${version}</version>
+ </parent>
+
+ <build>
+ <plugins>
+ <!-- what are these for?
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <wtpversion>1.5</wtpversion>
+ <wtpContextName>${artifactId}</wtpContextName>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ -->
+
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <webAppConfig>
+ <contextPath>/${artifactId}</contextPath>
+ </webAppConfig>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <!-- Project resources -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${rootArtifactId}-fixture</artifactId>
+ </dependency>
+
+ <!-- Apache Isis -->
+ <!-- scimpi -->
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>scimpi-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>scimpi-dispatcher</artifactId>
+ </dependency>
+ <!-- Isis system -->
+ <dependency>
+ <groupId>org.apache.isis.defaults</groupId>
+ <artifactId>bytecode</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>webapp</artifactId>
+ </dependency>
+ <!-- optional -->
+ <dependency>
+ <groupId>org.apache.isis.alternatives.objectstore</groupId>
+ <artifactId>xml</artifactId>
+ </dependency>
+
+ </dependencies>
+</project>
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/resources/images/Default.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/resources/images/Default.png?rev=1023517&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/resources/images/Default.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/META-INF/MANIFEST.MF?rev=1023517&view=auto
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/META-INF/MANIFEST.MF (added)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/META-INF/MANIFEST.MF Sun Oct 17 16:03:12 2010
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/allow
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/allow?rev=1023517&view=auto
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/allow (added)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/allow Sun Oct 17 16:03:12 2010
@@ -0,0 +1 @@
+# add allowed users
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/isis.properties?rev=1023517&view=auto
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/isis.properties (added)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/isis.properties Sun Oct 17 16:03:12 2010
@@ -0,0 +1,8 @@
+isis.locale=en_US
+
+isis.services.prefix=${groupId}.service
+isis.services=DomainObjectRepository
+
+isis.fixtures.prefix=${groupId}.fixture
+isis.fixtures=DomainObjectFixture
+
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/logging.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/logging.properties?rev=1023517&view=auto
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/logging.properties (added)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/logging.properties Sun Oct 17 16:03:12 2010
@@ -0,0 +1,10 @@
+log4j.rootCategory=WARN, Console
+#log4j.logger.org.apache.isis.webapp=DEBUG
+
+# The console appender
+log4j.appender.Console=org.apache.log4j.ConsoleAppender
+#log4j.appender.Console.threshold=INFO
+log4j.appender.Console.target=System.out
+log4j.appender.Console.layout=org.apache.log4j.PatternLayout
+log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-25.25c{1} %-10.10t %-5.5p %m%n
+
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/passwords
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/passwords?rev=1023517&view=auto
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/passwords (added)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/passwords Sun Oct 17 16:03:12 2010
@@ -0,0 +1,7 @@
+# username:password
+sven:pass
+dick:pass
+bob:pass
+
+webapp:pass
+
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/web.xml?rev=1023517&view=auto
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/web.xml (added)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/WEB-INF/web.xml Sun Oct 17 16:03:12 2010
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <display-name>${artifactId}</display-name>
+
+ <welcome-file-list>
+ <welcome-file>index.shtml</welcome-file>
+ </welcome-file-list>
+
+ <listener>
+ <listener-class>org.apache.isis.webapp.IsisWebAppBootstrapper</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>dispatcher</servlet-name>
+ <servlet-class>org.apache.isis.webapp.servlet.DispatcherServlet</servlet-class>
+ <init-param>
+ <param-name>username</param-name>
+ <param-value>webapp</param-value>
+ </init-param>
+ <init-param>
+ <param-name>password</param-name>
+ <param-value>pass</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>dispatcher</servlet-name>
+ <url-pattern>*.shtml</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>dispatcher</servlet-name>
+ <url-pattern>*.app</url-pattern>
+ </servlet-mapping>
+
+</web-app>
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/action.shtml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/action.shtml?rev=1023517&view=auto
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/action.shtml (added)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/action.shtml Sun Oct 17 16:03:12 2010
@@ -0,0 +1,5 @@
+<swf:page-title>Action <swf:action-name method="${method}"/></swf:page-title>
+<swf:template file="../style/template.shtml" />
+
+<h2>${title}</h2>
+<swf:action-form method="${method}" view="_generic.shtml" void="../index.shtml"/>
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/collection.shtml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/collection.shtml?rev=1023517&view=auto
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/collection.shtml (added)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/collection.shtml Sun Oct 17 16:03:12 2010
@@ -0,0 +1,7 @@
+<swf:page-title><swf:element-type /> Listing</swf:page-title>
+<swf:template file="../style/template.shtml" />
+
+<h2>${title}</h2>
+<swf:table link="_generic.shtml" />
+
+
\ No newline at end of file
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/edit.shtml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/edit.shtml?rev=1023517&view=auto
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/edit.shtml (added)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/edit.shtml Sun Oct 17 16:03:12 2010
@@ -0,0 +1,7 @@
+<swf:page-title>Edit <swf:title icon="no" /></swf:page-title>
+<swf:template file="../style/template.shtml" />
+
+<h2>Edit <swf:title /></h2>
+<swf:edit />
+
+
\ No newline at end of file
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/object.shtml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/object.shtml?rev=1023517&view=auto
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/object.shtml (added)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/generic/object.shtml Sun Oct 17 16:03:12 2010
@@ -0,0 +1,8 @@
+<swf:page-title><swf:title icon="no" /></swf:page-title>
+<swf:template file="../style/template.shtml" />
+
+<h2><swf:title /></h2>
+<swf:long-form link="_generic.shtml" />
+
+<swf:methods />
+
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/Default.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/Default.png?rev=1023517&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/Default.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/banner-bg.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/banner-bg.png?rev=1023517&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/banner-bg.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/banner.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/banner.png?rev=1023517&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/banner.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/bg-button.gif
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/bg-button.gif?rev=1023517&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/bg-button.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/logo.png
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/logo.png?rev=1023517&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/images/logo.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/index.shtml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/index.shtml?rev=1023517&view=auto
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/index.shtml (added)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/index.shtml Sun Oct 17 16:03:12 2010
@@ -0,0 +1,5 @@
+<swf:page-title>Application template</swf:page-title>
+<swf:template file="style/template.shtml" />
+
+<swf:services />
+
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/login.shtml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/login.shtml?rev=1023517&view=auto
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/login.shtml (added)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/login.shtml Sun Oct 17 16:03:12 2010
@@ -0,0 +1,5 @@
+<swf:page-title>Logon</swf:page-title>
+<swf:template file="style/template.shtml" />
+
+<h2>Please Log On</h2>
+<swf:logon/>
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/style/screen.css
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/style/screen.css?rev=1023517&view=auto
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/style/screen.css (added)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/style/screen.css Sun Oct 17 16:03:12 2010
@@ -0,0 +1,369 @@
+BODY {
+ font-family: Arial, Sans-Serif;
+ margin: 0 0 10px 0;
+ color: black;
+ background-color: #f0f0f0;
+}
+
+/*
+* Banner
+*/
+div#banner {
+ background: url(images/banner-bg.png);
+ background-repeat: repeat-x white-space : nowrap;
+ width: 100%;
+ height: 100px;
+}
+
+div#banner img.logo {
+ margin-left: 50px;
+ margin-top: 10px;
+ vertical-align: -16px;
+}
+
+div#banner span.title {
+ display: inline;
+ font-size: 24pt;
+ font-weight: normal;
+ margin-left: 16px;
+}
+
+/*
+* Content below banner
+*/
+div#content {
+ display: block;
+}
+
+div#content div#side {
+ display: block;
+ padding: 6px 30px;
+}
+
+div#side ul {
+ margin: 0;
+ padding: 0;
+}
+
+div#side li {
+ display: block;
+ font-size: 80%;
+ padding: 4px 0;
+}
+
+div#content div#main{
+ padding: 6px 30px;
+}
+
+/*
+* Feedback area
+*/
+.feedback {
+ border: 2px solid red;
+ background-color: #ffccff;
+ padding: 20px 10px;
+}
+
+.warning {
+ color: red;
+ font-style: italic;
+}
+
+.message {
+ color: blue;
+}
+
+.error {
+ color: red;
+ font-size: 80%;
+ padding-left: 6px;
+}
+
+/*
+* Debug
+*/
+
+div.debug {
+ display: block;
+ padding: 10px;
+ border: 1px solid gray;
+ background-color: #ddd;
+}
+
+/*
+* Headings
+*/
+h1, h2, h3, h4 {
+ color: blue;
+}
+
+
+/*
+* Hyper links
+*/
+a {
+ color: blue;
+ text-decoration: none;
+}
+
+a:hover {
+ text-decoration: underline;
+}
+
+a:visted {
+ color: blue;
+ text-decoration: none;
+}
+
+/*
+* Icons
+*/
+img.title-icon {
+ height: 32px;
+ padding-right: 6px;
+ vertical-align:-5px;
+}
+
+img.small-icon {
+ height: 16px;
+ padding-right: 6px;
+ vertical-align: text-bottom;
+}
+
+
+/*
+* Actions
+*/
+div.actions {
+
+}
+
+div.actions div.actions {
+ border: 0px;
+ padding: 0px;
+}
+
+div.actions h2 {
+ font-size: 90%;
+}
+
+div.actions h3 {
+ font-size: 80%;
+}
+
+div.actions div.action {
+ padding 2px;
+ margin: 4px 0;
+ height: 1.6em;
+}
+
+div.action INPUT,
+div.action a,
+a.action,
+div.action span.disabled
+{
+ font-size: 80%;
+ background-color: silver;
+ border: 1px solid #333399;
+ background: url(../images/bg-button.gif);
+ background-repeat: repeat-x;
+}
+
+div.action INPUT[type="hidden"]
+{
+ background: none;
+ border: none;
+}
+
+div.action a,
+a.action,
+div.action span.disabled {
+ padding: 1px 10px;
+}
+
+.action INPUT,
+a.action,
+.action a:link {
+ color: #000000;
+}
+
+.action INPUT,
+a.action,
+.action a:visited {
+ color: #000000;
+}
+
+.action INPUT,
+a.action,
+.action a:hover {
+ color: #000000;
+ text-decoration: none;
+}
+
+div.action span.disabled {
+ color: #555;
+}
+
+/*
+* Edit forms
+*/
+fieldset {
+ padding: 5px 10px;
+}
+
+fieldset div.field {
+ padding: 4px 0px;
+ min-height: 1.3em;
+}
+
+fieldset label {
+ float: left;
+ width:140px;
+ font-weight: bold;
+}
+
+fieldset input {
+ padding: 0px 0;
+}
+
+fieldset textarea {
+ font-family: Arial, Sans-Serif;
+}
+
+form input.button {
+ font-size: 80%;
+ background-color: silver;
+ border: 1px solid #333399;
+ background: url(../images/bg-button.gif);
+ background-repeat: repeat-x;
+ padding: 1px 0;
+}
+
+/*
+* Display forms
+*/
+div.form {
+ padding: 5px 0;
+}
+
+XXdiv.form * {
+ border: 1px solid red;
+}
+
+div.form div.field {
+ padding: 4px 6px;
+ min-height: 1.3em;
+}
+
+div.form div.odd-row {
+ background-color: #e7e7e7;
+}
+
+div.form div.even-row {
+ background-color: #eee;
+}
+
+div.form span.label {
+ float: left;
+ font-weight: bold;
+}
+
+div.form span.value {
+ display: block;
+ padding-left: 12em;
+ max-width: 45em;
+}
+
+
+
+/*
+* collections
+*/
+
+#store .entry {
+ border-bottom: 1px dotted #7745FF;
+ padding: 10px 0;
+}
+
+table {
+ border: 0px;
+ padding-bottom: 10px;
+}
+
+th {
+ background-color: #bbb;
+}
+
+tr.odd-row {
+ background-color: #eee;
+}
+
+tr.even-row {
+ background-color: #e7e7e7;
+}
+
+td {
+ vertical-align: top;
+ padding: 4px 10px;
+}
+
+
+
+
+
+
+/*
+* Application specific
+*/
+div.book {
+ padding-bottom: 10px;
+ border-bottom: 2px dashed;
+}
+
+div.cover {
+ float: left;
+ padding-right: 30px;
+ padding-bottom: 8px;
+}
+
+
+.title {
+ font-size: 120%;
+ font-weight: bold;
+}
+
+.description {}
+
+.price {
+ display: inline;
+ font-weight: bold;
+ text-align: left;
+ margin-right: 20px;
+}
+
+form, input {
+ display: inline;
+}
+
+
+
+
+
+div#cart {
+ float: right;
+ width: 160px;
+ font-size: 70%;
+ border: 1px solid gray;
+ margin: 10px;
+ padding: 10px;
+}
+
+div#cart ul {
+ padding: 0;
+
+}
+
+div#cart li {
+ display: block;
+ padding-bottom: 4px;
+}
Added: incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/style/template.shtml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/style/template.shtml?rev=1023517&view=auto
==============================================================================
--- incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/style/template.shtml (added)
+++ incubator/isis/trunk/support/archetypes/application/src/main/resources/archetype-resources/scimpi/src/main/webapp/style/template.shtml Sun Oct 17 16:03:12 2010
@@ -0,0 +1,34 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title>${title}</title>
+<link rel="stylesheet" title="Style 1" href="${_context}/style/screen.css" type="text/css" media="all" />
+</head>
+
+<body>
+
+<div id="banner">
+ <img class="logo" src="${_context}/images/logo.png"/><span class="title">Example application</span>
+</div>
+
+<div id="content">
+ <div id="side">
+ <ul>
+ <li><a href="${_context}/index.shtml">Home</a></li>
+ </ul>
+ <!--
+ uncomment if using NOF users
+ <swf:user login-view="generic/login.shtml" logout-view="index.shtml" />
+ -->
+ </div>
+ <div id="main">
+ <swf:feedback />
+ <swf:content />
+
+ <swf:diagnostics />
+ </div>
+</div>
+
+
+</body>
+</html>
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=1023517&r1=1023516&r2=1023517&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 16:03:12 2010
@@ -22,7 +22,6 @@
</build>
<dependencies>
-
<!-- other modules in this project -->
<dependency>
<groupId>${project.groupId}</groupId>
Modified: 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=1023517&r1=1023516&r2=1023517&view=diff
==============================================================================
--- incubator/isis/trunk/support/src/site/apt/jottings.apt (original)
+++ incubator/isis/trunk/support/src/site/apt/jottings.apt Sun Oct 17 16:03:12 2010
@@ -55,7 +55,6 @@ Building an exploration application from
To enable full Maven integration, right-click on the project in Eclipse and choose
"M2 Maven -> Enable dependency management".
- KM 2010-10-17
Application Archetype
Has a different project layout to exploration, above.
@@ -66,4 +65,13 @@ Application Archetype
Note: I have changed the default launch type to "prototype" and used the xml persistor.
-
\ No newline at end of file
+Scimpi Archetype
+ [I haven't figured this one out fully - it seems to be wanting to generate a
+ sub-project, but you can't specify enough parameters via the mvn command line.
+ I'm merging it into the application archetype]
+
+Maven Eclipse Plugin
+ I have to run "mvn install" before I can run "mvn eclipse:eclipse".
+ If I don't, it fails with "unable to find resources" kind of error.
+
+ KM 2010-10-17