gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject svn commit: rev 54116 - in gump/live: . python/gump/build python/gump/loader python/gump/notify python/gump/process python/gump/utils src/documentation/content/xdocs src/documentation/content/xdocs/metadata
Date Fri, 08 Oct 2004 21:31:50 GMT
Author: ajack
Date: Fri Oct  8 14:31:50 2004
New Revision: 54116

Modified:
   gump/live/ARTIFACT_DISCLAIMER.html
   gump/live/python/gump/build/maven.py
   gump/live/python/gump/loader/loader.py
   gump/live/python/gump/notify/notification.py
   gump/live/python/gump/notify/notifier.py
   gump/live/python/gump/process/command.py
   gump/live/python/gump/utils/sync.py
   gump/live/python/gump/utils/work.py
   gump/live/src/documentation/content/xdocs/gettingstarted.xml
   gump/live/src/documentation/content/xdocs/metadata/maven.xml
   gump/live/src/documentation/content/xdocs/site.xml
Log:
Move some fixes into live prior to a big restructure.


Modified: gump/live/ARTIFACT_DISCLAIMER.html
==============================================================================
--- gump/live/ARTIFACT_DISCLAIMER.html	(original)
+++ gump/live/ARTIFACT_DISCLAIMER.html	Fri Oct  8 14:31:50 2004
@@ -1,6 +1,6 @@
 <H2>Do not use these artifacts other than for <A HREF="http://gump.apache.org">Gumping!</A></H2>

 
-<P>The artifacts in this directory are explicitly <B>NOT</B> supported
by the Apache Sopftware Foundation. These artifacts are not trusted, since they are built
by an untrusted build process. Do <B>NOT</B> use these artifacts for any purposes
other than Gumping.</P>
+<P>The artifacts in this directory are explicitly <B>NOT</B> supported
by the Apache Software Foundation. These artifacts are not trusted, since they are built by
an untrusted build process. Do <B>NOT</B> use these artifacts for any purposes
other than Gumping.</P>
 
 <P>This repository contains arbitrary code downloaded from third party sites and may
include dangerous root kits, <B>use at your own risk</B>.</P>
 	

Modified: gump/live/python/gump/build/maven.py
==============================================================================
--- gump/live/python/gump/build/maven.py	(original)
+++ gump/live/python/gump/build/maven.py	Fri Oct  8 14:31:50 2004
@@ -249,7 +249,7 @@
         (classpath,bootclasspath)=languageHelper.getClasspathObjects(project)
         
         # :TODO: write...
