gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1604328 [1/2] - in /gump/live: ./ cron/ python/gump/core/model/ python/gump/core/update/ python/gump/test/resources/full1/ python/gump/tool/dot/ src/documentation/ src/documentation/content/xdocs/ src/documentation/content/xdocs/images/ sr...
Date Sat, 21 Jun 2014 09:32:18 GMT
Author: bodewig
Date: Sat Jun 21 09:32:17 2014
New Revision: 1604328

URL: http://svn.apache.org/r1604328
Log:
manually merge live into trunk, svn merge didn't work for me

Added:
    gump/live/cron/demo.sh
      - copied unchanged from r1604324, gump/trunk/cron/demo.sh
    gump/live/cron/local-env.sh.sample
      - copied unchanged from r1604324, gump/trunk/cron/local-env.sh.sample
    gump/live/demo-gump-run
      - copied unchanged from r1604324, gump/trunk/demo-gump-run
    gump/live/python/gump/test/resources/full1/module6.xml
      - copied unchanged from r1604324, gump/trunk/python/gump/test/resources/full1/module6.xml
    gump/live/python/gump/test/resources/full1/module7.xml
      - copied unchanged from r1604324, gump/trunk/python/gump/test/resources/full1/module7.xml
    gump/live/python/gump/tool/dot/
      - copied from r1604324, gump/trunk/python/gump/tool/dot/
    gump/live/site-sync.xml
      - copied unchanged from r1604324, gump/trunk/site-sync.xml
    gump/live/src/documentation/content/xdocs/images/gump-logo-tm.svg
      - copied unchanged from r1604324, gump/trunk/src/documentation/content/xdocs/images/gump-logo-tm.svg
    gump/live/src/xdocs/gump3-model-drienerlo.png
      - copied unchanged from r1604324, gump/trunk/src/xdocs/gump3-model-drienerlo.png
Modified:
    gump/live/forrest.properties
    gump/live/gump
    gump/live/python/gump/core/model/project.py
    gump/live/python/gump/core/model/property.py
    gump/live/python/gump/core/update/hg.py
    gump/live/python/gump/core/update/scmupdater.py
    gump/live/python/gump/test/resources/full1/profile.xml
    gump/live/src/documentation/content/xdocs/faq.xml
    gump/live/src/documentation/content/xdocs/gettingstarted.xml
    gump/live/src/documentation/content/xdocs/index.xml
    gump/live/src/documentation/content/xdocs/mail.xml
    gump/live/src/documentation/content/xdocs/metadata/builder.xml
    gump/live/src/documentation/content/xdocs/metadata/index.xml
    gump/live/src/documentation/content/xdocs/metadata/module.xml
    gump/live/src/documentation/content/xdocs/metadata/practices.xml
    gump/live/src/documentation/content/xdocs/metadata/project.xml
    gump/live/src/documentation/content/xdocs/metadata/repository.xml
    gump/live/src/documentation/content/xdocs/metadata/workspace.xml
    gump/live/src/documentation/content/xdocs/python/index.xml
    gump/live/src/documentation/content/xdocs/python/usage.xml
    gump/live/src/documentation/content/xdocs/site.xml
    gump/live/src/documentation/content/xdocs/status.xml
    gump/live/src/documentation/content/xdocs/tabs.xml
    gump/live/src/documentation/content/xdocs/whoweare.xml
    gump/live/src/documentation/content/xdocs/why.xml
    gump/live/src/documentation/skinconf.xml
    gump/live/src/xdocs/HowGumpWorks.html
    gump/live/src/xdocs/gump.pdf
    gump/live/src/xdocs/gump.ppt
    gump/live/test/fixture/workspace.xml

Modified: gump/live/forrest.properties
URL: http://svn.apache.org/viewvc/gump/live/forrest.properties?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/forrest.properties (original)
+++ gump/live/forrest.properties Sat Jun 21 09:32:17 2014
@@ -1 +1,152 @@
-# This file is empty on purpose. Forrest complains if it isn't there.
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+##############
+# These are the defaults, un-comment them only if you need to change them.
+#
+# You can even have a completely empty file, to assist with maintenance.
+# This file is required, even if empty.
+#
+# The file obtained from 'forrest seed-sample' shows the defaults.
+##############
+
+# Prints out a summary of Forrest settings for this project
+#forrest.echo=true
+
+# Project name (used to name .war file)
+#project.name=my-project
+
+# Specifies name of Forrest skin to use
+# See list at http://forrest.apache.org/docs/skins.html
+#project.skin=pelt
+
+# Descriptors for plugins and skins
+# comma separated list, file:// is supported
+#forrest.skins.descriptors=http://forrest.apache.org/skins/skins.xml,file:///c:/myskins/skins.xml
+#forrest.plugins.descriptors=http://forrest.apache.org/plugins/plugins.xml,http://forrest.apache.org/plugins/whiteboard-plugins.xml
+
+##############
+# behavioural properties
+#project.menu-scheme=tab_attributes
+#project.menu-scheme=directories
+
+##############
+# layout properties
+
+# Properties that can be set to override the default locations
+#
+# Parent properties must be set. This usually means uncommenting
+# project.content-dir if any other property using it is uncommented
+
+#project.status=status.xml
+#project.content-dir=src/documentation
+#project.raw-content-dir=${project.content-dir}/content
+#project.conf-dir=${project.content-dir}/conf
+#project.sitemap-dir=${project.content-dir}
+#project.xdocs-dir=${project.content-dir}/content/xdocs
+#project.resources-dir=${project.content-dir}/resources
+#project.stylesheets-dir=${project.resources-dir}/stylesheets
+#project.images-dir=${project.resources-dir}/images
+#project.schema-dir=${project.resources-dir}/schema
+#project.skins-dir=${project.content-dir}/skins
+#project.skinconf=${project.content-dir}/skinconf.xml
+#project.lib-dir=${project.content-dir}/lib
+#project.classes-dir=${project.content-dir}/classes
+#project.translations-dir=${project.content-dir}/translations
+
+#project.build-dir=${project.home}/build
+#project.site=site
+#project.site-dir=${project.build-dir}/${project.site}
+#project.temp-dir=${project.build-dir}/tmp
+
+##############
+# Cocoon catalog entity resolver properties
+# A local OASIS catalog file to supplement the default Forrest catalog
+#project.catalog=${project.schema-dir}/catalog.xcat
+
+##############
+# validation properties
+
+# This set of properties determine if validation is performed
+# Values are inherited unless overridden.
+# e.g. if forrest.validate=false then all others are false unless set to true.
+#forrest.validate=true
+#forrest.validate.xdocs=${forrest.validate}
+#forrest.validate.skinconf=${forrest.validate}
+#forrest.validate.sitemap=${forrest.validate}
+#forrest.validate.stylesheets=${forrest.validate}
+#forrest.validate.skins=${forrest.validate}
+#forrest.validate.skins.stylesheets=${forrest.validate.skins}
+
+# *.failonerror=(true|false) - stop when an XML file is invalid
+#forrest.validate.failonerror=true
+
+# *.excludes=(pattern) - comma-separated list of path patterns to not validate
+# Note: If you do add an "excludes" list then you need to specify site.xml too.
+# e.g.
+#forrest.validate.xdocs.excludes=site.xml, samples/subdir/**, samples/faq.xml
+#forrest.validate.xdocs.excludes=site.xml
+
+
+##############
+# General Forrest properties
+
+# The URL to start crawling from
+#project.start-uri=linkmap.html
+
+# Set logging level for messages printed to the console
+# (DEBUG, INFO, WARN, ERROR, FATAL_ERROR)
+#project.debuglevel=ERROR
+
+# Max memory to allocate to Java
+#forrest.maxmemory=64m
+
+# Any other arguments to pass to the JVM. For example, to run on an X-less
+# server, set to -Djava.awt.headless=true
+#forrest.jvmargs=
+
+# The bugtracking URL - the issue number will be appended
+# Projects would use their own issue tracker, of course.
+#project.bugtracking-url=http://issues.apache.org/bugzilla/show_bug.cgi?id=
+#project.bugtracking-url=http://issues.apache.org/jira/browse/
+
+# The issues list as rss
+#project.issues-rss-url=
+
+#I18n Property. Based on the locale request for the browser.
+#If you want to use it for static site then modify the JVM system.language
+# and run once per language
+project.i18n=false
+
+# The names of plugins that are required to build the project
+# comma separated list (no spaces)
+# You can request a specific version by appending "-VERSION" to the end of
+# the plugin name. If you exclude a version number, the latest released version
+# will be used. However, be aware that this may be a development version. In
+# a production environment it is recommended that you specify a known working
+# version.
+# Run "forrest available-plugins" for a list of plug-ins currently available.
+project.required.plugins=org.apache.forrest.plugin.input.logo,org.apache.forrest.plugin.output.pdf
+
+# codename: Dispatcher
+# Add the following plugins to project.required.plugins:
+#org.apache.forrest.plugin.internal.dispatcher
+
+# Proxy configuration
+# - proxy.user and proxy.password are only needed if the proxy is an authenticated one...
+# proxy.host=myproxy.example.org
+# proxy.port=<ProxyPort>
+# proxy.user=<login, if authenticated proxy>
+# proxy.password=<password, if authenticated proxy>

Modified: gump/live/gump
URL: http://svn.apache.org/viewvc/gump/live/gump?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/gump (original)
+++ gump/live/gump Sat Jun 21 09:32:17 2014
@@ -82,14 +82,6 @@ function usage
         $0 site-publish
 "
       ;;
-    get-metadata)
-      echo "
-      Use CVS to check out or update the metadata.
-
-      Usage:
-        $0 get-metadata [CVSROOT]
-"
-      ;;
     validate)
       echo "
       Run the DTD validation tools on the metadata.
@@ -108,7 +100,11 @@ function usage
       ;;
     *)
       echo "
-      Utility commandline interface for Gump.
+     _____
+    |   __|_ Apache_ ___ 
+    |  |  | | |     | . |
+    |_____|___|_|_|_|  _|
+                    |_|
      
       Usage:
         $0 command [opts ...]
@@ -117,11 +113,10 @@ function usage
      
         run -- run Gumpy
         test -- run Gumpy its unit tests
-        get-metadata -- Check out or update metadata from CVS
         validate -- validate the metadata
-        help -- print this information
         site -- use Apache Forrest to build the documentation
         site-publish -- use SVN and SSH to publish the site to the website
