gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject svn commit: rev 55159 - in gump/live: . conf/brutus.apache.org/etc conf/brutus.apache.org/var/www conf/brutus.apache.org/var/www/dynagump conf/brutus.apache.org/var/www/gump conf/brutus.apache.org/var/www/styles cron python python/gump/actor/document/xdocs python/gump/actor/rdf python/gump/core/build python/gump/tool/shared python/gump/util python/storage python/tool
Date Wed, 20 Oct 2004 15:35:53 GMT
Author: ajack
Date: Wed Oct 20 08:35:52 2004
New Revision: 55159

Added:
   gump/live/LOGO
      - copied unchanged from rev 55115, gump/trunk/LOGO
   gump/live/RESOLUTION
      - copied unchanged from rev 55115, gump/trunk/RESOLUTION
   gump/live/conf/brutus.apache.org/etc/
      - copied from rev 55115, gump/trunk/conf/brutus.apache.org/etc/
   gump/live/conf/brutus.apache.org/etc/motd
      - copied unchanged from rev 55115, gump/trunk/conf/brutus.apache.org/etc/motd
   gump/live/conf/brutus.apache.org/var/www/disclaimer.html   (props changed)
      - copied unchanged from rev 55115, gump/trunk/conf/brutus.apache.org/var/www/disclaimer.html
   gump/live/conf/brutus.apache.org/var/www/dynagump/
      - copied from rev 55115, gump/trunk/conf/brutus.apache.org/var/www/dynagump/
   gump/live/conf/brutus.apache.org/var/www/dynagump/Main.py
      - copied unchanged from rev 55115, gump/trunk/conf/brutus.apache.org/var/www/dynagump/Main.py
   gump/live/conf/brutus.apache.org/var/www/dynagump/__init__.py
      - copied unchanged from rev 55115, gump/trunk/conf/brutus.apache.org/var/www/dynagump/__init__.py
   gump/live/conf/brutus.apache.org/var/www/styles/
      - copied from rev 55115, gump/trunk/conf/brutus.apache.org/var/www/styles/
   gump/live/conf/brutus.apache.org/var/www/styles/default.css   (props changed)
      - copied unchanged from rev 55115, gump/trunk/conf/brutus.apache.org/var/www/styles/default.css
Removed:
   gump/live/ARTIFACT_DISCLAIMER.html
   gump/live/STATUS.txt
   gump/live/conf/brutus.apache.org/var/www/gump/
   gump/live/python/storage/
Modified:
   gump/live/conf/brutus.apache.org/var/www/index.html   (contents, props changed)
   gump/live/cron/gump.py
   gump/live/gump.py
   gump/live/python/   (props changed)
   gump/live/python/gump/actor/document/xdocs/documenter.py
   gump/live/python/gump/actor/rdf/describer.py
   gump/live/python/gump/core/build/maven.py
   gump/live/python/gump/tool/shared/comparator.py
   gump/live/python/gump/util/smtp.py
   gump/live/python/tool/commitCheck.py
Log:
Propogate TRUNK to LIVE.


Modified: gump/live/conf/brutus.apache.org/var/www/index.html
==============================================================================
--- gump/live/conf/brutus.apache.org/var/www/index.html	(original)
+++ gump/live/conf/brutus.apache.org/var/www/index.html	Wed Oct 20 08:35:52 2004
@@ -1,24 +1,63 @@
-<html>
-<head>
-<title>Welcome to gump@brutus</title>
-</head>
+<?xml version="1.0" encoding="UTF-8"?>
 
-<body>
-<h1>Welcome to gump@brutus</h1>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+   <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+      <title>Gump @ Brutus</title>
+      <link rel="stylesheet" type="text/css" href="styles/default.css"/>
+      <style>
+        #body h1 {
+            font-size: 140%;
+            color: #333;
+            font-weight: normal;
+            padding: 2px 8px 2px 15px;
+            margin: 25px -30px 25px -30px;
+        }
+        #body p span.first-char { 
+            font-size: 200%;
+        }
+        #body p.important { 
+            margin: 40px 0px 40px 0px; 
+            text-align: center; 
+            font-size: 130%; 
+            font-weight: bold; 
+        }
+      </style>
+   </head>
+   <body>
+<div id="sidebar">
+<div class="logo"><a href="http://gump.apache.org/"
+ title="Apache Gump"><img alt="Apache Gump"
+ src="http://gump.apache.org/images/bench.png"></a></div>
+<h2>Gump Runs</h2>
+<ul class="important">
+  <li><a href="/gump/public/">Public</a></li>
+  <li><a href="/gump/jdk15/">JDK 1.5</a></li>
+  <li><a href="/gump/kaffe/">Kaffe</a></li>
+  <li><a href="/gump/test/">Test</a></li>
+</ul>
+</div>
+      <div id="body">
+        <h1>Apache Gump on Brutus</h1>
+        <p><span class="first-char">W</span>elcome to Brutus, the machine
that the Apache Software Foundation dedicates to Gump.
 
 <p>The following is available:</p>
 
 <ul>
