You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/01/05 08:02:17 UTC
[02/13] isis git commit: ISIS-928: recreating simpleapp archetype
ISIS-928: 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/a317660a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a317660a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a317660a
Branch: refs/heads/ISIS-995-namedEscaped
Commit: a317660aedd397bcf1a4deced9012c265d1f2091
Parents: b0f8ab5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Jan 3 12:58:38 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Jan 3 12:58:38 2015 +0000
----------------------------------------------------------------------
.../META-INF/maven/archetype-metadata.xml | 27 ++++-------
.../archetype-resources/.gitattributes | 51 ++++++++++++++++++++
.../resources/archetype-resources/.gitignore | 40 +++++++++++++++
.../src/main/java/dom/simple/SimpleObject.java | 4 +-
.../src/main/java/dom/simple/SimpleObjects.java | 4 +-
.../archetype-resources/fixture/.gitignore | 1 -
.../simple/scenario/SimpleObjectsFixture.java | 2 +-
.../archetype-resources/integtests/.gitignore | 1 -
.../archetype-resources/webapp/.gitignore | 1 -
.../projects/basic/archetype.properties | 2 +-
10 files changed, 106 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a317660a/example/archetype/simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml
----------------------------------------------------------------------
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 73e00e3..42cce79 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
@@ -18,6 +18,15 @@
under the License.
-->
<archetype-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0" xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="simpleapp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <fileSets>
+ <fileSet encoding="UTF-8">
+ <directory/>
+ <includes>
+ <include>.gitattributes</include>
+ <include>.gitignore</include>
+ </includes>
+ </fileSet>
+ </fileSets>
<modules>
<module id="${rootArtifactId}-dom" dir="dom" name="${rootArtifactId}-dom">
<fileSets>
@@ -63,12 +72,6 @@
<include>**/*.java</include>
</includes>
</fileSet>
- <fileSet encoding="UTF-8">
- <directory/>
- <includes>
- <include>.gitignore</include>
- </includes>
- </fileSet>
</fileSets>
</module>
<module id="${rootArtifactId}-integtests" dir="integtests" name="${rootArtifactId}-integtests">
@@ -91,12 +94,6 @@
<include>logging.properties</include>
</includes>
</fileSet>
- <fileSet encoding="UTF-8">
- <directory/>
- <includes>
- <include>.gitignore</include>
- </includes>
- </fileSet>
</fileSets>
</module>
<module id="${rootArtifactId}-webapp" dir="webapp" name="${rootArtifactId}-webapp">
@@ -157,12 +154,6 @@
<include>**/*.launch</include>
</includes>
</fileSet>
- <fileSet encoding="UTF-8">
- <directory/>
- <includes>
- <include>.gitignore</include>
- </includes>
- </fileSet>
</fileSets>
</module>
</modules>
http://git-wip-us.apache.org/repos/asf/isis/blob/a317660a/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitattributes
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitattributes b/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitattributes
new file mode 100644
index 0000000..b1eafb6
--- /dev/null
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitattributes
@@ -0,0 +1,51 @@
+#
+#
+# text files are normalized (convert crlf => lf)
+# binary files are not normalized (binary is a macro for -text -diff)
+#
+#
+
+
+# Unless otherwise stated, assume text
+
+* text=auto
+
+
+*.java text diff=java
+*.html text diff=html
+*.xhtml text diff=html
+*.xml text
+*.txt text
+
+
+*.jar binary
+*.so binary
+*.dll binary
+
+# images
+*.jpg binary
+*.jpeg binary
+*.png binary
+*.pdn binary
+*.pdn binary
+
+
+*.cs text diff=csharp
+
+*.sln merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+*.doc diff=astextplain
+*.DOC diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot diff=astextplain
+*.DOT diff=astextplain
+*.pdf diff=astextplain
+*.PDF diff=astextplain
+*.rtf diff=astextplain
+*.RTF diff=astextplain
+
http://git-wip-us.apache.org/repos/asf/isis/blob/a317660a/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitignore
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitignore b/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitignore
new file mode 100644
index 0000000..ad3f5e2
--- /dev/null
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitignore
@@ -0,0 +1,40 @@
+*~
+*.swp
+*.class
+bin/
+target/
+target-ide/
+logs/
+.settings/
+.project
+.classpath
+.idea
+*.iml
+
+JArchitectOut/
+*.jdproj
+
+neo4j_DB/
+
+# log files
+datanucleus.log
+isis.log
+hs_err_pid*.log
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+dependency-reduced-pom.xml
+pom.xml.tag
+pom.xml.next
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+
+.clover/
+*.jdproj
+JArchitectOut/
+
+
+rebel.xml
http://git-wip-us.apache.org/repos/asf/isis/blob/a317660a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.java
index 473de9d..249e0a5 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObject.java
@@ -25,7 +25,6 @@ import javax.jdo.annotations.IdentityType;
import javax.jdo.annotations.VersionStrategy;
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.applib.annotation.Bookmarkable;
-import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.ObjectType;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.util.ObjectContracts;
@@ -48,7 +47,6 @@ public class SimpleObject implements Comparable<SimpleObject> {
@javax.jdo.annotations.Column(allowsNull="false")
@Title(sequence="1")
- @MemberOrder(sequence="1")
public String getName() {
return name;
}
@@ -62,7 +60,7 @@ public class SimpleObject implements Comparable<SimpleObject> {
//region > compareTo
@Override
- public int compareTo(SimpleObject other) {
+ public int compareTo(final SimpleObject other) {
return ObjectContracts.compare(this, other, "name");
}
http://git-wip-us.apache.org/repos/asf/isis/blob/a317660a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java
index 753f385..1b21be1 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/src/main/java/dom/simple/SimpleObjects.java
@@ -27,10 +27,12 @@ import org.apache.isis.applib.annotation.ActionSemantics;
import org.apache.isis.applib.annotation.ActionSemantics.Of;
import org.apache.isis.applib.annotation.Bookmarkable;
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.ParameterLayout;
-@DomainService(menuOrder = "10", repositoryFor = SimpleObject.class)
+@DomainService(repositoryFor = SimpleObject.class)
+@DomainServiceLayout(menuOrder = "10")
public class SimpleObjects {
//region > listAll (action)
http://git-wip-us.apache.org/repos/asf/isis/blob/a317660a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/.gitignore
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/.gitignore b/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/.gitignore
deleted file mode 100644
index a48e45b..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target-ide
http://git-wip-us.apache.org/repos/asf/isis/blob/a317660a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/scenario/SimpleObjectsFixture.java
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/scenario/SimpleObjectsFixture.java b/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/scenario/SimpleObjectsFixture.java
index f2936e0..efb7186 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/scenario/SimpleObjectsFixture.java
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/fixture/src/main/java/fixture/simple/scenario/SimpleObjectsFixture.java
@@ -36,7 +36,7 @@ public class SimpleObjectsFixture extends FixtureScript {
}
@Override
- protected void execute(ExecutionContext executionContext) {
+ protected void execute(final ExecutionContext executionContext) {
executionContext.executeChild(this, new SimpleObjectsTearDownFixture());
http://git-wip-us.apache.org/repos/asf/isis/blob/a317660a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/.gitignore
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/.gitignore b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/.gitignore
deleted file mode 100644
index d010f7a..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/neo4j_DB/
http://git-wip-us.apache.org/repos/asf/isis/blob/a317660a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/.gitignore
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/.gitignore b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/.gitignore
deleted file mode 100644
index d010f7a..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/neo4j_DB/
http://git-wip-us.apache.org/repos/asf/isis/blob/a317660a/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 b7242f4..946926c 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 @@
-#Mon Dec 22 19:27:02 GMT 2014
+#Sat Jan 03 12:58:31 GMT 2015
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it