-        for annotatedPath in classpath.getPathParts():
+        for annotatedPath in classpath.getPathParts()+bootclasspath.getPathParts():
             if isinstance(annotatedPath,gump.language.path.AnnotatedPath):
                 props.write(('# Contributor: %s\nmaven.jar.%s=%s\n') % \
                     (	annotatedPath.getContributor(),	

Modified: gump/live/python/gump/loader/loader.py
==============================================================================
--- gump/live/python/gump/loader/loader.py	(original)
+++ gump/live/python/gump/loader/loader.py	Fri Oct  8 14:31:50 2004
@@ -123,6 +123,9 @@
     def getBaseDir(self):
         return self.basedir
         
+    def getDescription(self):
+        return self.tag
+        
 class XmlUrlTask(XmlTask):
     def __init__(self,tag,url,basedir=None):
         XmlTask.__init__(self,url,tag,basedir)
@@ -131,6 +134,9 @@
     def getLocation(self): return self.getUrl()
     def getUrl(self):
         return self.url
+        
+    def getDescription(self):
+        return '%s @ %s' % (self.tag, self.url)
                 
 class XmlFileTask(XmlTask):
     def __init__(self,tag,file,basedir=None):
@@ -141,6 +147,9 @@
     def getFile(self):
         return self.file
         
+    def getDescription(self):
+        return '%s @ %s' % (self.tag, self.file)
+        
 class XmlWorker:   
 
     def __init__(self):
@@ -161,6 +170,9 @@
             
             task.setResult(XmlResult(dom))
         except Exception, details:
+            
+            log.warning('Failed to parse XML %s : %s' % (task.getDescription(),details))
+            
             task.setFailed(str(details))
       
     def postProcess(self,task,dom):        
@@ -188,6 +200,9 @@
                 log.debug("Skip Node: " + `child.nodeType` + ' ' + `child`)             
         
     
 class ModelLoader:
+    """
+    Load some XML, and map that to a model.
+    """
     def __init__(self,cache=False):
         self.annotations=[]
         self.xmlloader=XmlLoader(cache)
@@ -207,6 +222,9 @@
         return self.postProcess(cls)
         
     def postProcess(self,cls):
+        """
+        Convert the XML (DOM) into a class.
+        """
         
         rootObject=None
         
@@ -257,6 +275,9 @@
         # Copy over any XML errors/warnings
         #if isinstance(object,Annotatable):
         #    transferAnnotations(parser, object)
+        
+        if not rootObject:
+            raise RuntimeError, 'Failed to extract %s from XML.' % cls.__name__
         
         return rootObject
         

Modified: gump/live/python/gump/notify/notification.py
==============================================================================
--- gump/live/python/gump/notify/notification.py	(original)
+++ gump/live/python/gump/notify/notification.py	Fri Oct  8 14:31:50 2004
@@ -104,7 +104,7 @@
         
 This is an automated request, but not an unsolicited one. For 
 more information please visit http://gump.apache.org/nagged.html, 
-and/or contact folk at general@gump.apache.org.
+and/or contact the folk at general@gump.apache.org.
 
 """)
     
@@ -126,24 +126,22 @@
                 stream.write('.\nThis issue affects %s projects' % affected)
             
             if duration and duration > 1:
-                stream.write(', and has been outstanding for %s runs' % duration)
+                stream.write(',\n and has been outstanding for %s runs' % duration)
         
         stream.write('.\n')
         
         # Add State (and reason)
-        stream.write(type + ' State : \'' + self.entity.getStateDescription() + '\'')
-    
+        stream.write('The current state of this %s is \'%s\'' % (lower(type), self.entity.getStateDescription()))
  
         if self.entity.hasReason():
-            stream.write(', Reason \'' + self.entity.getReasonDescription() + '\'')
-        
-        stream.write("\n")
+            stream.write(', with reason \'' + self.entity.getReasonDescription() + '\'')
       
+        stream.write('.\n')
         
         # Show those affected
         if affected:
             affectedProjects=self.entity.getAffectedProjects()
             if True or ((duration and duration > 3) and affectedProjects):
                 # Show those negatively affected
-                stream.write('The following are affected:\n')
+                stream.write('For reference only, the following projects are affected by
this:\n')
             
                 for project in affectedProjects:
                     stream.write('    - ' + project.getName())
@@ -158,7 +156,7 @@
                                 
         # Link them back here...
         url=resolver.getUrl(self.entity)
-        stream.write('\nFull details are available at:\n\n    ')
+        stream.write('\nFull details are available at:\n    ')
         stream.write(url)
         stream.write('\n')
         
@@ -171,9 +169,7 @@
                 snippets=1
             
         if snippets:
-            stream.write('\nThat said, some snippets follow:\n')
-            
-        stream.write('\n')
+            stream.write('\nThat said, some information snippets are provided here.\n') 
          
       
         if isinstance(self.entity,Annotatable):
             self.resolveAnnotations(resolver,stream)
@@ -207,10 +203,11 @@
         #
         if self.entity.annotations:
             stream.write("\n")
-            stream.write("The following annotations were provided:")
+            stream.write("The following annotations (debug/informational/warning/error messages)
were provided:")
             stream.write("\n")
             for note in self.entity.annotations:      
                 stream.write(' -%s- %s\n' % (upper(levelName(note.level)), note.text))
+            stream.write("\n")
         
     def resolveWork(self, resolver, stream):
         """
@@ -234,16 +231,15 @@
     def resolveStats(self, resolver, stream):
         """
         Resolve any stats on the entity
-        """
-          
+        """          
         stats=self.entity.getStats()
-        stream.write('\n\n')
+        # :TODO:
+        # stream.write('\n\n')
         
     def resolveSyndication(self, resolver, stream): 
         """
         Resolve syndication links on the entity
         """
-        stream.write('\n')
         stream.write('To subscribe to this information via syndicated feeds:')
         stream.write('\n')
             
@@ -251,28 +247,26 @@
         rssurl=resolver.getUrl(self.entity,'rss','.xml')
         atomurl=resolver.getUrl(self.entity,'atom','.xml')
             
-        stream.write(' RSS: ' + rssurl + '\n')
-        stream.write(' Atom: ' + atomurl + '\n')
+        stream.write('- RSS: ' + rssurl + '\n')
+        stream.write('- Atom: ' + atomurl + '\n')
         
     def resolveFooter(self, resolver, id, stream):        
         """
         Resolve footer (Gump identification information)
         """
-        stream.write('\n\n--\n')
+        stream.write('\n============================== Gump Tracking Only ===\n')
+        stream.write('Produced by Gump version %s.\n' % setting.VERSION)
+        stream.write('Gump Run %s, %s\n' %    \
+                        (   default.datetime_s, self.run.getRunGuid() ))
         if id:
-            stream.write('Gump E-mail Identifier (within run) #%s.\n' % id )
-        stream.write('Produced by Gump %s.\n[Run (%s, %s)]' %	\
-                        (	setting.VERSION, 
-                            default.datetime_s, 
-                            self.run.getRunGuid() ))
-        stream.write('\n')
-
-        topurl=resolver.getUrl(self.run)
-        opturl=resolver.getUrl(self.run,'options')
-        stream.write(topurl)
-        stream.write('\n')
-        stream.write(opturl)
-        stream.write('\n')
+            stream.write('Gump E-mail Identifier (unique within run) #%s.\n' % id )
+         
+        #topurl=resolver.getUrl(self.run)
+        #opturl=resolver.getUrl(self.run,'options')
+        #stream.write(topurl)
+        #stream.write('\n')
+        #stream.write(opturl)
+        #stream.write('\n')
         
 class SuccessNotification(Notification):
     """

Modified: gump/live/python/gump/notify/notifier.py
==============================================================================
--- gump/live/python/gump/notify/notifier.py	(original)
+++ gump/live/python/gump/notify/notifier.py	Fri Oct  8 14:31:50 2004
@@ -290,7 +290,7 @@
                 
         # Form the subject
         subject=self.workspace.prefix+': Project '+ project.getName()	\
-            + ' (in Module ' + module.getName() + ') ' \
+            + ' (in module ' + module.getName() + ') ' \
             + lower(stateDescription(project.getState()))
             
         if notification.isWarning():

Modified: gump/live/python/gump/process/command.py
==============================================================================
--- gump/live/python/gump/process/command.py	(original)
+++ gump/live/python/gump/process/command.py	Fri Oct  8 14:31:50 2004
@@ -214,7 +214,7 @@
             overview += indent+'[Working Directory: ' + self.cwd + ']\n'
         if self.env:
             for envKey in self.env.keys():
-                overview += indent+envKey+' : '+self.env[envKey]
+                overview += indent+envKey+' : '+self.env[envKey]+ '\n'
         return overview
         
     def dump(self,indent=''):

Modified: gump/live/python/gump/utils/sync.py
==============================================================================
--- gump/live/python/gump/utils/sync.py	(original)
+++ gump/live/python/gump/utils/sync.py	Fri Oct  8 14:31:50 2004
@@ -181,9 +181,9 @@
                 dstname = os.path.join(dst, name)
             
             except UnicodeDecodeError, why:
-                message = "Unicode Error. Can't copy [%s] in [%s] to [%s]: [%s]" % (`name`,
`src`, `dst`, str(why))
+                message = 'Unicode Error. Can\'t copy [%s] in [%s] to [%s]: [%s]' % (`name`,
`src`, `dst`, str(why))
                 log.exception(message)
-                raise UnicodeDecodeError, message
+                raise RuntimeError, message
                 
             try:
                 if symlinks and os.path.islink(srcname):

Modified: gump/live/python/gump/utils/work.py
==============================================================================
--- gump/live/python/gump/utils/work.py	(original)
+++ gump/live/python/gump/utils/work.py	Fri Oct  8 14:31:50 2004
@@ -63,7 +63,7 @@
         
     def overview(self):
         overview='Work Name: ' + self.name +' (Type: ' + workTypeName(self.type)+')\n'
-        overview+='State: ' + stateDescription(self.state)+'\n'
+        overview+='Work ended in a state of : ' + stateDescription(self.state)+'\n'
         if self.message:
             overview+=message+'\n'
         return overview

Modified: gump/live/src/documentation/content/xdocs/gettingstarted.xml
==============================================================================
--- gump/live/src/documentation/content/xdocs/gettingstarted.xml	(original)
+++ gump/live/src/documentation/content/xdocs/gettingstarted.xml	Fri Oct  8 14:31:50 2004
@@ -132,9 +132,14 @@
     </section>
 
     <section><title>Defining your workspace</title>
-      <p>Sample workspaces are provided, 'gump' and 'minimal-workspace'.  Find 
-      take one an edit it to fit your environment/needs.  The suggested
+      <p>A sample workspace is provided, in 'workspace.xml', with some relative
+		paths (and a basedir of '.').  
+		Edit this to fit your environment/needs.  The suggested
       name for the file you create is your host name.</p>
+	  
+	  <p>'workspace.xml' comes referencing profile/minimal-profile.xml, a very small
+		profile (containing things up to Ant). Edit the workspace to point to 'profile/gump.xml'
+		for a full Gump.</p>
 
       <p>Again, reference the <link href="site:om/overview">overview</link>
to see
       how you can add projects, define your own profiles, and the modify

Modified: gump/live/src/documentation/content/xdocs/metadata/maven.xml
==============================================================================
--- gump/live/src/documentation/content/xdocs/metadata/maven.xml	(original)
+++ gump/live/src/documentation/content/xdocs/metadata/maven.xml	Fri Oct  8 14:31:50 2004
@@ -46,7 +46,7 @@
     
     <p>
     	 Gump generates a <strong>build.properties</strong> file for Maven, in which
is specifies the jar
-		 overrides, and also any <link href="project.html#property">properties</link>
that are passes into
+		 <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>
     

Modified: gump/live/src/documentation/content/xdocs/site.xml
==============================================================================
--- gump/live/src/documentation/content/xdocs/site.xml	(original)
+++ gump/live/src/documentation/content/xdocs/site.xml	Fri Oct  8 14:31:50 2004
@@ -30,8 +30,8 @@
             <license href="http://www.apache.org/licenses/LICENSE-2.0.txt" label="License"/>
 	</gump>
 	<results label="Results">
-	    <nightly href="http://gump.covalent.net/log/" label="Nightly"/>
-	    <jars href="http://gump.covalent.net/jars/" label="Jars"/>
+	    <nightly href="http://brutus.apache.org/gump/public/" label="Nightly"/>
+	    <jars href="http://brutus.apache.org/gump/public-jars/" label="Jars"/>
 	<!--     <index href="http://nagoya.apache.org/~rubys/gump/javadoc.html" label="Javadoc"/>
-->
 	</results>
 	<!--

Mime
View raw message