incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1087787 - in /incubator/isis/trunk: ./ examples/claims/quickrun/ examples/claims/quickrun/config/ examples/claims/viewer-bdd/src/test/java/org/apache/isis/support/prototype/stories/ src/site/ support/quickstart/ support/quickstart/quickrun...
Date Fri, 01 Apr 2011 16:26:42 GMT
Author: danhaywood
Date: Fri Apr  1 16:26:42 2011
New Revision: 1087787

URL: http://svn.apache.org/viewvc?rev=1087787&view=rev
Log:
reworking support/quickstart so that the archetype will be able to create self-contained JARs;
excluded transitive dependency of jmock on junit 4.4 in order that can use latest-and-greatest
junit version

Added:
    incubator/isis/trunk/support/quickstart/quickrun/src/
    incubator/isis/trunk/support/quickstart/quickrun/src/main/
    incubator/isis/trunk/support/quickstart/quickrun/src/main/resources/
    incubator/isis/trunk/support/quickstart/quickrun/src/main/resources/isis.properties
      - copied unchanged from r1085970, incubator/isis/trunk/support/quickstart/quickrun/config/isis.properties
    incubator/isis/trunk/support/quickstart/quickrun/src/main/resources/logging.properties
      - copied unchanged from r1085970, incubator/isis/trunk/support/quickstart/quickrun/config/logging.properties
    incubator/isis/trunk/support/quickstart/quickrun/src/main/resources/viewer_html.properties
      - copied unchanged from r1085970, incubator/isis/trunk/support/quickstart/quickrun/config/viewer_html.properties
Removed:
    incubator/isis/trunk/examples/claims/viewer-bdd/src/test/java/org/apache/isis/support/prototype/stories/
    incubator/isis/trunk/support/quickstart/quickrun/config/
Modified:
    incubator/isis/trunk/examples/claims/quickrun/config/isis.properties
    incubator/isis/trunk/examples/claims/quickrun/config/logging.properties
    incubator/isis/trunk/examples/claims/quickrun/pom.xml
    incubator/isis/trunk/pom.xml
    incubator/isis/trunk/src/site/site.xml
    incubator/isis/trunk/support/quickstart/pom.xml
    incubator/isis/trunk/support/quickstart/quickrun/pom.xml
    incubator/isis/trunk/support/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/BootstrapInExplorationMode.html
    incubator/isis/trunk/support/quickstart/tests-junit/pom.xml
    incubator/isis/trunk/support/quickstart/tests-junit/src/test/java/junit/AbstractTest.java
    incubator/isis/trunk/support/quickstart/viewer-html/pom.xml
    incubator/isis/trunk/viewer/junit/pom.xml
    incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java

Modified: incubator/isis/trunk/examples/claims/quickrun/config/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/quickrun/config/isis.properties?rev=1087787&r1=1087786&r2=1087787&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/quickrun/config/isis.properties (original)
+++ incubator/isis/trunk/examples/claims/quickrun/config/isis.properties Fri Apr  1 16:26:42
2011
@@ -6,11 +6,6 @@ isis.fixtures= ClaimsFixture
 
 isis.exploration.users=sven, dick, bob
 
-isis.viewer.html.header=<div id="site-header"><div id="site-logo">&nbsp;</div></div>
-isis.viewer.html.footer=<div id="page-footer"><small>Powered by Apache Isis</small></div>
-isis.viewer.html.port=8080
-
-
 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

Modified: incubator/isis/trunk/examples/claims/quickrun/config/logging.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/quickrun/config/logging.properties?rev=1087787&r1=1087786&r2=1087787&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/quickrun/config/logging.properties (original)
+++ incubator/isis/trunk/examples/claims/quickrun/config/logging.properties Fri Apr  1 16:26:42
2011
@@ -10,7 +10,7 @@ log4j.appender.Console.layout.Conversion
 
 
 log4j.appender.File=org.apache.log4j.RollingFileAppender
-log4j.appender.File.file=nakedobjects.log
+log4j.appender.File.file=isis.log
 log4j.appender.File.append=false
 #log4j.appender.File.maxFileSize=500KB
 #log4j.appender.File.maxBackupIndex=1