-<li><a href="/gump/public/">Main gump instance</a></li>
-<li><a href="/gump/jdk15/">Experimental run using jdk 1.5</a></li>
-<li><a href="/gump/pydoc/">PyDoc documentation for gump</a></li>
+<li><a href="/gump/public/">Main Gump run</a>[uses Sun's 1.4.x JVM and
Gump code from 'live' branch] (runs at 0:00,3:00,9:00,15:00,21:00 pacific time)</li>
+<li><a href="/gump/jdk15/">Run that uses Sun's JVM 1.5.x</a> (runs at 6:00
pacific time)</li>
+<li><a href="/gump/test/">Run that uses Sun's JVM 1.4.x but gump's code from
trunk</a> (runs at 12:00 pacific time)</li>
+<li><a href="/gump/kaffe/">Run that uses the free Kaffe VM</a> (runs at
18:00 pacific time)</li>
 </ul>
 
-
 <p>Enjoy.</p>
 
-<p>- The Gump Team</p>
-
-<p>PS: if you need actual information about gump, you're looking for <a href="http://gump.apache.org/">gump.apache.org</a>.</p>
-</body>
+        <p class="important"><a href="http://gump.apache.org/" title="Apache Gump">More
information on Apache gump!</a></p>
+      </div>
+      <div id="footer"><a href="http://www.apache.org/" title="the Apache Software
Foundation">
+The Apache Software Foundation</a>
+     </div>
+   </body>
 </html>

Modified: gump/live/cron/gump.py
==============================================================================
Binary files. No diff available.

Modified: gump/live/gump.py
==============================================================================
--- gump/live/gump.py	(original)
+++ gump/live/gump.py	Wed Oct 20 08:35:52 2004
@@ -189,8 +189,8 @@
         sys.stdout.write('-            Apache Gump \n')
         sys.stdout.write('- ************************************\n')
         sys.stdout.write('- GUMP run on host   : ' + hostname + '\n')
-        sys.stdout.write('- GUMP run @         : ' + time.strftime('%d %b %y %H:%M:%S', time.localtime())
+ '\n')
-        sys.stdout.write('- GUMP run @  UTC    : ' + time.strftime('%d %b %y %H:%M:%S', time.gmtime())
+ '\n')
+        sys.stdout.write('- GUMP run @         : ' + time.strftime('%d %b %Y %H:%M:%S', time.localtime())
+ '\n')
+        sys.stdout.write('- GUMP run @  UTC    : ' + time.strftime('%d %b %Y %H:%M:%S', time.gmtime())
+ '\n')
         sys.stdout.write('- GUMP run by Python : ' + `sys.version` + '\n')
         sys.stdout.write('- GUMP run by Python : ' + `sys.executable` + '\n')
         sys.stdout.write('- GUMP run by Gump   : ' + GUMP_VERSION + '\n')

