You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2010/11/11 17:31:00 UTC

svn commit: r1033986 - in /wicket/common/site/trunk: _site/atom.xml _site/start/quickstart.html start/quickstart.md

Author: dashorst
Date: Thu Nov 11 16:31:00 2010
New Revision: 1033986

URL: http://svn.apache.org/viewvc?rev=1033986&view=rev
Log:
Fixes issue WICKET-3159: archetype:generate fails horribly by ignoring the archetypeVersion set on the commandline

Modified:
    wicket/common/site/trunk/_site/atom.xml
    wicket/common/site/trunk/_site/start/quickstart.html
    wicket/common/site/trunk/start/quickstart.md

Modified: wicket/common/site/trunk/_site/atom.xml
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/atom.xml?rev=1033986&r1=1033985&r2=1033986&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/atom.xml (original)
+++ wicket/common/site/trunk/_site/atom.xml Thu Nov 11 16:31:00 2010
@@ -4,7 +4,7 @@
  <title>Apache Wicket</title>
  <link href="http://wicket.apache.org/atom.xml" rel="self"/>
  <link href="http://wicket.apache.org/"/>
- <updated>2010-11-11T14:22:13+01:00</updated>
+ <updated>2010-11-11T17:19:24+01:00</updated>
  <id>http://wicket.apache.org/</id>
  <author>
    <name>Apache Wicket</name>

Modified: wicket/common/site/trunk/_site/start/quickstart.html
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/start/quickstart.html?rev=1033986&r1=1033985&r2=1033986&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/start/quickstart.html (original)
+++ wicket/common/site/trunk/_site/start/quickstart.html Thu Nov 11 16:31:00 2010
@@ -171,7 +171,12 @@
 		var groupId = document.getElementById("groupId").value;
 		var artifactId = document.getElementById("artifactId").value;
 		var version = document.getElementById("version").value;
-		var cmd = 'mvn archetype:generate -DarchetypeGroupId=org.apache.wicket -DarchetypeArtifactId=wicket-archetype-quickstart -DarchetypeVersion=' + version + ' -DgroupId=' + groupId + ' -DartifactId=' + artifactId;						
+		var cmd;
+		if(version.match(/^1\.[34]/))
+			cmd = 'mvn archetype:create -DarchetypeGroupId=org.apache.wicket -DarchetypeArtifactId=wicket-archetype-quickstart -DarchetypeVersion=' + version + ' -DgroupId=' + groupId + ' -DartifactId=' + artifactId;						
+		else
+			cmd = 'mvn archetype:generate -DarchetypeGroupId=org.apache.wicket -DarchetypeArtifactId=wicket-archetype-quickstart -DarchetypeVersion=' + version + ' -DgroupId=' + groupId + ' -DartifactId=' + artifactId;						
+
 		if (version.match(/.*SNAPSHOT/)) cmd += ' -DremoteRepositories=http://wicketstuff.org/maven/repository/';
 		document.getElementById("cmdLine").value = cmd;
 	}

Modified: wicket/common/site/trunk/start/quickstart.md
URL: http://svn.apache.org/viewvc/wicket/common/site/trunk/start/quickstart.md?rev=1033986&r1=1033985&r2=1033986&view=diff
==============================================================================
--- wicket/common/site/trunk/start/quickstart.md (original)
+++ wicket/common/site/trunk/start/quickstart.md Thu Nov 11 16:31:00 2010
@@ -36,7 +36,12 @@ typing in the groupId, artifactId and ve
 		var groupId = document.getElementById("groupId").value;
 		var artifactId = document.getElementById("artifactId").value;
 		var version = document.getElementById("version").value;
-		var cmd = 'mvn archetype:generate -DarchetypeGroupId=org.apache.wicket -DarchetypeArtifactId=wicket-archetype-quickstart -DarchetypeVersion=' + version + ' -DgroupId=' + groupId + ' -DartifactId=' + artifactId;						
+		var cmd;
+		if(version.match(/^1\.[34]/))
+			cmd = 'mvn archetype:create -DarchetypeGroupId=org.apache.wicket -DarchetypeArtifactId=wicket-archetype-quickstart -DarchetypeVersion=' + version + ' -DgroupId=' + groupId + ' -DartifactId=' + artifactId;						
+		else
+			cmd = 'mvn archetype:generate -DarchetypeGroupId=org.apache.wicket -DarchetypeArtifactId=wicket-archetype-quickstart -DarchetypeVersion=' + version + ' -DgroupId=' + groupId + ' -DartifactId=' + artifactId;						
+
 		if (version.match(/.*SNAPSHOT/)) cmd += ' -DremoteRepositories=http://wicketstuff.org/maven/repository/';
 		document.getElementById("cmdLine").value = cmd;
 	}