Modified: incubator/isis/trunk/examples/claims/quickrun/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/quickrun/pom.xml?rev=1087787&r1=1087786&r2=1087787&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/quickrun/pom.xml (original)
+++ incubator/isis/trunk/examples/claims/quickrun/pom.xml Fri Apr  1 16:26:42 2011
@@ -22,6 +22,13 @@
 			<artifactId>claims-fixture</artifactId>
 		</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>

Modified: incubator/isis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/pom.xml?rev=1087787&r1=1087786&r2=1087787&view=diff
==============================================================================
--- incubator/isis/trunk/pom.xml (original)
+++ incubator/isis/trunk/pom.xml Fri Apr  1 16:26:42 2011
@@ -944,6 +944,12 @@
                 <groupId>org.jmock</groupId>
                 <artifactId>jmock-junit4</artifactId>
                 <version>2.5.1</version>
+                <exclusions>
+					<exclusion>
+						<groupId>junit</groupId>
+						<artifactId>junit-dep</artifactId>
+					</exclusion>            	
+	            </exclusions>
             </dependency>
 
             <!-- transitively includes cglib:cglib-nodep:2.1_3 and org.objenesis:objenesis:1.0
-->
@@ -961,6 +967,13 @@
                 <scope>test</scope>
             </dependency>
 
+            <!-- JodaTime -->
+            <dependency>
+	    		<groupId>joda-time</groupId>
+	    		<artifactId>joda-time</artifactId>
+	            <version>1.6.2</version>
+            </dependency>
+
             <!-- Specs -->
             <dependency>
                 <groupId>geronimo-spec</groupId>

Modified: incubator/isis/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/src/site/site.xml?rev=1087787&r1=1087786&r2=1087787&view=diff
==============================================================================
--- incubator/isis/trunk/src/site/site.xml (original)
+++ incubator/isis/trunk/src/site/site.xml Fri Apr  1 16:26:42 2011
@@ -36,27 +36,6 @@
             <item name="Case Study" href="naked-objects-case-study.html" />
         </menu>
 
-        <menu name="Project Info" ref="reports"/>
-
-		<menu name="Community and Help">
-			<item name="IRC" href="http://webchat.freenode.net/?channels=apache-isis&amp;uio=d4"
/>
-            <item name="Mailing List">
-                <item name="Post to"
-                    href="mailto:isis-dev@incubator.apache.org" />
-                <item name="Archives"
-                    href="http://mail-archives.apache.org/mod_mbox/incubator-isis-dev/" />
-                <item name="Subscribe"
-                    href="mailto:isis-dev-subscribe@incubator.apache.org" />
-            </item>
-            <!-- 
-            <item name="Twitter (#ApacheIsis)" href="http://search.twitter.com/search?q=%23ApacheIsis"
/>
-            -->
-            <item name="Wiki" href="https://cwiki.apache.org/confluence/display/ISIS/Index"
/>
-            <item name="JIRA" href="https://issues.apache.org/jira/browse/ISIS" />
-            <item name="CI" href="https://hudson.apache.org/hudson/job/isis-trunk-ubuntu"
/>
-            <item name="Isis Extras" href="http://code.google.com/a/apache-extras.org/p/isis-extras/"
/>
-        </menu>
-
 		<!-- This 'global' menu is inherited -->
 		<menu name="Isis Modules" inherit="bottom" href="core/index.html">
 			<item name="Application Library" href="applib/index.html" />
@@ -90,12 +69,23 @@
             </item>
 		</menu>
 
-        <menu name="For Contributors">
-            <item name="Contributor's Guide">
-                <item name="PDF" href="docbkx/pdf/${docbkxGuideName}.pdf" />
-                <item name="HTML" href="docbkx/html/guide/${docbkxGuideName}.html" />
+		<menu name="Community and Help">
+			<item name="IRC" href="http://webchat.freenode.net/?channels=apache-isis&amp;uio=d4"
/>
+            <item name="Mailing List">
+                <item name="Post to"
+                    href="mailto:isis-dev@incubator.apache.org" />
+                <item name="Archives"
+                    href="http://mail-archives.apache.org/mod_mbox/incubator-isis-dev/" />
+                <item name="Subscribe"
+                    href="mailto:isis-dev-subscribe@incubator.apache.org" />
             </item>
