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/11/28 11:20:40 UTC
[5/7] isis git commit: ISIS-1538: recreating simpleapp archetype
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/checks/pmd-rulesets/imports.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/checks/pmd-rulesets/imports.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/checks/pmd-rulesets/imports.xml
deleted file mode 100644
index 28fc2a2..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/checks/pmd-rulesets/imports.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version="1.0"?>
-
-<ruleset name="Import Statements"
- xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
-
- <description>
-These rules deal with different problems that can occur with import statements.
- </description>
-
- <rule name="DuplicateImports"
- since="0.5"
- message="Avoid duplicate imports such as ''{0}''"
- class="net.sourceforge.pmd.lang.java.rule.imports.DuplicateImportsRule"
- externalInfoUrl="http://pmd.sourceforge.net/pmd-5.0.5/rules/java/imports.html${symbol_pound}DuplicateImports">
- <description>
-Duplicate or overlapping import statements should be avoided.
- </description>
- <priority>4</priority>
- <example>
-<![CDATA[
-import java.lang.String;
-import java.lang.*;
-public class Foo {}
-]]>
- </example>
- </rule>
-
- <rule name="DontImportJavaLang"
- since="0.5"
- message="Avoid importing anything from the package 'java.lang'"
- class="net.sourceforge.pmd.lang.java.rule.imports.DontImportJavaLangRule"
- externalInfoUrl="http://pmd.sourceforge.net/pmd-5.0.5/rules/java/imports.html${symbol_pound}DontImportJavaLang">
- <description>
-Avoid importing anything from the package 'java.lang'. These classes are automatically imported (JLS 7.5.3).
- </description>
- <priority>4</priority>
- <example>
-<![CDATA[
-import java.lang.String; // this is unnecessary
-
-public class Foo {}
-
-// --- in another source code file...
-
-import java.lang.*; // this is bad
-
-public class Foo {}
-]]>
- </example>
- </rule>
-
- <rule name="UnusedImports"
- since="1.0"
- message="Avoid unused imports such as ''{0}''"
- class="net.sourceforge.pmd.lang.java.rule.imports.UnusedImportsRule"
- externalInfoUrl="http://pmd.sourceforge.net/pmd-5.0.5/rules/java/imports.html${symbol_pound}UnusedImports">
- <description>
-Avoid the use of unused import statements to prevent unwanted dependencies.
- </description>
- <priority>4</priority>
- <example>
-<![CDATA[
-// this is bad
-import java.io.File;
-public class Foo {}
-]]>
- </example>
- </rule>
-
- <rule name="ImportFromSamePackage"
- since="1.02"
- message="No need to import a type that lives in the same package"
- class="net.sourceforge.pmd.lang.java.rule.imports.ImportFromSamePackageRule"
- externalInfoUrl="http://pmd.sourceforge.net/pmd-5.0.5/rules/java/imports.html${symbol_pound}ImportFromSamePackage">
- <description>
-There is no need to import a type that lives in the same package.
- </description>
- <priority>3</priority>
- <example>
- <![CDATA[
- package foo;
-
- import foo.Buz; // no need for this
- import foo.*; // or this
-
- public class Bar{}
- ]]>
- </example>
- </rule>
-
- <rule name="TooManyStaticImports"
- language="java"
- since="4.1"
- class="net.sourceforge.pmd.lang.rule.XPathRule"
- message="Too many static imports may lead to messy code"
- externalInfoUrl="http://pmd.sourceforge.net/pmd-5.0.5/rules/java/imports.html${symbol_pound}TooManyStaticImports">
- <description><![CDATA[
-If you overuse the static import feature, it can make your program unreadable and
-unmaintainable, polluting its namespace with all the static members you import.
-Readers of your code (including you, a few months after you wrote it) will not know
-which class a static member comes from (Sun 1.5 Language Guide).
- ]]></description>
- <priority>3</priority>
- <properties>
- <property name="maximumStaticImports" type="Integer"
- description="All static imports can be disallowed by setting this to 0" min="0" max="100" value="4"/>
- <property name="xpath">
- <value><![CDATA[
-.[count(ImportDeclaration[@Static = 'true']) > ${symbol_dollar}maximumStaticImports]
- ]]></value>
- </property>
- </properties>
- <example><![CDATA[
-import static Lennon;
-import static Ringo;
-import static George;
-import static Paul;
-import static Yoko; // Too much !
- ]]></example>
- </rule>
-
- <rule name="UnnecessaryFullyQualifiedName"
- language="java"
- since="5.0"
- class="net.sourceforge.pmd.lang.java.rule.imports.UnnecessaryFullyQualifiedNameRule"
- message="Unnecessary use of fully qualified name ''{0}'' due to existing import ''{1}''"
- externalInfoUrl="http://pmd.sourceforge.net/pmd-5.0.5/rules/java/imports.html${symbol_pound}UnnecessaryFullyQualifiedName">
- <description><![CDATA[
-Import statements allow the use of non-fully qualified names. The use of a fully qualified name
-which is covered by an import statement is redundant. Consider using the non-fully qualified name.
- ]]></description>
- <priority>4</priority>
- <example><![CDATA[
-import java.util.List;
-
-public class Foo {
- private java.util.List list1; // Unnecessary FQN
- private List list2; // More appropriate given import of 'java.util.List'
-}
- ]]></example>
- </rule>
-
-</ruleset>
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/checks/pmd-rulesets/rulesets.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/checks/pmd-rulesets/rulesets.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/checks/pmd-rulesets/rulesets.properties
deleted file mode 100644
index 0a1c2d3..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/checks/pmd-rulesets/rulesets.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-rulesets.filenames=rulesets/java/basic.xml,rulesets/java/imports.xml,rulesets/java/unusedcode.xml
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/checks/pmd-rulesets/unusedcode.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/checks/pmd-rulesets/unusedcode.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/checks/pmd-rulesets/unusedcode.xml
deleted file mode 100644
index 6e3d178..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/checks/pmd-rulesets/unusedcode.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version="1.0"?>
-
-<ruleset name="Unused Code"
- xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
- <description>
-The Unused Code ruleset contains rules that find unused or ineffective code.
- </description>
-
- <rule name="UnusedPrivateField"
- since="0.1"
- language="java"
- message="Avoid unused private fields such as ''{0}''."
- class="net.sourceforge.pmd.lang.java.rule.unusedcode.UnusedPrivateFieldRule"
- externalInfoUrl="http://pmd.sourceforge.net/pmd-5.0.5/rules/java/unusedcode.html${symbol_pound}UnusedPrivateField">
- <description>
-Detects when a private field is declared and/or assigned a value, but not used.
- </description>
- <priority>3</priority>
- <example>
-<![CDATA[
-public class Something {
- private static int FOO = 2; // Unused
- private int i = 5; // Unused
- private int j = 6;
- public int addOne() {
- return j++;
- }
-}
-]]>
- </example>
- </rule>
-
- <rule name="UnusedLocalVariable"
- language="java"
- since="0.1"
- message="Avoid unused local variables such as ''{0}''."
- class="net.sourceforge.pmd.lang.java.rule.unusedcode.UnusedLocalVariableRule"
- externalInfoUrl="http://pmd.sourceforge.net/pmd-5.0.5/rules/java/unusedcode.html${symbol_pound}UnusedLocalVariable">
- <description>
-Detects when a local variable is declared and/or assigned, but not used.
- </description>
- <priority>3</priority>
-
- <example>
-<![CDATA[
-public class Foo {
- public void doSomething() {
- int i = 5; // Unused
- }
-}
-]]>
- </example>
- </rule>
-
- <rule name="UnusedPrivateMethod"
- language="java"
- since="0.7"
- message="Avoid unused private methods such as ''{0}''."
- class="net.sourceforge.pmd.lang.java.rule.unusedcode.UnusedPrivateMethodRule"
- externalInfoUrl="http://pmd.sourceforge.net/pmd-5.0.5/rules/java/unusedcode.html${symbol_pound}UnusedPrivateMethod">
- <description>
-Unused Private Method detects when a private method is declared but is unused.
- </description>
- <priority>3</priority>
- <example>
-<![CDATA[
-public class Something {
- private void foo() {} // unused
-}
-]]>
- </example>
- </rule>
-
-
- <rule name="UnusedFormalParameter"
- language="java"
- since="0.8"
- message="Avoid unused {0} parameters such as ''{1}''."
- class="net.sourceforge.pmd.lang.java.rule.unusedcode.UnusedFormalParameterRule"
- externalInfoUrl="http://pmd.sourceforge.net/pmd-5.0.5/rules/java/unusedcode.html${symbol_pound}UnusedFormalParameter">
- <description>
-Avoid passing parameters to methods or constructors without actually referencing them in the method body.
- </description>
- <priority>3</priority>
-
- <example>
-<![CDATA[
-public class Foo {
- private void bar(String howdy) {
- // howdy is not used
- }
-}
-]]>
- </example>
- </rule>
-
- <rule name="UnusedModifier"
- language="java"
- since="1.02"
- message="Avoid modifiers which are implied by the context"
- class="net.sourceforge.pmd.lang.java.rule.unusedcode.UnusedModifierRule"
- externalInfoUrl="http://pmd.sourceforge.net/pmd-5.0.5/rules/java/unusedcode.html${symbol_pound}UnusedModifier">
- <description>
-Fields in interfaces are automatically public static final, and methods are public abstract.
-Classes or interfaces nested in an interface are automatically public and static (all nested interfaces are automatically static).
-For historical reasons, modifiers which are implied by the context are accepted by the compiler, but are superfluous.
- </description>
- <priority>3</priority>
- <example>
- <![CDATA[
-public interface Foo {
- public abstract void bar(); // both abstract and public are ignored by the compiler
- public static final int X = 0; // public, static, and final all ignored
- public static class Bar {} // public, static ignored
- public static interface Baz {} // ditto
-}
-public class Bar {
- public static interface Baz {} // static ignored
-}
- ]]>
- </example>
- </rule>
- </ruleset>
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/checks/pmd.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/checks/pmd.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/checks/pmd.xml
deleted file mode 100644
index ac23283..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/checks/pmd.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<ruleset name="Maven Ruleset"
- xmlns="http://pmd.sf.net/ruleset/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
- xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
-
- <!--
- Customized PMD ruleset for Maven, see [0] for more information
- [0] http://pmd.sourceforge.net/howtomakearuleset.html
- -->
-
- <description>
- This ruleset checks the code for discouraged programming constructs.
- </description>
-
- <rule ref="pmd-rulesets/basic.xml">
- <exclude name="EmptyCatchBlock"/>
- </rule>
- <rule ref="pmd-rulesets/basic.xml/EmptyCatchBlock">
- <properties>
- <property name="allowCommentedBlocks" value="true"/>
- </properties>
- </rule>
-
- <rule ref="pmd-rulesets/unusedcode.xml"/>
- <rule ref="pmd-rulesets/imports.xml"/>
-</ruleset>
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/build.gradle
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/build.gradle b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/build.gradle
deleted file mode 100644
index 6bfc911..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/build.gradle
+++ /dev/null
@@ -1,72 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// 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.
-//
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// this gradle script compiles and enhances the dom classes.
-//
-// The script is intended to be used in conjunction with IntelliJ IDEA, to remove the necessity to run the DataNucleus
-// enhancer immediately before running the app, and therefore reduce the turn-around time. The script is run as
-// in the background as a daemon while editing/developing; whenever a change is made to any source code, gradle will
-// automatically compile *and* enhance the code.
-//
-// To use, just type:
-//
-// gradle -t --offline &
-//
-// It is also necessary to disable the IntelliJ's automatic building of the 'dom' project. This is done using:
-//
-// File > Settings > Build, Execution, Deployment > Compiler > Excludes
-//
-// and then exclude the .../dom/src/main/java directory
-//
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-defaultTasks 'compileJava', 'copyClasses'
-
-apply plugin: 'java'
-apply plugin: 'tangram.tools'
-
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-version = (new XmlParser()).parse('pom.xml').parent.version.text()
-
-buildscript {
- repositories {
- maven { url "http://oss.jfrog.org/artifactory/oss-snapshot-local" }
- jcenter()
- }
- dependencies {
- classpath 'tangram:gradle-plugin:1.1.2'
- }
-}
-repositories {
- mavenLocal()
- maven { url "http://oss.jfrog.org/artifactory/oss-snapshot-local" }
- jcenter()
-}
-dependencies {
- compile group: 'org.apache.isis.core', name: 'isis-core-applib', version: '1.14.0-SNAPSHOT'
-}
-task copyClasses << {
- copy {
- from 'build/classes/main'
- into 'target/classes'
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/gradlew
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/gradlew b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/gradlew
deleted file mode 100644
index 27309d9..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/gradlew
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-## Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
- echo "$*"
-}
-
-die ( ) {
- echo
- echo "$*"
- echo
- exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
- fi
-else
- JAVACMD="java"
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
- fi
- i=$((i+1))
- done
- case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/gradlew.bat
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/gradlew.bat b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/gradlew.bat
deleted file mode 100644
index 832fdb6..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/layouts.gradle
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/layouts.gradle b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/layouts.gradle
deleted file mode 100644
index f5fa30d..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/layouts.gradle
+++ /dev/null
@@ -1,49 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// 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.
-//
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// This gradle script copies over .layout.xml files from src to target directory.
-//
-// This script is intended to be used while the app is running (in prototype mode), reducing the turn-around time
-// when updating the layout.
-//
-// The framework will automatically notice any changes to .layout.xml files, but these are read from the classpath
-// (under target/classes), not the source path. Using IntelliJ (say) these can be copied over manually by invoking
-// Run > Reload Changed Classes, and then refreshing the browser.
-//
-// This script instead is intended to be run in the background as a daemon; whenever a change
-// is made to any .layout.xml file, gradle will automatically copy over the file to the target directory.
-//
-// The script is run using:
-//
-// gradle -t -b layouts.gradle --offline &
-//
-// To reduce turn-around time further, also use the liveReload.gradle script (to automatically refresh the browser).
-//
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-defaultTasks 'copyLayouts'
-
-task copyLayouts(type:Copy) {
- from 'src/main/java'
- into 'target/classes'
- include '**/*.layout.xml'
-}
-
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/liveReload.gradle
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/liveReload.gradle b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/liveReload.gradle
deleted file mode 100644
index adb0ab1..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/liveReload.gradle
+++ /dev/null
@@ -1,56 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// 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.
-//
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// This gradle script sets up livereload, configured so that any updates to the dom module's classpath will
-// trigger the browser to reload the page. In particular, this relates to the .layout.xml files which define the
-// grid layout of domain objects.
-//
-// As a prerequisite, the app needs to configured to load the livereload.js script. This can be done by adding the
-// following configuration property (to viewer_wicket.properties, isis.properties or the AppManifest, as you prefer):
-//
-// isis.viewer.wicket.liveReloadUrl=http://localhost:35729/livereload.js?snipver=1
-//
-// This gradle script is run using:
-//
-// gradle -t -b livereload.gradle --offline &
-//
-// To reduce turn-around time further, also use the layouts.gradle script (to automatically copy over the layout.xml
-// files to the classpath).
-//
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-defaultTasks 'liveReload'
-
-buildscript {
- repositories {
- jcenter()
- }
- dependencies {
- classpath 'org.kordamp.gradle:livereload-gradle-plugin:0.2.1'
- }
-}
-
-apply plugin: 'org.kordamp.gradle.livereload'
-
-liveReload {
- docRoot new File('target/classes').canonicalPath
-}
-
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/logging-dn-enhance.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/logging-dn-enhance.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/logging-dn-enhance.properties
deleted file mode 100644
index 2040d89..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/logging-dn-enhance.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-${symbol_pound} Licensed to the Apache Software Foundation (ASF) under one
-${symbol_pound} or more contributor license agreements. See the NOTICE file
-${symbol_pound} distributed with this work for additional information
-${symbol_pound} regarding copyright ownership. The ASF licenses this file
-${symbol_pound} to you under the Apache License, Version 2.0 (the
-${symbol_pound} "License"); you may not use this file except in compliance
-${symbol_pound} with the License. You may obtain a copy of the License at
-${symbol_pound}
-${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0
-${symbol_pound}
-${symbol_pound} Unless required by applicable law or agreed to in writing,
-${symbol_pound} software distributed under the License is distributed on an
-${symbol_pound} "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-${symbol_pound} KIND, either express or implied. See the License for the
-${symbol_pound} specific language governing permissions and limitations
-${symbol_pound} under the License.
-
-${symbol_pound} LOG4J Configuration
-${symbol_pound} ===================
-
-${symbol_pound} Basic logging goes to "datanucleus.log"
-log4j.appender.A1=org.apache.log4j.FileAppender
-log4j.appender.A1.File=datanucleus.log
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
-${symbol_pound}log4j.appender.A1.Threshold=INFO
-
-${symbol_pound} Categories
-${symbol_pound} Each category can be set to a "level", and to direct to an appender
-
-${symbol_pound} Default to DEBUG level for all DataNucleus categories
-log4j.logger.DataNucleus = DEBUG, A1
-
-log4j.category.com.mchange.v2.c3p0=INFO, A1
-log4j.category.com.mchange.v2.resourcepool=INFO, A1
-log4j.category.org.logicalcobwebs.proxool=INFO,A1
-
-
-${symbol_pound} Hbase libs logging
-log4j.category.org.apache.hadoop=INFO,A1
-log4j.category.org.apache.zookeeper=INFO,A1
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/logging-integtest.properties
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/logging-integtest.properties b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/logging-integtest.properties
deleted file mode 100644
index 088bbe4..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/logging-integtest.properties
+++ /dev/null
@@ -1,114 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-${symbol_pound} Licensed to the Apache Software Foundation (ASF) under one
-${symbol_pound} or more contributor license agreements. See the NOTICE file
-${symbol_pound} distributed with this work for additional information
-${symbol_pound} regarding copyright ownership. The ASF licenses this file
-${symbol_pound} to you under the Apache License, Version 2.0 (the
-${symbol_pound} "License"); you may not use this file except in compliance
-${symbol_pound} with the License. You may obtain a copy of the License at
-${symbol_pound}
-${symbol_pound} http://www.apache.org/licenses/LICENSE-2.0
-${symbol_pound}
-${symbol_pound} Unless required by applicable law or agreed to in writing,
-${symbol_pound} software distributed under the License is distributed on an
-${symbol_pound} "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-${symbol_pound} KIND, either express or implied. See the License for the
-${symbol_pound} specific language governing permissions and limitations
-${symbol_pound} under the License.
-
-
-${symbol_pound}
-${symbol_pound} Isis uses log4j is used to provide system logging
-${symbol_pound}
-log4j.rootCategory=INFO, Console
-
-${symbol_pound} The console appender
-log4j.appender.Console=org.apache.log4j.ConsoleAppender
-log4j.appender.Console.target=System.out
-log4j.appender.Console.layout=org.apache.log4j.PatternLayout
-log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} [%-20c{1} %-10t %-5p] %m%n
-
-log4j.appender.File=org.apache.log4j.RollingFileAppender
-log4j.appender.File.file=isis.log
-log4j.appender.File.append=false
-log4j.appender.File.layout=org.apache.log4j.PatternLayout
-log4j.appender.File.layout.ConversionPattern=%d [%-20c{1} %-10t %-5p] %m%n
-
-log4j.appender.translations-po=org.apache.log4j.FileAppender
-log4j.appender.translations-po.File=./translations.pot
-log4j.appender.translations-po.Append=false
-log4j.appender.translations-po.layout=org.apache.log4j.PatternLayout
-log4j.appender.translations-po.layout.ConversionPattern=%m%n
-
-! turn on the internal log4j debugging flag so we can see what it is doing
-${symbol_pound}log4j.debug=true
-
-
-${symbol_pound} DataNucleus
-${symbol_pound} the first two log the DML and DDL (if set to DEBUG)
-log4j.logger.DataNucleus.Datastore.Native=WARN, Console
-log4j.logger.DataNucleus.Datastore.Schema=DEBUG, Console
-${symbol_pound} the remainder can probably be left to WARN
-log4j.logger.DataNucleus.Persistence=WARN, Console
-log4j.logger.DataNucleus.Transaction=WARN, Console
-log4j.logger.DataNucleus.Connection=WARN, Console
-log4j.logger.DataNucleus.Query=WARN, Console
-log4j.logger.DataNucleus.Cache=WARN, Console
-log4j.logger.DataNucleus.MetaData=WARN, Console
-log4j.logger.DataNucleus.Datastore=WARN, Console
-log4j.logger.DataNucleus.Datastore.Persist=WARN, Console
-log4j.logger.DataNucleus.Datastore.Retrieve=WARN, Console
-log4j.logger.DataNucleus.General=WARN, Console
-log4j.logger.DataNucleus.Lifecycle=WARN, Console
-log4j.logger.DataNucleus.ValueGeneration=WARN, Console
-log4j.logger.DataNucleus.Enhancer=WARN, Console
-log4j.logger.DataNucleus.SchemaTool=ERROR, Console
-log4j.logger.DataNucleus.JDO=WARN, Console
-log4j.logger.DataNucleus.JPA=ERROR, Console
-log4j.logger.DataNucleus.JCA=WARN, Console
-log4j.logger.DataNucleus.IDE=ERROR, Console
-
-log4j.additivity.DataNucleus.Datastore.Native=false
-log4j.additivity.DataNucleus.Datastore.Schema=false
-log4j.additivity.DataNucleus.Datastore.Persistence=false
-log4j.additivity.DataNucleus.Datastore.Transaction=false
-log4j.additivity.DataNucleus.Datastore.Connection=false
-log4j.additivity.DataNucleus.Datastore.Query=false
-log4j.additivity.DataNucleus.Datastore.Cache=false
-log4j.additivity.DataNucleus.Datastore.MetaData=false
-log4j.additivity.DataNucleus.Datastore.Datastore=false
-log4j.additivity.DataNucleus.Datastore.Datastore.Persist=false
-log4j.additivity.DataNucleus.Datastore.Datastore.Retrieve=false
-log4j.additivity.DataNucleus.Datastore.General=false
-log4j.additivity.DataNucleus.Datastore.Lifecycle=false
-log4j.additivity.DataNucleus.Datastore.ValueGeneration=false
-log4j.additivity.DataNucleus.Datastore.Enhancer=false
-log4j.additivity.DataNucleus.Datastore.SchemaTool=false
-log4j.additivity.DataNucleus.Datastore.JDO=false
-log4j.additivity.DataNucleus.Datastore.JPA=false
-log4j.additivity.DataNucleus.Datastore.JCA=false
-log4j.additivity.DataNucleus.Datastore.IDE=false
-
-
-
-
-${symbol_pound} if using log4jdbc-remix as JDBC driver
-${symbol_pound}log4j.logger.jdbc.sqlonly=DEBUG, sql, Console
-${symbol_pound}log4j.additivity.jdbc.sqlonly=false
-${symbol_pound}log4j.logger.jdbc.resultsettable=DEBUG, jdbc, Console
-${symbol_pound}log4j.additivity.jdbc.resultsettable=false
-
-${symbol_pound}log4j.logger.jdbc.audit=WARN,jdbc, Console
-${symbol_pound}log4j.additivity.jdbc.audit=false
-${symbol_pound}log4j.logger.jdbc.resultset=WARN,jdbc
-${symbol_pound}log4j.additivity.jdbc.resultset=false
-${symbol_pound}log4j.logger.jdbc.sqltiming=WARN,sqltiming
-${symbol_pound}log4j.additivity.jdbc.sqltiming=false
-${symbol_pound}log4j.logger.jdbc.connection=FATAL,connection
-${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
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/pom.xml
deleted file mode 100644
index 0870a2a..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/pom.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
---><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>
-
- <parent>
- <groupId>${groupId}</groupId>
- <artifactId>${rootArtifactId}</artifactId>
- <version>${version}</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <artifactId>${artifactId}</artifactId>
- <name>SimpleApp Simple Module</name>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- <testResource>
- <directory>src/test/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>com.github.odavid.maven.plugins</groupId>
- <artifactId>mixin-maven-plugin</artifactId>
- <version>0.1-alpha-39</version>
- <extensions>true</extensions>
- <configuration>
- <mixins>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>standard</artifactId>
- <version>0.0.1</version>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>enforcerrelaxed</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>datanucleusenhance</artifactId>
- <version>0.0.2</version>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>isisvalidate</artifactId>
- <version>0.0.1</version>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>surefire</artifactId>
- <version>0.0.2</version>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>sourceandjavadoc</artifactId>
- <version>0.0.1</version>
- </mixin>
- <mixin>
- <groupId>com.danhaywood.mavenmixin</groupId>
- <artifactId>staticanalysis</artifactId>
- <version>0.0.1</version>
- </mixin>
- </mixins>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <danhaywood-mavenmixin-isisvalidate>domainapp.modules.simple.SimpleModuleManifest</danhaywood-mavenmixin-isisvalidate>
- <danhaywood-mavenmixin-staticanalysis.checkstyle.configLocation>${project.basedir}/../checks/checkstyle.xml</danhaywood-mavenmixin-staticanalysis.checkstyle.configLocation>
- <danhaywood-mavenmixin-staticanalysis.pmd.ruleset>${project.basedir}/../checks/pmd.xml</danhaywood-mavenmixin-staticanalysis.pmd.ruleset>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-applib</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.danhaywood.mavendeps</groupId>
- <artifactId>isistesting</artifactId>
- <version>0.0.2</version>
- <type>pom</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </dependency>
-
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/META-INF/persistence.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/META-INF/persistence.xml
deleted file mode 100644
index c5d8e78..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/META-INF/persistence.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- 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.
--->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0">
-
- <persistence-unit name="simple">
- </persistence-unit>
-</persistence>
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/SimpleModuleManifest.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/SimpleModuleManifest.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/SimpleModuleManifest.java
deleted file mode 100644
index 3be4554..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/SimpleModuleManifest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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.
- */
-package domainapp.modules.simple;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.isis.applib.AppManifest;
-import org.apache.isis.applib.fixturescripts.FixtureScript;
-
-import domainapp.modules.simple.dom.SimpleModuleDomSubmodule;
-import domainapp.modules.simple.fixture.SimpleModuleFixtureSubmodule;
-
-/**
- * Used by <code>isis-maven-plugin</code> (build-time validation of the module) and also by module-level integration tests.
- */
-public class SimpleModuleManifest implements AppManifest {
-
- @Override
- public List<Class<?>> getModules() {
- return Arrays.<Class<?>>asList(
- SimpleModuleDomSubmodule.class,
- SimpleModuleFixtureSubmodule.class
- );
- }
-
- @Override
- public List<Class<?>> getAdditionalServices() {
- return Collections.emptyList();
- }
-
- @Override
- public String getAuthenticationMechanism() {
- return null;
- }
-
- @Override
- public String getAuthorizationMechanism() {
- return null;
- }
-
- @Override
- public List<Class<? extends FixtureScript>> getFixtures() {
- return null;
- }
-
- /**
- * No overrides.
- */
- @Override
- public Map<String, String> getConfigurationProperties() {
- return null;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/SimpleModuleDomSubmodule.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/SimpleModuleDomSubmodule.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/SimpleModuleDomSubmodule.java
deleted file mode 100644
index db8172d..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/SimpleModuleDomSubmodule.java
+++ /dev/null
@@ -1,33 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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.
- */
-package domainapp.modules.simple.dom;
-
-public final class SimpleModuleDomSubmodule {
-
- public static class PropertyDomainEvent<S,T>
- extends org.apache.isis.applib.services.eventbus.PropertyDomainEvent<S,T> {}
- public static class CollectionDomainEvent<S,T>
- extends org.apache.isis.applib.services.eventbus.CollectionDomainEvent<S,T> {}
- public static class ActionDomainEvent<S> extends
- org.apache.isis.applib.services.eventbus.ActionDomainEvent<S> {}
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
deleted file mode 100644
index 3d05da7..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.java
+++ /dev/null
@@ -1,236 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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.
- */
-package domainapp.modules.simple.dom.impl;
-
-import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.VersionStrategy;
-
-import org.apache.isis.applib.annotation.Action;
-import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.applib.annotation.Auditing;
-import org.apache.isis.applib.annotation.CommandReification;
-import org.apache.isis.applib.annotation.Contributed;
-import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.applib.annotation.Editing;
-import org.apache.isis.applib.annotation.Mixin;
-import org.apache.isis.applib.annotation.Parameter;
-import org.apache.isis.applib.annotation.ParameterLayout;
-import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.annotation.Publishing;
-import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.services.i18n.TranslatableString;
-import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.applib.services.title.TitleService;
-import org.apache.isis.applib.util.ObjectContracts;
-
-import domainapp.modules.simple.dom.SimpleModuleDomSubmodule;
-import lombok.Getter;
-import lombok.Setter;
-
-@javax.jdo.annotations.PersistenceCapable(
- identityType=IdentityType.DATASTORE,
- schema = "simple",
- table = "SimpleObject"
-)
-@javax.jdo.annotations.DatastoreIdentity(
- strategy=javax.jdo.annotations.IdGeneratorStrategy.IDENTITY,
- column="id")
-@javax.jdo.annotations.Version(
- strategy= VersionStrategy.DATE_TIME,
- column="version")
-@javax.jdo.annotations.Queries({
- @javax.jdo.annotations.Query(
- name = "findByName", language = "JDOQL",
- value = "SELECT "
- + "FROM domainapp.modules.simple.dom.impl.SimpleObject "
- + "WHERE name.indexOf(:name) >= 0 ")
-})
-@javax.jdo.annotations.Unique(name="SimpleObject_name_UNQ", members = {"name"})
-@DomainObject(
- objectType = "simple.SimpleObject",
- auditing = Auditing.ENABLED,
- publishing = Publishing.ENABLED
-)
-public class SimpleObject implements Comparable<SimpleObject> {
-
- //region > title
- public TranslatableString title() {
- return TranslatableString.tr("Object: {name}", "name", getName());
- }
- //endregion
-
- //region > constructor
- public SimpleObject(final String name) {
- setName(name);
- }
- //endregion
-
- //region > name (read-only property)
- public static class NameType {
- private NameType() {
- }
-
- public static class Meta {
- public static final int MAX_LEN = 40;
-
- private Meta() {
- }
- }
-
- public static class PropertyDomainEvent
- extends SimpleModuleDomSubmodule.PropertyDomainEvent<SimpleObject, String> { }
- }
-
-
- @javax.jdo.annotations.Column(allowsNull = "false", length = NameType.Meta.MAX_LEN)
- @Property(
- editing = Editing.DISABLED,
- domainEvent = NameType.PropertyDomainEvent.class
- )
- @Getter @Setter
- private String name;
-
- // endregion
-
- //region > notes (editable property)
- public static class NotesType {
- private NotesType() {
- }
-
- public static class Meta {
- public static final int MAX_LEN = 4000;
-
- private Meta() {
- }
- }
-
- public static class PropertyDomainEvent
- extends SimpleModuleDomSubmodule.PropertyDomainEvent<SimpleObject, String> { }
- }
-
-
- @javax.jdo.annotations.Column(
- allowsNull = "true",
- length = NotesType.Meta.MAX_LEN
- )
- @Property(
- command = CommandReification.ENABLED,
- publishing = Publishing.ENABLED,
- domainEvent = NotesType.PropertyDomainEvent.class
- )
- @Getter @Setter
- private String notes;
- //endregion
-
- //region > updateName (action)
- @Mixin
- public static class _updateName {
-
- public static class ActionDomainEvent extends SimpleModuleDomSubmodule.ActionDomainEvent<SimpleObject> {
- }
-
- private final SimpleObject simpleObject;
-
- public _updateName(final SimpleObject simpleObject) {
- this.simpleObject = simpleObject;
- }
-
- @Action(
- command = CommandReification.ENABLED,
- publishing = Publishing.ENABLED,
- semantics = SemanticsOf.IDEMPOTENT,
- domainEvent = ActionDomainEvent.class
- )
- @ActionLayout(
- contributed = Contributed.AS_ACTION
- )
- public SimpleObject ${symbol_dollar}${symbol_dollar}(
- @Parameter(maxLength = SimpleObject.NameType.Meta.MAX_LEN)
- @ParameterLayout(named = "Name")
- final String name) {
- simpleObject.setName(name);
- return simpleObject;
- }
-
- public String default0${symbol_dollar}${symbol_dollar}() {
- return simpleObject.getName();
- }
-
- public TranslatableString validate0${symbol_dollar}${symbol_dollar}(final String name) {
- return name != null && name.contains("!") ? TranslatableString.tr("Exclamation mark is not allowed") : null;
- }
-
- }
- //endregion
-
- //region > delete (action)
- @Mixin
- public static class _delete {
-
- public static class ActionDomainEvent extends SimpleModuleDomSubmodule.ActionDomainEvent<SimpleObject> {
- }
-
- private final SimpleObject simpleObject;
- public _delete(final SimpleObject simpleObject) {
- this.simpleObject = simpleObject;
- }
-
- @Action(
- domainEvent = ActionDomainEvent.class,
- semantics = SemanticsOf.NON_IDEMPOTENT_ARE_YOU_SURE
- )
- @ActionLayout(
- contributed = Contributed.AS_ACTION
- )
- public void ${symbol_dollar}${symbol_dollar}() {
- final String title = titleService.titleOf(simpleObject);
- messageService.informUser(String.format("'%s' deleted", title));
- repositoryService.remove(simpleObject);
- }
-
- @javax.inject.Inject
- RepositoryService repositoryService;
-
- @javax.inject.Inject
- TitleService titleService;
-
- @javax.inject.Inject
- MessageService messageService;
- }
-
- //endregion
-
- //region > toString, compareTo
- @Override
- public String toString() {
- return ObjectContracts.toString(this, "name");
- }
-
- @Override
- public int compareTo(final SimpleObject other) {
- return ObjectContracts.compare(this, other, "name");
- }
-
- //endregion
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.layout.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.layout.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.layout.xml
deleted file mode 100644
index 963c3e3..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.layout.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- 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.
--->
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:c="http://isis.apache.org/applib/layout/component" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <bs3:row>
- <bs3:col span="12" unreferencedActions="true">
- <c:domainObject bookmarking="AS_ROOT"/>
- </bs3:col>
- </bs3:row>
- <bs3:row>
- <bs3:col span="6">
- <bs3:tabGroup>
- <bs3:tab name="General">
- <bs3:row>
- <bs3:col span="12">
- <c:fieldSet name="Name">
- <c:action id="delete"/>
- <c:property id="name" namedEscaped="true">
- <c:action id="updateName"/>
- </c:property>
- <c:property id="notes" namedEscaped="true" multiLine="10" hidden="ALL_TABLES"/>
- </c:fieldSet>
- </bs3:col>
- </bs3:row>
- </bs3:tab>
- <bs3:tab name="Metadata">
- <bs3:row>
- <bs3:col span="12">
- <c:fieldSet name="Metadata"/>
- </bs3:col>
- </bs3:row>
- </bs3:tab>
- <bs3:tab name="Other">
- <bs3:row>
- <bs3:col span="12">
- <c:fieldSet name="Other" unreferencedProperties="true"/>
- </bs3:col>
- </bs3:row>
- </bs3:tab>
- </bs3:tabGroup>
- <bs3:tabGroup>
- </bs3:tabGroup>
- </bs3:col>
- <bs3:col span="6">
- <bs3:tabGroup unreferencedCollections="true">
- </bs3:tabGroup>
- </bs3:col>
- </bs3:row>
-</bs3:grid>
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.png
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.png b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.png
deleted file mode 100644
index 0bd6f57..0000000
Binary files a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectMenu.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectMenu.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectMenu.java
deleted file mode 100644
index 07d9399..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectMenu.java
+++ /dev/null
@@ -1,80 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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.
- */
-package domainapp.modules.simple.dom.impl;
-
-import java.util.List;
-
-import org.apache.isis.applib.annotation.Action;
-import org.apache.isis.applib.annotation.ActionLayout;
-import org.apache.isis.applib.annotation.BookmarkPolicy;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.DomainServiceLayout;
-import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.annotation.ParameterLayout;
-import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
-
-@DomainService(
- nature = NatureOfService.VIEW_MENU_ONLY,
- repositoryFor = SimpleObject.class
-)
-@DomainServiceLayout(
- named = "Simple Objects",
- menuOrder = "10"
-)
-public class SimpleObjectMenu {
-
-
- @Action(semantics = SemanticsOf.SAFE)
- @ActionLayout(bookmarking = BookmarkPolicy.AS_ROOT)
- @MemberOrder(sequence = "1")
- public List<SimpleObject> listAll() {
- return simpleObjectRepository.listAll();
- }
-
-
- @Action(semantics = SemanticsOf.SAFE)
- @ActionLayout(bookmarking = BookmarkPolicy.AS_ROOT)
- @MemberOrder(sequence = "2")
- public List<SimpleObject> findByName(
- @ParameterLayout(named="Name")
- final String name
- ) {
- return simpleObjectRepository.findByName(name);
- }
-
-
- public static class CreateDomainEvent extends ActionDomainEvent<SimpleObjectMenu> {}
- @Action(domainEvent = CreateDomainEvent.class)
- @MemberOrder(sequence = "3")
- public SimpleObject create(
- @ParameterLayout(named="Name")
- final String name) {
- return simpleObjectRepository.create(name);
- }
-
-
- @javax.inject.Inject
- SimpleObjectRepository simpleObjectRepository;
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository.java
deleted file mode 100644
index c6ee82b..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjectRepository.java
+++ /dev/null
@@ -1,61 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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.
- */
-package domainapp.modules.simple.dom.impl;
-
-import java.util.List;
-
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
-import org.apache.isis.applib.query.QueryDefault;
-import org.apache.isis.applib.services.registry.ServiceRegistry2;
-import org.apache.isis.applib.services.repository.RepositoryService;
-
-@DomainService(
- nature = NatureOfService.DOMAIN,
- repositoryFor = SimpleObject.class
-)
-public class SimpleObjectRepository {
-
- public List<SimpleObject> listAll() {
- return repositoryService.allInstances(SimpleObject.class);
- }
-
- public List<SimpleObject> findByName(final String name) {
- return repositoryService.allMatches(
- new QueryDefault<>(
- SimpleObject.class,
- "findByName",
- "name", name));
- }
-
- public SimpleObject create(final String name) {
- final SimpleObject object = new SimpleObject(name);
- serviceRegistry.injectServicesInto(object);
- repositoryService.persist(object);
- return object;
- }
-
- @javax.inject.Inject
- RepositoryService repositoryService;
- @javax.inject.Inject
- ServiceRegistry2 serviceRegistry;
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleModuleFixtureSubmodule.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleModuleFixtureSubmodule.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleModuleFixtureSubmodule.java
deleted file mode 100644
index 098b18a..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/fixture/SimpleModuleFixtureSubmodule.java
+++ /dev/null
@@ -1,27 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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.
- */
-package domainapp.modules.simple.fixture;
-
-public final class SimpleModuleFixtureSubmodule {
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/fixture/data/SimpleObjectMenu_create.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/fixture/data/SimpleObjectMenu_create.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/fixture/data/SimpleObjectMenu_create.java
deleted file mode 100644
index 9b47915..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/fixture/data/SimpleObjectMenu_create.java
+++ /dev/null
@@ -1,61 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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.
- */
-
-package domainapp.modules.simple.fixture.data;
-
-import org.apache.isis.applib.fixturescripts.FixtureScript;
-
-import domainapp.modules.simple.dom.impl.SimpleObject;
-import domainapp.modules.simple.dom.impl.SimpleObjectMenu;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-@Accessors(chain = true)
-public class SimpleObjectMenu_create extends FixtureScript {
-
- /**
- * Name of the object (required)
- */
- @Getter @Setter
- private String name;
-
- /**
- * The created simple object (output).
- */
- @Getter
- private SimpleObject simpleObject;
-
-
- @Override
- protected void execute(final ExecutionContext ec) {
-
- String name = checkParam("name", ec, String.class);
-
- this.simpleObject = wrap(simpleObjectMenu).create(name);
- ec.addResult(this, simpleObject);
- }
-
- @javax.inject.Inject
- SimpleObjectMenu simpleObjectMenu;
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/fixture/scenario/RecreateSimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/fixture/scenario/RecreateSimpleObjects.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/fixture/scenario/RecreateSimpleObjects.java
deleted file mode 100644
index 3d5b7e2..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/fixture/scenario/RecreateSimpleObjects.java
+++ /dev/null
@@ -1,79 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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.
- */
-
-package domainapp.modules.simple.fixture.scenario;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import com.google.common.collect.Lists;
-
-import org.apache.isis.applib.fixturescripts.FixtureScript;
-
-import domainapp.modules.simple.dom.impl.SimpleObject;
-import domainapp.modules.simple.fixture.data.SimpleObjectMenu_create;
-import domainapp.modules.simple.fixture.teardown.SimpleModuleTearDown;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-@Accessors(chain = true)
-public class RecreateSimpleObjects extends FixtureScript {
-
- public final List<String> NAMES = Collections.unmodifiableList(Arrays.asList(
- "Foo", "Bar", "Baz", "Frodo", "Froyo", "Fizz", "Bip", "Bop", "Bang", "Boo"));
-
- /**
- * The number of objects to create, up to 10; optional, defaults to 3.
- */
- @Getter @Setter
- private Integer number;
-
- /**
- * The simpleobjects created by this fixture (output).
- */
- @Getter
- private final List<SimpleObject> simpleObjects = Lists.newArrayList();
-
- @Override
- protected void execute(final ExecutionContext ec) {
-
- // defaults
- final int number = defaultParam("number", ec, 3);
-
- // validate
- if(number < 0 || number > NAMES.size()) {
- throw new IllegalArgumentException(String.format("number must be in range [0,%d)", NAMES.size()));
- }
-
- // execute
- ec.executeChild(this, new SimpleModuleTearDown());
- for (int i = 0; i < number; i++) {
- final String name = NAMES.get(i);
- final SimpleObjectMenu_create fs = new SimpleObjectMenu_create().setName(name);
- ec.executeChild(this, fs.getName(), fs);
- simpleObjects.add(fs.getSimpleObject());
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/d05bc761/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/fixture/teardown/SimpleModuleTearDown.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/fixture/teardown/SimpleModuleTearDown.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/fixture/teardown/SimpleModuleTearDown.java
deleted file mode 100644
index a5033a1..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/modules/module-simple/src/main/java/domainapp/modules/simple/fixture/teardown/SimpleModuleTearDown.java
+++ /dev/null
@@ -1,39 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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.
- */
-
-package domainapp.modules.simple.fixture.teardown;
-
-import org.apache.isis.applib.fixturescripts.FixtureScript;
-import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
-
-public class SimpleModuleTearDown extends FixtureScript {
-
- @Override
- protected void execute(ExecutionContext executionContext) {
- isisJdoSupport.executeUpdate("delete from ${symbol_escape}"simple${symbol_escape}".${symbol_escape}"SimpleObject${symbol_escape}"");
- }
-
-
- @javax.inject.Inject
- private IsisJdoSupport isisJdoSupport;
-
-}