Author: hlship
Date: Fri Oct 26 18:15:31 2007
New Revision: 588862
URL: http://svn.apache.org/viewvc?rev=588862&view=rev
Log:
Change the update-versions script to update the archetype's pom.xml as well,
and simplify the release instructions accordingly.
Modified:
tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/pom.xml
tapestry/tapestry5/trunk/quickstart/src/site/apt/index.apt
tapestry/tapestry5/trunk/src/site/apt/dev/checklist.apt
tapestry/tapestry5/trunk/support/update-versions
Modified:
tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/pom.xml?rev=588862&r1=588861&r2=588862&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/pom.xml
(original)
+++
tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/pom.xml
Fri Oct 26 18:15:31 2007
@@ -1,6 +1,4 @@
-<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";>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";>
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
Modified: tapestry/tapestry5/trunk/quickstart/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/site/apt/index.apt?rev=588862&r1=588861&r2=588862&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/site/apt/index.apt (original)
+++ tapestry/tapestry5/trunk/quickstart/src/site/apt/index.apt Fri Oct 26
18:15:31 2007
@@ -28,30 +28,59 @@
[INFO] Building Maven Default Project
[INFO] task-segment: [archetype:create] (aggregator-style)
[INFO]
----------------------------------------------------------------------------
-
-. . .
-
+[INFO] Setting property: classpath.resource.loader.class =>
'org.codehaus.plexus.velocity.ContextClassLoaderResourceLoader'.
+[INFO] Setting property: velocimacro.messages.on => 'false'.
+[INFO] Setting property: resource.loader => 'classpath'.
+[INFO] Setting property: resource.manager.logwhenfound => 'false'.
+[INFO] **************************************************************
+[INFO] Starting Jakarta Velocity v1.4
+[INFO] RuntimeInstance initializing.
+[INFO] Default Properties File:
org/apache/velocity/runtime/defaults/velocity.properties
+[INFO] Default ResourceManager initializing. (class
org.apache.velocity.runtime.resource.ResourceManagerImpl)
+[INFO] Resource Loader Instantiated:
org.codehaus.plexus.velocity.ContextClassLoaderResourceLoader
+[INFO] ClasspathResourceLoader : initialization starting.
+[INFO] ClasspathResourceLoader : initialization complete.
+[INFO] ResourceCache : initialized. (class
org.apache.velocity.runtime.resource.ResourceCacheImpl)
+[INFO] Default ResourceManager initialization complete.
+[INFO] Loaded System Directive: org.apache.velocity.runtime.directive.Literal
+[INFO] Loaded System Directive: org.apache.velocity.runtime.directive.Macro
+[INFO] Loaded System Directive: org.apache.velocity.runtime.directive.Parse
+[INFO] Loaded System Directive: org.apache.velocity.runtime.directive.Include
+[INFO] Loaded System Directive: org.apache.velocity.runtime.directive.Foreach
+[INFO] Created: 20 parsers.
+[INFO] Velocimacro : initialization starting.
+[INFO] Velocimacro : adding VMs from VM library template : VM_global_library.vm
+[ERROR] ResourceManager : unable to find resource 'VM_global_library.vm' in
any resource loader.
+[INFO] Velocimacro : error using VM library template VM_global_library.vm :
org.apache.velocity.exception.ResourceNotFoundException: Unable to find
resource 'VM_global_library.vm'
+[INFO] Velocimacro : VM library template macro registration complete.
+[INFO] Velocimacro : allowInline = true : VMs can be defined inline in
templates
+[INFO] Velocimacro : allowInlineToOverride = false : VMs defined inline may
NOT replace previous VM definitions
+[INFO] Velocimacro : allowInlineLocal = false : VMs defined inline will be
global in scope if allowed.
+[INFO] Velocimacro : initialization complete.
+[INFO] Velocity successfully started.
[INFO] [archetype:create]
+[INFO] artifact org.apache.tapestry:quickstart: checking for updates from
central
[INFO]
----------------------------------------------------------------------------
-[INFO] Using following parameters for creating Archetype: quickstart:5.0.5
+[INFO] Using following parameters for creating Archetype: quickstart:RELEASE
[INFO]
----------------------------------------------------------------------------
[INFO] Parameter: groupId, Value: org.example
[INFO] Parameter: packageName, Value: org.example.myapp
-[INFO] Parameter: basedir, Value: /Users/Howard/work
+[INFO] Parameter: basedir, Value:
/Users/Howard/Documents/workspace/tapestry5/target
[INFO] Parameter: package, Value: org.example.myapp
[INFO] Parameter: version, Value: 1.0.0-SNAPSHOT
[INFO] Parameter: artifactId, Value: myapp
+[WARNING] org.apache.velocity.runtime.exception.ReferenceException: reference
: template = archetype-resources/pom.xml [line 14,column 22] :
${tapestry-release-version} is not a valid reference.
+[WARNING] org.apache.velocity.runtime.exception.ReferenceException: reference
: template = archetype-resources/pom.xml [line 80,column 26] :
${tapestry-release-version} is not a valid reference.
[INFO] ********************* End of debug info from resources from generated
POM ***********************
-[WARNING] org.apache.velocity.runtime.exception.ReferenceException: reference
: template = archetype-resources/src/main/webapp/WEB-INF/Start.html [line
11,column 34] : ${currentTime} is not a valid reference.
-[INFO] Archetype created in dir: /Users/Howard/work/myapp
+[WARNING] org.apache.velocity.runtime.exception.ReferenceException: reference
: template = archetype-resources/src/main/webapp/Start.tml [line 11,column 34]
: ${currentTime} is not a valid reference.
+[INFO] Archetype created in dir:
/Users/Howard/Documents/workspace/tapestry5/target/myapp
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESSFUL
[INFO] ------------------------------------------------------------------------
-[INFO] Total time: 1 second
-[INFO] Finished at: Tue Jan 23 11:57:11 PST 2007
-[INFO] Final Memory: 4M/8M
+[INFO] Total time: 2 seconds
+[INFO] Finished at: Fri Oct 26 18:12:49 PDT 2007
+[INFO] Final Memory: 5M/9M
[INFO] ------------------------------------------------------------------------
-~/work
$
+---+
@@ -105,7 +134,7 @@
Tapestry 5 is currently in a pre-release stage. The Tapestry libraries,
including this archetype, are being distributed as snaphots and are rebuilt
nightly. Being snapshots, these artifacts are not in the central Maven
repository.
To make use of the Tapestry snapshots, append
<<<-DremoteRepositories=http://tapestry.formos.com/maven-snapshot-repository/>>>
and <<<-DarchetypeVersion=5.0.x-SNAPSHOT>>> (you'll have to figure out what
- the lastest snapshot is) to the command line when invoking Maven.
+ the lastest snapshot version is) to the command line when invoking Maven.
The generated POM includes entries to automatically search the snapshot
repository, so you won't need to use <<<-DremoteRepositories>>> after creating
your initial project.
Modified: tapestry/tapestry5/trunk/src/site/apt/dev/checklist.apt
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/src/site/apt/dev/checklist.apt?rev=588862&r1=588861&r2=588862&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/src/site/apt/dev/checklist.apt (original)
+++ tapestry/tapestry5/trunk/src/site/apt/dev/checklist.apt Fri Oct 26 18:15:31
2007
@@ -19,14 +19,7 @@
We need to update the version number across all modules, from 5.0.x-SNAPSHOT
to just 5.0.x.
- The first step is to bump up those numbers to the final release value.
-
- * module quickstart:
<<quickstart/src/main/resources/archetype-resources/pom.xml>> contains a copy
of the version number, <<at the bottom>> of the file.
-
- * other modules: A Ruby script, support/update-versions, can change the
version numbers everywhere else. A single parameter on the command line is the
new version number.
- This updates the master POM and the POM in each module.
-
- []
+ The Ruby script, support/update-versions, can change the version numbers
everywhere they need changing. A single parameter on the command line is the
new version number.
From the root folder, execute <<<mvn clean install>>>; this should take a
couple of minutes.
@@ -207,7 +200,8 @@
Advance the Version Numbers
- This is optional but is useful, go find all those version numbers again
and set them to 5.0.(n+1)-SNAPSHOT. So, if you just released 5.0.3, set all
the version numbers to 5.0.4-SNAPSHOT.
+ This is optional but is useful, go find all those version numbers again
and set them to 5.0.(n+1)-SNAPSHOT. So, if you just released 5.0.3, set all
the version numbers to 5.0.4-SNAPSHOT. Again,
+ use the support/update-versions Ruby script.
Modified: tapestry/tapestry5/trunk/support/update-versions
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/support/update-versions?rev=588862&r1=588861&r2=588862&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/support/update-versions (original)
+++ tapestry/tapestry5/trunk/support/update-versions Fri Oct 26 18:15:31 2007
@@ -19,43 +19,46 @@
$version = ARGV[0]
+def read_pom(file)
+ open(file) do |f|
+ Hpricot.XML(f)
+ end
+end
+
def write(file, pom)
puts "Updating #{file} ..."
File.open(file, "w") do |stream|
stream << pom
- end
-
+ end
end
-def process_module(mod_name)
-
- file = "#{mod_name}/pom.xml"
-
- pom = open(file) do |f|
- Hpricot.XML(f)
- end
-
- pom.at("/project/parent/version").inner_html = $version
-
+def edit_pom(file)
+ pom = read_pom(file)
+ yield pom
write(file, pom)
end
-puts "Updating to version #{$version} ..."
+def process_module(mod_name)
-$master_pom = open("pom.xml") do |f|
- Hpricot.XML(f)
+ edit_pom("#{mod_name}/pom.xml") do |pom|
+ pom.at("/project/parent/version").inner_html = $version
+ end
end
-$modules = []
-
-($master_pom/"project/modules/module").each { |elem| $modules <<
elem.inner_html }
+puts "Updating to version #{$version} ..."
-$master_pom.at("/project/version").inner_html = $version
+edit_pom("pom.xml") do |pom|
+
+ modules = []
-write("pom.xml", $master_pom)
+ (pom/"project/modules/module").each { |elem| modules << elem.inner_html }
-# Add entries for each module
+ modules.sort.each { |mod_name| process_module(mod_name) }
-$modules.sort.each { |mod_name| process_module(mod_name) }
+ pom.at("/project/version").inner_html = $version
+end
+edit_pom("quickstart/src/main/resources/archetype-resources/pom.xml") do |pom|
+ pom.at("/project/properties/tapestry-release-version").inner_html = $version
+end
