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 2016/10/26 23:26:19 UTC
[5/7] isis git commit: ISIS-1470: recreating simpleapp archetype
ISIS-1470: recreating simpleapp archetype
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/8af6d50a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/8af6d50a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/8af6d50a
Branch: refs/heads/release-1.13.1-RC1
Commit: 8af6d50a89b94877b04b06ed60af0a7019d1144b
Parents: 248f9a6
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Oct 27 00:17:42 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Oct 27 00:17:42 2016 +0100
----------------------------------------------------------------------
example/archetype/simpleapp/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/dom/build.gradle | 2 +-
.../src/test/java/domainapp/dom/simple/SimpleObjectTest.java | 6 +++---
.../simpleapp/src/main/resources/archetype-resources/pom.xml | 2 +-
.../webapp/src/main/webapp/WEB-INF/viewer_wicket.properties | 3 ++-
.../src/test/resources/projects/basic/archetype.properties | 2 +-
6 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/8af6d50a/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index 657f73d..1fc8f76 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.isis.archetype</groupId>
<artifactId>simpleapp-archetype</artifactId>
@@ -44,7 +44,7 @@
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.13.0</version>
+ <version>1.13.1</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/8af6d50a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/build.gradle
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/build.gradle b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/build.gradle
index bc75138..6bfc911 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/build.gradle
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/build.gradle
@@ -62,7 +62,7 @@ repositories {
jcenter()
}
dependencies {
- compile group: 'org.apache.isis.core', name: 'isis-core-applib', version: '1.13.0-SNAPSHOT'
+ compile group: 'org.apache.isis.core', name: 'isis-core-applib', version: '1.14.0-SNAPSHOT'
}
task copyClasses << {
copy {
http://git-wip-us.apache.org/repos/asf/isis/blob/8af6d50a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
index c620db1..f33e30b 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/test/java/domainapp/dom/simple/SimpleObjectTest.java
@@ -30,7 +30,7 @@ public class SimpleObjectTest {
@Before
public void setUp() throws Exception {
- simpleObject = new SimpleObject();
+ simpleObject = new SimpleObject("Foobar");
}
public static class Name extends SimpleObjectTest {
@@ -38,10 +38,10 @@ public class SimpleObjectTest {
@Test
public void happyCase() throws Exception {
// given
- String name = "Foobar";
- assertThat(simpleObject.getName()).isNull();
+ assertThat(simpleObject.getName()).isEqualTo("Foobar");
// when
+ String name = "Foobar - updated";
simpleObject.setName(name);
// then
http://git-wip-us.apache.org/repos/asf/isis/blob/8af6d50a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
index 9f7b7c4..e1790cd 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
</prerequisites>
<properties>
- <isis.version>1.13.0</isis.version>
+ <isis.version>1.13.1</isis.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
http://git-wip-us.apache.org/repos/asf/isis/blob/8af6d50a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
index 1318487..2e56399 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
@@ -94,7 +94,8 @@ ${symbol_pound} comma-separated list of themes to choose from (default is to sho
${symbol_pound}
${symbol_pound}isis.viewer.wicket.themes.enabled=bootstrap-theme,Cosmo,Flatly,Darkly,Sandstone,United
-
+${symbol_pound} ISIS-1520 Temporarily disable the broken Amelia theme and list all other themes
+isis.viewer.wicket.themes.enabled=bootstrap-theme, Cerulean, Cosmo, Cyborg, Darkly, Flatly, Journal, Lumen, Paper, Readable, Sandstone, Simplex, Slate, Spacelab, Superhero, United, Yeti
${symbol_pound}
${symbol_pound} whether to automatically select dependent choice when the choice it depends upon changes.
http://git-wip-us.apache.org/repos/asf/isis/blob/8af6d50a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
index b0dfe87..8809ded 100644
--- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Fri Jul 08 10:41:07 BST 2016
+#Thu Oct 27 00:17:25 BST 2016
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it