+    help -- print this information
      
       Run
      
@@ -140,8 +135,7 @@ function usage
 # Print an error message and then exit.
 function error
 {
-  echo "$0: $1"
-#  usage
+  echo "$1"
   exit 1
 }
 
@@ -252,9 +246,6 @@ function delegate
     site-publish)
       site_publish $@
       ;;
-    get-metadata)
-      get_metadata $@
-      ;;
     validate)
       validate $0
       ;;
@@ -265,7 +256,7 @@ function delegate
       experimental_tests $@
       ;;
     '')
-      error "Please specify a command"
+      usage $@
       ;;
     *)
       error "Unknown command '$command'"

Modified: gump/live/python/gump/core/model/project.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/model/project.py?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/python/gump/core/model/project.py (original)
+++ gump/live/python/gump/core/model/project.py Sat Jun 21 09:32:17 2014
@@ -117,6 +117,9 @@ class Project(NamedModelObject, Statable
         self.honoraryPackage = False
         self.built = False
 
+        # removed dependencies
+        self.removes = []
+
     def __del__(self):
         NamedModelObject.__del__(self)
         Statable.__del__(self)
@@ -626,7 +629,7 @@ class Project(NamedModelObject, Statable
         [b.expand(self, workspace) for b in self.builder]
 
         if not packaged:
-            removes = []
+            self.removes = []
 
             # Complete dependencies so properties can reference the, 
             # completed metadata within a dependent project
@@ -645,7 +648,7 @@ class Project(NamedModelObject, Statable
                                       "on %s from %s." % \
                                       (depProject.getName(), self.getName()))
 
-                    removes.append(dependency)
+                    self.removes.append(dependency)
                 else:
                     # Don't redo what is done.
                     if not depProject.isComplete():
@@ -654,7 +657,7 @@ class Project(NamedModelObject, Statable
                         depProject.complete(workspace, new_visited)
 
             # Remove circulars...
-            for dependency in removes:
+            for dependency in self.removes:
                 self.removeDependency(dependency)
 
             self.buildDependenciesMap(workspace)
@@ -764,6 +767,13 @@ class Project(NamedModelObject, Statable
 
         return (badDepends, badOptions)
 
+    def get_removed_dependencies(self):
+        """
+        ProjectDependencies that have been removed in order to break
+        circular dependencies.
+        """
+        return self.removes
+
     def hasBaseDirectory(self):
         if self.basedir:
             return True

Modified: gump/live/python/gump/core/model/property.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/model/property.py?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/python/gump/core/model/property.py (original)
+++ gump/live/python/gump/core/model/property.py Sat Jun 21 09:32:17 2014
@@ -53,9 +53,9 @@ class Property(NamedModelObject):
         Get a value
         """
         if self.output :
-            if self.reference == 'jarpath' or self.reference == 'outputpath' :
+            if self.reference == 'jarpath' or self.reference == 'outputpath':
                 self.setValue(self.output.getPath())
-            else :
+            else:
                 self.setValue(self.output.getName())                
         return self.value
 

Modified: gump/live/python/gump/core/update/hg.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/update/hg.py?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/python/gump/core/update/hg.py (original)
+++ gump/live/python/gump/core/update/hg.py Sat Jun 21 09:32:17 2014
@@ -20,6 +20,7 @@ import re
 from gump.core.update.scmupdater import extract_URL, log_repository_and_url, \
     match_workspace_template, ScmUpdater, should_be_quiet
 from gump.util.process.command import Cmd
+from gump.util.process.launcher import execute
 
 def setup_common_parameters(module, cmd):
     if should_be_quiet(module):    
@@ -57,10 +58,24 @@ class HgUpdater(ScmUpdater):
 
     def getUpdateCommand(self, module):
         """
-            Build the appropriate hg command for pull
+            Build the appropriate hg command for pull if hg incoming
+            indicates any changes
         """
         log_repository_and_url(module, 'hg')
-        cmd = Cmd('hg', 'update_' + module.getName(), 
+
+        cmd = Cmd('hg', 'incoming_' + module.getName(), 
+                  module.getSourceControlStagingDirectory())
+        cmd.addParameter('incoming')
+        setup_common_parameters(module, cmd)
+        result = execute(cmd)
+
+        if not result.isOk():
+            module.addInfo('No updates')
+            cmd = Cmd('echo', 'update_' + module.getName(), 
+                      module.getSourceControlStagingDirectory())
+            cmd.addParameter('hg incoming indicated no changes to pull')
+        else:
+            cmd = Cmd('hg', 'update_' + module.getName(), 
                   module.getSourceControlStagingDirectory())
         cmd.addParameter('pull')
         # update working copy

Modified: gump/live/python/gump/core/update/scmupdater.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/update/scmupdater.py?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/python/gump/core/update/scmupdater.py (original)
+++ gump/live/python/gump/core/update/scmupdater.py Sat Jun 21 09:32:17 2014
@@ -144,28 +144,7 @@ class ScmUpdater(RunSpecific):
             # Update Context w/ Results
             if not cmdResult.isOk():
                 log.error('Failed to checkout/update module: ' + module.name)
-
-                #
-                # Here the live branch differs from trunk: while live
-                # will mark the module as failed (and not build any
-                # projects contained in it), live will go on if the
-                # directory exists and assume it is a transient error
-                #
-                if not isUpdate:     
-                    module.changeState(STATE_FAILED, REASON_UPDATE_FAILED)
-                else:
-                    module.addError('*** Failed to update from source control.' \
-                                        + 'Stale contents ***')
-                        
-                    # Black mark for this repository
-                    repository = module.getRepository()
-                    repository.addError('*** Failed to update ' + module.name +\
-                                            'from source control. Stale '+ \
-                                            'contents ***')
-
-                    # Kinda bogus, but better than nowt (for now)
-                    module.changeState(STATE_SUCCESS, REASON_UPDATE_FAILED)
-
+                module.changeState(STATE_FAILED, REASON_UPDATE_FAILED)
             else:
                 module.changeState(STATE_SUCCESS)
 

Modified: gump/live/python/gump/test/resources/full1/profile.xml
URL: http://svn.apache.org/viewvc/gump/live/python/gump/test/resources/full1/profile.xml?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/python/gump/test/resources/full1/profile.xml (original)
+++ gump/live/python/gump/test/resources/full1/profile.xml Sat Jun 21 09:32:17 2014
@@ -9,6 +9,8 @@
   <module href="module3.xml"/>
   <module href="module4.xml"/>
   <module href="module5.xml"/>
+  <module href="module6.xml"/>
+  <module href="module7.xml"/>
   
   <module href="broken1.xml"/>
   <module href="broken2.xml"/>
@@ -31,6 +33,8 @@
 
   <!-- Override package1 to be a package -->
   <project name='package1' package='package1' />
+  <!-- this is a missing package, within a missing module -->
+  <project name='package2' package='missing_package' />
   
 </profile>
 

Modified: gump/live/src/documentation/content/xdocs/faq.xml
URL: http://svn.apache.org/viewvc/gump/live/src/documentation/content/xdocs/faq.xml?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/src/documentation/content/xdocs/faq.xml (original)
+++ gump/live/src/documentation/content/xdocs/faq.xml Sat Jun 21 09:32:17 2014
@@ -18,7 +18,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
 <document>
   <header>    
-    <title>Gump - Frequently Asked Questions</title>
+    <title>Apache Gump - Frequently Asked Questions</title>
   
   	<authors>
   		<person name="Sam Ruby" email="rubys AT us.ibm DOT com"/>
@@ -27,8 +27,8 @@
   </header>    
 <body>
 
-	<section><title>Question: Which version of Ant (or JUnit or log4j or...) does Gump use?</title>
-    <p><strong>Answer: </strong>The latest from cvs (as of the instant of the Gump run).</p>
+	<section><title>Question: Which version of Apache Ant (or JUnit or Apache log4j or...) does Apache Gump use?</title>
+    <p><strong>Answer: </strong>The latest from SCM (as of the instant of the Gump run).</p>
     </section>
     
 	<section><title>Question: Gump is building the latest version of everything?</title>
@@ -53,12 +53,12 @@
     	</section>
     	
       <section><title>Question: I've got a fix, how do I get Gump to pick it up?</title>
-    		<p><strong>Answer: </strong>Check it into cvs.</p>
+    		<p><strong>Answer: </strong>Check it into your source control.</p>
     	</section>
     	
 <section><title>Question: I checked in a fix, how do I know if Gump picked it up?</title>
-    		<p><strong>Answer: </strong>On the build log, click on the link marked <code>cvs</code>.  It 
-              will tell you when the latest cvs update or checkout was 
+    		<p><strong>Answer: </strong>On the build log, click on the link marked <code>update</code>.  It 
+              will tell you when the latest scm update or checkout was 
               performed and what source files were obtained in the process.</p>
     	</section>
     	
@@ -84,8 +84,8 @@
               definition for a project I'm a committer on...how do I get
               the change to be made?</title>
     		<p><strong>Answer: </strong>The 
-              <link href="http://cvs.apache.org/viewcvs/gump/">
-              gump cvs repository</link> is open to all ASF committers.
+              <link href="http://svn.apache.org/viewvc/gump/metadata/">
+              gump svn repository</link> is open to all ASF committers.
               Simply check it out and commit your changes.  It is highly
               recommended that you build the "gen" target first of the
               provided build.xml in order to verify that your changes
@@ -101,7 +101,7 @@
               general@gump.apache.org</link>.  Being Apache related
               (i.e, used by or a consumer of other Apache projects) helps,
               but is not required.  What is important is that your code be
-              publicly accessible via cvs and that it be buildable in an
+              publicly accessible via a supported SCM and that it be buildable in an
               OS independent manner.</p>
     	</section>
     	
@@ -110,9 +110,9 @@
     		<p><strong>Answer: </strong>That's supported too, as long as your project supports
               viewcvs or equivalent.  Simply put the URL of the project
               definition in the 
-              <link href="http://cvs.apache.org/viewcvs/gump/profile/gump.xml?rev=HEAD&amp;content-type=text/vnd.viewcvs-markup">
+              <link href="http://svn.apache.org/viewvc/gump/metadata/profile/gump.xml?content-type=text/vnd.viewcvs-markup">
               gump profile</link>.  However, if you are an ASF committer, why
-              not consider leaving it in the gump cvs repository, that
+              not consider leaving it in the gump svn repository, that
               way others can also help out too?
              </p>
     	</section>

Modified: gump/live/src/documentation/content/xdocs/gettingstarted.xml
URL: http://svn.apache.org/viewvc/gump/live/src/documentation/content/xdocs/gettingstarted.xml?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/src/documentation/content/xdocs/gettingstarted.xml (original)
+++ gump/live/src/documentation/content/xdocs/gettingstarted.xml Sat Jun 21 09:32:17 2014
@@ -20,7 +20,7 @@
 
   <header>
     
-    <title>Gump: Getting Started</title>
+    <title>Apache Gump&#x2122;: Getting Started</title>
   <authors>
   	<person name="Adam R. B. Jack" email="ajack@apache.org"/>
   </authors></header>
@@ -28,7 +28,7 @@
 <body>
 
 <!--
-  <section><title>Getting started with Gump</title>     
+  <section><title>Getting started with Apache Gump</title>     
     <p>There are a number of ways to work with Gump, and
     </p>
     <table>
@@ -89,7 +89,7 @@
       notification, so it can be omitted.</p>
       
       <p>It is highly recommended at this point that you review the
-      description of the data definitions used by Gump, starting with
+      description of the data definitions used by Apache Gump, starting with
       the <link href="site:om/overview">overview</link>.</p>
       
       <section><title>Pre-requisites</title>
@@ -111,7 +111,7 @@
 
     <section><title>Getting the source/metadata for Gump</title>
   	  <section><title>Getting the source</title>
-		<p>Gump source code resides in Subversion <fork href="http://cvs.apache.org/viewcvs.cgi/gump/?root=Apache-SVN">here</fork>.</p>
+		<p>Gump source code resides in Subversion <fork href="https://svn.apache.org/repos/asf/gump/trunk/">here</fork>.</p>
       <source>
       svn checkout https://svn.apache.org/repos/asf/gump/trunk/ gump 
       </source>      
@@ -120,16 +120,14 @@
 	  </section>
 	  <section><title>Getting the metadata</title>
 
-		<p>The shared Gump metadata resides in CVS <fork href="http://cvs.apache.org/viewcvs.cgi/gump/">here</fork>.</p>
+        <p>If you have checked out the code then you already have the
+          metadata in gump/metadata.</p>
+
+		<p>The shared Gump metadata resides in SVN <fork href="https://svn.apache.org/repos/asf/gump/metadata">here</fork>.</p>
 	<source>
-      cd gump
-      export CVSROOT=:pserver:anoncvs@cvs.apache.org:/home/cvspublic
-      cvs login
-      cvs co -d metadata gump
+      svn checkout https://svn.apache.org/repos/asf/gump/trunk/metadata metadata
       </source>
 	  </section>
-      <p>If prompted for the password, enter <strong>anoncvs</strong>.</p>
-	  <p>This checks out the metadata into a sub-directory called metadata, under gump.</p>
     </section>
 
     <section><title>Defining your workspace</title>
@@ -155,7 +153,7 @@
       </p>
 
       <p>A list of some of the packages you might want to install can be found
-      <link href="http://brutus.apache.org/gump/public/packages.html">
+      <link href="http://vmgump.apache.org/gump/public/packages.html">
       here</link>.</p>
 
       <p><strong>JDK 1.4</strong> includes both <code>jaxp</code> and <code>jsse</code>

Modified: gump/live/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/gump/live/src/documentation/content/xdocs/index.xml?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/src/documentation/content/xdocs/index.xml (original)
+++ gump/live/src/documentation/content/xdocs/index.xml Sat Jun 21 09:32:17 2014
@@ -20,7 +20,7 @@
 
   <header>
     
-    <title>Apache Gump</title>
+    <title>Apache Gump&#x2122;</title>
 
   	<authors>
   		<person name="Sam Ruby" email="rubys AT us.ibm DOT com"/>
@@ -30,11 +30,13 @@
   </header>
 <body>
 
-  <section><title>What is Gump?</title>
+  <section><title>What is Apache Gump&#x2122;?</title>
 
   <p>
-Gump is Apache's continuous integration tool. It is written in python and fully supports Apache Ant, 
-Apache Maven and other build tools. Gump is unique in that it builds and compiles software against 
+The Apache Gump continuous integration tool was the first one
+developed at
+the <fork href="http://www.apache.org/">Apache Software Foundation</fork>. It is written in Python and fully supports Apache Ant, 
+Apache Maven (1.x to 3.x) and other build tools. Gump is unique in that it builds and compiles software against 
 the latest development versions of those projects. This allows gump to detect potentially 
 incompatible changes to that software just a few hours after those changes are checked into the 
 version control system. Notifications are sent to the project team as soon as such a change is 
@@ -43,9 +45,8 @@ detected, referencing more detailed repo
 
   <p>
 You can set up and run Gump on your own machine and run it on your own projects, however it is 
-currently most famous for building most of Apache's java-based projects and their dependencies (which 
-constitutes several million lines of code split up into hundreds of projects). For this purpose, the 
-gump project maintains its own dedicated server.
+currently most famous for building many of Apache's projects and their dependencies. For this purpose, the 
+Gump project maintains its own dedicated server.
   </p>
 
   </section>
@@ -53,10 +54,9 @@ gump project maintains its own dedicated
   <section><title>How does Gump work?</title>
 
     <p>
-      With Traditional Gump, <link href="http://cvs.apache.org/viewcvs/gump/project">
-      project</link> definitions are converted from XML to scripts native to the
-      platform on which you are running.  With Python Gump the XML is mapped into in memory
-      objects for processing. Scripts execute cvs or svn update
+      With Gump, <link href="http://svn.apache.org/viewcvs/gump/project">
+      project</link> definitions are mapped from XML into in memory
+      objects for processing. Scripts execute SCM update
       commands for every module which contains a project being built, and
       invoke builds for each project in an order that ensures that dependencies
       are satisfied. Build outputs are processed and, if successful, dependent projects
@@ -64,17 +64,51 @@ gump project maintains its own dedicated
     </p>
 
     <p>
-      The commands use the actual build.xml files from the projects, but do
-      not use the scripts or jar files checked into CVS/SVN.  Instead, the
-      CLASSPATH is set and properties are passed on the command line.
+      The commands use the actual build.xml/Makefile/pom.xml files
+      from the projects, but in general do
+      not use the scripts or jar files checked into CVS/SVN.  Instead,
+      Gump tries to play several tricks in order to ensure that Gump's
+      versions of files are used.
     </p>
     
-    <note>
+    <p>
+      In order to really build against the latest versions of
+      everything, Gump will need support from the build process, the
+      build tool or has to find its way around the build tool.
+    </p>
+
+    <p>
+      The <fork
+      href="http://vmgump.apache.org/gump/public/apache-httpd/apache-httpd-buildconf/index.html">Apache HTTPd
+        builds</fork> are an example for a build process that supports
+      Gump.  HTTPd needs APR and Gump can provide the path to the
+      freshly built APR files as command line options to the buildconf
+      and/or configure scripts.
+    </p>
+
+    <p>
+      In Ant's case
     	Gump set's Ant's <link href="http://ant.apache.org/manual/sysclasspath.html">build.sysclasspath</link> to <strong>only</strong> and manages the system classpath:<br/>
     	To quote Ant:<br/>
     	<em>Only the system classpath is used and classpaths specified in build files, etc are ignored. 
-    		This situation could be considered as the person running the build file knows more about the environment than the person writing the build file</em>
-    </note>
+                This situation could be considered as the person running the build file knows more about the environment than the person writing the build file</em>.<br/>
+      Note that Gump uses the svn trunk version of Ant when building Ant projects.
+    </p>
+
+    <p>
+      For Maven 1.x builds, Gump runs maven with the --offline switch
+      and uses jar overrides.  Sometimes the artifact ids expected by
+      maven and Gump's names of the jars don't match, in which case
+      &lt;property&gt; elements have to be used to get the correct
+      artifact ids.
+    </p>
+
+    <p>
+      So far Gump's support for Maven 2.x and later uses the most complex
+      approach, for the full story see <link
+      href="metadata/builder.html#mvn2">the section on the mvn2
+      builder</link>.
+    </p>
 
     <p>
       The net effect is that every project is built every day with the latest
@@ -90,29 +124,27 @@ gump project maintains its own dedicated
     </p>
 
     <p>
-      A Perl script which is driven off of a naglist will optionally send
-      e-mails to various newsgroups upon matching strings being found in the
-      build output.  This is typically used to alert developers of build
-      failures.
+      The "official" Gump run on vmgump will optionally send
+      e-mails to various newsgroups upon build failures.
     </p>
   </section>
 
   <section><title>Where is Gump?</title>
     <ul>
-      <li><link href="http://cvs.apache.org/viewcvs/gump/">Source</link></li>
+      <li><link href="https://svn.apache.org/repos/asf/gump/">Source</link></li>
     </ul>
   </section>
 
   <section><title>When does Gump run?</title>
 
-    <p>
+    <!--p>
       Gump runs continually in various locations, primarily on Apache hardware, see below.	  
     </p>
 
 	<note>
-	Gump operates best in when distributed (over various servers). Please contact us if you are willing to
+        Gump operates best when distributed (over various servers). Please contact us if you are willing to
 	contribute resources to this project.
-	</note>
+        </note-->
 	
     <table>
       <tr>
@@ -121,15 +153,22 @@ gump project maintains its own dedicated
         <th>Comments</th>
       </tr>
       <tr>
-        <td><fork href="http://brutus.apache.org/gump/public/">Apache (Brutus)</fork> </td>
-        <td>1.4.2_04</td>
-        <td>Python Gump</td>
+        <td><fork href="http://vmgump.apache.org/gump/public/">Apache
+            (vmgump - Ubuntu Linux 10.04)</fork> </td>
+        <td>OpenJDK 6</td>
+        <td>up to 4 times daily</td>
       </tr>
-      <tr>
-        <td><fork href="http://brutus.apache.org/gump/jdk15/">Apache (Brutus) JDK15</fork> </td>
-        <td>1.5.0-beta2</td>
-        <td>Python Gump</td>
+      <!--tr>
+        <td><fork href="http://gump.zones.apache.org/gump/public/">Apache (FreeBSD)</fork> </td>
+        <td>1.6</td>
+        <td>up to 4 times daily</td>
       </tr>
+      <tr>
+        <td><fork href="http://adam.apache.org/gump/">Apache
+            (Adam - Mac OS X Server)</fork> </td>
+        <td>Apple's Java 1.6</td>
+        <td>up to 4 times daily</td>
+      </tr-->
     </table>
 
   </section>
@@ -173,5 +212,15 @@ gump project maintains its own dedicated
       <link href="why.html">separate page</link>.
     </p>
   </section>
+
+  <section><title>Trademarks</title>
+    <p>Apache Gump, Gump, Apache, the Apache feather logo, and the
+      Apache Gump project logos are trademarks of The Apache Software
+      Foundation.</p>
+
+      <p>Java is a registered trademarks of Oracle Corporation.  All
+      other product names mentioned herein and throughout the entire
+      web site are trademarks of their respective owners.</p>
+  </section>
 </body>
 </document>

Modified: gump/live/src/documentation/content/xdocs/mail.xml
URL: http://svn.apache.org/viewvc/gump/live/src/documentation/content/xdocs/mail.xml?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/src/documentation/content/xdocs/mail.xml (original)
+++ gump/live/src/documentation/content/xdocs/mail.xml Sat Jun 21 09:32:17 2014
@@ -20,7 +20,7 @@
 
   <header>
     
-    <title>Gump Mailing Lists</title>
+    <title>Apache Gump Mailing Lists</title>
     <authors>
       <person name="Community" email="general AT gump DOT apache DOT org"/>
     </authors>
@@ -32,7 +32,7 @@
       <p>Please read the <link
       href="http://jakarta.apache.org/site/mail.html">guidelines of
       the Jakarta Project</link> before subscribing and posting to the
-      Gump general list as they apply to this list as well.</p>
+      Apache Gump general list as they apply to this list as well.</p>
 
       <p>Like almost all lists of the Apache Software Foundation,
       Gump's list is a subscriber only lists, this means you have to
@@ -46,8 +46,8 @@
           <strong>Medium Traffic</strong>
           <link href="mailto:general-subscribe@gump.apache.org">Subscribe</link>
           <link href="mailto:general-unsubscribe@gump.apache.org">Unsubscribe</link>
-          <link href="http://mail-archives.apache.org/eyebrowse/SummarizeList?listId=227">Archive</link>
-          <link href="http://marc.theaimsgroup.com/?l=gump&amp;r=1&amp;w=2">alternative Archive</link>
+          <link href="http://mail-archives.apache.org/mod_mbox/gump-general/">Archive</link>
+          <link href="http://marc.info/?l=gump&amp;r=1&amp;w=2">alternative Archive</link>
         </p>
 
         <p>This is the list where participating developers, users and

Modified: gump/live/src/documentation/content/xdocs/metadata/builder.xml
URL: http://svn.apache.org/viewvc/gump/live/src/documentation/content/xdocs/metadata/builder.xml?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/src/documentation/content/xdocs/metadata/builder.xml (original)
+++ gump/live/src/documentation/content/xdocs/metadata/builder.xml Sat Jun 21 09:32:17 2014
@@ -20,7 +20,7 @@
 
   <header>
     
-    <title>Gump</title>
+    <title>Apache Gump&#x2122;</title>
   	<authors>
   	<person name="Sam Ruby" email="rubys@us.ibm.com"/>
   	<person name="Adam R. B. Jack" email="ajack@apache.org"/>
@@ -31,7 +31,7 @@
 
   <section><title>More on builders</title>
 
-    <p>Gump supports building projects with a wide variety of tools.
+    <p>Apache Gump supports building projects with a wide variety of tools.
     These tools are described using their own elements, all of them
     support a common set of attributes and nested elements.  The
     common structure is described in the next section, followed by
@@ -88,8 +88,9 @@
         </tr>
         <tr>
           <td>project</td>
-          <td>The name of the referenced project.  Required if the reference
-          attribute is "home", "jar", "jarpath", or "srcdir".</td>
+          <td>The name of the referenced project.  Required if the
+          reference attribute is "home", "jar", "jarpath", "output",
+          "outputpath", or "srcdir".</td>
           <td>No</td>
         </tr>
         <tr>
@@ -97,10 +98,23 @@
           <td>
             One of the following values:<br/>
             <strong>home:</strong> the home directory for the referenced project<br/>
-            <strong>jar:</strong> the simple name (path relative to home) of the jar in a
+            <strong>output:</strong> the simple name (path relative to home) of the output in a
               referenced project.<br/>
-            <strong>jarpath:</strong> the fully qualified path of the jar in a referenced
+
+            <strong>jar:</strong> the simple name (path relative to
+              home) of the jar in a referenced project.  This is
+              similar to outputpath with a outputtype attribute of
+              "jar" but also applies to outputs of type "boot" and
+              "testsjar".<br/>
+
+            <strong>outputpath:</strong> the fully qualified path of the output in a referenced
               project.<br/>
+
+            <strong>jarpath:</strong> the fully qualified path of the
+              jar in a referenced project.  This is similar to
+              outputpath with a outputtype attribute of "jar" but also
+              applies to outputs of type "boot" and "testsjar".<br/>
+
             <strong>srcdir:</strong> the srcdir for the module containing the project.<br/>
           </td>
           <td>No</td>
@@ -114,8 +128,14 @@
         </tr>
         <tr>
           <td>id</td>
-          <td>Specifies which jar is desired.  Required only for projects which
-          define more than one jar.</td>
+          <td>Specifies which output is desired.  Required only for projects which
+          define more than one output of the same type.</td>
+          <td>No</td>
+        </tr>
+        <tr>
+          <td>outputtype</td>
+          <td>Specifies which type of output is desired.  Required only if the
+          reference attribute is "output" or "outputpath".</td>
           <td>No</td>
         </tr>
       </table>
@@ -127,7 +147,8 @@
       that has become a common enough practice that it makes sense to
       introduce this element.</p>
 
-      <p>Depend is only supported by the Java builders Ant and Maven.</p>
+      <p>Depend is only supported by the Java builders Ant and Maven
+        (any version).</p>
 
       <table>
         <tr>
@@ -163,7 +184,8 @@
 
     <section><title>jvmarg</title>
       <p>Additional command line parameters to pass to the Java
-      Virtual Machine running Ant or Maven.</p>
+      Virtual Machine running Ant or Maven (any version).  Doesn't
+      have any effect on any of the other builders.</p>
 
       <table>
         <tr>
@@ -183,8 +205,7 @@
     <section><title>sysproperty</title>
       <p>Java system property to be passed to the Java Virtual Machine.</p>
 
-      <p>Sysproperty is only supported by the Java builders Ant and
-      Maven.</p>
+      <p>Sysproperty is only supported by the Ant builder.</p>
 
       <table>
         <tr>
@@ -290,7 +311,7 @@
 
   <section><title>ant</title>
     <p>Specifies the arguments to be passed to <fork
-    href="http://ant.apache.org/">Ant</fork>.</p>
+    href="http://ant.apache.org/">Apache Ant</fork>.</p>
 
     <table>
       <tr>
@@ -314,28 +335,30 @@
     </table>
   </section>
 
-  <section><title>maven</title>
+  <section><title>mvn1</title>
     <p>Specifies the arguments to be passed to <fork
-    href="http://maven.apache.org/">Maven</fork>.</p>
+    href="http://maven.apache.org/">Apache Maven 1.x</fork>.</p>
     
-    <p>The <fork href="http://maven.apache.org/">Maven</fork>
-    component of Gump (&lt;maven&gt;) uses a
+    <p>The <fork href="http://maven.apache.org/">Maven 1.x</fork>
+    component of Gump (&lt;mvn1&gt;) uses a
     <strong>pre-installed</strong> version of <fork
     href="http://maven.apache.org">Maven</fork>, it does
-    <strong>NOT</strong> bootstrap Maven from CVS HEAD, yet. This is
-    hopefully something that will be added in the future.</p>
+    <strong>NOT</strong> bootstrap Maven from svn trunk.</p>
     
     <p>Gump generates a <strong>build.properties</strong> file for
     Maven, in which it specifies the jar <link
     href="http://maven.apache.org/reference/user-guide.html#Overriding_Stated_Dependencies">overrides</link>,
     and also any <link href="project.html#property">properties</link>
-    that are passes into the &lt;maven element.</p>
+    that are passes into the &lt;maven&gt; element.</p>
     
-    <p>Currently Gump does <strong>not</strong> read the Maven
+    <p>Gump does <strong>not</strong> read the Maven
     project.xml (POM) to attempt to determine dependencies, the Gump
     descriptor needs to have them. The 'gump' goal in Maven ought
     generate such a file.</p>
     
+    <p>The element name <strong>maven</strong> can be used as an alias
+      for <strong>mvn1</strong>.</p>
+
     <table>
       <tr>
         <th>Attribute</th>
@@ -351,6 +374,247 @@
     </table>
   </section>
 
+  <section><title>mvn2</title>
+    <p>Specifies the arguments to be passed to <fork
+    href="http://maven.apache.org/">Apache Maven 2.x</fork>.</p>
+    
+    <p>The <fork href="http://maven.apache.org/">Maven 2.x</fork>
+    component of Gump (&lt;mvn2&gt;) uses a
+    <strong>pre-installed</strong> version of <fork
+    href="http://maven.apache.org">Maven 2.x</fork>, it does
+    <strong>NOT</strong> bootstrap Maven from svn trunk.</p>
+    
+    <p>
+      First of all, all mvn built projects use the same local
+      repository for artifacts they've downloaded and this local
+      repository is wiped out after each Gump run.  This can be
+      overriden on a per build basis, see below.
+    </p>
+
+    <p>
+      When Gump starts up, it starts a web application on the build
+      server that acts as a proxy for mvn repository requests.
+      Whenever a project has been built successfully Gump registers
+      the created artifacts with this proxy.  When the proxy is asked
+      for a jar artifact and a jar with matching group and artifact id
+      has been registered, the proxy will completely ignore the
+      specified version and serve the Gump built jar file - and
+      calculate SHA1 as well as MD5 checksums for them on the fly as
+      needed.  Any other request that is unknown to the proxy will be
+      passed on to the central mvn repository, in particular the proxy
+      will never serve POMs itself.
+    </p>  
+
+    <p>
+      Technically it is not necessary to declare the dependencies of a
+      mvn built project since artifacts will be retrieved from the
+      proxy even if Gump doesn't know about the dependency.  This can
+      only work if the dependency has already been built, though, so
+      it is still better to list all dependencies inside the Gump
+      descriptor in order to maintain correct build order.
+    </p>
+
+    <p>
+      Maven 2.x and some of its plugins will also download jars even if
+      the project itself doesn't need them.  It is a good practice to
+      watch the log file of the repository proxy and add the jars that
+      have been obtained from the central repository as explicit
+      dependencies to the projects that have asked for them.
+    </p>
+
+    <p>
+      Sometimes a project simply cannot depend on another project
+      built by Gump since it would cause a dependency cycle.  One such
+      example is BCEL, which is needed by Xalan and thus transitively
+      by a lot of other projects.  BCEL is built using Maven 2.x and
+      uses a plugin that depends on JMock and commons-lang, both of
+      which transitively depend on BCEL.  The way around this is to
+      allow BCEL to obtain those jars from the central repository (by
+      being built first) but make it use a separate local repository
+      so that subsequent requests for JMock and commons-lang by other
+      projects will use Gump's versions instead of the released ones.
+    </p>
+
+    <p>The element name <strong>mvn</strong> can be used as an alias
+      for <strong>mvn2</strong>.</p>
+
+    <table>
+      <tr>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required?</th>
+      </tr>
+      <tr>
+        <td>goal</td>
+        <td>The Maven goal to invoke.  <em>This can be a comma
+        separated list. Spaces are preserved.</em></td>
+        <td>No. Defaults to <strong>package</strong>.</td>
+      </tr>
+      <tr>
+        <td>profile</td>
+        <td>The Maven profile to activate.</td>
+        <td>No. Gump will use the default profile if the attribute has
+        not been set.</td>
+      </tr>
+      <tr>
+        <td>separateLocalRepository</td>
+        <td>Normally all &lt;mvn&gt; builds share the same local
+          repository that will be removed after each complete Gump run.
+          Sometimes a project needs to use a separate local repository
+          from the others, the most common case is that a project needs
+          to be built against a released dependency instead of a Gump
+          built one in order to break a dependency cycle.<br/>
+          The value of this attribute can be a boolean or an
+          identifier.  If you use a boolean it simply en- or
+          disables a local repository separate from the other
+          directories and Gump will choose a directory name (if the
+          value is true).  If several projects are tightly related
+          and should share the same local repository different from
+          the other projects you can use an id instead of a boolean
+          and use the same id for each project.
+        </td>
+        <td>No. Defaults to <strong>false</strong>.</td>
+      </tr>
+    </table>
+  </section>
+
+  <section><title>mvn2install</title>
+    <p>Installs a file into the local Maven 2.x+ repository using the
+      mvn2 install plugin.</p>
+
+    <p>This element is a shortcut for a common use case of the mvn
+      builder which would otherwise involve several nested property
+      elements.  It uses mvn's "install:install-file" goal to install
+      the file given by the file attribute using the groupId of the
+      current project (or workspace) and the given or implied
+      artifactId.</p>
+    
+    <p>If the artifact to install is a POM, Gump can try to parse the
+      file for the version number.  Gump's parser isn't complete and
+      may be unable to extract the proper version - for example, Gump
+      will not support property references - in which case the version
+      must be specified explicitly.</p>
+
+    <p>The element name <strong>mvninstall</strong> can be used as an
+      alias for <strong>mvn2install</strong>.</p>
+
+    <table>
+      <tr>
+        <th>Attribute</th>
+        <th>Description</th>
+        <th>Required?</th>
+      </tr>
+      <tr>
+        <td>version</td>
+        <td>The version of the artifact to install.</td>
+        <td>Yes if <code>packaging</code> is different from "pom" or
+          the version inside the POM uses property references.</td>
+      </tr>
+      <tr>
+        <td>file</td>
+        <td>The file to install (relative to basedir).</td>
+        <td>No. Defaults to "pom.xml".</td>
+      </tr>
+      <tr>
+        <td>packaging</td>
+        <td>The type of artifact to install.</td>
+        <td>No. Defaults to "pom".</td>
+      </tr>
+      <tr>
+        <td>artifactId</td>
+        <td>The id of the artifact to install.</td>
+        <td>No. Defaults to project's name.</td>
+      </tr>
+      <tr>
+        <td>profile</td>
+        <td>The Maven profile to activate.</td>
+        <td>No. Gump will use the default profile if the attribute has
+        not been set.</td>
+      </tr>
+      <tr>
+        <td>separateLocalRepository</td>
+        <td>Normally all &lt;mvn&gt; builds share the same local
+          repository that will be removed after each complete Gump run.
+          Sometimes a project needs to use a separate local repository
+          from the others, the most common case is that a project needs
+          to be built against a released dependency instead of a Gump
+          built one in order to break a dependency cycle.<br/>
+          The value of this attribute can be a boolean or an
+          identifier.  If you use a boolean it simply en- or
+          disables a local repository separate from the other
+          directories and Gump will choose a directory name (if the
+          value is true).  If several projects are tightly related
+          and should share the same local repository different from
+          the other projects you can use an id instead of a boolean
+          and use the same id for each project.
+        </td>
+        <td>No. Defaults to <strong>false</strong>.</td>
+      </tr>
+    </table>
+
+    <source><![CDATA[
+<project name="foo" groupId="bar">
+  <mvn2install version="1.0"/>
+</project>]]></source>
+
+    <p>is completely equivalent to</p>
+
+    <source><![CDATA[
+<project name="foo" groupId="bar">
+  <mvn2 goal="install:install-file">
+    <property name="groupId" value="bar"/>
+    <property name="artifactId" value="foo"/>
+    <property name="packaging" value="pom"/>
+    <property name="file" value="pom.xml"/>
+    <property name="version" value="1.0"/>
+  </mvn2>
+</project>]]></source>
+
+  </section>
+
+  <section><title>mvn3</title>
+    <p>Specifies the arguments to be passed to <fork
+    href="http://maven.apache.org/">Apache Maven 3.x</fork>.</p>
+    
+    <p>The <fork href="http://maven.apache.org/">Maven 3.x</fork>
+    component of Gump (&lt;mvn3&gt;) uses a
+    <strong>pre-installed</strong> version of <fork
+    href="http://maven.apache.org">Maven 3.x</fork>, it does
+    <strong>NOT</strong> bootstrap Maven from svn trunk.</p>
+
+    <p>The mvn3 builder works the same way as
+      the <link href="#mvn2">mvn2</link> builder and supports all the
+      same attributes and nested elements.</p>
+  </section>
+    
+  <section><title>mvn3install</title>
+    <p>Installs a file into the local Maven 2.x+ repository using the
+      mvn3 install plugin.</p>
+
+    <p>This builder is identical to
+      the <link href="#mvn2install">mvn2install</link> builder but uses
+      Maven 3.x rather than 2.x to invoke the install plugin.</p>
+
+    <source><![CDATA[
+<project name="foo" groupId="bar">
+  <mvn3install version="1.0"/>
+</project>]]></source>
+
+    <p>is completely equivalent to</p>
+
+    <source><![CDATA[
+<project name="foo" groupId="bar">
+  <mvn3 goal="install:install-file">
+    <property name="groupId" value="bar"/>
+    <property name="artifactId" value="foo"/>
+    <property name="packaging" value="pom"/>
+    <property name="file" value="pom.xml"/>
+    <property name="version" value="1.0"/>
+  </mvn3>
+</project>]]></source>
+
+  </section>
+
   <section><title>configure</title>
 
     <p>Is a specialized version of <link href="#script">script</link>

Modified: gump/live/src/documentation/content/xdocs/metadata/index.xml
URL: http://svn.apache.org/viewvc/gump/live/src/documentation/content/xdocs/metadata/index.xml?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/src/documentation/content/xdocs/metadata/index.xml (original)
+++ gump/live/src/documentation/content/xdocs/metadata/index.xml Sat Jun 21 09:32:17 2014
@@ -19,12 +19,12 @@
 <document>
 
   <header>    
-    <title>Gump Object Model</title>
+    <title>Apache Gump&#x2122; Object Model</title>
   <authors><person name="Sam Ruby" email="rubys@us.ibm.com"/></authors></header>
 
 <body>
 
-    <p>The data definitions for Gump are organized around the various
+    <p>The data definitions for Apache Gump are organized around the various
     roles a developer may perform.  The overall approach is that elements
     (e.g. project definitions) can be repeated in multiple contexts (e.g.,
     modules, profiles, and workspaces), with definitions in "higher"
@@ -84,10 +84,11 @@
     </section>
 
     <section><title>repository</title>
-      <p>A <link href="repository.html">repository</link> specifies where modules
-      can physically be located.  In the case of cvs (the only option
-      supported at the present time), it contains the information used to
-      form the CVSROOT used on checkout and update commands.</p>
+      <p>A <link href="repository.html">repository</link> specifies
+      where modules can physically be located.  In the case of cvs, it
+      contains the information used to form the CVSROOT used on
+      checkout and update commands, for other supported SCMs it
+      contains URLs or similar information.</p>
     </section>
 
     <section><title>profile</title>

Modified: gump/live/src/documentation/content/xdocs/metadata/module.xml
URL: http://svn.apache.org/viewvc/gump/live/src/documentation/content/xdocs/metadata/module.xml?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/src/documentation/content/xdocs/metadata/module.xml (original)
+++ gump/live/src/documentation/content/xdocs/metadata/module.xml Sat Jun 21 09:32:17 2014
@@ -49,16 +49,20 @@
         <td>Set to "true" to turn on module debugging.</td>
         <td>No</td>
       </tr>
+      <tr>
+        <td>groupId</td>
+        <td>mvn groupId for artifacts built by the projects contained
+        in this module.</td>
+        <td>No, defaults to the module's name</td>
+      </tr>
     </table>
 
-    <warning>Only Python Gump supports &lt;module debug=&quot;true&quot;</warning>
-
     <section><title>url</title>
       <p>This is the homepage for the collection of projects contained in
       this module.  This element is optional, but if present, will be
       referenced in the generated web pages containing build results.</p>
 
-      <p>Note: give the way that Gump uses href to specify definitions which
+      <p>Note: give the way that Apache Gump uses href to specify definitions which
       are to be inlined, the design of this element is rather unfortunate.
       Perhaps it should be replaced with a &lt;home-page&gt; element.</p>
 
@@ -91,10 +95,6 @@
       <p>References the <link href="repository.html">repository</link> in which
       this project resides.  May also contain various overrides.</p>
 
-      <p>Note: as the long term plans is to make Gump handle many different
-      types of repository types, the name of this element should ultimately
-      change</p>
-
       <table>
         <tr>
           <th>Attribute</th>
@@ -141,8 +141,10 @@
 
     <section><title>svn</title>
 
-      <p>References a <link href="http://subversion.tigris.org">Subversion</link> 
-      repository in which this project resides.</p>
+      <p>References the
+      Subversion <link href="repository.html">repository</link> in
+      which this project resides.  May also contain various
+      overrides.</p>
 
       <table>
         <tr>
@@ -151,16 +153,18 @@
           <th>Required?</th>
         </tr>
         <tr>
-          <td>url</td>
-          <td>The url of the repository in which this module resides.</td>
+          <td>repository</td>
+          <td>The name of the repository in which this module resides.</td>
           <td>Yes</td>
         </tr>
+        <tr>
+          <td>dir</td>
+          <td>The subdirectory in which the svn module is present.  Useful
+          for repositories like Apache's which organize related modules
+          into directories.</td>
+          <td>No</td>
+        </tr>
       </table>
-
-      <p>For example:</p>
-          <source>
-  &lt;svn url="http://svn.collab.net/repos/svn/trunk" /&gt;
-</source>    
     </section>
 
     <section><title>p4</title>
@@ -187,6 +191,123 @@
 </source>    
     </section>
 
+    <section><title>git</title>
+
+      <p>References the
+      Git <link href="repository.html">repository</link> in
+      which this project resides.  May also contain various
+      overrides.</p>
+
+      <table>
+        <tr>
+          <th>Attribute</th>
+          <th>Description</th>
+          <th>Required?</th>
+        </tr>
+        <tr>
+          <td>repository</td>
+          <td>The name of the repository in which this module resides.</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>dir</td>
+          <td>The subdirectory in which the git module is present.
+          Useful for repositories which organize related modules into
+          directories.</td>
+          <td>No</td>
+        </tr>
+        <tr>
+          <td>branch</td>
+          <td>Remote git branch to pull from.</td>
+          <td>No, defaults to "master".</td>
+        </tr>
+      </table>
+    </section>
+
+    <section><title>darcs</title>
+
+      <p>References the
+      darcs <link href="repository.html">repository</link> in
+      which this project resides.  May also contain various
+      overrides.</p>
+
+      <table>
+        <tr>
+          <th>Attribute</th>
+          <th>Description</th>
+          <th>Required?</th>
+        </tr>
+        <tr>
+          <td>repository</td>
+          <td>The name of the repository in which this module resides.</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>dir</td>
+          <td>The subdirectory in which the darcs module is present.
+          Useful for repositories which organize related modules into
+          directories.</td>
+          <td>No</td>
+        </tr>
+      </table>
+    </section>
+
+    <section><title>bzr</title>
+
+      <p>References the
+      Bazaar <link href="repository.html">repository</link> in
+      which this project resides.  May also contain various
+      overrides.</p>
+
+      <table>
+        <tr>
+          <th>Attribute</th>
+          <th>Description</th>
+          <th>Required?</th>
+        </tr>
+        <tr>
+          <td>repository</td>
+          <td>The name of the repository in which this module resides.</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>dir</td>
+          <td>The subdirectory in which the bzr module is present.
+          Useful for repositories which organize related modules into
+          directories.</td>
+          <td>No</td>
+        </tr>
+      </table>
+    </section>
+
+    <section><title>hg</title>
+
+      <p>References the
+      Mercurial <link href="repository.html">repository</link> in
+      which this project resides.  May also contain various
+      overrides.</p>
+
+      <table>
+        <tr>
+          <th>Attribute</th>
+          <th>Description</th>
+          <th>Required?</th>
+        </tr>
+        <tr>
+          <td>repository</td>
+          <td>The name of the repository in which this module resides.</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>dir</td>
+          <td>The subdirectory in which the hg module is present.
+          Useful for repositories which organize related modules into
+          directories.</td>
+          <td>No</td>
+        </tr>
+      </table>
+    </section>
+
     <section><title>project</title>
       <p>A definition of a <link href="project.html">project</link> which is
       physically contained in this module.</p>

Modified: gump/live/src/documentation/content/xdocs/metadata/practices.xml
URL: http://svn.apache.org/viewvc/gump/live/src/documentation/content/xdocs/metadata/practices.xml?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/src/documentation/content/xdocs/metadata/practices.xml (original)
+++ gump/live/src/documentation/content/xdocs/metadata/practices.xml Sat Jun 21 09:32:17 2014
@@ -29,7 +29,7 @@
 <body>  	
 	
 	<section><title>Why good practices?</title>
-		<p>There are a number of reasons why an optimal Gump Descriptor ought be
+		<p>There are a number of reasons why an optimal Apache Gump Descriptor ought be
 			a goal. Some are to be nice to Gump, and it's resources. Some are so
 			Gump can be nice to your project. <strong>In short</strong>, don't ask Gump to do more than it needs, and don't put
 			barriers in the way of the frequent Gumping of your project. 

Modified: gump/live/src/documentation/content/xdocs/metadata/project.xml
URL: http://svn.apache.org/viewvc/gump/live/src/documentation/content/xdocs/metadata/project.xml?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/src/documentation/content/xdocs/metadata/project.xml (original)
+++ gump/live/src/documentation/content/xdocs/metadata/project.xml Sat Jun 21 09:32:17 2014
@@ -35,21 +35,16 @@
 
     <ul>
     <li><link href="builder.html">Build instructions</link>:
-    &lt;ant&gt;, &lt;nant&gt;, &lt;maven&gt;, &lt;configure&gt;,
+    &lt;ant&gt;, &lt;nant&gt;, &lt;mvn1&gt;, &lt;mvn2&gt;, &lt;mvn3&gt;, &lt;configure&gt;,
     &lt;make&gt; and &lt;script&gt;.<br/>
           Describes how to produce the outputs from the inputs.</li>
     <li>Inputs: &lt;depend&gt;, &lt;option&gt;, and &lt;work&gt;.  Describes
     where to find the inputs (primarily jar files, but can be directories and
     files).</li>
-    <li>Outputs: &lt;home&gt; and &lt;jar&gt;.  Describes where to locate
+    <li>Outputs: &lt;home&gt;, &lt;license&gt;, &lt;jar&gt;, &lt;pom&gt; and &lt;output&gt;.  Describes where to locate
     the output files.</li>
     </ul>
 
-    <note>Note that &lt;depend&gt; elements nested within &lt;ant&gt;
-    elements are precisely equivalent to specifying both a property to be
-    passed to Ant, as well as a separate depend element. 
-	See <link href="builder.html#depend">here</link>.</note>
-
     <table>
       <tr>
         <th>Attribute</th>
@@ -81,6 +76,11 @@
         <td>Override the Java Virtual Machine version expected to be used.</td>
         <td>No</td>
       </tr>
+      <tr>
+        <td>groupId</td>
+        <td>mvn groupId for artifacts built by this project.</td>
+        <td>No, inherits the value from the containing module.</td>
+      </tr>
     </table>
 
     <warning>vm is not currently implemented</warning>
@@ -288,9 +288,51 @@
       </table>
     </section>
 
+    <section><title>output</title>
+      <p>The name of something a project creates.  This is a generic
+        element and there are specialized elements for jars and POMs
+        for example.</p>
+
+      <p>Each output must have a type attribute and may have an id
+        attribute.  ids must be unique among all outputs of the same
+        type.</p>
+
+      <table>
+        <tr>
+          <th>Attribute</th>
+          <th>Description</th>
+          <th>Required?</th>
+        </tr>
+        <tr>
+          <td>name</td>
+          <td>The file name of the output.<br/>
+            May contain shell glob patterns
+            (<code>*</code>, <code>?</code> or ranges
+            like <code>[a-z]</code>) in which case the pattern must
+            match exactly one existing file.  The path is relative to
+            the project's home-directory if it has been defined.</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>id</td>
+          <td>Provides a unique id which can be used to provide selection
+          between multiple output definitions of the same type.</td>
+          <td>No</td>
+        </tr>
+        <tr>
+          <td>type</td>
+          <td>One of "jar", "pom", "boot" (a jar that should be added
+          to the bootclasspath), "testsjar" or "assembly".</td>
+          <td>Yes</td>
+        </tr>
+      </table>
+    </section>
+
     <section><title>jar</title>
       <p>The name of an output jar, relative to the home directory.</p>
 
+      <p>This is a shortcut for an output element with type="jar".</p>
+
       <table>
         <tr>
           <th>Attribute</th>
@@ -299,7 +341,11 @@
         </tr>
         <tr>
           <td>name</td>
-          <td>The name of the jar</td>
+          <td>The name of the jar.<br/>
+            May contain shell glob patterns
+            (<code>*</code>, <code>?</code> or ranges
+            like <code>[a-z]</code>) in which case the pattern must
+            match exactly one existing file.</td>
           <td>Yes</td>
         </tr>
         <tr>
@@ -314,12 +360,46 @@
           prepended to the bootclasspath instead of being appended to the 
           classpath.  This attribute is ignored unless bootclass="yes"
           is specified on the <link href="workspace.html">workspace</link>.</td>
+          <td>No, defaults to "jar"</td>
+        </tr>
+      </table>
+    </section>
+
+    <section><title>pom</title>
+      <p>The name of an output POM, relative to the home directory.</p>
+
+      <p>This is a shortcut for an output element with type="pom".</p>
+
+      <table>
+        <tr>
+          <th>Attribute</th>
+          <th>Description</th>
+          <th>Required?</th>
+        </tr>
+        <tr>
+          <td>name</td>
+          <td>The name of the POM.<br/>
+            May contain shell glob patterns
+            (<code>*</code>, <code>?</code> or ranges
+            like <code>[a-z]</code>) in which case the pattern must
+            match exactly one existing file.</td>
+          <td>Yes</td>
+        </tr>
+        <tr>
+          <td>id</td>
+          <td>Provides a unique id which can be used to provide selection
+          between multiple poms definitions.</td>
           <td>No</td>
         </tr>
+        <tr>
+          <td>type</td>
+          <td>Same as output's type attribute.</td>
+          <td>No, defaults to "pom".</td>
+        </tr>
       </table>
     </section>
 
-    <section><title>javadoc</title>
+    <!--section><title>javadoc</title>
       <p>This declares where the outputs of the
       <link href="http://java.sun.com/j2se/javadoc/index.html">javadoc</link> tool
       outputs are placed.  This option only has any meaning if the
@@ -427,20 +507,22 @@
 
       <p>must be used.</p>
 
-    </section>
+    </section-->
 
-    <section><title>junitreport</title>
-      <p>This declares where the outputs of the
-      <link href="http://ant.apache.org/manual/OptionalTasks/junitreport.html">junitreport</link>
-      tool outputs are placed.  This option only has any meaning if the
-      <link href="workspace.html#junitreport">&lt;junitreport&gt;</link> element
-      is present in the workspace definition.</p>
+    <section><title>report</title>
+      <p>This declares where any sort of report - for example
+        the outputs of the
+      <link href="http://ant.apache.org/manual/Tasks/junitreport.html">junitreport</link>
+      tool - are placed.</p>
    
-	<warning>
-    <link href="../python/index.html">Python Gump</link> only takes the nested and parent 
-    references as a directory reference, and lists the contents of the files in that
-    directory. It does this irrespective of any entry in the workspace.
-  	</warning>
+      <p>The name <code>junitreport</code> can be used as a synonym
+      for <code>report</code>.</p>
+
+      <p>
+        Apache Gump takes the nested and parent references as a directory
+        reference, and lists the contents of the files in that
+        directory.
+      </p>
   	
       <table>
         <tr>
@@ -462,7 +544,7 @@
           of the workspace.</td>
           <td>No</td>
         </tr>
-        <tr>
+        <!--tr>
           <td>project</td>
           <td>Label to use in the junitreport listing (see below).
           Default is the name of the project.</td>
@@ -474,10 +556,10 @@
           (see below) appear under the named module instead of the
           enclosing module.</td>
           <td>No</td>
-        </tr>
+        </tr-->
       </table>
 
-      <p>&lt;junitreport&gt; supports a nested &lt;description&gt;
+      <!--p>&lt;junitreport&gt; supports a nested &lt;description&gt;
       element, which can be used to set the title in the junitreport
       listing.  If no &lt;description&gt; element has been specified,
       the title defaults to the description of the
@@ -533,7 +615,7 @@
     &lt;/junitreport&gt;
 		</source>
 
-      <p>must be used.</p>
+      <p>must be used.</p-->
 
     </section>
 
@@ -559,31 +641,20 @@
         <tr>
           <td>from</td>
           <td>Sender address for the email report.</td>
-          <td>Yes, unless there is a &quot;from&quot; attribute in
-          each nested regexp element.</td>
+          <td>Yes.</td>
         </tr>
         <tr>
           <td>to</td>
           <td>Recipient of the email report.  Will be overridden by a
           &quot;to&quot; attribute in the 
           <link href="workspace.html#nag">workspace</link>.</td>
-          <td>Yes, unless there is a &quot;to&quot; attribute in each
-          nested regexp element.</td>
+          <td>Yes.</td>
         </tr>
       </table>
       
-	<warning>
-    <link href="../python/index.html">Python Gump</link> does not use regular expressions,
-    it soley relies upon the exit code of the called builder or script.
-  	</warning>
-  	
-      <p>A build failure is detected by matching the output of the
-      build against Perl regular expressions, the default expression
-      is <code>/BUILD FAILED/i</code>.  The regular expressions are
-      specified using nested regexp elements - you can associate
-      different email addresses and subjects with each expression.</p>
+      <p>A build failure is detected by the exit code of the builder.</p>
 
-      <p>The regexp element supports the same attributes as the nag
+      <!--p>The regexp element supports the same attributes as the nag
       element with an additional (required) pattern attribute.  This
       attribute specifies the Perl regular expression to be used when
       looking for a build failure.</p>
@@ -617,7 +688,7 @@
        </p>
       <source>
 &lt;nag&gt;
-  &lt;!-- pattern default is /BUILD FAILED/i --&gt;
+  &lt;!- - pattern default is /BUILD FAILED/i - -&gt;
   &lt;regexp from=&quot;from@example.org&quot; 
           to=&quot;to@example.org&quot; 
           subject=&quot;Build Failure - @name of project element@&quot;/&gt;
@@ -634,7 +705,7 @@
       </p>
       <source>
 &lt;nag&gt;
-  &lt;!-- pattern default is /BUILD FAILED/i --&gt;
+  &lt;!- - pattern default is /BUILD FAILED/i - -&gt;
   &lt;regexp from=&quot;from@example.org&quot; 
           to=&quot;to@example.org&quot; 
           subject=&quot;Build Failure - @name of project element@&quot;/&gt;
@@ -643,7 +714,7 @@
           to=&quot;to@example.org&quot; 
           subject=&quot;Gump Build Warning - Deprecated methods used&quot;/&gt;
 &lt;/nag&gt;
-	</source>
+	</source-->
     </section>
 
     <section><title>redistributable</title>

Modified: gump/live/src/documentation/content/xdocs/metadata/repository.xml
URL: http://svn.apache.org/viewvc/gump/live/src/documentation/content/xdocs/metadata/repository.xml?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/src/documentation/content/xdocs/metadata/repository.xml (original)
+++ gump/live/src/documentation/content/xdocs/metadata/repository.xml Sat Jun 21 09:32:17 2014
@@ -20,7 +20,7 @@
 
   <header>
     
-    <title>Gump</title>
+    <title>Apache Gump&#x2122;</title>
   <authors><person name="Sam Ruby" email="rubys@us.ibm.com"/></authors></header>
 
 <body>
@@ -44,7 +44,10 @@
       <tr>
         <td>type</td>
         <td>Type of repository.</td>
-        <td><strong>cvs</strong>,<strong>svn</strong>,<strong>jars</strong>,<strong>p4</strong> currently supported.</td>
+        <td><strong>cvs</strong>, <strong>svn</strong>, <strong>jars</strong>,
+          <strong>p4</strong>, <strong>git</strong>, <strong>darcs</strong>,
+          <strong>bzr</strong>, <strong>hg</strong> currently
+          supported.</td>
       </tr>
       <tr>
         <td>compress</td>
@@ -190,7 +193,7 @@
         </tr>
         <tr>
           <td>clientspec</td>
-          <td>A Perforce clientspec is a set of mappings from server paths to local paths.  The Perforce server keeps track of what files are "current" in a particular clientspec; as a result, a clientspec cannot be shared across Gump instances.  It is recommended to set the &lt;samp&gt;allwrite&lt;/samp&gt; option in the clientspec.</td>
+          <td>A Perforce clientspec is a set of mappings from server paths to local paths.  The Perforce server keeps track of what files are "current" in a particular clientspec; as a result, a clientspec cannot be shared across Apache Gump instances.  It is recommended to set the &lt;samp&gt;allwrite&lt;/samp&gt; option in the clientspec.</td>
           <td>Yes</td>
         </tr>
         <tr>
@@ -211,6 +214,37 @@
       </table>
     </section>
 	</section>
+	<section>
+	  <title>GIT/darcs/Bazaar/Mercurial Usage</title>
+          <note>This is for type='git', type='darcs', type='bzr' and
+            type='hg'.</note>
+
+	  <p>This specifies all of the elements which are combined to
+            form a command line.  They are split out into separate
+            entities so that each can be individually overridden in a
+            workspace definition.  When an entity is listed as required
+            below, it means that when all of the definitions are combined
+            the entity must have a value - a workspace or profile, for
+            example, only needs to contain the values which it
+            overrides.</p>
+
+          <table>
+            <tr>
+              <th>Entity</th>
+              <th>Description</th>
+              <th>Required?</th>
+            </tr>
+            <tr>
+              <td>url</td>
+              <td>This is the base URL for all modules that reside
+		within this repository.
+		The <link href="module.html">module</link>'s
+		&lt;git|darcs|bzr|hg <strong>dir</strong> attribute is
+		appended to this base url if present.</td>
+              <td>Yes</td>
+            </tr>
+          </table>
+	</section>
 	</section>
 </body>
 </document>

Modified: gump/live/src/documentation/content/xdocs/metadata/workspace.xml
URL: http://svn.apache.org/viewvc/gump/live/src/documentation/content/xdocs/metadata/workspace.xml?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/src/documentation/content/xdocs/metadata/workspace.xml (original)
+++ gump/live/src/documentation/content/xdocs/metadata/workspace.xml Sat Jun 21 09:32:17 2014
@@ -20,7 +20,7 @@
 
   <header>
     
-    <title>Gump</title>
+    <title>Apache Gump&#x2122;</title>
   <authors><person name="Sam Ruby" email="rubys@us.ibm.com"/></authors></header>
 
 <body>
@@ -48,7 +48,7 @@
         <td>name</td>
         <td>Name of this workspace.
         </td>
-        <td>Required by Python Gump</td>
+        <td>Yes</td>
       </tr>
       <tr>
         <td>pkgdir</td>
@@ -84,23 +84,23 @@
       </tr>
       <tr>
         <td>version</td>
-        <td>Which version of the Gump dtd this workspace was defined against.
+        <td>Which version of the Apache Gump dtd this workspace was defined against.
           The current version is "0.4".
         </td>
         <td>Yes</td>
       </tr>
-      <tr>
+      <!--tr>
         <td>sync</td>
         <td>The name of the command, along with any desired parameters, used to
           synchronize the build directory with the cvs directory.  This can make
           a <em>considerable</em> performance advantage over the default action
           which is to recursively remove the directory and copy the entire
           directory tree.  Recommended value for this parameter is
-          <code>"rsync -r -a --delete"</code>. <em>Note:</em> Not used ny Python Gump,
+          <code>"rsync -r -a - -delete"</code>. <em>Note:</em> Not used ny Python Gump,
           which builds this in.
          </td>
         <td>No</td>
-      </tr>
+      </tr-->
       <tr>
         <td>bootclass</td>
         <td>If this value is set to "yes", it will enable placing jars on the
@@ -110,6 +110,39 @@
         </td>
         <td>No</td>
       </tr>
+      <tr>
+        <td>makeCommand</td>
+        <td>The make executable to use.</td>
+        <td>No, defaults to make.</td>
+      </tr>
+      <tr>
+        <td>mvnRepoProxyPort</td>
+        <td>TCP port to bind the mvn repository proxy to.</td>
+        <td>No, defaults to 8192.</td>
+      </tr>
+      <tr>
+        <td>logurl</td>
+        <td>Public URL that makes the contens of <code>logdir</code>
+          available.  This will be used in nag emails.</td>
+        <td>No.  Defaults to ""</td>
+      </tr>
+      <tr>
+        <td>mailserver</td>
+        <td>SMTP server to use when sending nag emails.</td>
+        <td>No.  Defaults to mail.apache.org</td>
+      </tr>
+      <tr>
+        <td>administrator</td>
+        <td>Email address that receives the final report when a Gump
+          run is finished.</td>
+        <td>No.</td>
+      </tr>
+      <tr>
+        <td>email</td>
+        <td>Email address that is the sender of the final report when
+          a Gump run is finished.</td>
+        <td>No.</td>
+      </tr>
     </table>
     <p/>
 
@@ -276,7 +309,7 @@
     </section>
 
 
-    <section><title>javadoc</title>
+    <!--section><title>javadoc</title>
       <p>Enables publishing of a summary page linking all of the javadocs
       produced in the process.  This will be placed in the workspace log
       directory with the name "javadoc.html".</p>
@@ -307,7 +340,7 @@
           <td>No</td>
         </tr>
       </table>
-    </section>
+    </section-->
 
     <section><title>junitreport</title>
       <p>Enables publishing of a summary page linking all of the junit

Modified: gump/live/src/documentation/content/xdocs/python/index.xml
URL: http://svn.apache.org/viewvc/gump/live/src/documentation/content/xdocs/python/index.xml?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/src/documentation/content/xdocs/python/index.xml (original)
+++ gump/live/src/documentation/content/xdocs/python/index.xml Sat Jun 21 09:32:17 2014
@@ -18,7 +18,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
 <document>
  <header>    
-  	<title>Gump</title>
+  	<title>Apache Gump&#x2122;</title>
   	<authors>
   		<person name="Sam Ruby" email="rubys AT us.ibm DOT com"/>
   		<person name="Adam Jack" email="ajack AT sybase DOT com"/>
@@ -26,14 +26,14 @@
  </header>
 
 <body>
-  <section><title>Python Gump</title>
+  <section><title>Apache Python Gump</title>
   <p>
     See the <link href="http://wiki.apache.org/gump/GumpPython">background</link> on why
-    the Python Gump re-write was initiated.
+    the Apache Python Gump re-write was initiated.
   </p>
   
   <note>
-  	Python Gump has matured to the point it is the live run, and will soon replace Traditional 
+  	Python Gump has matured to the point it is the live run and replaced Traditional 
   	all together.
   </note>
   

Modified: gump/live/src/documentation/content/xdocs/python/usage.xml
URL: http://svn.apache.org/viewvc/gump/live/src/documentation/content/xdocs/python/usage.xml?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/src/documentation/content/xdocs/python/usage.xml (original)
+++ gump/live/src/documentation/content/xdocs/python/usage.xml Sat Jun 21 09:32:17 2014
@@ -20,14 +20,14 @@
 
   <header>
     
-    <title>Gump</title>
+    <title>Apache Gump&#x2122;</title>
   <authors><person name="Sam Ruby" email="rubys@us.ibm.com"/></authors></header>
 
 <body>
 
     <section><title>Getting Started</title>
     <note>
-    	Python Gump shares the first few steps with Traditional Gump, 
+    	Apache Python Gump shares the first few steps with Traditional Gump, 
     	so start <link href="site:gettingstarted">here</link>
     </note>
     </section>

Modified: gump/live/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/gump/live/src/documentation/content/xdocs/site.xml?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/src/documentation/content/xdocs/site.xml (original)
+++ gump/live/src/documentation/content/xdocs/site.xml Sat Jun 21 09:32:17 2014
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -20,20 +20,20 @@
 	xmlns="http://apache.org/forrest/linkmap/1.0" 
 	tab="gump">
 
-	<gump label="Gump">
+	<gump label="Apache Gump">
 	    <index href="index.html" label="Home"/>
 	    <status href="status.html" label="Status"/>
-	    <source href="http://cvs.apache.org/viewcvs/gump/?root=Apache-SVN" label="Source"/>
-	    <source href="http://cvs.apache.org/viewcvs/gump/" label="Metadata"/>
+	    <source href="https://svn.apache.org/repos/asf/gump/trunk" label="Source"/>
+	    <source href="https://svn.apache.org/repos/asf/gump/metadata" label="Metadata"/>
 	    <faq href="http://wiki.apache.org/gump/FrequentlyAskedQuestions" label="FAQ"/>
-	    <gettingstarted href="gettingstarted.html" label="Getting Started"/>
-	    <todo href="todo.html" label="Help Wanted"/>
-            <license href="http://www.apache.org/licenses/LICENSE-2.0.txt" label="License"/>
+	    <!--gettingstarted href="gettingstarted.html" label="Getting Started"/-->
+	    <!--todo href="todo.html" label="Help Wanted"/-->
+            <license href="http://www.apache.org/licenses/" label="License"/>
             <nagged href="nagged.html"/>
 	</gump>
 	<results label="Results">
-	    <nightly href="http://brutus.apache.org/gump/public/" label="Nightly"/>
-	    <jars href="http://brutus.apache.org/gump/public-jars/" label="Jars"/>
+	    <nightly href="http://vmgump.apache.org/gump/public/" label="Nightly"/>
+	    <jars href="http://vmgump.apache.org/gump/public-jars/" label="Jars"/>
 	</results>
 	<!--
 	<menu label="Cross Reference">
@@ -50,10 +50,19 @@
 	    <wiki href="http://wiki.apache.org/gump" label="Wiki"/>
 	    <issues href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10457" label="Issues"/>
             <howtocontribute href="http://jakarta.apache.org/site/getinvolved.html" label="Get Involved"/>
+            <security href="http://www.apache.org/security/"
+                      label="Reporting Security Issues"/>
             <whoweare href="whoweare.html" label="Who We Are"/>
             <bylaws href="bylaws.html" label="Project Bylaws"/>
 	</getinvolved>
 
+        <sponsorship label="Sponsorship">
+            <program href="http://www.apache.org/foundation/sponsorship.html"
+              label="Donate"/>
+            <thanks href="http://www.apache.org/foundation/thanks.html"
+              label="Thanks"/>
+        </sponsorship>
+
 	<om label="Object Model" tab="metadata">
 	    <overview href="metadata/index.html" label="Overview"/>
 	    <workspace href="metadata/workspace.html" label="Workspace"/>
@@ -71,13 +80,20 @@
 	</python>
 
   <external-refs>
-    <xml.apache.org href="http://xml.apache.org/">
-      <forrest href="forrest/">
-        <validation href="validation.html"/>
-        <webapp href="your-project.html#webapp"/>
-        <document-v11 href="document-v11.html"/>
+    <forrest href="http://forrest.apache.org/">
+      <linking href="docs/linking.html"/>
+      <validation href="docs/validation.html"/>
+      <webapp href="docs/your-project.html#webapp"/>
+      <cap href="docs/cap.html"/>
+      <dtd-docs href="docs/dtd-docs.html"/>
+      <new_content_type href="docs/your-project.html#adding_new_content_type"/>
+      <buildPlugin href="docs/howto/howto-buildPlugin.html"/>
+      <dev href="howto-dev.html">
+        <debug-validation href="#debug-validation"/>
+      </dev>
       </forrest>
-      <cocoon href="cocoon/"/>
-    </xml.apache.org>
+    <forrest-zone href="http://forrest.zones.apache.org/"/>
+    <cocoon href="http://cocoon.apache.org/"/>
+    <xml.apache.org href="http://xml.apache.org/"/>
   </external-refs>
 </site>

Modified: gump/live/src/documentation/content/xdocs/status.xml
URL: http://svn.apache.org/viewvc/gump/live/src/documentation/content/xdocs/status.xml?rev=1604328&r1=1604327&r2=1604328&view=diff
==============================================================================
--- gump/live/src/documentation/content/xdocs/status.xml (original)
+++ gump/live/src/documentation/content/xdocs/status.xml Sat Jun 21 09:32:17 2014
@@ -20,7 +20,7 @@
 
   <header>
     
-    <title>Gump</title>
+    <title>Apache Gump&#x2122;</title>
   <authors><person name="Sam Ruby" email="rubys@us.ibm.com"/></authors></header>
 
 <body>
@@ -31,37 +31,12 @@
     release, in other cases they may represent an abject failure to
     communicate.</p>
 
-    <section><title>jakarta-taglibs</title>
-      <p>At the moment, the taglibs builds require the presence of xalan1.
-      Xalan1's last release was in August of 2000.  It has been removed
-      from cvs, and even the backwards compatibility support has been removed 
-      from Xalan2.  Xalan1 is not compatible with Xerces2.  While I would
-      recommend letting go of the Xalan1 support, at a minimum, this
-      dependency needs to be made optional during compilation.
-      </p>
-    </section>
   </section>
 
   <section><title>Other Issues</title>
     <p>These represent versioning issues that will not show up in any
-    Gump run, but you may need to be aware.</p>
-
-    <section><title>jakarta-turbine</title>
-      <p>Based on inspection, I don't believe that turbine-2 and turbine-3 can
-      coexist in a classpath.  The jakarta-jetspeed, jakarta-turbine-jyve, and
-      jakarta-turbine-orgami projects depend on turbine-2.  The
-      jakarta-turbine-flux project depends on turbine-3.</p>
-    </section>
+    Apache Gump run, but you may need to be aware.</p>
 
-    <section><title>jakarta-velocity</title>
-      <p>The combination of Texen, Ant 1.4 or later, and placing jars on your
-      classpath can result in unexpected behavior.  This has been isolated
-      to a standalone 
-      <link href="http://marc.theaimsgroup.com/?l=ant-dev&amp;m=100264908721443&amp;w=2">test case</link> 
-      and being investigated by the Ant development team.  Meanwhile, an 
-      undocumented attribute, reverseloader, which when set to the value "true"
-      on taskdefs which defines texen may help.</p>
-    </section>
   </section>
 
   <section><title>Recent success stories</title>



Mime
View raw message