Modified: gump/live/python/gump/actor/document/xdocs/documenter.py
==============================================================================
--- gump/live/python/gump/actor/document/xdocs/documenter.py	(original)
+++ gump/live/python/gump/actor/document/xdocs/documenter.py	Wed Oct 20 08:35:52 2004
@@ -974,15 +974,15 @@
         
         projectsSection=document.createSection('Projects with issues...')
         projectsSection.createParagraph("""These are the project that need 'fixing'.
-This page helps Gumpmeisters (and others) locate the main areas to focus attention. 
-The count of affected indicates relative importance of fixing this project.""")        
-        projectsTable=projectsSection.createTable(['Name','Affected',
-                    'Dependees','Project State','Duration\nin state'])
+This page helps Gumpmeisters (and others) locate the main areas to focus attention.""") 
      
+        projectsTable=projectsSection.createTable(['Name',
+                        'Dependees','Affected',
+                        'Project State','Duration\nin state'])
         pcount=0
         
-        affectedOrder=createOrderedList(sortedProjectList,compareProjectsByAffected)
+        depOrder=createOrderedList(sortedProjectList,compareProjectsByFullDependeeCount)
   
-        for project in affectedOrder:
+        for project in depOrder:
             if not self.gumpSet.inProjectSequence(project): continue       
             
             if not project.getState()==STATE_FAILED:
@@ -1003,10 +1003,9 @@
             projectRow.createComment(project.getName())
                                     
             self.insertLink(project,self.workspace,projectRow.createData())   
-                        
-            projectRow.createData(affected)
-            
+                                    
             projectRow.createData( project.getFullDependeeCount())
+            projectRow.createData(affected)
             
             self.insertStateIcon(project,self.workspace,projectRow.createData())
             

Modified: gump/live/python/gump/actor/rdf/describer.py
==============================================================================
--- gump/live/python/gump/actor/rdf/describer.py	(original)
+++ gump/live/python/gump/actor/rdf/describer.py	Wed Oct 20 08:35:52 2004
@@ -52,7 +52,7 @@
     GUMP_URI = 'http://gump.apache.org/schemas/main/1.0/'
     GUMP_NS = Namespace(GUMP_URI)
         
-    GUMP_ENTITY_URI_BASE = 'http://apache.org/gump'
+    GUMP_ENTITY_URI_BASE = 'http://gump.apache.org/metadata/'
     
     def __init__(self,run,resolver=None):      
         

Modified: gump/live/python/gump/core/build/maven.py
==============================================================================
--- gump/live/python/gump/core/build/maven.py	(original)
+++ gump/live/python/gump/core/build/maven.py	Wed Oct 20 08:35:52 2004
@@ -105,12 +105,12 @@
                 catFileToFileHolder(project, projpFile, FILE_TYPE_CONFIG)               
           
   
     #
-    # Build an ANT command for this project
+    # Build an Maven command for this project
     #        
     def getMavenCommand(self,project,languageHelper):
         maven=project.maven
     
-        # The ant goal (or none == ant default goal)
+        # The maven goal (or none == maven default goal)
         goal=maven.getGoal()
     
         # Optional 'verbose' or 'debug'

Modified: gump/live/python/gump/tool/shared/comparator.py
==============================================================================
--- gump/live/python/gump/tool/shared/comparator.py	(original)
+++ gump/live/python/gump/tool/shared/comparator.py	Wed Oct 20 08:35:52 2004
@@ -112,6 +112,20 @@
     if not c: c=cmp(project1,project2)
     return c       
     
+def compareProjectsByFullDependeeCount(project1,project2):
+    count1=project1.getFullDependeeCount()
+    count2=project2.getFullDependeeCount()
+    c= count2 - count1                  
+    if not c: c=cmp(project1,project2)
+    return c       
+    
+def compareProjectsByFullDependencyCount(project1,project2):
+    count1=project1.getFullDependencyCount()
+    count2=project2.getFullDependencyCount()
+    c= count2 - count1                 
+    if not c: c=cmp(project1,project2)
+    return c        
+        
 def compareProjectsByFOGFactor(project1,project2):
     fog1=project1.getFOGFactor()
     fog2=project2.getFOGFactor()

Modified: gump/live/python/gump/util/smtp.py
==============================================================================
--- gump/live/python/gump/util/smtp.py	(original)
+++ gump/live/python/gump/util/smtp.py	Wed Oct 20 08:35:52 2004
@@ -60,7 +60,7 @@
         """E-mail"""
         # Add the From: and To: headers at the start!
         data = ("Date: %s\r\nFrom: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n%s%s"
-           	% (	time.strftime('%a, %d %b %y %H:%M:%S %Z', time.localtime()),
+           	% (	time.strftime('%a, %d %b %Y %H:%M:%S %Z', time.localtime()),
                         #self.fromaddr.encode(),
                         self.fromaddr, 
            		string.join(self.toaddrs, ", "),

Modified: gump/live/python/tool/commitCheck.py
==============================================================================
--- gump/live/python/tool/commitCheck.py	(original)
+++ gump/live/python/tool/commitCheck.py	Wed Oct 20 08:35:52 2004
@@ -147,7 +147,7 @@
         hostname = socket.gethostname()
 
         log.write('- GUMP run on host   : ' + hostname + '\n')
-        log.write('- GUMP run @         : ' + time.strftime('%d %b %y %H:%M:%S', time.gmtime())
+ '\n')
+        log.write('- GUMP run @         : ' + time.strftime('%d %b %Y %H:%M:%S', time.gmtime())
+ '\n')
         log.write('- GUMP run by Python : ' + `sys.version` + '\n')
         log.write('- GUMP run on OS     : ' + `os.name` + '\n')
         log.write('- GUMP run in env    : \n')

Mime
View raw message