-            <item name="Jottings" href="jottings.html" />
+            <!-- 
+            <item name="Twitter (#ApacheIsis)" href="http://search.twitter.com/search?q=%23ApacheIsis"
/>
+            -->
+            <item name="Wiki" href="https://cwiki.apache.org/confluence/display/ISIS/Index"
/>
+            <item name="JIRA" href="https://issues.apache.org/jira/browse/ISIS" />
+            <item name="CI" href="https://hudson.apache.org/hudson/job/isis-trunk-ubuntu"
/>
+            <item name="Isis Extras" href="http://code.google.com/a/apache-extras.org/p/isis-extras/"
/>
         </menu>
 
 		<menu name="Other Resources">
@@ -119,6 +109,16 @@
             <item name="Isis Roadmap" href="roadmap.html" />
 		</menu>
 
+        <menu name="For Contributors">
+            <item name="Contributor's Guide">
+                <item name="PDF" href="docbkx/pdf/${docbkxGuideName}.pdf" />
+                <item name="HTML" href="docbkx/html/guide/${docbkxGuideName}.html" />
+            </item>
+            <item name="Jottings" href="jottings.html" />
+        </menu>
+
+        <menu name="Project Info" ref="reports"/>
+
         <menu name="Apache">
             <item name="Foundation" href="http://www.apache.org/" />
             <item name="License" href="http://www.apache.org/licenses/" />

Modified: incubator/isis/trunk/support/quickstart/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/quickstart/pom.xml?rev=1087787&r1=1087786&r2=1087787&view=diff
==============================================================================
--- incubator/isis/trunk/support/quickstart/pom.xml (original)
+++ incubator/isis/trunk/support/quickstart/pom.xml Fri Apr  1 16:26:42 2011
@@ -84,6 +84,25 @@
                     <artifactId>maven-jetty-plugin</artifactId>
                     <version>6.1.25</version>
                 </plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-shade-plugin</artifactId>
+					<version>1.4</version>
+				</plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-antrun-plugin</artifactId>
+					<version>1.6</version>
+					<executions>
+						<execution>
+					        <goals>
+					          <goal>run</goal>
+					        </goals>
+						</execution>
+					</executions>
+				</plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -209,6 +228,12 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.8.2</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

Modified: incubator/isis/trunk/support/quickstart/quickrun/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/quickstart/quickrun/pom.xml?rev=1087787&r1=1087786&r2=1087787&view=diff
==============================================================================
--- incubator/isis/trunk/support/quickstart/quickrun/pom.xml (original)
+++ incubator/isis/trunk/support/quickstart/quickrun/pom.xml Fri Apr  1 16:26:42 2011
@@ -2,6 +2,12 @@
 <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>
 
