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 2014/06/07 17:33:33 UTC
[28/37] git commit: ISIS-792: fixes for simple archetype
ISIS-792: fixes for simple archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8a0d750f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8a0d750f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8a0d750f
Branch: refs/heads/master
Commit: 8a0d750fac2d78df36712a0742d2ff1284f93a98
Parents: 38f6506
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Jun 6 07:16:44 2014 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Jun 6 07:33:17 2014 +0200
----------------------------------------------------------------------
.../simple_wicket_restful_jdo/webapp/pom.xml | 12 +++++++++---
.../webapp/src/main/webapp/WEB-INF/isis.properties | 3 +++
.../main/resources/archetype-resources/webapp/pom.xml | 12 +++++++++---
.../webapp/src/main/webapp/WEB-INF/isis.properties | 3 +++
4 files changed, 24 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8a0d750f/example/application/simple_wicket_restful_jdo/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/webapp/pom.xml b/example/application/simple_wicket_restful_jdo/webapp/pom.xml
index 374e1d7..420a825 100644
--- a/example/application/simple_wicket_restful_jdo/webapp/pom.xml
+++ b/example/application/simple_wicket_restful_jdo/webapp/pom.xml
@@ -54,6 +54,7 @@
</goals>
<configuration>
<backgroundImage>${basedir}/src/main/jettyconsole/isis-banner.png</backgroundImage>
+ <destinationFile>${project.build.directory}/${project.build.finalName}-jetty-console.jar</destinationFile>
</configuration>
<phase>package</phase>
</execution>
@@ -185,6 +186,10 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-wrapper</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-profilestore</artifactId>
</dependency>
<dependency>
@@ -238,7 +243,7 @@
<!--
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
- <artifactId>jdbc</artifactId>
+ <artifactId>sqljdbc4</artifactId>
<version>4.0</version>
</dependency>
-->
@@ -271,7 +276,7 @@
<tasks>
<exec executable="java" failonerror="true">
<arg value="-jar" />
- <arg value="${project.build.directory}/${project.build.finalName}-jetty-console.war" />
+ <arg value="${project.build.directory}/${project.build.finalName}-jetty-console.jar" />
</exec>
</tasks>
</configuration>
@@ -285,7 +290,6 @@
<properties>
<!-- as used in the rebel.xml in the dom project -->
<target.dir>target</target.dir>
-
<isis-jrebel-plugin.packagePrefix>dom.simple,org.apache.isis.objectstore.jdo.applib</isis-jrebel-plugin.packagePrefix>
<isis-jrebel-plugin.loggingLevel>warn</isis-jrebel-plugin.loggingLevel>
</properties>
@@ -340,4 +344,6 @@
</profile>
</profiles>
+
+
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/8a0d750f/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties b/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
index 1d6eb1c..4591060 100644
--- a/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/application/simple_wicket_restful_jdo/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -180,6 +180,8 @@ isis.services = \
org.apache.isis.applib.annotation.Bulk$InteractionContext,\
org.apache.isis.applib.services.scratchpad.Scratchpad,\
org.apache.isis.applib.services.queryresultscache.QueryResultsCache,\
+ org.apache.isis.core.wrapper.WrapperFactoryDefault,\
+ org.apache.isis.applib.services.classdiscovery.ClassDiscoveryServiceUsingReflections,\
\
# JDO implementation of the EventBusService, \
org.apache.isis.objectstore.jdo.datanucleus.service.eventbus.EventBusServiceJdo,\
@@ -246,6 +248,7 @@ isis.fixtures=fixture.simple.SimpleObjectsFixture
+
################################################################################
#
# Viewer defaults
http://git-wip-us.apache.org/repos/asf/isis/blob/8a0d750f/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/pom.xml b/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/pom.xml
index 2816b5c..ee58552 100644
--- a/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/pom.xml
+++ b/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/pom.xml
@@ -54,6 +54,7 @@
</goals>
<configuration>
<backgroundImage>${basedir}/src/main/jettyconsole/isis-banner.png</backgroundImage>
+ <destinationFile>${project.build.directory}/${project.build.finalName}-jetty-console.jar</destinationFile>
</configuration>
<phase>package</phase>
</execution>
@@ -179,6 +180,10 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-wrapper</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-profilestore</artifactId>
</dependency>
<dependency>
@@ -232,7 +237,7 @@
<!--
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
- <artifactId>jdbc</artifactId>
+ <artifactId>sqljdbc4</artifactId>
<version>4.0</version>
</dependency>
-->
@@ -265,7 +270,7 @@
<tasks>
<exec executable="java" failonerror="true">
<arg value="-jar" />
- <arg value="${project.build.directory}/${project.build.finalName}-jetty-console.war" />
+ <arg value="${project.build.directory}/${project.build.finalName}-jetty-console.jar" />
</exec>
</tasks>
</configuration>
@@ -279,7 +284,6 @@
<properties>
<!-- as used in the rebel.xml in the dom project -->
<target.dir>target</target.dir>
-
<isis-jrebel-plugin.packagePrefix>dom.simple,org.apache.isis.objectstore.jdo.applib</isis-jrebel-plugin.packagePrefix>
<isis-jrebel-plugin.loggingLevel>warn</isis-jrebel-plugin.loggingLevel>
</properties>
@@ -334,4 +338,6 @@
</profile>
</profiles>
+
+
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/8a0d750f/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties b/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
index c9e5fc6..5e0186c 100644
--- a/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
+++ b/example/archetype/simple_wicket_restful_jdo/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/isis.properties
@@ -183,6 +183,8 @@ isis.services = ${symbol_escape}
org.apache.isis.applib.annotation.Bulk${symbol_dollar}InteractionContext,${symbol_escape}
org.apache.isis.applib.services.scratchpad.Scratchpad,${symbol_escape}
org.apache.isis.applib.services.queryresultscache.QueryResultsCache,${symbol_escape}
+ org.apache.isis.core.wrapper.WrapperFactoryDefault,${symbol_escape}
+ org.apache.isis.applib.services.classdiscovery.ClassDiscoveryServiceUsingReflections,${symbol_escape}
${symbol_escape}
${symbol_pound} JDO implementation of the EventBusService, ${symbol_escape}
org.apache.isis.objectstore.jdo.datanucleus.service.eventbus.EventBusServiceJdo,${symbol_escape}
@@ -249,6 +251,7 @@ ${symbol_pound}isis.services.command.actions=all|none|ignoreQueryOnly
+
${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbo
l_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}${symbol_pound}
${symbol_pound}
${symbol_pound} Viewer defaults