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 2018/02/28 22:42:35 UTC
[isis] 04/10: ISIS-1875: recreating simpleapp archetype
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.2-RC1
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ee431694a28f7d8699bd62eb1eeb47e601df245d
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Feb 28 22:27:22 2018 +0000
ISIS-1875: recreating simpleapp archetype
---
example/archetype/simpleapp/pom.xml | 9 ++++-----
.../resources/META-INF/maven/archetype-metadata.xml | 19 -------------------
.../application/logging-integtest.properties | 10 ++++++++++
.../application/DomainAppApplicationModule.java | 3 +++
.../module-simple/logging-integtest.properties | 9 +++++++++
.../java/domainapp/modules/simple/SimpleModule.java | 5 ++++-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../resources/projects/basic/archetype.properties | 2 +-
8 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index 835fbd4..0fa3968 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -17,11 +17,11 @@
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>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>1.16.2-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
<name>simpleapp-archetype</name>
<build>
@@ -65,12 +65,11 @@
<connection>scm:git:git@github.com:incodehq/incode-build.git/simpleapp</connection>
<developerConnection>scm:git:git@github.com:incodehq/incode-build.git/simpleapp</developerConnection>
<url>git@github.com:incodehq/incode-build.git/simpleapp</url>
- <tag>HEAD</tag>
- </scm>
+ </scm>
<parent>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
- <version>1.16.2-SNAPSHOT</version>
+ <version>1.16.2</version>
<relativePath>../../../core/pom.xml</relativePath>
</parent>
<properties>
diff --git a/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml b/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml
index 1aabf29..9f3e162 100644
--- a/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -25,25 +25,6 @@
<include>**/*.xml</include>
</includes>
</fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>modules/module-simple</directory>
- <includes>
- <include>**/*.txt</include>
- <include>**/*.java</include>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </fileSet>
- <fileSet encoding="UTF-8">
- <directory>modules/module-simple</directory>
- <includes>
- <include>**/*.pot</include>
- <include>**/*.png</include>
- <include>**/*.jar</include>
- <include>**/*.lst</include>
- <include>**/*.class</include>
- </includes>
- </fileSet>
<fileSet encoding="UTF-8">
<directory/>
<includes>
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/logging-integtest.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/logging-integtest.properties
index 088bbe4..2e956b5 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/logging-integtest.properties
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/logging-integtest.properties
@@ -112,3 +112,13 @@ ${symbol_pound}log4j.additivity.jdbc.connection=false
log4j.logger.org.apache.isis.core.runtime.services.i18n.po.PoWriter=INFO,translations-po
log4j.additivity.org.apache.isis.core.runtime.services.i18n.po.PoWriter=false
+
+
+log4j.logger.org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilder=WARN,Console
+log4j.additivity.org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilder=false
+
+log4j.logger.org.apache.isis.core.integtestsupport.IntegrationBootstrapAbstract=DEBUG,Console
+log4j.additivity.org.apache.isis.core.integtestsupport.IntegrationBootstrapAbstract=false
+
+log4j.logger.com.mchange.v2.c3p0.SQLWarnings=WARN,Console
+log4j.additivity.com.mchange.v2.c3p0.SQLWarnings=false
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/DomainAppApplicationModule.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/DomainAppApplicationModule.java
index 5b9afab..342d795 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/DomainAppApplicationModule.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/application/src/main/java/domainapp/application/DomainAppApplicationModule.java
@@ -23,6 +23,8 @@ package domainapp.application;
import java.util.Set;
+import javax.xml.bind.annotation.XmlRootElement;
+
import com.google.common.collect.Sets;
import org.apache.isis.applib.Module;
@@ -30,6 +32,7 @@ import org.apache.isis.applib.ModuleAbstract;
import domainapp.modules.simple.SimpleModule;
+@XmlRootElement(name = "module")
public class DomainAppApplicationModule extends ModuleAbstract {
@Override
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/logging-integtest.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/logging-integtest.properties
index 088bbe4..22633ff 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/logging-integtest.properties
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/logging-integtest.properties
@@ -112,3 +112,12 @@ ${symbol_pound}log4j.additivity.jdbc.connection=false
log4j.logger.org.apache.isis.core.runtime.services.i18n.po.PoWriter=INFO,translations-po
log4j.additivity.org.apache.isis.core.runtime.services.i18n.po.PoWriter=false
+
+log4j.logger.org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilder=WARN,Console
+log4j.additivity.org.apache.isis.core.metamodel.specloader.specimpl.FacetedMethodsBuilder=false
+
+log4j.logger.org.apache.isis.core.integtestsupport.IntegrationBootstrapAbstract=DEBUG,Console
+log4j.additivity.org.apache.isis.core.integtestsupport.IntegrationBootstrapAbstract=false
+
+log4j.logger.com.mchange.v2.c3p0.SQLWarnings=WARN,Console
+log4j.additivity.com.mchange.v2.c3p0.SQLWarnings=false
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
index 01fe400..2645e06 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
@@ -21,12 +21,15 @@
*/
package domainapp.modules.simple;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.apache.isis.applib.ModuleAbstract;
import org.apache.isis.applib.fixturescripts.FixtureScript;
import org.apache.isis.applib.fixturescripts.teardown.TeardownFixtureAbstract2;
-import org.apache.isis.applib.ModuleAbstract;
import domainapp.modules.simple.dom.impl.SimpleObject;
+@XmlRootElement(name = "module")
public class SimpleModule extends ModuleAbstract {
@Override
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 ead8212..dc0c62a 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml
@@ -34,7 +34,7 @@
<packaging>pom</packaging>
<properties>
- <isis.version>1.16.1</isis.version>
+ <isis.version>1.16.2</isis.version>
<lombok.version>1.16.18</lombok.version>
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 9290491..3149704 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 @@
-#Sun Feb 18 16:17:45 GMT 2018
+#Wed Feb 28 22:26:56 GMT 2018
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.