+	<!-- common use cases: -->
+	<!-- mvn package                 : creates self-contained JAR -->
+	<!-- mvn antrun:run -D exec=dnd     : runs JAR using DnD viewer -->
+	<!-- mvn antrun:run -D exec=html    : runs JAR as self-hosted webapp using HTML viewer
(http://localhost:8080/logon.app)  -->
+	<!-- mvn antrun:run -D exec=restful : runs JAR as self-hosted webapp using RESTful viewer
-->
+	
 	<parent>
     	<groupId>org.apache.isis.support</groupId>
     	<artifactId>quickstart</artifactId>
@@ -15,6 +21,32 @@
 		<jetty.version>6.1.4</jetty.version>
 	</properties>
 
+	<build>
+		<plugins>
+			<!-- 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.Isis</mainClass>
+								</transformer>
+							</transformers>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
 	<dependencies>
 		<!-- other modules in this project -->
 		<dependency>
@@ -75,14 +107,6 @@
         </dependency>
 
 
-        <!-- JUnit Viewer dependencies -->
-        <dependency>
-            <groupId>org.apache.isis.viewer</groupId>
-            <artifactId>junit</artifactId>
-            <version>0.1.2-incubating-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-        
 		<!--  JETTY DEPENDENCIES FOR TESTING  -->
 		<dependency>
 			<groupId>org.mortbay.jetty</groupId>
@@ -102,7 +126,110 @@
 			<version>${jetty.version}</version>
 			<scope>provided</scope>
 		</dependency>
-
 	</dependencies>
 
+	<profiles>
+		<profile>
+			<!-- prereqs: mvn package -->
+			<!-- mvn antrun:run -D exec=dnd -->
+			<id>exec-dnd</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+				<property>
+					<name>exec</name>
+					<value>dnd</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<configuration>
+							<tasks>
+								<exec executable="java" failonerror="true">
+									<arg value="-jar"/>
+									<arg value="${project.build.directory}/${project.build.finalName}.jar"/>
+									<arg value="-type"/>
+									<arg value="exploration"/>
+									<arg value="-viewer"/>
+									<arg value="dnd"/>
+								</exec>
+							</tasks>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<!-- prereqs: mvn package -->
+			<!-- mvn antrun:run -D exec=html -->
+			<id>exec-html</id>
+			<activation>
+				<property>
+					<name>exec</name>
+					<value>html</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<configuration>
+							<tasks>
+								<exec executable="echo"/>
+								<exec executable="echo"/>
+								<exec executable="echo">
+									<arg value="open http://localhost:8080/logon.app"/>
+								</exec>
+								<exec executable="echo"/>
+								<exec executable="echo"/>
+								<exec executable="java" failonerror="true">
+									<arg value="-jar"/>
+									<arg value="${project.build.directory}/${project.build.finalName}.jar"/>
+									<arg value="-type"/>
+									<arg value="exploration"/>
+									<arg value="-viewer"/>
+									<arg value="html"/>
+								</exec>
+							</tasks>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<!-- prereqs: mvn package -->
+			<!-- mvn antrun:run -D exec=restful -->
+			<id>exec-restful</id>
+			<activation>
+				<property>
+					<name>exec</name>
+					<value>restful</value>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<configuration>
+							<tasks>
+								<exec executable="java" failonerror="true">
+									<arg value="-jar"/>
+									<arg value="${project.build.directory}/${project.build.finalName}.jar"/>
+									<arg value="-type"/>
+									<arg value="exploration"/>
+									<arg value="-viewer"/>
+									<arg value="org.apache.isis.viewer.restful.viewer.embedded.RestfulViewerInstaller"/>
+								</exec>
+							</tasks>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
 </project>

Modified: incubator/isis/trunk/support/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/BootstrapInExplorationMode.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/BootstrapInExplorationMode.html?rev=1087787&r1=1087786&r2=1087787&view=diff
==============================================================================
--- incubator/isis/trunk/support/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/BootstrapInExplorationMode.html
(original)
+++ incubator/isis/trunk/support/quickstart/tests-bdd/src/test/resources/viewer/bdd/common/BootstrapInExplorationMode.html
Fri Apr  1 16:26:42 2011
@@ -10,7 +10,7 @@ The system:
 <li>
 <p concordion:execute="#result=bootstrapIsis(#configDir,#deploymentType)">
 <span concordion:assertTrue="#result">bootstrapped</span> from
-config directory <span concordion:set="#configDir">../quickrun/config</span>
+config directory <span concordion:set="#configDir">../quickrun/src/main/resources</span>
 and running in <span concordion:set="#deploymentType">exploration</span>
 mode,
 </p>

Modified: incubator/isis/trunk/support/quickstart/tests-junit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/quickstart/tests-junit/pom.xml?rev=1087787&r1=1087786&r2=1087787&view=diff
==============================================================================
--- incubator/isis/trunk/support/quickstart/tests-junit/pom.xml (original)
+++ incubator/isis/trunk/support/quickstart/tests-junit/pom.xml Fri Apr  1 16:26:42 2011
@@ -11,91 +11,23 @@
 	<artifactId>quickstart-tests-junit</artifactId>
 	<name>Quickstart JUnit Tests</name>
 
-	<properties>
-		<jetty.version>6.1.4</jetty.version>
-	</properties>
-
 	<dependencies>
-		<!-- other modules in this project -->
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>quickstart-fixture</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>
-        
-        <!-- isis viewers -->
-		<dependency>
-			<groupId>org.apache.isis.viewer</groupId>
-			<artifactId>dnd</artifactId>
-		</dependency>
+		<!-- this project's dependencies -->
 		<dependency>
-			<groupId>org.apache.isis.viewer</groupId>
-			<artifactId>html</artifactId>
-		</dependency>
-        <dependency>
-            <groupId>org.apache.isis.viewer</groupId>
-            <artifactId>restful-viewer</artifactId>
+			<groupId>org.apache.isis.support</groupId>
+            <artifactId>quickstart-quickrun</artifactId>
+            <version>0.1.2-incubating-SNAPSHOT</version>
         </dependency>
 
-
-        <!-- JUnit Viewer dependencies -->
+        <!-- isis viewers -->
         <dependency>
             <groupId>org.apache.isis.viewer</groupId>
             <artifactId>junit</artifactId>
             <version>0.1.2-incubating-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
-        
-		<!--  JETTY DEPENDENCIES FOR TESTING  -->
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>jetty</artifactId>
-			<version>${jetty.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>jetty-util</artifactId>
-			<version>${jetty.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>jetty-management</artifactId>
-			<version>${jetty.version}</version>
-			<scope>provided</scope>
-		</dependency>
+
 
 	</dependencies>
 

Modified: incubator/isis/trunk/support/quickstart/tests-junit/src/test/java/junit/AbstractTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/quickstart/tests-junit/src/test/java/junit/AbstractTest.java?rev=1087787&r1=1087786&r2=1087787&view=diff
==============================================================================
--- incubator/isis/trunk/support/quickstart/tests-junit/src/test/java/junit/AbstractTest.java
(original)
+++ incubator/isis/trunk/support/quickstart/tests-junit/src/test/java/junit/AbstractTest.java
Fri Apr  1 16:26:42 2011
@@ -36,7 +36,7 @@ import org.apache.isis.viewer.junit.Serv
 import org.apache.isis.viewer.junit.Services;
 
 @RunWith(IsisTestRunner.class)
-@ConfigDir("../quickrun/config")
+@ConfigDir("../quickrun/src/main/resources")
 @Services({ @Service(ToDoItemRepositoryDefault.class) })
 public abstract class AbstractTest {
 

Modified: incubator/isis/trunk/support/quickstart/viewer-html/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/support/quickstart/viewer-html/pom.xml?rev=1087787&r1=1087786&r2=1087787&view=diff
==============================================================================
--- incubator/isis/trunk/support/quickstart/viewer-html/pom.xml (original)
+++ incubator/isis/trunk/support/quickstart/viewer-html/pom.xml Fri Apr  1 16:26:42 2011
@@ -19,6 +19,28 @@
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
             </plugin>
+
+			<!-- mvn package -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<transformers>
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<mainClass>org.apache.isis.WebServer</mainClass>
+								</transformer>
+							</transformers>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 

Modified: incubator/isis/trunk/viewer/junit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/pom.xml?rev=1087787&r1=1087786&r2=1087787&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/pom.xml (original)
+++ incubator/isis/trunk/viewer/junit/pom.xml Fri Apr  1 16:26:42 2011
@@ -161,12 +161,9 @@
             <artifactId>jmock-legacy</artifactId>
         </dependency>
 
-        <!-- hack: override to be compatible with org.jmock:jmock's dependency 
-            on junit:junit-dep -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.4</version>
         </dependency>
 
     </dependencies>

Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java?rev=1087787&r1=1087786&r2=1087787&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java
(original)
+++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java
Fri Apr  1 16:26:42 2011
@@ -31,6 +31,7 @@ import org.junit.internal.runners.Method
 import org.junit.internal.runners.TestClass;
 import org.junit.internal.runners.TestMethod;
 import org.junit.runner.Description;
+import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunNotifier;
 
 import org.apache.isis.applib.fixtures.LogonFixture;
@@ -125,12 +126,12 @@ public class IsisTestRunner extends JUni
 		    
 		    getTransactionManager().endTransaction();
             
-        } catch (final InvocationTargetException e) {
-            notifier.testAborted(description, e.getCause());
+        } catch (final InvocationTargetException e) {
+            testAborted(notifier, description, e.getCause());
             getTransactionManager().abortTransaction();
             return;
         } catch (final Exception e) {
-            notifier.testAborted(description, e);
+            testAborted(notifier, description, e);
             return;
         } finally {
             if (system != null) {
@@ -142,6 +143,13 @@ public class IsisTestRunner extends JUni
         }
     }
 
+
+	private void testAborted(RunNotifier notifier, Description description,
+			Throwable e) {
+		notifier.fireTestStarted(description);
+		notifier.fireTestFailure(new Failure(description, e));
+		notifier.fireTestFinished(description);
+	}
 
     /**
      * Taken from JMock's runner.



Mime
View raw message