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 2011/11/23 23:54:49 UTC
svn commit: r1205646 - in /incubator/isis/trunk/examples: claims/
claims/viewer-bdd/src/test/resources/org/apache/isis/example/claims/common/
claims/viewer-bdd/src/test/resources/org/apache/isis/example/claims/stories/newClaim/
claims/viewer-html/ clai...
Author: danhaywood
Date: Wed Nov 23 22:54:47 2011
New Revision: 1205646
URL: http://svn.apache.org/viewvc?rev=1205646&view=rev
Log:
ISIS-107: fixing quickstart in order to recreate archetype; minor fixes to get claims example working again
Added:
incubator/isis/trunk/examples/quickstart/tests-junit/isis.properties
Modified:
incubator/isis/trunk/examples/claims/pom.xml
incubator/isis/trunk/examples/claims/viewer-bdd/src/test/resources/org/apache/isis/example/claims/common/Employees.html
incubator/isis/trunk/examples/claims/viewer-bdd/src/test/resources/org/apache/isis/example/claims/stories/newClaim/ScenarioOnceCreatedShowsUpForClaimant.html
incubator/isis/trunk/examples/claims/viewer-html/pom.xml
incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/web.xml
incubator/isis/trunk/examples/claims/viewer-json/pom.xml
incubator/isis/trunk/examples/quickstart/pom.xml
incubator/isis/trunk/examples/quickstart/tests-bdd/pom.xml
incubator/isis/trunk/examples/quickstart/tests-junit/pom.xml
incubator/isis/trunk/examples/quickstart/viewer-html/pom.xml
incubator/isis/trunk/examples/quickstart/viewer-json/pom.xml
Modified: incubator/isis/trunk/examples/claims/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/pom.xml?rev=1205646&r1=1205645&r2=1205646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/pom.xml (original)
+++ incubator/isis/trunk/examples/claims/pom.xml Wed Nov 23 22:54:47 2011
@@ -104,7 +104,14 @@
</execution>
</executions>
</plugin>
- </plugins>
+
+ <!-- http://simplericity.com/2009/11/10/1257880778509.html -->
+ <plugin>
+ <groupId>org.simplericity.jettyconsole</groupId>
+ <artifactId>jetty-console-maven-plugin</artifactId>
+ <version>1.43</version>
+ </plugin>
+ </plugins>
</pluginManagement>
<plugins>
Modified: incubator/isis/trunk/examples/claims/viewer-bdd/src/test/resources/org/apache/isis/example/claims/common/Employees.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-bdd/src/test/resources/org/apache/isis/example/claims/common/Employees.html?rev=1205646&r1=1205645&r2=1205646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-bdd/src/test/resources/org/apache/isis/example/claims/common/Employees.html (original)
+++ incubator/isis/trunk/examples/claims/viewer-bdd/src/test/resources/org/apache/isis/example/claims/common/Employees.html Wed Nov 23 22:54:47 2011
@@ -28,7 +28,7 @@
<table isis:execute="#result=setUpObject(#className, #aliasAs, #name, #approver)">
<tr>
<th concordion:set="#name">Name</th>
- <th concordion:set="#approver">Approver</th>
+ <th concordion:set="#approver">DefaultApprover</th>
<th concordion:set="#aliasAs">aliasAs</th>
<th concordion:assertEquals="#result"/>
</tr>
Modified: incubator/isis/trunk/examples/claims/viewer-bdd/src/test/resources/org/apache/isis/example/claims/stories/newClaim/ScenarioOnceCreatedShowsUpForClaimant.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-bdd/src/test/resources/org/apache/isis/example/claims/stories/newClaim/ScenarioOnceCreatedShowsUpForClaimant.html?rev=1205646&r1=1205645&r2=1205646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-bdd/src/test/resources/org/apache/isis/example/claims/stories/newClaim/ScenarioOnceCreatedShowsUpForClaimant.html (original)
+++ incubator/isis/trunk/examples/claims/viewer-bdd/src/test/resources/org/apache/isis/example/claims/stories/newClaim/ScenarioOnceCreatedShowsUpForClaimant.html Wed Nov 23 22:54:47 2011
@@ -306,13 +306,13 @@
</tr>
<tr>
- <td>New - 2007-2-18</td>
+ <td>New - 2007-02-18</td>
<td>ok</td>
</tr>
<tr>
- <td>New - 2007-2-14</td>
+ <td>New - 2007-02-14</td>
<td>ok</td>
</tr>
@@ -335,13 +335,13 @@
<tr>
<td>claim 2</td>
- <td>2007-2-18</td>
+ <td>2007-02-18</td>
</tr>
<tr>
<td>claim 1</td>
- <td>2007-2-14</td>
+ <td>2007-02-14</td>
</tr>
</table>
</li>
Modified: incubator/isis/trunk/examples/claims/viewer-html/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-html/pom.xml?rev=1205646&r1=1205645&r2=1205646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-html/pom.xml (original)
+++ incubator/isis/trunk/examples/claims/viewer-html/pom.xml Wed Nov 23 22:54:47 2011
@@ -39,26 +39,18 @@
</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>
+ <plugin>
+ <groupId>org.simplericity.jettyconsole</groupId>
+ <artifactId>jetty-console-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>createconsole</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/web.xml?rev=1205646&r1=1205645&r2=1205646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/claims/viewer-html/src/main/webapp/WEB-INF/web.xml Wed Nov 23 22:54:47 2011
@@ -126,5 +126,5 @@
<servlet-name>Forward</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>
-
+
</web-app>
Modified: incubator/isis/trunk/examples/claims/viewer-json/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-json/pom.xml?rev=1205646&r1=1205645&r2=1205646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-json/pom.xml (original)
+++ incubator/isis/trunk/examples/claims/viewer-json/pom.xml Wed Nov 23 22:54:47 2011
@@ -37,6 +37,19 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
</plugin>
+ <!-- mvn package -->
+ <plugin>
+ <groupId>org.simplericity.jettyconsole</groupId>
+ <artifactId>jetty-console-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>createconsole</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: incubator/isis/trunk/examples/quickstart/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/pom.xml?rev=1205646&r1=1205645&r2=1205646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/pom.xml Wed Nov 23 22:54:47 2011
@@ -125,6 +125,12 @@
</execution>
</executions>
</plugin>
+ <!-- http://simplericity.com/2009/11/10/1257880778509.html -->
+ <plugin>
+ <groupId>org.simplericity.jettyconsole</groupId>
+ <artifactId>jetty-console-maven-plugin</artifactId>
+ <version>1.43</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
Modified: incubator/isis/trunk/examples/quickstart/tests-bdd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-bdd/pom.xml?rev=1205646&r1=1205645&r2=1205646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-bdd/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/tests-bdd/pom.xml Wed Nov 23 22:54:47 2011
@@ -51,10 +51,47 @@
<!-- this project's dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>quickstart-quickrun</artifactId>
+ <artifactId>quickstart-fixture</artifactId>
<version>0.2.0-incubating-SNAPSHOT</version>
</dependency>
+ <!-- isis core -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>runtime</artifactId>
+ </dependency>
+
+ <!-- isis default runtime -->
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <artifactId>webserver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
+ <artifactId>dflt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+ <artifactId>dflt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+ <artifactId>xml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
+ <artifactId>dflt</artifactId>
+ </dependency>
+
+ <!-- isis defaults (other) -->
+ <dependency>
+ <groupId>org.apache.isis.progmodels</groupId>
+ <artifactId>dflt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.security</groupId>
+ <artifactId>dflt</artifactId>
+ </dependency>
<!-- BDD Viewers concordion dependencies -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
Added: incubator/isis/trunk/examples/quickstart/tests-junit/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-junit/isis.properties?rev=1205646&view=auto
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-junit/isis.properties (added)
+++ incubator/isis/trunk/examples/quickstart/tests-junit/isis.properties Wed Nov 23 22:54:47 2011
@@ -0,0 +1,44 @@
+# 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.
+isis.services.prefix = objstore.dflt
+isis.services = todo.ToDoItemRepositoryDefault
+
+isis.fixtures.prefix= fixture
+isis.fixtures= LogonAsSvenFixture,todo.ToDoItemsFixture
+
+isis.exploration.users=sven, dick, bob
+
+
+isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.dflt.classsubstitutor.CglibClassSubstitutor
+#isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.javassist.classsubstitutor.JavassistClassSubstitutor
+#isis.reflector.class-substitutor=org.apache.isis.runtimes.dflt.bytecode.identity.classsubstitutor.ClassSubstitutorIdentity
+
+isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.dflt.objectfactory.CglibObjectFactory
+#isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.javassist.objectfactory.JavassistObjectFactory
+#isis.persistor.object-factory=org.apache.isis.runtimes.dflt.bytecode.identity.objectfactory.ObjectFactoryBasic
+
+
+isis.persistor.domain-object-container=org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault
+#isis.persistor.domain-object-container=org.apache.isis.progmodel.wrapper.metamodel.DomainObjectContainerWrapperFactory
+
+
+#isis.reflector.facets.include=org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl
+#isis.authorization.learn=true
+
+isis.user-profile-store=in-memory
+isis.persistor=in-memory
+#isis.xmlos.dir=/tmp/xml
\ No newline at end of file
Modified: incubator/isis/trunk/examples/quickstart/tests-junit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/tests-junit/pom.xml?rev=1205646&r1=1205645&r2=1205646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/tests-junit/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/tests-junit/pom.xml Wed Nov 23 22:54:47 2011
@@ -34,8 +34,39 @@
<!-- this project's dependencies -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>quickstart-quickrun</artifactId>
+ <artifactId>quickstart-fixture</artifactId>
<version>0.2.0-incubating-SNAPSHOT</version>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt</groupId>
+ <artifactId>webserver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt.bytecode</groupId>
+ <artifactId>dflt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+ <artifactId>dflt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt.objectstores</groupId>
+ <artifactId>xml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.runtimes.dflt.profilestores</groupId>
+ <artifactId>dflt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.progmodels</groupId>
+ <artifactId>dflt</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.security</groupId>
+ <artifactId>dflt</artifactId>
</dependency>
<!-- isis viewers -->
Modified: incubator/isis/trunk/examples/quickstart/viewer-html/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-html/pom.xml?rev=1205646&r1=1205645&r2=1205646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/viewer-html/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-html/pom.xml Wed Nov 23 22:54:47 2011
@@ -38,27 +38,19 @@
<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.simplericity.jettyconsole</groupId>
+ <artifactId>jetty-console-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>createconsole</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: incubator/isis/trunk/examples/quickstart/viewer-json/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-json/pom.xml?rev=1205646&r1=1205645&r2=1205646&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/viewer-json/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-json/pom.xml Wed Nov 23 22:54:47 2011
@@ -37,6 +37,19 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
</plugin>
+ <!-- mvn package -->
+ <plugin>
+ <groupId>org.simplericity.jettyconsole</groupId>
+ <artifactId>jetty-console-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>createconsole</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>