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 2012/12/19 09:15:03 UTC

[4/12] git commit: ISIS-188: quickstart_wicket_restful_jdo archetype + script

ISIS-188: quickstart_wicket_restful_jdo archetype + script


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/95b99bd9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/95b99bd9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/95b99bd9

Branch: refs/heads/master
Commit: 95b99bd91e4f3df55329c6b9a94d2c64c072a38d
Parents: 1c328cf
Author: Dan Haywood <da...@apache.org>
Authored: Wed Dec 19 07:16:47 2012 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Wed Dec 19 08:03:32 2012 +0000

----------------------------------------------------------------------
 .../quickstart_wicket_restful_jdo/pom.xml          |    5 +++
 .../resources/projects/basic/archetype.properties  |    2 +-
 scripts/updateGeneratedArchetypeSources.groovy     |   28 +++++++++++++++
 3 files changed, 34 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/95b99bd9/example/archetype/quickstart_wicket_restful_jdo/pom.xml
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/pom.xml b/example/archetype/quickstart_wicket_restful_jdo/pom.xml
index 2ee4af2..d1db20a 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/pom.xml
+++ b/example/archetype/quickstart_wicket_restful_jdo/pom.xml
@@ -41,4 +41,9 @@
       </plugins>
     </pluginManagement>
   </build>
+  <parent>
+    <groupId>org.apache.isis.core</groupId>
+    <artifactId>isis</artifactId>
+    <version>1.0.0</version>
+  </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/isis/blob/95b99bd9/example/archetype/quickstart_wicket_restful_jdo/src/test/resources/projects/basic/archetype.properties
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/test/resources/projects/basic/archetype.properties b/example/archetype/quickstart_wicket_restful_jdo/src/test/resources/projects/basic/archetype.properties
index 44e71e3..7df9be9 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/src/test/resources/projects/basic/archetype.properties
+++ b/example/archetype/quickstart_wicket_restful_jdo/src/test/resources/projects/basic/archetype.properties
@@ -1,4 +1,4 @@
-#Wed Dec 19 00:06:17 GMT 2012
+#Wed Dec 19 07:09:24 GMT 2012
 package=it.pkg
 version=0.1-SNAPSHOT
 groupId=archetype.it

http://git-wip-us.apache.org/repos/asf/isis/blob/95b99bd9/scripts/updateGeneratedArchetypeSources.groovy
----------------------------------------------------------------------
diff --git a/scripts/updateGeneratedArchetypeSources.groovy b/scripts/updateGeneratedArchetypeSources.groovy
index dd449f7..4a08201 100644
--- a/scripts/updateGeneratedArchetypeSources.groovy
+++ b/scripts/updateGeneratedArchetypeSources.groovy
@@ -21,6 +21,13 @@ import groovy.xml.XmlUtil
 import javax.xml.transform.*
 import javax.xml.transform.stream.*
 
+
+def cli = new CliBuilder(usage: 'updateGeneratedArchetypeSources.groovy -v [version]')
+cli.with {
+    v longOpt: 'version', args: 1, required: true, argName: 'version', 'Isis core version to use as parent POM'
+}
+
+
 /////////////////////////////////////////////////////
 //
 // constants
@@ -50,6 +57,20 @@ def license_using_xml_comments="""<?xml version="1.0" encoding="UTF-8"?>
   under the License.
 -->
 """
+
+/////////////////////////////////////////////////////
+//
+// Parse command line
+//
+/////////////////////////////////////////////////////
+
+def options = cli.parse(args)
+if (!options) {
+    return
+}
+
+isis_version=options.v
+
 /////////////////////////////////////////////////////
 //
 // update pom.xml's groupId
@@ -64,6 +85,13 @@ println "updating ${pomFile.path}"
 def pomFileText = stripXmlPragma(pomFile)
 
 def pomXml = new XmlSlurper(false,true).parseText(pomFileText)
+pomXml.appendNode {
+  parent {
+    groupId("org.apache.isis.core")
+    artifactId("isis")
+    version(isis_version)
+  }
+}
 pomXml.groupId='org.apache.isis.archetype'
 
 def pomSmb = new groovy.xml.StreamingMarkupBuilder().bind {