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/03/19 15:40:54 UTC
isis git commit: ISIS-1287: recreating simpleapp archetype
Repository: isis
Updated Branches:
refs/heads/master b61429640 -> e6700ca3d
ISIS-1287: 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/e6700ca3
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e6700ca3
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e6700ca3
Branch: refs/heads/master
Commit: e6700ca3d95f0d420e8cecacc58530c72edb8dfd
Parents: b614296
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Mar 19 14:39:19 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Mar 19 14:39:19 2016 +0000
----------------------------------------------------------------------
example/archetype/simpleapp/pom.xml | 4 +-
.../META-INF/maven/archetype-metadata.xml | 6 +
.../archetype-resources/.gitattributes | 51 +++
.../resources/archetype-resources/.gitignore | 42 ++
.../resources/archetype-resources/dom/pom.xml | 50 ---
.../archetype-resources/integtests/.gitignore | 1 +
.../archetype-resources/integtests/pom.xml | 50 +++
.../integtests/translations.pot | 442 -------------------
.../webapp/ide/eclipse/launch/.gitignore | 2 +
.../ide/eclipse/launch/SimpleApp-JREBEL.launch | 33 --
.../archetype-resources/webapp/lib/.gitignore | 5 +
.../projects/basic/archetype.properties | 2 +-
12 files changed, 160 insertions(+), 528 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e6700ca3/example/archetype/simpleapp/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/pom.xml b/example/archetype/simpleapp/pom.xml
index 29a16ca..a0b38f1 100644
--- a/example/archetype/simpleapp/pom.xml
+++ b/example/archetype/simpleapp/pom.xml
@@ -29,14 +29,14 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.4</version>
+ <version>2.2</version>
</extension>
</extensions>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
- <version>2.4</version>
+ <version>2.2</version>
</plugin>
</plugins>
</pluginManagement>
http://git-wip-us.apache.org/repos/asf/isis/blob/e6700ca3/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 ef9a445..847ea88 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
@@ -61,6 +61,12 @@
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
<directory>src/test/java</directory>
<includes>
<include>**/*.java</include>
http://git-wip-us.apache.org/repos/asf/isis/blob/e6700ca3/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/e6700ca3/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..0558e54
--- /dev/null
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/.gitignore
@@ -0,0 +1,42 @@
+*~
+*.swp
+*.class
+bin/
+target/
+target-ide/
+logs/
+.settings/
+.project
+.classpath
+.idea
+*.iml
+
+JArchitectOut/
+*.jdproj
+
+neo4j_DB/
+
+# log files
+datanucleus.log
+isis.log
+i18n-po.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
+/translations.pot
http://git-wip-us.apache.org/repos/asf/isis/blob/e6700ca3/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
index 467dec8..2d7b105 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/dom/pom.xml
@@ -196,56 +196,6 @@
</build>
</profile>
- <profile>
- <id>isis-swagger</id>
- <activation>
- <property>
- <name>!skip.isis-swagger</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.isis.tool</groupId>
- <artifactId>isis-maven-plugin</artifactId>
- <version>${isis.version}</version>
- <configuration>
- <appManifest>domainapp.dom.DomainAppDomManifest</appManifest>
- <visibilities>
- <visibility>PUBLIC</visibility>
- <visibility>PRIVATE</visibility>
- </visibilities>
- <format>JSON</format>
- <fileNamePrefix>swagger</fileNamePrefix>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- </dependency>
- <!--
- ... workaround to avoid conflict with plexus-default
- (not sure why exclusions in the isis-maven-plugin aren't sufficient, though ...
- -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>16.0.1</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>swagger</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
http://git-wip-us.apache.org/repos/asf/isis/blob/e6700ca3/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
new file mode 100644
index 0000000..88dfbbc
--- /dev/null
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/.gitignore
@@ -0,0 +1 @@
+/translations.pot
http://git-wip-us.apache.org/repos/asf/isis/blob/e6700ca3/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml
index b058cd6..c1628f8 100644
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/pom.xml
@@ -85,6 +85,56 @@
<profiles>
<profile>
+ <id>isis-swagger</id>
+ <activation>
+ <property>
+ <name>!skip.isis-swagger</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.isis.tool</groupId>
+ <artifactId>isis-maven-plugin</artifactId>
+ <version>${isis.version}</version>
+ <configuration>
+ <appManifest>domainapp.app.DomainAppAppManifest</appManifest>
+ <visibilities>
+ <visibility>PUBLIC</visibility>
+ <visibility>PRIVATE</visibility>
+ </visibilities>
+ <format>JSON</format>
+ <fileNamePrefix>swagger</fileNamePrefix>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!--
+ ... workaround to avoid conflict with plexus-default
+ (not sure why exclusions in the isis-maven-plugin aren't sufficient, though ...
+ -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>16.0.1</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>swagger</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<!--
enhanced cucumber reporting per http://www.masterthought.net/section/cucumber-reporting
-->
http://git-wip-us.apache.org/repos/asf/isis/blob/e6700ca3/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/translations.pot
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/translations.pot b/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/translations.pot
deleted file mode 100644
index 7d3837d..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/integtests/translations.pot
+++ /dev/null
@@ -1,442 +0,0 @@
-
-
-##############################################################################
-#
-# .pot file
-#
-# Translate this file to each required language and place in WEB-INF, eg:
-#
-# /WEB-INF/translations-en_US.po
-# /WEB-INF/translations-en.po
-# /WEB-INF/translations-fr_FR.po
-# /WEB-INF/translations-fr.po
-# /WEB-INF/translations.po
-#
-# If the app uses TranslatableString (eg for internationalized validation
-# messages), or if the app calls the TranslationService directly, then ensure
-# that all text to be translated has been captured by running a full
-# integration test suite that exercises all relevant behaviour
-#
-##############################################################################
-
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2016-03-17 18:27:02+\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-
-
-#: org.apache.isis.applib.services.metamodel.MetaModelServicesMenu#downloadMetaModel(java.lang.String)
-msgid ".csv file name"
-msgstr ""
-
-
-#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_downloadJdoMetadata#$$(java.lang.String)
-msgid ".jdo file name"
-msgstr ""
-
-
-#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#downloadTranslations(java.lang.String)
-msgid ".pot file name"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.appfeat.ApplicationMemberType#ACTION
-msgid "Action"
-msgstr ""
-
-
-#: org.apache.isis.core.runtime.system.IsisSystem
-msgid "Are you sure?"
-msgstr ""
-
-
-#: org.apache.isis.core.runtime.system.IsisSystem
-msgid "Cancel"
-msgstr ""
-
-
-#: org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureType$2#CLASS
-msgid "Class"
-msgstr ""
-
-
-#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#resetTranslationCache()
-msgid "Clear translation cache"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.appfeat.ApplicationMemberType#COLLECTION
-msgid "Collection"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.layout.LayoutService$Style#COMPLETE
-msgid "Complete"
-msgstr ""
-
-
-#: org.apache.isis.core.runtime.system.IsisSystem
-msgid "Confirm"
-msgstr ""
-
-
-#: domainapp.dom.simple.SimpleObjects#create()
-msgid "Create"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.layout.LayoutService$Style#CURRENT
-msgid "Current"
-msgstr ""
-
-
-#: domainapp.dom.simple.SimpleObject#delete()
-msgid "Delete"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureScript#discoverable
-msgid "Discoverable"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixtures.FixtureType#DOMAIN_OBJECTS
-msgid "Domain Objects"
-msgstr ""
-
-
-#: domainapp.dom.simple.SimpleObject#downloadJdoMetadata()
-msgid "Download Jdo Metadata"
-msgstr ""
-
-
-#: domainapp.app.services.homepage.HomePageViewModel#downloadLayoutXml()
-#: domainapp.dom.simple.SimpleObject#downloadLayoutXml()
-#: org.apache.isis.applib.fixturescripts.FixtureResult#downloadLayoutXml()
-#: org.apache.isis.core.metamodel.services.appfeat.ApplicationFeature#downloadLayoutXml()
-#: org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureId#downloadLayoutXml()
-msgid "Download Layout Xml"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.layout.LayoutServiceMenu#downloadLayouts()
-msgid "Download Layouts (XML)"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.metamodel.MetaModelServicesMenu#downloadMetaModel()
-msgid "Download Meta Model (CSV)"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.swagger.SwaggerServiceMenu#downloadSwaggerSpec()
-msgid "Download Swagger Spec"
-msgstr ""
-
-
-#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#downloadTranslations()
-msgid "Download Translations"
-msgstr ""
-
-
-#: domainapp.dom.simple.SimpleObject#name
-msgid "Exclamation mark is not allowed"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.dto.Dto_downloadXml#$$(java.lang.String)
-#: org.apache.isis.applib.services.dto.Dto_downloadXsd#$$(java.lang.String,org.apache.isis.applib.services.jaxb.JaxbService$IsisSchemas)
-#: org.apache.isis.applib.services.layout.Object_downloadLayoutXml#$$(java.lang.String,org.apache.isis.applib.services.layout.LayoutService$Style)
-msgid "File name"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.swagger.SwaggerServiceMenu#downloadSwaggerSpec(java.lang.String,org.apache.isis.applib.services.swagger.SwaggerService$Visibility,org.apache.isis.applib.services.swagger.SwaggerService$Format)
-msgid "Filename"
-msgstr ""
-
-
-#: domainapp.dom.simple.SimpleObjects#findByName()
-msgid "Find By Name"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureResult#fixtureScriptClassName
-msgid "Fixture script"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureScript#friendlyName
-msgid "Friendly Name"
-msgstr ""
-
-
-#: domainapp.app.services.homepage.HomePageService#homePage()
-msgid "Home Page"
-msgstr ""
-
-
-#: domainapp.dom.simple.SimpleObject#datanucleusIdLong()
-#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusIdLong#$$()
-msgid "Id"
-msgstr ""
-
-
-#: org.apache.isis.applib.annotation.SemanticsOf#IDEMPOTENT
-msgid "Idempotent"
-msgstr ""
-
-
-#: org.apache.isis.applib.annotation.SemanticsOf#IDEMPOTENT_ARE_YOU_SURE
-msgid "Idempotent Are You Sure"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.jaxb.JaxbService$IsisSchemas#IGNORE
-msgid "Ignore"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.jaxb.JaxbService$IsisSchemas#INCLUDE
-msgid "Include"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.swagger.SwaggerService$Format#JSON
-msgid "Json"
-msgstr ""
-
-
-#: domainapp.dom.simple.SimpleObjects#listAll()
-msgid "List All"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureScript#localName
-msgid "Local Name"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureScript#lookup()
-#: org.apache.isis.applib.services.bookmark.BookmarkHolderActionContributions#lookup()
-msgid "Lookup"
-msgstr ""
-
-
-#: org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureType$3#MEMBER
-msgid "Member"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.layout.Object_downloadLayoutXml
-#: org.apache.isis.applib.services.layout.Object_rebuildMetamodel
-#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusIdLong
-#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusVersionLong
-#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusVersionTimestamp
-#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_downloadJdoMetadata
-msgid "Metadata"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.layout.LayoutService$Style#MINIMAL
-msgid "Minimal"
-msgstr ""
-
-
-#: domainapp.dom.simple.SimpleObject#name
-#: domainapp.dom.simple.SimpleObjects#create(java.lang.String)
-#: domainapp.dom.simple.SimpleObjects#findByName(java.lang.String)
-msgid "Name"
-msgstr ""
-
-
-#: org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureFactory#newApplicationFeature()
-msgid "New Application Feature"
-msgstr ""
-
-
-#: org.apache.isis.applib.annotation.SemanticsOf#NON_IDEMPOTENT
-msgid "Non Idempotent"
-msgstr ""
-
-
-#: org.apache.isis.applib.annotation.SemanticsOf#NON_IDEMPOTENT_ARE_YOU_SURE
-msgid "Non Idempotent Are You Sure"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.layout.LayoutService$Style#NORMALIZED
-msgid "Normalized"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.bookmark.BookmarkHolderAssociationContributions#object()
-msgid "Object"
-msgstr ""
-
-
-#: domainapp.dom.simple.SimpleObject#title()
-msgid "Object: {name}"
-msgstr ""
-
-
-#: domainapp.app.services.homepage.HomePageViewModel#objects
-msgid "Objects"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixtures.FixtureType#OTHER
-msgid "Other"
-msgstr ""
-
-
-#: org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureType$1#PACKAGE
-msgid "Package"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureScripts#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
-#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
-#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScriptWithAutoComplete(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
-msgid "Parameters"
-msgstr ""
-
-
-#: org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureId#parentClassId
-msgid "Parent Class Id"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.swagger.SwaggerService$Visibility#PRIVATE
-msgid "Private"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.swagger.SwaggerService$Visibility#PRIVATE_WITH_PROTOTYPING
-msgid "Private With Prototyping"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.appfeat.ApplicationMemberType#PROPERTY
-msgid "Property"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault
-#: org.apache.isis.applib.services.layout.LayoutServiceMenu
-#: org.apache.isis.applib.services.metamodel.MetaModelServicesMenu
-#: org.apache.isis.applib.services.swagger.SwaggerServiceMenu
-#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu
-msgid "Prototyping"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.swagger.SwaggerService$Visibility#PUBLIC
-msgid "Public"
-msgstr ""
-
-
-#: domainapp.app.services.homepage.HomePageViewModel#rebuildMetamodel()
-#: domainapp.dom.simple.SimpleObject#rebuildMetamodel()
-#: org.apache.isis.applib.fixturescripts.FixtureResult#rebuildMetamodel()
-#: org.apache.isis.core.metamodel.services.appfeat.ApplicationFeature#rebuildMetamodel()
-#: org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureId#rebuildMetamodel()
-msgid "Rebuild Metamodel"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#recreateObjectsAndReturnFirst()
-msgid "Recreate Objects And Return First"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureResult#object
-msgid "Result"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureResult#className
-msgid "Result class"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureResult#key
-msgid "Result key"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureScripts#runFixtureScript()
-#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScript()
-#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScriptWithAutoComplete()
-msgid "Run Fixture Script"
-msgstr ""
-
-
-#: org.apache.isis.applib.annotation.SemanticsOf#SAFE
-msgid "Safe"
-msgstr ""
-
-
-#: org.apache.isis.applib.annotation.SemanticsOf#SAFE_AND_REQUEST_CACHEABLE
-msgid "Safe And Request Cacheable"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureScript
-msgid "Script"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureScripts#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
-#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScript(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
-#: org.apache.isis.applib.services.fixturespec.FixtureScriptsDefault#runFixtureScriptWithAutoComplete(org.apache.isis.applib.fixturescripts.FixtureScript,java.lang.String)
-msgid "Script-specific parameters (if any). The format depends on the script implementation (eg key=value, CSV, JSON, XML etc)"
-msgstr ""
-
-
-#: domainapp.dom.simple.SimpleObjects#title()
-msgid "Simple Objects"
-msgstr ""
-
-
-#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#switchToReadingTranslations()
-msgid "Switch To Reading Translations"
-msgstr ""
-
-
-#: org.apache.isis.core.runtime.services.i18n.po.TranslationServicePoMenu#switchToWritingTranslations()
-msgid "Switch To Writing Translations"
-msgstr ""
-
-
-#: org.apache.isis.applib.fixturescripts.FixtureScript#type
-#: org.apache.isis.core.metamodel.services.appfeat.ApplicationFeatureId#type
-msgid "Type"
-msgstr ""
-
-
-#: domainapp.dom.simple.SimpleObject#datanucleusVersionLong()
-#: domainapp.dom.simple.SimpleObject#datanucleusVersionTimestamp()
-#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusVersionLong#$$()
-#: org.apache.isis.core.metamodel.services.jdosupport.Persistable_datanucleusVersionTimestamp#$$()
-msgid "Version"
-msgstr ""
-
-
-#: org.apache.isis.applib.services.swagger.SwaggerService$Format#YAML
-msgid "Yaml"
-msgstr ""
-
-
-
-
-
-##############################################################################
-# end of .pot file
-##############################################################################
-
http://git-wip-us.apache.org/repos/asf/isis/blob/e6700ca3/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/ide/eclipse/launch/.gitignore
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/ide/eclipse/launch/.gitignore b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/ide/eclipse/launch/.gitignore
new file mode 100644
index 0000000..1d44fd4
--- /dev/null
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/ide/eclipse/launch/.gitignore
@@ -0,0 +1,2 @@
+/SimpleApp-PROTOTYPE-jrebel.launch
+/SimpleApp-jrebel.launch
http://git-wip-us.apache.org/repos/asf/isis/blob/e6700ca3/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/ide/eclipse/launch/SimpleApp-JREBEL.launch
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/ide/eclipse/launch/SimpleApp-JREBEL.launch b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/ide/eclipse/launch/SimpleApp-JREBEL.launch
deleted file mode 100644
index 3b1d393..0000000
--- a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/ide/eclipse/launch/SimpleApp-JREBEL.launch
+++ /dev/null
@@ -1,33 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version="1.0" encoding="UTF-8"?><launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
- <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
- <listEntry value="/isis-core-webserver/src/main/java/org/apache/isis/WebServer.java"/>
- </listAttribute>
- <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
- <listEntry value="1"/>
- </listAttribute>
- <mapAttribute key="org.eclipse.debug.core.preferred_launchers">
- <mapEntry value="org.eclipse.jdt.launching.localJavaApplication" key="[debug]"/>
- <mapEntry value="org.eclipse.jdt.launching.localJavaApplication" key="[run]"/>
- </mapAttribute>
- <stringAttribute value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector" key="org.eclipse.debug.core.source_locator_id"/>
- <stringAttribute value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;isis-jrebel-plugin&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;default/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> " key="org.eclipse.debug.core.source_locator_meme
nto"/>
- <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
- <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
- </listAttribute>
- <booleanAttribute value="true" key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS"/>
- <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
- <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" path="1" type="4"/> "/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="simple_wicket_restful_jdo-webapp" type="1"/> "/>
- <listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" path="3" type="4"/> "/>
- </listAttribute>
- <stringAttribute value="org.eclipse.m2e.launchconfig.classpathProvider" key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER"/>
- <booleanAttribute value="true" key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH"/>
- <stringAttribute value="org.apache.isis.WebServer" key="org.eclipse.jdt.launching.MAIN_TYPE"/>
- <stringAttribute value="--port 8080 --type PROTOTYPE" key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"/>
- <stringAttribute value="${rootArtifactId}-webapp" key="org.eclipse.jdt.launching.PROJECT_ATTR"/>
- <stringAttribute value="org.eclipse.m2e.launchconfig.sourcepathProvider" key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER"/>
- <stringAttribute value="${jrebel_args} -Drebel.log=false -Drebel.check_class_hash=true -Drebel.packages_exclude=org.apache.isis -Dproject.root=${project_loc}/.. -Dtarget.dir=target-ide -Drebel.plugins=C:/github/danhaywood/isis-jrebel-plugin/target/danhaywood-isis-jrebel-plugin-1.0.0-SNAPSHOT.jar -Disis-jrebel-plugin.packagePrefix=dom.simple,org.apache.isis.objectstore.jdo.applib -Disis-jrebel-plugin.loggingLevel=warn -XX:MaxPermSize=128m" key="org.eclipse.jdt.launching.VM_ARGUMENTS"/>
-</launchConfiguration>
http://git-wip-us.apache.org/repos/asf/isis/blob/e6700ca3/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/lib/.gitignore
----------------------------------------------------------------------
diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/lib/.gitignore b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/lib/.gitignore
new file mode 100644
index 0000000..70eee7e
--- /dev/null
+++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/webapp/lib/.gitignore
@@ -0,0 +1,5 @@
+#
+# explicitly ignoring Microsoft JDBC4 jar
+# (cannot redistribute, licensing)
+#
+sqljdbc4.jar
http://git-wip-us.apache.org/repos/asf/isis/blob/e6700ca3/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 5ff0bc1..6a6f45c 100644
--- a/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/simpleapp/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Fri Mar 18 06:23:26 GMT 2016
+#Sat Mar 19 14:39:01 GMT 2016
package=it.pkg
version=0.1-SNAPSHOT
groupId=archetype.it