zenoss-commit — svn commit list

[Zenoss-commit] r4795 - trunk/Products/ZenWin

[<sv...@ze...>]

Author: ecn
Date: 2007-04-23 09:32:44 -0400 (Mon, 23 Apr 2007)
New Revision: 4795

Modified:
   trunk/Products/ZenWin/zenwin.py
Log:
 * fix really stupid config processing


Modified: trunk/Products/ZenWin/zenwin.py
===================================================================
--- trunk/Products/ZenWin/zenwin.py	2007-04-23 12:47:10 UTC (rev 4794)
+++ trunk/Products/ZenWin/zenwin.py	2007-04-23 13:32:44 UTC (rev 4795)
@@ -117,14 +117,14 @@
 
 
     def updateDevices(self, devices):
-        devices = []
-        for n,u,p,s in devices:
+        config = []
+        for n,u,p,s,_ in devices:
             if self.options.device and self.options.device != n: continue
             st = StatusTest(self, n, u, p, s, self.options.debug)
             st.setPlugins(self.getPlugins())
-            devices.append(st) 
+            config.append(st) 
         if devices:
-            self.devices = devices
+            self.devices = config
     
     def buildOptions(self):
         Base.buildOptions(self)

[Zenoss-commit] r4794 - trunk/Products/ZenWin

[<sv...@ze...>]

Author: ecn
Date: 2007-04-23 08:47:10 -0400 (Mon, 23 Apr 2007)
New Revision: 4794

Modified:
   trunk/Products/ZenWin/WinEventlog.py
   trunk/Products/ZenWin/WinServiceTest.py
   trunk/Products/ZenWin/zenwinmodeler.py
Log:
get rid of dos-style line endings

Modified: trunk/Products/ZenWin/WinEventlog.py
===================================================================
--- trunk/Products/ZenWin/WinEventlog.py	2007-04-23 12:20:25 UTC (rev 4793)
+++ trunk/Products/ZenWin/WinEventlog.py	2007-04-23 12:47:10 UTC (rev 4794)
@@ -10,66 +10,66 @@
 # For complete information please visit: http://www.zenoss.com/oss/
 #
 ###########################################################################
-#
-#
-import socket
-import logging
-log = logging.getLogger("zen.WinEventlog")
-
-class WinEventlog(object):
-
-    name = "WinEventlog"
-    manager = socket.getfqdn()
-    evtAgent = "WinEventlog"
-    evtAlertGroup = "Eventlog"
-    failure = {'eventClass':'/Status/WinEventlog', 'agent': 'zenwin',
-                'severity':4}
-    statmsg = "Windows Service '%s' is %s"
-    
-    eventlogFields = "EventCode,EventType,Message,SourceName,TimeGenerated"
-
-    minSeverity = 2
-
-    
-    def run(self, srec, zem):
-        """Test a single device.
-        """
-        wql = "select LogFileName from Win32_NTEventLogFile"
-        for linfo in srec.query(wql):
-            logname = linfo.LogFileName
-            if logname == "Security": continue # don't monitor for now
-            lastpoll = srec.lastpoll.get(logname, None)
-            if lastpoll is None:
-                lastpoll = srec.instance("Win32_OperatingSystem").LocalDateTime
-                srec.lastpoll[logname] = lastpoll
-                log.info("first time seeing log %s device %s",logname,srec.name)
-                continue
-            wql = ("select %s from Win32_NTLogEvent where LogFile='%s' "
-                  "and TimeGenerated > '%s' and EventType <= %d" % 
-                  (self.eventlogFields, logname, lastpoll, self.minSeverity))
-            log.debug(wql)
-            for i, lrec in enumerate(srec.query(wql)):
-                if i == 0: srec.lastpoll[logname] = lrec.TimeGenerated
-                if not lrec.Message: continue
-                evt = self.mkevt(srec, lrec)
-                zem.sendEvent(evt)
-
-    
-    def mkevt(self, srec, lrec):
-        """Put event in the queue to be sent to the ZenEventManager.
-        """
-        evtkey = "%s_%s" % (lrec.SourceName, lrec.EventCode)
-        sev = 4 - lrec.EventType     #lower severity by one level
-        evt = {}
-        evt['device'] = srec.name
-        evt['eventClassKey'] = evtkey
-        evt['eventGroup'] = lrec.LogFile
-        evt['component'] = lrec.SourceName
-        evt['ntevid'] = lrec.EventCode
-        evt['summary'] = lrec.Message.strip()
-        evt['agent'] = self.evtAgent
-        evt['severity'] = sev
-        evt['eventGroup'] = self.evtAlertGroup
-        evt['manager'] = self.manager
-        log.debug("device:%s msg:'%s'", srec.name, lrec.Message)
-        return evt
+#
+#
+import socket
+import logging
+log = logging.getLogger("zen.WinEventlog")
+
+class WinEventlog(object):
+
+    name = "WinEventlog"
+    manager = socket.getfqdn()
+    evtAgent = "WinEventlog"
+    evtAlertGroup = "Eventlog"
+    failure = {'eventClass':'/Status/WinEventlog', 'agent': 'zenwin',
+                'severity':4}
+    statmsg = "Windows Service '%s' is %s"
+    
+    eventlogFields = "EventCode,EventType,Message,SourceName,TimeGenerated"
+
+    minSeverity = 2
+
+    
+    def run(self, srec, zem):
+        """Test a single device.
+        """
+        wql = "select LogFileName from Win32_NTEventLogFile"
+        for linfo in srec.query(wql):
+            logname = linfo.LogFileName
+            if logname == "Security": continue # don't monitor for now
+            lastpoll = srec.lastpoll.get(logname, None)
+            if lastpoll is None:
+                lastpoll = srec.instance("Win32_OperatingSystem").LocalDateTime
+                srec.lastpoll[logname] = lastpoll
+                log.info("first time seeing log %s device %s",logname,srec.name)
+                continue
+            wql = ("select %s from Win32_NTLogEvent where LogFile='%s' "
+                  "and TimeGenerated > '%s' and EventType <= %d" % 
+                  (self.eventlogFields, logname, lastpoll, self.minSeverity))
+            log.debug(wql)
+            for i, lrec in enumerate(srec.query(wql)):
+                if i == 0: srec.lastpoll[logname] = lrec.TimeGenerated
+                if not lrec.Message: continue
+                evt = self.mkevt(srec, lrec)
+                zem.sendEvent(evt)
+
+    
+    def mkevt(self, srec, lrec):
+        """Put event in the queue to be sent to the ZenEventManager.
+        """
+        evtkey = "%s_%s" % (lrec.SourceName, lrec.EventCode)
+        sev = 4 - lrec.EventType     #lower severity by one level
+        evt = {}
+        evt['device'] = srec.name
+        evt['eventClassKey'] = evtkey
+        evt['eventGroup'] = lrec.LogFile
+        evt['component'] = lrec.SourceName
+        evt['ntevid'] = lrec.EventCode
+        evt['summary'] = lrec.Message.strip()
+        evt['agent'] = self.evtAgent
+        evt['severity'] = sev
+        evt['eventGroup'] = self.evtAlertGroup
+        evt['manager'] = self.manager
+        log.debug("device:%s msg:'%s'", srec.name, lrec.Message)
+        return evt

Modified: trunk/Products/ZenWin/WinServiceTest.py
===================================================================
--- trunk/Products/ZenWin/WinServiceTest.py	2007-04-23 12:20:25 UTC (rev 4793)
+++ trunk/Products/ZenWin/WinServiceTest.py	2007-04-23 12:47:10 UTC (rev 4794)
@@ -10,61 +10,61 @@
 # For complete information please visit: http://www.zenoss.com/oss/
 #
 ###########################################################################
-#
-#
-
-import socket
-import logging
-log = logging.getLogger("zen.WinServiceTest")
-
-class WinServiceTest(object):
-    
-    name = "WinServiceTest"
-    manager = socket.getfqdn()
-    evtClass = "/Status/WinService"
-    evtAgent = "zenwin"
-    evtAlertGroup = "StatusTest"
-    statmsg = "Windows Service '%s' is %s"
-
-
-    def run(self, srec, zem):
-        """Test a single device.
-        """
-        if not srec.svcs: return
-        wql = "select Name from Win32_Service where State='Running'"
-        svcs = [ svc.Name.lower() for svc in srec.query(wql) ]
-        for name, (status, severity) in srec.svcs.items():
-            evt = None
-            log.debug("service: %s status: %d", name, status)
-            if name.lower() not in svcs:
-                srec.svcs[name] = status + 1, severity
-                msg = self.statmsg % (name, "down")
-                evt = self.mkevt(srec.name, name, msg, severity)
-                log.info("svc down %s, %s", srec.name, name)
-            elif status > 0:
-                srec.svcs[name] = 0 , severity
-                msg = self.statmsg % (name, "up")
-                evt = self.mkevt(srec.name, name, msg, 0)
-            if evt: zem.sendEvent(evt)
-
-    
-    def mkevt(self, devname, svcname, msg, sev=5):
-        """Put event in the queue to be sent to the ZenEventManager.
-        """
-        evt = {}
-        evt['device'] = devname
-        evt['eventClass'] = self.evtClass
-        evt['component'] = svcname
-        evt['summary'] = msg
-        evt['eventClass'] = self.evtClass
-        evt['agent'] = self.evtAgent
-        evt['severity'] = sev
-        evt['eventGroup'] = self.evtAlertGroup
-        evt['manager'] = self.manager
-        if sev > 0: log.critical(msg)
-        else: log.info(msg)
-        return evt
-
-
-
-
+#
+#
+
+import socket
+import logging
+log = logging.getLogger("zen.WinServiceTest")
+
+class WinServiceTest(object):
+    
+    name = "WinServiceTest"
+    manager = socket.getfqdn()
+    evtClass = "/Status/WinService"
+    evtAgent = "zenwin"
+    evtAlertGroup = "StatusTest"
+    statmsg = "Windows Service '%s' is %s"
+
+
+    def run(self, srec, zem):
+        """Test a single device.
+        """
+        if not srec.svcs: return
+        wql = "select Name from Win32_Service where State='Running'"
+        svcs = [ svc.Name.lower() for svc in srec.query(wql) ]
+        for name, (status, severity) in srec.svcs.items():
+            evt = None
+            log.debug("service: %s status: %d", name, status)
+            if name.lower() not in svcs:
+                srec.svcs[name] = status + 1, severity
+                msg = self.statmsg % (name, "down")
+                evt = self.mkevt(srec.name, name, msg, severity)
+                log.info("svc down %s, %s", srec.name, name)
+            elif status > 0:
+                srec.svcs[name] = 0 , severity
+                msg = self.statmsg % (name, "up")
+                evt = self.mkevt(srec.name, name, msg, 0)
+            if evt: zem.sendEvent(evt)
+
+    
+    def mkevt(self, devname, svcname, msg, sev=5):
+        """Put event in the queue to be sent to the ZenEventManager.
+        """
+        evt = {}
+        evt['device'] = devname
+        evt['eventClass'] = self.evtClass
+        evt['component'] = svcname
+        evt['summary'] = msg
+        evt['eventClass'] = self.evtClass
+        evt['agent'] = self.evtAgent
+        evt['severity'] = sev
+        evt['eventGroup'] = self.evtAlertGroup
+        evt['manager'] = self.manager
+        if sev > 0: log.critical(msg)
+        else: log.info(msg)
+        return evt
+
+
+
+

Modified: trunk/Products/ZenWin/zenwinmodeler.py
===================================================================
--- trunk/Products/ZenWin/zenwinmodeler.py	2007-04-23 12:20:25 UTC (rev 4793)
+++ trunk/Products/ZenWin/zenwinmodeler.py	2007-04-23 12:47:10 UTC (rev 4794)
@@ -10,115 +10,115 @@
 # For complete information please visit: http://www.zenoss.com/oss/
 #
 ###########################################################################
-#
-#
-
-import os
-import time
-import sys
-import logging
-import wmiclient
-from socket import getfqdn
-import pywintypes
-
-
-import Globals
-from WinCollector import WinCollector as Base
-from Products.ZenEvents.ZenEventClasses import \
-     Heartbeat, Status_WinSrv, Status_Wmi
-from Products.ZenUtils.Utils import prepId
-
-class zenwinmodeler(Base):
-    
-    evtClass = Status_WinSrv
-    agent = "zenwinmodeler"
-    evtAlertGroup = "ServiceTest"
-    deviceConfig = 'getDeviceWinInfo'
-
-    def __init__(self):
-        Base.__init__(self)
-        self.devices = []
-
-    def processLoop(self):
-        """For each device collect service info and send to server.
-        """
-        self.log.error("devices %r", self.devices);
-        for name, user, passwd, sev, url in self.devices:
-            if self.options.device and name != self.options.device:
-                continue
-            try:
-                if name in self.wmiprobs:
-                    self.log.warn("skipping %s has bad wmi state", name)
-                    continue
-                self.log.info("collecting from %s using user %s", name, user)
-                svcs = self.getServices(name, user, passwd)
-                if not svcs: 
-                    self.log.warn("failed collecting from %s", name)
-                    continue
-                svc = self.configService()
-                d = svc.callRemote('applyDataMap', url, svcs,
-                                   'winservices', 'os',
-                                   'Products.ZenModel.WinService')
-                d.addErrback(self.error)
-            except (SystemExit, KeyboardInterrupt): raise
-            except pywintypes.com_error, e:
-                msg = "wmi failed "
-                code, txt, info, param = e
-                wmsg = "%s: %s" % (abs(code), txt)
-                if info:
-                    wcode, source, descr, hfile, hcont, scode = info
-                    scode = abs(scode)
-                    if descr: wmsg = descr.strip()
-                msg += "%d: %s" % (scode, wmsg)
-                self.sendFail(name, msg)
-            except:
-                self.sendFail(name)
-
-   
-    def getServices(self, name, user, passwd):
-        """Collect the service info and build datamap using WMI.
-        """
-        data = []
-        attrs = ("acceptPause","acceptStop","name","caption",
-                 "pathName","serviceType","startMode","startName")
-        dev = wmiclient.WMI(name, user, passwd)
-        dev.connect()
-        wql = "select %s from Win32_Service" % (",".join(attrs))
-        svcs = dev.query(wql)
-        self.log.debug("query='%s'", wql)
-        for svc in svcs:
-            sdata = {'id':prepId(svc.name),
-                     'setServiceClass': {'name':svc.name,
-                                         'description':svc.caption}}
-            for att in attrs:
-                if att in ("name", "caption"): continue
-                sdata[att] = getattr(svc,att,"")
-            data.append(sdata)
-        return data
-        
-        
-    def sendFail(self, name, msg="", evtclass=Status_Wmi, sev=3):
-        evt = { 'eventClass':evtclass, 
-                'agent': self.agent,
-                'component': '',
-                'severity':sev}
-        if not msg:
-            msg = "wmi connection failed %s" % name
-        evt['summary'] = msg
-        evt['device'] = name
-        self.sendEvent(evt)
-        #self.log.warn(msg)
-        self.log.exception(msg)
-        self.failed = True
-
-    def updateDevices(self, devices):
-        self.devices = devices
-
-
-if __name__=='__main__':
-    zw = zenwinmodeler()
-    zw.run()
-
-
-
-    
+#
+#
+
+import os
+import time
+import sys
+import logging
+import wmiclient
+from socket import getfqdn
+import pywintypes
+
+
+import Globals
+from WinCollector import WinCollector as Base
+from Products.ZenEvents.ZenEventClasses import \
+     Heartbeat, Status_WinSrv, Status_Wmi
+from Products.ZenUtils.Utils import prepId
+
+class zenwinmodeler(Base):
+    
+    evtClass = Status_WinSrv
+    agent = "zenwinmodeler"
+    evtAlertGroup = "ServiceTest"
+    deviceConfig = 'getDeviceWinInfo'
+
+    def __init__(self):
+        Base.__init__(self)
+        self.devices = []
+
+    def processLoop(self):
+        """For each device collect service info and send to server.
+        """
+        self.log.error("devices %r", self.devices);
+        for name, user, passwd, sev, url in self.devices:
+            if self.options.device and name != self.options.device:
+                continue
+            try:
+                if name in self.wmiprobs:
+                    self.log.warn("skipping %s has bad wmi state", name)
+                    continue
+                self.log.info("collecting from %s using user %s", name, user)
+                svcs = self.getServices(name, user, passwd)
+                if not svcs: 
+                    self.log.warn("failed collecting from %s", name)
+                    continue
+                svc = self.configService()
+                d = svc.callRemote('applyDataMap', url, svcs,
+                                   'winservices', 'os',
+                                   'Products.ZenModel.WinService')
+                d.addErrback(self.error)
+            except (SystemExit, KeyboardInterrupt): raise
+            except pywintypes.com_error, e:
+                msg = "wmi failed "
+                code, txt, info, param = e
+                wmsg = "%s: %s" % (abs(code), txt)
+                if info:
+                    wcode, source, descr, hfile, hcont, scode = info
+                    scode = abs(scode)
+                    if descr: wmsg = descr.strip()
+                msg += "%d: %s" % (scode, wmsg)
+                self.sendFail(name, msg)
+            except:
+                self.sendFail(name)
+
+   
+    def getServices(self, name, user, passwd):
+        """Collect the service info and build datamap using WMI.
+        """
+        data = []
+        attrs = ("acceptPause","acceptStop","name","caption",
+                 "pathName","serviceType","startMode","startName")
+        dev = wmiclient.WMI(name, user, passwd)
+        dev.connect()
+        wql = "select %s from Win32_Service" % (",".join(attrs))
+        svcs = dev.query(wql)
+        self.log.debug("query='%s'", wql)
+        for svc in svcs:
+            sdata = {'id':prepId(svc.name),
+                     'setServiceClass': {'name':svc.name,
+                                         'description':svc.caption}}
+            for att in attrs:
+                if att in ("name", "caption"): continue
+                sdata[att] = getattr(svc,att,"")
+            data.append(sdata)
+        return data
+        
+        
+    def sendFail(self, name, msg="", evtclass=Status_Wmi, sev=3):
+        evt = { 'eventClass':evtclass, 
+                'agent': self.agent,
+                'component': '',
+                'severity':sev}
+        if not msg:
+            msg = "wmi connection failed %s" % name
+        evt['summary'] = msg
+        evt['device'] = name
+        self.sendEvent(evt)
+        #self.log.warn(msg)
+        self.log.exception(msg)
+        self.failed = True
+
+    def updateDevices(self, devices):
+        self.devices = devices
+
+
+if __name__=='__main__':
+    zw = zenwinmodeler()
+    zw.run()
+
+
+
+    

[Zenoss-commit] r4793 - in trunk/inst: . conf

[<sv...@ze...>]

Author: ecn
Date: 2007-04-23 08:20:25 -0400 (Mon, 23 Apr 2007)
New Revision: 4793

Modified:
   trunk/inst/COPYRIGHT.txt
   trunk/inst/GNUmakefile
   trunk/inst/conf/zenstatus.conf
Log:
fix copywrite issues

Modified: trunk/inst/COPYRIGHT.txt
===================================================================
--- trunk/inst/COPYRIGHT.txt	2007-04-23 12:19:12 UTC (rev 4792)
+++ trunk/inst/COPYRIGHT.txt	2007-04-23 12:20:25 UTC (rev 4793)
@@ -1,6 +1,6 @@
 All files in this directory and below are:
 
-Copyright (c) 2002 Zenoss, Inc. All rights reserved.
+Copyright (c) 2007 Zenoss, Inc. All rights reserved.
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

Modified: trunk/inst/GNUmakefile
===================================================================
--- trunk/inst/GNUmakefile	2007-04-23 12:19:12 UTC (rev 4792)
+++ trunk/inst/GNUmakefile	2007-04-23 12:20:25 UTC (rev 4793)
@@ -101,7 +101,7 @@
 
 
 #
-CONFIG_FILES= 	$(patsubst conf/%,%,$(wildcard conf/*.conf*))
+CONFIG_FILES= 	$(patsubst conf/%,%,$(wildcard conf/*.conf*) conf/hubpasswd)
 INSTALLED_CONFIG= $(patsubst %,$(DESTDIR)$(ZENHOME)/etc/%.example, $(CONFIG_FILES))
 
 # general patterns for unpacking sources
@@ -135,7 +135,6 @@
         fi
 
 
-# don't build winexe-install on a mac
 EVERYTHING = 					\
             zope-install			\
             twistedsnmp-install			\
@@ -150,6 +149,7 @@
             simplejson-install			\
             winexe-install
 
+# don't build winexe-install on a mac
 ifeq ($(DARWIN),1)
     products-install: $(filter-out winexe-install, $(EVERYTHING))
 else

Modified: trunk/inst/conf/zenstatus.conf
===================================================================
--- trunk/inst/conf/zenstatus.conf	2007-04-23 12:19:12 UTC (rev 4792)
+++ trunk/inst/conf/zenstatus.conf	2007-04-23 12:20:25 UTC (rev 4793)
@@ -0,0 +1 @@
+monitor localhost

[Zenoss-commit] r4792 - trunk/Products/OFolder

[<sv...@ze...>]

Author: ecn
Date: 2007-04-23 08:19:12 -0400 (Mon, 23 Apr 2007)
New Revision: 4792

Added:
   trunk/Products/OFolder/LICENSE.txt
Log:
fix copyright issues

Added: trunk/Products/OFolder/LICENSE.txt

[Zenoss-commit] r4791 - branches/zenoss-1.1.x/Products/OFolder

[<sv...@ze...>]

Author: ecn
Date: 2007-04-23 08:18:30 -0400 (Mon, 23 Apr 2007)
New Revision: 4791

Added:
   branches/zenoss-1.1.x/Products/OFolder/LICENSE.txt
Log:
fix copyright issues

Added: branches/zenoss-1.1.x/Products/OFolder/LICENSE.txt

[Zenoss-commit] r4790 - in branches/zenoss-1.1.x/Products: CMFCore GenericSetup

[<sv...@ze...>]

Author: ecn
Date: 2007-04-23 08:15:04 -0400 (Mon, 23 Apr 2007)
New Revision: 4790

Added:
   branches/zenoss-1.1.x/Products/CMFCore/LICENSE.txt
   branches/zenoss-1.1.x/Products/GenericSetup/LICENSE.txt
Log:
finish up copyright issues

Added: branches/zenoss-1.1.x/Products/CMFCore/LICENSE.txt

Added: branches/zenoss-1.1.x/Products/GenericSetup/LICENSE.txt

[Zenoss-commit] r4789 - trunk/Products/ZenModel

[<sv...@ze...>]

Author: marc
Date: 2007-04-20 16:34:42 -0400 (Fri, 20 Apr 2007)
New Revision: 4789

Modified:
   trunk/Products/ZenModel/DeviceClass.py
Log:
#1229
 * zProp tab added

Modified: trunk/Products/ZenModel/DeviceClass.py
===================================================================
--- trunk/Products/ZenModel/DeviceClass.py	2007-04-20 19:11:40 UTC (rev 4788)
+++ trunk/Products/ZenModel/DeviceClass.py	2007-04-20 20:34:42 UTC (rev 4789)
@@ -120,6 +120,11 @@
                 , 'action'        : 'viewEvents'
                 , 'permissions'   : (  permissions.view, )
                 },
+                { 'id'            : 'config'
+                , 'name'          : 'zProperties'
+                , 'action'        : 'zPropertyEdit'
+                , 'permissions'   : (permissions.view,)
+                },
 #                { 'id'            : 'historyEvents'
 #                , 'name'          : 'History'
 #                , 'action'        : 'viewHistoryEvents'

[Zenoss-commit] r4788 - trunk/Products/ZenHub/services

[<sv...@ze...>]

Author: jstevens
Date: 2007-04-20 15:11:40 -0400 (Fri, 20 Apr 2007)
New Revision: 4788

Removed:
   trunk/Products/ZenHub/services/WebConfig.py
Log:
Moved this to the zenpack


Deleted: trunk/Products/ZenHub/services/WebConfig.py

[Zenoss-commit] r4787 - trunk/pynetsnmp

[<sv...@ze...>]

Author: ecn
Date: 2007-04-20 15:02:57 -0400 (Fri, 20 Apr 2007)
New Revision: 4787

Modified:
   trunk/pynetsnmp/twistedsnmp.py
Log:
fail better when exceptions occur decoding OIDs


Modified: trunk/pynetsnmp/twistedsnmp.py
===================================================================
--- trunk/pynetsnmp/twistedsnmp.py	2007-04-20 19:00:56 UTC (rev 4786)
+++ trunk/pynetsnmp/twistedsnmp.py	2007-04-20 19:02:57 UTC (rev 4787)
@@ -170,27 +170,39 @@
 
     def get(self, oids, timeout=None, retryCount=None):
         d = defer.Deferred()
-        self.defers[self.session.get(translateOids(oids))] = d
+        try:
+            self.defers[self.session.get(translateOids(oids))] = d
+        except Exception, ex:
+            return defer.fail(ex)
         updateReactor()
         return d
 
     def walk(self, oid, timeout=None, retryCount=None):
         d = defer.Deferred()
-        self.defers[self.session.walk(translateOid(oid))] = d
+        try:
+            self.defers[self.session.walk(translateOid(oid))] = d
+        except Exception, ex:
+            return defer.fail(ex)
         updateReactor()
         return d
 
     def getbulk(self, nonrepeaters, maxrepititions, oids):
         d = defer.Deferred()
-        self.defers[self.session.getbulk(nonrepeaters,
-                                         maxrepititions,
-                                         translateOids(oids))] = d
+        try:
+            self.defers[self.session.getbulk(nonrepeaters,
+                                             maxrepititions,
+                                             translateOids(oids))] = d
+        except Exception, ex:
+            return defer.fail(ex)
         updateReactor()
         return d
 
     def getTable(self, oids, timeout, retryCount, maxRepetitions):
         from tableretriever import TableRetriever
-        t = TableRetriever(self, oids, timeout, retryCount, maxRepetitions)
+        try:
+            t = TableRetriever(self, oids, timeout, retryCount, maxRepetitions)
+        except Exception, ex:
+            return defer.fail(ex)
         updateReactor()
         return t()
 

[Zenoss-commit] r4786 - trunk/pynetsnmp

[<sv...@ze...>]

Author: ecn
Date: 2007-04-20 15:00:56 -0400 (Fri, 20 Apr 2007)
New Revision: 4786

Modified:
   trunk/pynetsnmp/pkg
Log:
make pkg 0.2


Modified: trunk/pynetsnmp/pkg
===================================================================
--- trunk/pynetsnmp/pkg	2007-04-20 18:04:01 UTC (rev 4785)
+++ trunk/pynetsnmp/pkg	2007-04-20 19:00:56 UTC (rev 4786)
@@ -4,7 +4,7 @@
    exit 1  
 }
 PACKAGE=pynetsnmp
-VERSION=0.1
+VERSION=0.2
 VPACKAGE=$PACKAGE-$VERSION
 SVN=http://dev.zenoss.org/svn
 SVNTRUNK=$SVN/trunk/$PACKAGE

[Zenoss-commit] r4785 - trunk/Products/ZenModel

[<sv...@ze...>]

Author: jstevens
Date: 2007-04-20 14:04:01 -0400 (Fri, 20 Apr 2007)
New Revision: 4785

Modified:
   trunk/Products/ZenModel/Organizer.py
Log:
fixes #1114
 * better handling of invalid addresses when adding networks

Modified: trunk/Products/ZenModel/Organizer.py
===================================================================
--- trunk/Products/ZenModel/Organizer.py	2007-04-20 14:41:01 UTC (rev 4784)
+++ trunk/Products/ZenModel/Organizer.py	2007-04-20 18:04:01 UTC (rev 4785)
@@ -24,7 +24,7 @@
 
 from Products.ZenRelations.RelSchema import *
 from Products.ZenUtils.Utils import travAndColl
-from Products.ZenUtils.Exceptions import ZenPathError
+from Products.ZenUtils.Exceptions import ZenPathError, ZentinelException
 
 from EventView import EventView
 from ZenModelRM import ZenModelRM
@@ -90,11 +90,15 @@
     def manage_addOrganizer(self, newPath, REQUEST=None):
         """add a device group to the database"""
         if not newPath: return self.callZenScreen(REQUEST)
-        if newPath.startswith("/"):
-            self.createOrganizer(newPath)
-        else:
-            org = self.__class__(newPath)
-            self._setObject(org.id, org)
+        try:
+            if newPath.startswith("/"):
+                self.createOrganizer(newPath)
+            else:
+                org = self.__class__(newPath)
+                self._setObject(org.id, org)
+        except ZentinelException, e:
+            if REQUEST:
+                REQUEST['message'] = 'Error: %s' % e
         if REQUEST: return self.callZenScreen(REQUEST)
             
 

[Zenoss-commit] r4784 - trunk/Products/ZenEvents

[<sv...@ze...>]

Author: marc
Date: 2007-04-20 10:41:01 -0400 (Fri, 20 Apr 2007)
New Revision: 4784

Modified:
   trunk/Products/ZenEvents/EventClassInst.py
Log:
#898
 * Clear events severity no longer updated

Modified: trunk/Products/ZenEvents/EventClassInst.py
===================================================================
--- trunk/Products/ZenEvents/EventClassInst.py	2007-04-20 14:36:18 UTC (rev 4783)
+++ trunk/Products/ZenEvents/EventClassInst.py	2007-04-20 14:41:01 UTC (rev 4784)
@@ -54,7 +54,8 @@
         evt._action = getattr(self, "zEventAction", "status")
         sev = getattr(self, "zEventSeverity", -1)
         if sev >= 0:
-            evt.severity = sev
+            if evt.severity > 0:
+                evt.severity = sev
         return evt
 
     def applyTransform(self, evt, device):

[Zenoss-commit] r4783 - trunk/Products/ZenModel/data

[<sv...@ze...>]

Author: jstevens
Date: 2007-04-20 10:36:18 -0400 (Fri, 20 Apr 2007)
New Revision: 4783

Modified:
   trunk/Products/ZenModel/data/devices.xml
Log:
fixes 876
 * added count datasource to OSProcess template
 * added graph for count_count in template also


Modified: trunk/Products/ZenModel/data/devices.xml
===================================================================
--- trunk/Products/ZenModel/data/devices.xml	2007-04-20 14:20:57 UTC (rev 4782)
+++ trunk/Products/ZenModel/data/devices.xml	2007-04-20 14:36:18 UTC (rev 4783)
@@ -240,7 +240,40 @@
 </object>
 </tomanycont>
 </object>
+<object id='count' module='Products.ZenModel.BasicDataSource' class='BasicDataSource'>
+<property select_variable="sourcetypes" type="selection" id="sourcetype" mode="w" >
+SNMP
+</property>
+<property type="boolean" id="enabled" mode="w" >
+True
+</property>
+<property type="boolean" id="usessh" mode="w" >
+False
+</property>
+<property type="int" id="severity" mode="w" >
+3
+</property>
+<property type="int" id="cycletime" mode="w" >
+300
+</property>
+<tomanycont id='datapoints'>
+<object id='count' module='Products.ZenModel.RRDDataPoint' class='RRDDataPoint'>
+<property select_variable="rrdtypes" type="selection" id="rrdtype" mode="w" >
+GAUGE
+</property>
+<property type="boolean" id="isrow" mode="w" >
+True
+</property>
+<property type="long" id="limit" mode="w" >
+-1
+</property>
+<property type="string" id="format" mode="w" >
+%5.2lf%s
+</property>
+</object>
 </tomanycont>
+</object>
+</tomanycont>
 <tomanycont id='graphs'>
 <object id='CPU Utilization' module='Products.ZenModel.RRDGraph' class='RRDGraph'>
 <property type="lines" id="dsnames" mode="w" >
@@ -330,6 +363,47 @@
 True
 </property>
 </object>
+<object id='Process Count' module='Products.ZenModel.RRDGraph' class='RRDGraph'>
+<property type="lines" id="dsnames" mode="w" >
+['count_count']
+</property>
+<property type="int" id="sequence" mode="w" >
+2
+</property>
+<property type="int" id="height" mode="w" >
+100
+</property>
+<property type="int" id="width" mode="w" >
+500
+</property>
+<property type="int" id="linewidth" mode="w" >
+1
+</property>
+<property type="boolean" id="log" mode="w" >
+False
+</property>
+<property type="boolean" id="base" mode="w" >
+False
+</property>
+<property type="boolean" id="stacked" mode="w" >
+False
+</property>
+<property type="boolean" id="summary" mode="w" >
+True
+</property>
+<property type="int" id="miny" mode="w" >
+0
+</property>
+<property type="int" id="maxy" mode="w" >
+-1
+</property>
+<property type="lines" id="colors" mode="w" >
+('#00cc00', '#0000ff', '#00ffff', '#ff0000', '#ffff00', '#cc0000', '#0000cc', '#0080c0', '#8080c0', '#ff0080', '#800080', '#0000a0', '#408080', '#808000', '#000000', '#00ff00', '#fb31fb', '#0080ff', '#ff8000', '#800000')
+</property>
+<property type="boolean" id="hasSummary" mode="w" >
+True
+</property>
+</object>
 </tomanycont>
 </object>
 <object id='WinService' module='Products.ZenModel.RRDTemplate' class='RRDTemplate'>

[Zenoss-commit] r4782 - trunk/Products/ZenHub/services

[<sv...@ze...>]

Author: jstevens
Date: 2007-04-20 10:20:57 -0400 (Fri, 20 Apr 2007)
New Revision: 4782

Modified:
   trunk/Products/ZenHub/services/WebConfig.py
Log:
fixed a bug in a logging call


Modified: trunk/Products/ZenHub/services/WebConfig.py
===================================================================
--- trunk/Products/ZenHub/services/WebConfig.py	2007-04-20 14:05:48 UTC (rev 4781)
+++ trunk/Products/ZenHub/services/WebConfig.py	2007-04-20 14:20:57 UTC (rev 4782)
@@ -40,7 +40,7 @@
         result = []
         log.debug('Getting pagechecks for %s' % dev.id)
         if not dev.monitorDevice():
-            log.warn('Not monitoring %s' % dev.id)
+            log.warning('Not monitoring %s' % dev.id)
             return result
         for templ in dev.getRRDTemplates():
             dataSources = templ.getRRDDataSources('PAGECHECK')

[Zenoss-commit] r4781 - in trunk/Products/ZenModel: . migrate skins/zenmodel

[<sv...@ze...>]

Author: marc
Date: 2007-04-20 10:05:48 -0400 (Fri, 20 Apr 2007)
New Revision: 4781

Added:
   trunk/Products/ZenModel/skins/zenmodel/dialog_addTemplate.pt
   trunk/Products/ZenModel/skins/zenmodel/dialog_copyTemplates.pt
   trunk/Products/ZenModel/skins/zenmodel/dialog_deleteTemplates.pt
   trunk/Products/ZenModel/skins/zenmodel/dialog_exportTemplates.pt
   trunk/Products/ZenModel/skins/zenmodel/dialog_pasteTemplates.pt
Modified:
   trunk/Products/ZenModel/DeviceClass.py
   trunk/Products/ZenModel/migrate/menus.py
   trunk/Products/ZenModel/skins/zenmodel/perfConfig.pt
   trunk/Products/ZenModel/skins/zenmodel/performanceTemplates.pt
Log:
#1235
 * Added dialogs/methods for
  * Add
  * Delete
  * Copy
  * Paste Into
  * Export
 * Removed buttons on perfConf and performanceTemplates


Modified: trunk/Products/ZenModel/DeviceClass.py
===================================================================
--- trunk/Products/ZenModel/DeviceClass.py	2007-04-20 13:49:53 UTC (rev 4780)
+++ trunk/Products/ZenModel/DeviceClass.py	2007-04-20 14:05:48 UTC (rev 4781)
@@ -461,14 +461,21 @@
         return cp
 
 
-    def manage_pasteRRDTemplates(self, cb_copy_data=None, REQUEST=None):
+    def manage_pasteRRDTemplates(self, moveTarget=None, cb_copy_data=None, REQUEST=None):
         """Paste RRDTemplates that have been copied before.
         """
         cp = None
         if cb_copy_data: cp = cb_copy_data
         elif REQUEST:
             cp = REQUEST.get("__cp",None)
-        if cp: self.rrdTemplates.manage_pasteObjects(cp)
+        
+        if cp:
+            if moveTarget:
+                target = self.getDmdRoot(self.dmdRootName).getOrganizer(moveTarget)
+                target.rrdTemplates.manage_pasteObjects(cp)
+            else:
+                self.rrdTemplates.manage_pasteObjects(cp)
+            
         if REQUEST:
             REQUEST['RESPONSE'].setCookie('__cp', 'deleted', path='/zport/dmd',
                             expires='Wed, 31-Dec-97 23:59:59 GMT')

Modified: trunk/Products/ZenModel/migrate/menus.py
===================================================================
--- trunk/Products/ZenModel/migrate/menus.py	2007-04-20 13:49:53 UTC (rev 4780)
+++ trunk/Products/ZenModel/migrate/menus.py	2007-04-20 14:05:48 UTC (rev 4781)
@@ -1068,7 +1068,49 @@
                     isdialog=True,
                     permissions=('Change Device',),
                     ),
-                ],             
+                ],      
+            'Templates':[
+                dict(
+                    ordering=20.0, 
+                    id=         'addTemplate',
+                    description='Add Template...',
+                    action=     'dialog_addTemplate',
+                    isdialog=True,
+                    permissions=('Change Device',),
+                    ),
+                dict(
+                    ordering=19.0, 
+                    id=         'deleteTemplates',
+                    description='Delete Templates...',
+                    action=     'dialog_deleteTemplates',
+                    isdialog=True,
+                    permissions=('Change Device',),
+                    ),
+                dict(
+                    ordering=18.0, 
+                    id=         'copyTemplates',
+                    description='Copy Templates...',
+                    action=     'dialog_copyTemplates',
+                    isdialog=True,
+                    permissions=('Change Device',),
+                    ),
+                dict(
+                    ordering=18.0, 
+                    id=         'pasteTemplates',
+                    description='Paste Templates Into...',
+                    action=     'dialog_pasteTemplates',
+                    isdialog=True,
+                    permissions=('Change Device',),
+                    ),
+                dict(
+                    ordering=16.0, 
+                    id=         'exportTemplates',
+                    description='Export Templates...',
+                    action=     'dialog_exportTemplates',
+                    isdialog=True,
+                    permissions=('Change Device',),
+                    ),
+                ],       
             })
         
         dmd.Networks.buildMenus(

Added: trunk/Products/ZenModel/skins/zenmodel/dialog_addTemplate.pt

Added: trunk/Products/ZenModel/skins/zenmodel/dialog_copyTemplates.pt

Added: trunk/Products/ZenModel/skins/zenmodel/dialog_deleteTemplates.pt

Added: trunk/Products/ZenModel/skins/zenmodel/dialog_exportTemplates.pt

Added: trunk/Products/ZenModel/skins/zenmodel/dialog_pasteTemplates.pt

Modified: trunk/Products/ZenModel/skins/zenmodel/perfConfig.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/perfConfig.pt	2007-04-20 13:49:53 UTC (rev 4780)
+++ trunk/Products/ZenModel/skins/zenmodel/perfConfig.pt	2007-04-20 14:05:48 UTC (rev 4781)
@@ -2,14 +2,14 @@
 <tal:block metal:fill-slot="contentPane">
 <form method="post" tal:attributes="action here/absolute_url_path">
 
-
 <tal:block metal:define-macro="rrdtemplatelist"
     tal:define="
         tableName string:rrdtemplatelist;
         objects here/getRRDTemplates;
         showfilterbox python:True;
         batch python:here.ZenTableManager.getBatch(tableName,objects);
-        tabletitle string:Available Performance Templates; ">
+        tabletitle string:Available Performance Templates; 
+        menu_id string:Templates">
 <tal:block metal:use-macro="here/zenuimacros/macros/zentable">
 <tal:block metal:fill-slot="zentablecontents">
 
@@ -49,47 +49,13 @@
         <td tal:content="temp/description"/>
     </tr>
     </tal:block>
+    
     <tr>
         <td colspan="4" class="tableheader">
             <span metal:use-macro="here/zenTableNavigation/macros/navbody"/>
         </td>
     </tr>
-
-    <tr class="tableheader" tal:condition="here/isManager">
-        <td colspan="4">
-        <input class="tableheader" type="text" name="id"/>
-        <input class="tableheader" type="submit" 
-            onkeypress="return submitViaEnter(event,'manage_addRRDTemplate');" 
-            name="manage_addRRDTemplate:method" value=" Add " /> 
-        |
-        <input class="tableheader" type="submit" value="Copy"
-            name="manage_copyRRDTemplates:method"/>
-        <tal:block tal:condition="here/cb_dataValid">
-        |
-        <input class="tableheader" type="submit" value="Paste"
-            name="manage_pasteRRDTemplates:method"/>
-        </tal:block>
-        |
-        <input class="tableheader" type="submit" 
-            name="manage_deleteRRDTemplates:method" value=" Delete " />
-        |
-
-        <input class="tableheader" type="submit"
-                name="SelectButton" value="Select All" 
-                onClick="toggleSelect(this.form);return false"/>
-
-        |
-
-        <input class="tableheader" type="submit" 
-            name="manage_exportRRDTemplates:method" value=" Export " />
-        to 
-        <select class="tableheader" name="dest">
-            <option value="filesystem" selected="True">File System</option>
-            <!-- option value="zenossdotnet">Your Zenoss.net Account</option /-->
-        </select>
-        
-        </td>
-    </tr>
+    
 <!-- END TABLE CONTENTS -->
 
 </tal:block>

Modified: trunk/Products/ZenModel/skins/zenmodel/performanceTemplates.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/performanceTemplates.pt	2007-04-20 13:49:53 UTC (rev 4780)
+++ trunk/Products/ZenModel/skins/zenmodel/performanceTemplates.pt	2007-04-20 14:05:48 UTC (rev 4781)
@@ -8,7 +8,8 @@
         tableName string:rrdtemplatelist;
         objects here/dmd/Devices/getAllRRDTemplates;
         batch python:here.ZenTableManager.getBatch(tableName,objects);
-        tabletitle string:All Performance Templates; ">
+        tabletitle string:All Performance Templates;
+        menu_id string:Templates">
 <tal:block metal:use-macro="here/zenuimacros/macros/zentable">
 <tal:block metal:fill-slot="zentablecontents">
 
@@ -48,47 +49,13 @@
         <td tal:content="temp/description"/>
     </tr>
     </tal:block>
+    
     <tr>
         <td colspan="4" class="tableheader">
             <span metal:use-macro="here/zenTableNavigation/macros/navbody"/>
         </td>
     </tr>
-
-    <tr class="tableheader" tal:condition="here/isManager">
-        <td colspan="4">
-        <input class="tableheader" type="text" name="id"/>
-        <input class="tableheader" type="submit" 
-            onkeypress="return submitViaEnter(event,'manage_addRRDTemplate');" 
-            name="manage_addRRDTemplate:method" value=" Add " /> 
-        |
-        <input class="tableheader" type="submit" value="Copy"
-            name="manage_copyRRDTemplates:method"/>
-        <tal:block tal:condition="here/cb_dataValid">
-        |
-        <input class="tableheader" type="submit" value="Paste"
-            name="manage_pasteRRDTemplates:method"/>
-        </tal:block>
-        |
-        <input class="tableheader" type="submit" 
-            name="manage_deleteRRDTemplates:method" value=" Delete " />
-        |
-
-        <input class="tableheader" type="submit"
-                name="SelectButton" value="Select All" 
-                onClick="toggleSelect(this.form);return false"/>
-
-        |
-
-        <input class="tableheader" type="submit" 
-            name="manage_exportRRDTemplates:method" value=" Export " />
-        to 
-        <select class="tableheader" name="dest">
-            <option value="filesystem" selected="True">File System</option>
-            <!-- option value="zenossdotnet">Your Zenoss.net Account</option /-->
-        </select>
-        
-        </td>
-    </tr>
+    
 <!-- END TABLE CONTENTS -->
 
 </tal:block>

[Zenoss-commit] r4780 - trunk/Products/ZenRRD

[<sv...@ze...>]

Author: ecn
Date: 2007-04-20 09:49:53 -0400 (Fri, 20 Apr 2007)
New Revision: 4780

Modified:
   trunk/Products/ZenRRD/zenperfxmlrpc.py
Log:
remove Three Rings copyright... Erik to get release or remove the file.


Modified: trunk/Products/ZenRRD/zenperfxmlrpc.py
===================================================================
--- trunk/Products/ZenRRD/zenperfxmlrpc.py	2007-04-20 13:48:17 UTC (rev 4779)
+++ trunk/Products/ZenRRD/zenperfxmlrpc.py	2007-04-20 13:49:53 UTC (rev 4780)
@@ -1,3 +1,4 @@
+#! /usr/bin/env python 
 ###########################################################################
 #
 # This program is part of Zenoss Core, an open source monitoring platform.
@@ -10,8 +11,6 @@
 # For complete information please visit: http://www.zenoss.com/oss/
 #
 ###########################################################################
-#! /usr/bin/env python 
-#   Copyright (c) 2006 Three Rings Design, Inc. All rights reserved.
 
 __doc__='''zenperfxmlrpc
 

[Zenoss-commit] r4779 - trunk/bin

[<sv...@ze...>]

Author: ecn
Date: 2007-04-20 09:48:17 -0400 (Fri, 20 Apr 2007)
New Revision: 4779

Modified:
   trunk/bin/fsrecover
   trunk/bin/zenactions
   trunk/bin/zenbackup.py
   trunk/bin/zenbackupcommon.py
   trunk/bin/zenbatchload
   trunk/bin/zenbuild
   trunk/bin/zenchkrels
   trunk/bin/zenchkschema
   trunk/bin/zencommand
   trunk/bin/zenctl
   trunk/bin/zendevicedump
   trunk/bin/zendeviceload
   trunk/bin/zendisc
   trunk/bin/zendmd
   trunk/bin/zendoc
   trunk/bin/zendump
   trunk/bin/zeneventbuild
   trunk/bin/zeneventlog
   trunk/bin/zeneventsdump
   trunk/bin/zenfunctions
   trunk/bin/zenhub
   trunk/bin/zenload
   trunk/bin/zenmail
   trunk/bin/zenmib
   trunk/bin/zenmigrate
   trunk/bin/zenmodeler
   trunk/bin/zenoss
   trunk/bin/zenoss_init_post
   trunk/bin/zenoss_init_pre
   trunk/bin/zenoss_upgrade_post
   trunk/bin/zenoss_upgrade_pre
   trunk/bin/zenpack
   trunk/bin/zenpass
   trunk/bin/zenperfsnmp
   trunk/bin/zenperfxmlrpc
   trunk/bin/zenping
   trunk/bin/zenprocess
   trunk/bin/zenprodrm
   trunk/bin/zenrender
   trunk/bin/zenrestore.py
   trunk/bin/zenschamadoc
   trunk/bin/zenstatus
   trunk/bin/zenstep
   trunk/bin/zensyslog
   trunk/bin/zentrap
   trunk/bin/zenwin
   trunk/bin/zenwinmodeler
   trunk/bin/zproprmlocal
Log:
copyright clarification

Modified: trunk/bin/fsrecover
===================================================================
--- trunk/bin/fsrecover	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/fsrecover	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: trunk/bin/zenactions
===================================================================
--- trunk/bin/zenactions	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenactions	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: trunk/bin/zenbackup.py
===================================================================
--- trunk/bin/zenbackup.py	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenbackup.py	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,28 +1,47 @@
-#! /usr/bin/env python 
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2006 Zenoss, Inc. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+# For complete information please visit: http://www.zenoss.com/oss/
+# This program is part of Zenoss Core, an open source monitoring platform.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+# For complete information please visit: http://www.zenoss.com/oss/
+# This program is part of Zenoss Core, an open source monitoring platform.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+# For complete information please visit: http://www.zenoss.com/oss/
+#! /usr/bin/env python 
 
 __doc__='''zenbackup
 
 Creates backup of zope data files, zenoss conf files and the events database.
 '''
 
-import Globals
-from Products.ZenUtils.CmdBase import CmdBase
+import Globalsfrom Products.ZenUtils.CmdBase import CmdBase
 from Products.ZenUtils.ZCmdBase import ZCmdBase
 import sys
 import os
-import os.path
-import tempfile
+import os.pathimport tempfile
 from datetime import date
 import getpass
 import ConfigParser
 import time
 import commands
-
 from zenbackupcommon import *
 MAX_UNIQUE_NAME_ATTEMPTS = 1000
 

Modified: trunk/bin/zenbackupcommon.py
===================================================================
--- trunk/bin/zenbackupcommon.py	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenbackupcommon.py	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,9 +1,26 @@
-#! /usr/bin/env python 
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2007 Zenoss, Inc. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+# For complete information please visit: http://www.zenoss.com/oss/
+# This program is part of Zenoss Core, an open source monitoring platform.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+# For complete information please visit: http://www.zenoss.com/oss/
+#! /usr/bin/env python 
 
 __doc__='''zenbackupcommon.py
 
@@ -15,7 +32,6 @@
 CONFIG_FILE = 'backup.settings'
 CONFIG_SECTION = 'zenbackup'
 
-CONFIG_FIELDS = (   ('dbname', 'events', 'database'),
-                    ('dbuser', 'root', 'username'),
+CONFIG_FIELDS = (   ('dbname', 'events', 'database'),                    ('dbuser', 'root', 'username'),
                     ('dbpass', '', 'password'))
                 

Modified: trunk/bin/zenbatchload
===================================================================
--- trunk/bin/zenbatchload	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenbatchload	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #!/usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 $PYTHON $ZENHOME/Products/ZenModel/BatchDeviceLoader.py "$CMD" $*

Modified: trunk/bin/zenbuild
===================================================================
--- trunk/bin/zenbuild	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenbuild	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: trunk/bin/zenchkrels
===================================================================
--- trunk/bin/zenchkrels	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenchkrels	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,3 +1,13 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 . $ZENHOME/bin/zenfunctions 
 $PYTHON $ZENHOME/Products/ZenUtils/CheckRelations.py $*

Modified: trunk/bin/zenchkschema
===================================================================
--- trunk/bin/zenchkschema	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenchkschema	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,3 +1,13 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 . $ZENHOME/bin/zenfunctions 
 $PYTHON $ZENHOME/Products/ZenRelations/checkrel.py $*

Modified: trunk/bin/zencommand
===================================================================
--- trunk/bin/zencommand	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zencommand	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: trunk/bin/zenctl
===================================================================
--- trunk/bin/zenctl	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenctl	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 # zenctl        This init.d script starts and stops Zenoss
 #               

Modified: trunk/bin/zendevicedump
===================================================================
--- trunk/bin/zendevicedump	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zendevicedump	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,3 +1,13 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 . $ZENHOME/bin/zenfunctions 
 $PYTHON $ZENHOME/Products/ZenRelations/ExportDevices.py "$CMD" $*

Modified: trunk/bin/zendeviceload
===================================================================
--- trunk/bin/zendeviceload	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zendeviceload	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,3 +1,13 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 . $ZENHOME/bin/zenfunctions 
 $PYTHON $ZENHOME/Products/ZenRelations/ImportDevices.py "$CMD" $*

Modified: trunk/bin/zendisc
===================================================================
--- trunk/bin/zendisc	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zendisc	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: trunk/bin/zendmd
===================================================================
--- trunk/bin/zendmd	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zendmd	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 # For some reason the zenfunctions line eats part of $*.  Store
 # value now to use in call to zendmd.py

Modified: trunk/bin/zendoc
===================================================================
--- trunk/bin/zendoc	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zendoc	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 . $ZENHOME/bin/zenfunctions
 rm -rf $ZENHOME/zendocs/api
 mkdir -p $ZENHOME/zendocs/api

Modified: trunk/bin/zendump
===================================================================
--- trunk/bin/zendump	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zendump	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,3 +1,13 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 . $ZENHOME/bin/zenfunctions 
 $PYTHON $ZENHOME/Products/ZenRelations/ExportRM.py "$CMD" $*

Modified: trunk/bin/zeneventbuild
===================================================================
--- trunk/bin/zeneventbuild	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zeneventbuild	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 if [ "$ZENHOME" = "" ]; then 
     echo ERROR: ZENHOME envrionment variable not set.

Modified: trunk/bin/zeneventlog
===================================================================
--- trunk/bin/zeneventlog	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zeneventlog	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,6 +1,15 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
-WMI_ROOT=/home/ecn/work/zenoss
 . $ZENHOME/bin/zenfunctions
 
 PRGHOME=$ZENHOME/Products/ZenWin

Modified: trunk/bin/zeneventsdump
===================================================================
--- trunk/bin/zeneventsdump	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zeneventsdump	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 # Dump events in the MySQL in memory table status
 # Make sure that MYUSER MYPASS and MYSQLHOME are set properly

Modified: trunk/bin/zenfunctions
===================================================================
--- trunk/bin/zenfunctions	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenfunctions	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,9 +1,13 @@
-
-#################################################################
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#   Copyright (c) 2003 Confmon Corporation. All rights reserved.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
 #
-#################################################################
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 INSTANCE_HOME=$ZENHOME
 export INSTANCE_HOME

Modified: trunk/bin/zenhub
===================================================================
--- trunk/bin/zenhub	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenhub	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: trunk/bin/zenload
===================================================================
--- trunk/bin/zenload	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenload	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,3 +1,13 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 . $ZENHOME/bin/zenfunctions 
 $PYTHON $ZENHOME/Products/ZenRelations/ImportRM.py "$CMD" $*

Modified: trunk/bin/zenmail
===================================================================
--- trunk/bin/zenmail	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenmail	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: trunk/bin/zenmib
===================================================================
--- trunk/bin/zenmib	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenmib	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: trunk/bin/zenmigrate
===================================================================
--- trunk/bin/zenmigrate	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenmigrate	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 # For some reason the zenfunctions line eats part of $*.  Store
 # value now to use in call to zendmd.py

Modified: trunk/bin/zenmodeler
===================================================================
--- trunk/bin/zenmodeler	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenmodeler	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: trunk/bin/zenoss
===================================================================
--- trunk/bin/zenoss	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenoss	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,10 +1,23 @@
 #!/usr/bin/env bash
 #
-# zenmon        This shell script takes care of starting and stopping zenmon.
+# zenoss        This shell script takes care of starting and stopping zenmon.
 #               
 # chkconfig: 2345 80 30
 # description: Zenoss is a monitoring program written by Zenoss, Inc.
+# 
 
+
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
+
 if [ -z "$ZENHOME" ] ; then
   for d in $HOME /home/zenoss ; do 
     for f in .bash_login .bash_profile .profile .bashrc ; do

Modified: trunk/bin/zenoss_init_post
===================================================================
--- trunk/bin/zenoss_init_post	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenoss_init_post	2007-04-20 13:48:17 UTC (rev 4779)
@@ -7,6 +7,17 @@
 # been started for the first time.
 #
 
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
+
 # environment variables
 export OS_USERNAME="**OS_USERNAME**"
 export ZENHOME="**ZENHOME**"

Modified: trunk/bin/zenoss_init_pre
===================================================================
--- trunk/bin/zenoss_init_pre	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenoss_init_pre	2007-04-20 13:48:17 UTC (rev 4779)
@@ -7,6 +7,16 @@
 # been started for the first time.
 #
 
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 # environment variables
 export OS_USERNAME="**OS_USERNAME**"
 export ZENHOME="**ZENHOME**"

Modified: trunk/bin/zenoss_upgrade_post
===================================================================
--- trunk/bin/zenoss_upgrade_post	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenoss_upgrade_post	2007-04-20 13:48:17 UTC (rev 4779)
@@ -7,6 +7,16 @@
 # been started for the first time after an upgrade.
 #
 
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 # environment variables
 export OS_USERNAME="**OS_USERNAME**"
 export ZENHOME="**ZENHOME**"

Modified: trunk/bin/zenoss_upgrade_pre
===================================================================
--- trunk/bin/zenoss_upgrade_pre	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenoss_upgrade_pre	2007-04-20 13:48:17 UTC (rev 4779)
@@ -7,6 +7,16 @@
 # been started for the first time after an upgrade.
 #
 
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 # environment variables
 export OS_USERNAME="**OS_USERNAME**"
 export ZENHOME="**ZENHOME**"

Modified: trunk/bin/zenpack
===================================================================
--- trunk/bin/zenpack	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenpack	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 $PYTHON $ZENHOME/Products/ZenUtils/zenpack.py "$CMD" $*

Modified: trunk/bin/zenpass
===================================================================
--- trunk/bin/zenpass	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenpass	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 cd $ZENHOME
 

Modified: trunk/bin/zenperfsnmp
===================================================================
--- trunk/bin/zenperfsnmp	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenperfsnmp	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: trunk/bin/zenperfxmlrpc
===================================================================
--- trunk/bin/zenperfxmlrpc	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenperfxmlrpc	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: trunk/bin/zenping
===================================================================
--- trunk/bin/zenping	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenping	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: trunk/bin/zenprocess
===================================================================
--- trunk/bin/zenprocess	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenprocess	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: trunk/bin/zenprodrm
===================================================================
--- trunk/bin/zenprodrm	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenprodrm	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,10 +1,14 @@
 #! /usr/bin/env bash
-
-#################################################################
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#   Copyright (c) 2003 Confmon Corporation. All rights reserved.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
 #
-#################################################################
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 read -p "Are you sure you would like to delete Zenoss? (Y/n) " -n 1
 echo ""

Modified: trunk/bin/zenrender
===================================================================
--- trunk/bin/zenrender	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenrender	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: trunk/bin/zenrestore.py
===================================================================
--- trunk/bin/zenrestore.py	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenrestore.py	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,9 +1,26 @@
-#! /usr/bin/env python 
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2007 Zenoss, Inc. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+# For complete information please visit: http://www.zenoss.com/oss/
+# This program is part of Zenoss Core, an open source monitoring platform.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+# For complete information please visit: http://www.zenoss.com/oss/
+#! /usr/bin/env python 
 
 __doc__='''zenrestore
 
@@ -15,15 +32,13 @@
 import sys
 import os
 import os.path
-import tempfile
-import ConfigParser
+import tempfileimport ConfigParser
 
 from zenbackupcommon import *
 
 
 class ZenRestore(CmdBase):
 
-
     def __init__(self, noopts=0):
         CmdBase.__init__(self, noopts)
         self.zenhome = os.getenv('ZENHOME')

Modified: trunk/bin/zenschamadoc
===================================================================
--- trunk/bin/zenschamadoc	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenschamadoc	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,3 +1,13 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 . $ZENHOME/bin/zenfunctions 
 $PYTHON $ZENHOME/Products/ZenRelations/schemadoc.py Products.ZenModel

Modified: trunk/bin/zenstatus
===================================================================
--- trunk/bin/zenstatus	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenstatus	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: trunk/bin/zenstep
===================================================================
--- trunk/bin/zenstep	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenstep	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,3 +1,13 @@
 #! /bin/sh
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 export INSTANCE_HOME=$ZENHOME
 $ZENHOME/bin/python $ZENHOME/Products/ZenRRD/zenstep.py $@

Modified: trunk/bin/zensyslog
===================================================================
--- trunk/bin/zensyslog	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zensyslog	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: trunk/bin/zentrap
===================================================================
--- trunk/bin/zentrap	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zentrap	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: trunk/bin/zenwin
===================================================================
--- trunk/bin/zenwin	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenwin	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: trunk/bin/zenwinmodeler
===================================================================
--- trunk/bin/zenwinmodeler	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zenwinmodeler	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: trunk/bin/zproprmlocal
===================================================================
--- trunk/bin/zproprmlocal	2007-04-20 13:46:23 UTC (rev 4778)
+++ trunk/bin/zproprmlocal	2007-04-20 13:48:17 UTC (rev 4779)
@@ -1,4 +1,14 @@
 #! /usr/bin/env bash
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
 
 . $ZENHOME/bin/zenfunctions
 

[Zenoss-commit] r4778 - branches/zenoss-1.1.x/bin

[<sv...@ze...>]

Author: ecn
Date: 2007-04-20 09:46:23 -0400 (Fri, 20 Apr 2007)
New Revision: 4778

Modified:
   branches/zenoss-1.1.x/bin/fsrecover
   branches/zenoss-1.1.x/bin/zenactions
   branches/zenoss-1.1.x/bin/zenbackup.py
   branches/zenoss-1.1.x/bin/zenbuild
   branches/zenoss-1.1.x/bin/zenchkrels
   branches/zenoss-1.1.x/bin/zenchkschema
   branches/zenoss-1.1.x/bin/zencommand
   branches/zenoss-1.1.x/bin/zenctl
   branches/zenoss-1.1.x/bin/zendevicedump
   branches/zenoss-1.1.x/bin/zendeviceload
   branches/zenoss-1.1.x/bin/zendisc
   branches/zenoss-1.1.x/bin/zendmd
   branches/zenoss-1.1.x/bin/zendoc
   branches/zenoss-1.1.x/bin/zendump
   branches/zenoss-1.1.x/bin/zeneventbuild
   branches/zenoss-1.1.x/bin/zeneventsdump
   branches/zenoss-1.1.x/bin/zenfunctions
   branches/zenoss-1.1.x/bin/zenload
   branches/zenoss-1.1.x/bin/zenmib
   branches/zenoss-1.1.x/bin/zenmigrate
   branches/zenoss-1.1.x/bin/zenmodeler
   branches/zenoss-1.1.x/bin/zenoss
   branches/zenoss-1.1.x/bin/zenoss_init_post
   branches/zenoss-1.1.x/bin/zenoss_init_pre
   branches/zenoss-1.1.x/bin/zenoss_upgrade_post
   branches/zenoss-1.1.x/bin/zenoss_upgrade_pre
   branches/zenoss-1.1.x/bin/zenpass
   branches/zenoss-1.1.x/bin/zenperfsnmp
   branches/zenoss-1.1.x/bin/zenperfxmlrpc
   branches/zenoss-1.1.x/bin/zenping
   branches/zenoss-1.1.x/bin/zenprocess
   branches/zenoss-1.1.x/bin/zenprodrm
   branches/zenoss-1.1.x/bin/zenschamadoc
   branches/zenoss-1.1.x/bin/zenstatus
   branches/zenoss-1.1.x/bin/zenstep
   branches/zenoss-1.1.x/bin/zensyslog
   branches/zenoss-1.1.x/bin/zentrap
   branches/zenoss-1.1.x/bin/zenxevent
Log:
"back-port" copyright clarifications to 1.1.X

Modified: branches/zenoss-1.1.x/bin/fsrecover
===================================================================
--- branches/zenoss-1.1.x/bin/fsrecover	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/fsrecover	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: branches/zenoss-1.1.x/bin/zenactions
===================================================================
--- branches/zenoss-1.1.x/bin/zenactions	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenactions	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: branches/zenoss-1.1.x/bin/zenbackup.py
===================================================================
--- branches/zenoss-1.1.x/bin/zenbackup.py	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenbackup.py	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,9 +1,17 @@
 #! /usr/bin/env python 
-#################################################################
+
+###########################################################################
 #
-#   Copyright (c) 2006 Zenoss, Inc. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__='''zenbackup
 

Modified: branches/zenoss-1.1.x/bin/zenbuild
===================================================================
--- branches/zenoss-1.1.x/bin/zenbuild	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenbuild	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: branches/zenoss-1.1.x/bin/zenchkrels
===================================================================
--- branches/zenoss-1.1.x/bin/zenchkrels	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenchkrels	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,3 +1,15 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 . $ZENHOME/bin/zenfunctions 
 $PYTHON $ZENHOME/Products/ZenUtils/CheckRelations.py $*

Modified: branches/zenoss-1.1.x/bin/zenchkschema
===================================================================
--- branches/zenoss-1.1.x/bin/zenchkschema	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenchkschema	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,3 +1,15 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 . $ZENHOME/bin/zenfunctions 
 $PYTHON $ZENHOME/Products/ZenRelations/checkrel.py $*

Modified: branches/zenoss-1.1.x/bin/zencommand
===================================================================
--- branches/zenoss-1.1.x/bin/zencommand	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zencommand	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: branches/zenoss-1.1.x/bin/zenctl
===================================================================
--- branches/zenoss-1.1.x/bin/zenctl	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenctl	2007-04-20 13:46:23 UTC (rev 4778)
@@ -3,7 +3,21 @@
 # zenctl        This init.d script starts and stops Zenoss
 #               
 # description: Zenoss is a monitoring program written by Zenoss, Inc.
+
+###########################################################################
 #
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
+
+#
 # Most of the time this script simply delegates to
 # ${ZENHOME}/bin/zenoss to actually execute the requested command
 # (start/stop).  But, in some situations it behaves differently.  
@@ -27,6 +41,7 @@
 # --Christopher Blunck
 #
 
+
 # environment variables
 export ZENHOME="**ZENHOME**"
 export RUNUSER="**OS_USERNAME**"

Modified: branches/zenoss-1.1.x/bin/zendevicedump
===================================================================
--- branches/zenoss-1.1.x/bin/zendevicedump	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zendevicedump	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,3 +1,15 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 . $ZENHOME/bin/zenfunctions 
 $PYTHON $ZENHOME/Products/ZenRelations/ExportDevices.py "$CMD" $*

Modified: branches/zenoss-1.1.x/bin/zendeviceload
===================================================================
--- branches/zenoss-1.1.x/bin/zendeviceload	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zendeviceload	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,3 +1,15 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 . $ZENHOME/bin/zenfunctions 
 $PYTHON $ZENHOME/Products/ZenRelations/ImportDevices.py "$CMD" $*

Modified: branches/zenoss-1.1.x/bin/zendisc
===================================================================
--- branches/zenoss-1.1.x/bin/zendisc	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zendisc	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: branches/zenoss-1.1.x/bin/zendmd
===================================================================
--- branches/zenoss-1.1.x/bin/zendmd	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zendmd	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 # For some reason the zenfunctions line eats part of $*.  Store
 # value now to use in call to zendmd.py

Modified: branches/zenoss-1.1.x/bin/zendoc
===================================================================
--- branches/zenoss-1.1.x/bin/zendoc	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zendoc	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 . $ZENHOME/bin/zenfunctions
 rm -rf $ZENHOME/zendocs/api
 mkdir -p $ZENHOME/zendocs/api

Modified: branches/zenoss-1.1.x/bin/zendump
===================================================================
--- branches/zenoss-1.1.x/bin/zendump	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zendump	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,3 +1,15 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 . $ZENHOME/bin/zenfunctions 
 $PYTHON $ZENHOME/Products/ZenRelations/ExportRM.py "$CMD" $*

Modified: branches/zenoss-1.1.x/bin/zeneventbuild
===================================================================
--- branches/zenoss-1.1.x/bin/zeneventbuild	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zeneventbuild	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 if [ "$ZENHOME" = "" ]; then 
     echo ERROR: ZENHOME envrionment variable not set.

Modified: branches/zenoss-1.1.x/bin/zeneventsdump
===================================================================
--- branches/zenoss-1.1.x/bin/zeneventsdump	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zeneventsdump	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 # Dump events in the MySQL in memory table status
 # Make sure that MYUSER MYPASS and MYSQLHOME are set properly

Modified: branches/zenoss-1.1.x/bin/zenfunctions
===================================================================
--- branches/zenoss-1.1.x/bin/zenfunctions	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenfunctions	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,9 +1,16 @@
 
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2003 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 INSTANCE_HOME=$ZENHOME
 export INSTANCE_HOME

Modified: branches/zenoss-1.1.x/bin/zenload
===================================================================
--- branches/zenoss-1.1.x/bin/zenload	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenload	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,3 +1,15 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 . $ZENHOME/bin/zenfunctions 
 $PYTHON $ZENHOME/Products/ZenRelations/ImportRM.py "$CMD" $*

Modified: branches/zenoss-1.1.x/bin/zenmib
===================================================================
--- branches/zenoss-1.1.x/bin/zenmib	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenmib	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: branches/zenoss-1.1.x/bin/zenmigrate
===================================================================
--- branches/zenoss-1.1.x/bin/zenmigrate	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenmigrate	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: branches/zenoss-1.1.x/bin/zenmodeler
===================================================================
--- branches/zenoss-1.1.x/bin/zenmodeler	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenmodeler	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: branches/zenoss-1.1.x/bin/zenoss
===================================================================
--- branches/zenoss-1.1.x/bin/zenoss	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenoss	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,10 +1,23 @@
 #!/usr/bin/env bash
 #
-# zenmon        This shell script takes care of starting and stopping zenmon.
+# zenoss        This shell script takes care of starting and stopping zenoss.
 #               
 # chkconfig: 2345 80 30
 # description: Zenoss is a monitoring program written by Zenoss, Inc.
 
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
+
 if [ -z "$ZENHOME" ] ; then
   for d in $HOME /home/zenoss ; do 
     for f in .bash_login .bash_profile .profile .bashrc ; do

Modified: branches/zenoss-1.1.x/bin/zenoss_init_post
===================================================================
--- branches/zenoss-1.1.x/bin/zenoss_init_post	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenoss_init_post	2007-04-20 13:46:23 UTC (rev 4778)
@@ -7,6 +7,18 @@
 # been started for the first time.
 #
 
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 # environment variables
 export OS_USERNAME="**OS_USERNAME**"
 export ZENHOME="**ZENHOME**"

Modified: branches/zenoss-1.1.x/bin/zenoss_init_pre
===================================================================
--- branches/zenoss-1.1.x/bin/zenoss_init_pre	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenoss_init_pre	2007-04-20 13:46:23 UTC (rev 4778)
@@ -7,6 +7,18 @@
 # been started for the first time.
 #
 
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 # environment variables
 export OS_USERNAME="**OS_USERNAME**"
 export ZENHOME="**ZENHOME**"

Modified: branches/zenoss-1.1.x/bin/zenoss_upgrade_post
===================================================================
--- branches/zenoss-1.1.x/bin/zenoss_upgrade_post	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenoss_upgrade_post	2007-04-20 13:46:23 UTC (rev 4778)
@@ -7,6 +7,18 @@
 # been started for the first time after an upgrade.
 #
 
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 # environment variables
 export OS_USERNAME="**OS_USERNAME**"
 export ZENHOME="**ZENHOME**"

Modified: branches/zenoss-1.1.x/bin/zenoss_upgrade_pre
===================================================================
--- branches/zenoss-1.1.x/bin/zenoss_upgrade_pre	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenoss_upgrade_pre	2007-04-20 13:46:23 UTC (rev 4778)
@@ -7,6 +7,18 @@
 # been started for the first time after an upgrade.
 #
 
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 # environment variables
 export OS_USERNAME="**OS_USERNAME**"
 export ZENHOME="**ZENHOME**"

Modified: branches/zenoss-1.1.x/bin/zenpass
===================================================================
--- branches/zenoss-1.1.x/bin/zenpass	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenpass	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 cd $ZENHOME
 

Modified: branches/zenoss-1.1.x/bin/zenperfsnmp
===================================================================
--- branches/zenoss-1.1.x/bin/zenperfsnmp	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenperfsnmp	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: branches/zenoss-1.1.x/bin/zenperfxmlrpc
===================================================================
--- branches/zenoss-1.1.x/bin/zenperfxmlrpc	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenperfxmlrpc	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: branches/zenoss-1.1.x/bin/zenping
===================================================================
--- branches/zenoss-1.1.x/bin/zenping	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenping	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: branches/zenoss-1.1.x/bin/zenprocess
===================================================================
--- branches/zenoss-1.1.x/bin/zenprocess	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenprocess	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: branches/zenoss-1.1.x/bin/zenprodrm
===================================================================
--- branches/zenoss-1.1.x/bin/zenprodrm	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenprodrm	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,10 +1,16 @@
 #! /usr/bin/env bash
-
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2003 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
         
 . $ZENHOME/bin/zenfunctions
 

Modified: branches/zenoss-1.1.x/bin/zenschamadoc
===================================================================
--- branches/zenoss-1.1.x/bin/zenschamadoc	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenschamadoc	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,3 +1,15 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 . $ZENHOME/bin/zenfunctions 
 $PYTHON $ZENHOME/Products/ZenRelations/schemadoc.py Products.ZenModel

Modified: branches/zenoss-1.1.x/bin/zenstatus
===================================================================
--- branches/zenoss-1.1.x/bin/zenstatus	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenstatus	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: branches/zenoss-1.1.x/bin/zenstep
===================================================================
--- branches/zenoss-1.1.x/bin/zenstep	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenstep	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,3 +1,15 @@
 #! /bin/sh
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 export INSTANCE_HOME=$ZENHOME
 $ZENHOME/bin/python $ZENHOME/Products/ZenRRD/zenstep.py $@

Modified: branches/zenoss-1.1.x/bin/zensyslog
===================================================================
--- branches/zenoss-1.1.x/bin/zensyslog	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zensyslog	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: branches/zenoss-1.1.x/bin/zentrap
===================================================================
--- branches/zenoss-1.1.x/bin/zentrap	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zentrap	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 . $ZENHOME/bin/zenfunctions
 

Modified: branches/zenoss-1.1.x/bin/zenxevent
===================================================================
--- branches/zenoss-1.1.x/bin/zenxevent	2007-04-20 13:42:48 UTC (rev 4777)
+++ branches/zenoss-1.1.x/bin/zenxevent	2007-04-20 13:46:23 UTC (rev 4778)
@@ -1,4 +1,16 @@
 #! /usr/bin/env bash
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 . $ZENHOME/bin/zenfunctions
 

[Zenoss-commit] r4777 - in branches/zenoss-1.1.x/Products: . DataCollector DataCollector/CommandParsers DataCollector/maps/commandmaps DataCollector/plugins DataCollector/plugins/zenoss DataCollector/plugins/zenoss/cmd DataCollector/plugins/zenoss/cmd/linux DataCollector/plugins/zenoss/portscan DataCollector/plugins/zenoss/snmp ZenEvents ZenEvents/skins/zenevents ZenEvents/tests ZenModel ZenModel/data ZenModel/migrate ZenModel/skins/zenmodel ZenModel/tests ZenModel/tests/portal ZenModel/tests/portal/Devices ZenModel/tests/portal/Monitors ZenModel/tests/portal/Systems ZenRRD ZenRRD/plugins ZenRRD/tests ZenRelations ZenRelations/tests ZenReports ZenReports/plugins ZenStatus ZenStatus/test ZenUtils ZenUtils/tests ZenWidgets

[<sv...@ze...>]

Author: ecn
Date: 2007-04-20 09:42:48 -0400 (Fri, 20 Apr 2007)
New Revision: 4777

Modified:
   branches/zenoss-1.1.x/Products/COPYRIGHT.txt
   branches/zenoss-1.1.x/Products/DataCollector/ApplyDataMap.py
   branches/zenoss-1.1.x/Products/DataCollector/CollectorClient.py
   branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/CiscoDhcpHelperAddress.py
   branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/CiscoShowHardware.py
   branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/CommandParser.py
   branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Linux_ifconfig.py
   branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Linux_netstat_an.py
   branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Linux_netstat_rn.py
   branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Uname_A.py
   branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Unix_df_k.py
   branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Windows_ipconfig_all.py
   branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/__init__.py
   branches/zenoss-1.1.x/Products/DataCollector/Exceptions.py
   branches/zenoss-1.1.x/Products/DataCollector/PortscanClient.py
   branches/zenoss-1.1.x/Products/DataCollector/SnmpClient.py
   branches/zenoss-1.1.x/Products/DataCollector/SnmpSession.py
   branches/zenoss-1.1.x/Products/DataCollector/SshClient.py
   branches/zenoss-1.1.x/Products/DataCollector/SshSession.py
   branches/zenoss-1.1.x/Products/DataCollector/TelnetClient.py
   branches/zenoss-1.1.x/Products/DataCollector/TelnetSession.py
   branches/zenoss-1.1.x/Products/DataCollector/__init__.py
   branches/zenoss-1.1.x/Products/DataCollector/maps/commandmaps/ifconfigMap.py
   branches/zenoss-1.1.x/Products/DataCollector/maps/commandmaps/vxprintMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/CollectorPlugin.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/DataMaps.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/__init__.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/__init__.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/cmd/__init__.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/cmd/linux/__init__.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/cmd/linux/dfB1.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/cmd/linux/ifconfig.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/cmd/linux/netstat_an.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/cmd/linux/netstat_rn.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/cmd/uname.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/portscan/IpServiceMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/portscan/__init__.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/APCDeviceMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/CiscoHSRP.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/CiscoMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/CpuMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/DellCPUMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/DellDeviceMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/DellPCIMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/DeviceMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/HPCPUMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/HPDeviceMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/HRFileSystemMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/HRSWInstalledMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/HRSWRunMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/InformantHardDiskMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/InterfaceMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/IpServiceMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/NewDeviceMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/PowerwareDeviceMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/RouteMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/SysedgeDiskMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/SysedgeFileSystemMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/SysedgeMap.py
   branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/snmp/__init__.py
   branches/zenoss-1.1.x/Products/DataCollector/zendisc.py
   branches/zenoss-1.1.x/Products/DataCollector/zenmodeler.py
   branches/zenoss-1.1.x/Products/ZenEvents/ActionRule.py
   branches/zenoss-1.1.x/Products/ZenEvents/ActionRuleWindow.py
   branches/zenoss-1.1.x/Products/ZenEvents/Availability.py
   branches/zenoss-1.1.x/Products/ZenEvents/BetterEventDetail.py
   branches/zenoss-1.1.x/Products/ZenEvents/CustomEventView.py
   branches/zenoss-1.1.x/Products/ZenEvents/DbAccessBase.py
   branches/zenoss-1.1.x/Products/ZenEvents/Event.py
   branches/zenoss-1.1.x/Products/ZenEvents/EventClass.py
   branches/zenoss-1.1.x/Products/ZenEvents/EventClassInst.py
   branches/zenoss-1.1.x/Products/ZenEvents/EventClassifier.py
   branches/zenoss-1.1.x/Products/ZenEvents/EventCommand.py
   branches/zenoss-1.1.x/Products/ZenEvents/EventDetail.py
   branches/zenoss-1.1.x/Products/ZenEvents/EventFilter.py
   branches/zenoss-1.1.x/Products/ZenEvents/EventManagerBase.py
   branches/zenoss-1.1.x/Products/ZenEvents/EventServer.py
   branches/zenoss-1.1.x/Products/ZenEvents/Exceptions.py
   branches/zenoss-1.1.x/Products/ZenEvents/MySqlEventManager.py
   branches/zenoss-1.1.x/Products/ZenEvents/MySqlSendEvent.py
   branches/zenoss-1.1.x/Products/ZenEvents/Schedule.py
   branches/zenoss-1.1.x/Products/ZenEvents/SendEvent.py
   branches/zenoss-1.1.x/Products/ZenEvents/SyslogProcessing.py
   branches/zenoss-1.1.x/Products/ZenEvents/UpdateCheck.py
   branches/zenoss-1.1.x/Products/ZenEvents/WhereClause.py
   branches/zenoss-1.1.x/Products/ZenEvents/ZEvent.py
   branches/zenoss-1.1.x/Products/ZenEvents/ZenEventClasses.py
   branches/zenoss-1.1.x/Products/ZenEvents/__init__.py
   branches/zenoss-1.1.x/Products/ZenEvents/interfaces.py
   branches/zenoss-1.1.x/Products/ZenEvents/skins/zenevents/scHistoryEventInit.py
   branches/zenoss-1.1.x/Products/ZenEvents/syslog_h.py
   branches/zenoss-1.1.x/Products/ZenEvents/tests/sendEvents.py
   branches/zenoss-1.1.x/Products/ZenEvents/tests/sendSyslog.py
   branches/zenoss-1.1.x/Products/ZenEvents/tests/testEventClassifier.py
   branches/zenoss-1.1.x/Products/ZenEvents/tests/testMySqlEventManager.py
   branches/zenoss-1.1.x/Products/ZenEvents/tests/testMySqlSendEvent.py
   branches/zenoss-1.1.x/Products/ZenEvents/xtest.py
   branches/zenoss-1.1.x/Products/ZenEvents/zenactions.py
   branches/zenoss-1.1.x/Products/ZenEvents/zensendsyslog.py
   branches/zenoss-1.1.x/Products/ZenEvents/zensyslog.py
   branches/zenoss-1.1.x/Products/ZenEvents/zentrap.py
   branches/zenoss-1.1.x/Products/ZenEvents/zenxevent.py
   branches/zenoss-1.1.x/Products/ZenModel/AdministrativeRole.py
   branches/zenoss-1.1.x/Products/ZenModel/BasicDeviceLoader.py
   branches/zenoss-1.1.x/Products/ZenModel/CPU.py
   branches/zenoss-1.1.x/Products/ZenModel/CiscoLoader.py
   branches/zenoss-1.1.x/Products/ZenModel/Classifier.py
   branches/zenoss-1.1.x/Products/ZenModel/ClassifierEntry.py
   branches/zenoss-1.1.x/Products/ZenModel/CmdDeviceLoader.py
   branches/zenoss-1.1.x/Products/ZenModel/Commandable.py
   branches/zenoss-1.1.x/Products/ZenModel/ConfmonPropManager.py
   branches/zenoss-1.1.x/Products/ZenModel/DataRoot.py
   branches/zenoss-1.1.x/Products/ZenModel/Device.py
   branches/zenoss-1.1.x/Products/ZenModel/DeviceClass.py
   branches/zenoss-1.1.x/Products/ZenModel/DeviceComponent.py
   branches/zenoss-1.1.x/Products/ZenModel/DeviceGroup.py
   branches/zenoss-1.1.x/Products/ZenModel/DeviceHW.py
   branches/zenoss-1.1.x/Products/ZenModel/DeviceManagerBase.py
   branches/zenoss-1.1.x/Products/ZenModel/DeviceOrganizer.py
   branches/zenoss-1.1.x/Products/ZenModel/DeviceReport.py
   branches/zenoss-1.1.x/Products/ZenModel/DeviceResultInt.py
   branches/zenoss-1.1.x/Products/ZenModel/DmdBuilder.py
   branches/zenoss-1.1.x/Products/ZenModel/EventView.py
   branches/zenoss-1.1.x/Products/ZenModel/Exceptions.py
   branches/zenoss-1.1.x/Products/ZenModel/ExpansionCard.py
   branches/zenoss-1.1.x/Products/ZenModel/FileSystem.py
   branches/zenoss-1.1.x/Products/ZenModel/HWComponent.py
   branches/zenoss-1.1.x/Products/ZenModel/HardDisk.py
   branches/zenoss-1.1.x/Products/ZenModel/Hardware.py
   branches/zenoss-1.1.x/Products/ZenModel/HardwareClass.py
   branches/zenoss-1.1.x/Products/ZenModel/IpAddress.py
   branches/zenoss-1.1.x/Products/ZenModel/IpInterface.py
   branches/zenoss-1.1.x/Products/ZenModel/IpNetwork.py
   branches/zenoss-1.1.x/Products/ZenModel/IpRouteEntry.py
   branches/zenoss-1.1.x/Products/ZenModel/IpService.py
   branches/zenoss-1.1.x/Products/ZenModel/IpServiceClass.py
   branches/zenoss-1.1.x/Products/ZenModel/IpServiceLoader.py
   branches/zenoss-1.1.x/Products/ZenModel/Location.py
   branches/zenoss-1.1.x/Products/ZenModel/MEProduct.py
   branches/zenoss-1.1.x/Products/ZenModel/MaintenanceWindow.py
   branches/zenoss-1.1.x/Products/ZenModel/ManagedEntity.py
   branches/zenoss-1.1.x/Products/ZenModel/Manufacturer.py
   branches/zenoss-1.1.x/Products/ZenModel/ManufacturerRoot.py
   branches/zenoss-1.1.x/Products/ZenModel/MibBase.py
   branches/zenoss-1.1.x/Products/ZenModel/MibModule.py
   branches/zenoss-1.1.x/Products/ZenModel/MibNode.py
   branches/zenoss-1.1.x/Products/ZenModel/MibNotification.py
   branches/zenoss-1.1.x/Products/ZenModel/MibOrganizer.py
   branches/zenoss-1.1.x/Products/ZenModel/Monitor.py
   branches/zenoss-1.1.x/Products/ZenModel/MonitorClass.py
   branches/zenoss-1.1.x/Products/ZenModel/NagiosCmd.py
   branches/zenoss-1.1.x/Products/ZenModel/NagiosTemplate.py
   branches/zenoss-1.1.x/Products/ZenModel/OSComponent.py
   branches/zenoss-1.1.x/Products/ZenModel/OSProcess.py
   branches/zenoss-1.1.x/Products/ZenModel/OSProcessClass.py
   branches/zenoss-1.1.x/Products/ZenModel/OSProcessOrganizer.py
   branches/zenoss-1.1.x/Products/ZenModel/OperatingSystem.py
   branches/zenoss-1.1.x/Products/ZenModel/Organizer.py
   branches/zenoss-1.1.x/Products/ZenModel/PerformanceConf.py
   branches/zenoss-1.1.x/Products/ZenModel/PerformanceView.py
   branches/zenoss-1.1.x/Products/ZenModel/ProductClass.py
   branches/zenoss-1.1.x/Products/ZenModel/RRDDataPoint.py
   branches/zenoss-1.1.x/Products/ZenModel/RRDDataSource.py
   branches/zenoss-1.1.x/Products/ZenModel/RRDGraph.py
   branches/zenoss-1.1.x/Products/ZenModel/RRDTemplate.py
   branches/zenoss-1.1.x/Products/ZenModel/RRDThreshold.py
   branches/zenoss-1.1.x/Products/ZenModel/RRDView.py
   branches/zenoss-1.1.x/Products/ZenModel/Report.py
   branches/zenoss-1.1.x/Products/ZenModel/ReportClass.py
   branches/zenoss-1.1.x/Products/ZenModel/Service.py
   branches/zenoss-1.1.x/Products/ZenModel/ServiceClass.py
   branches/zenoss-1.1.x/Products/ZenModel/ServiceOrganizer.py
   branches/zenoss-1.1.x/Products/ZenModel/SiteError.py
   branches/zenoss-1.1.x/Products/ZenModel/Software.py
   branches/zenoss-1.1.x/Products/ZenModel/SoftwareClass.py
   branches/zenoss-1.1.x/Products/ZenModel/StatusColor.py
   branches/zenoss-1.1.x/Products/ZenModel/StatusMonitorConf.py
   branches/zenoss-1.1.x/Products/ZenModel/System.py
   branches/zenoss-1.1.x/Products/ZenModel/TerminalServer.py
   branches/zenoss-1.1.x/Products/ZenModel/UBRRouter.py
   branches/zenoss-1.1.x/Products/ZenModel/UserCommand.py
   branches/zenoss-1.1.x/Products/ZenModel/UserSettings.py
   branches/zenoss-1.1.x/Products/ZenModel/WinService.py
   branches/zenoss-1.1.x/Products/ZenModel/XmlDataLoader.py
   branches/zenoss-1.1.x/Products/ZenModel/ZDeviceLoader.py
   branches/zenoss-1.1.x/Products/ZenModel/ZVersion.py
   branches/zenoss-1.1.x/Products/ZenModel/ZenDate.py
   branches/zenoss-1.1.x/Products/ZenModel/ZenModelBase.py
   branches/zenoss-1.1.x/Products/ZenModel/ZenModelItem.py
   branches/zenoss-1.1.x/Products/ZenModel/ZenModelRM.py
   branches/zenoss-1.1.x/Products/ZenModel/ZenStatus.py
   branches/zenoss-1.1.x/Products/ZenModel/ZenossInfo.py
   branches/zenoss-1.1.x/Products/ZenModel/ZentinelPortal.py
   branches/zenoss-1.1.x/Products/ZenModel/__init__.py
   branches/zenoss-1.1.x/Products/ZenModel/data/scrub.py
   branches/zenoss-1.1.x/Products/ZenModel/identify.py
   branches/zenoss-1.1.x/Products/ZenModel/interfaces.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/Migrate.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/__init__.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/about_zenoss.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/advanced_query.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/ar_schedule.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/betterstandarderrormessage.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/casesensitive_catalogs.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/changeeventaction.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/changeeventclasses.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/clearid.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/command.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/datapoints.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/defaultcommandtimeout.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/devicepriority.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/event_commands.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/event_newclasses.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/eventdbname.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/evtprops.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/hoist_perf_data.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/import_export_filesystem.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/indexhtml.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/innodb.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/interfacename_convert.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/keypath.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/kill_cricket.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/loadaveragereport.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/maxoids.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/mibs.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/monitors.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/mwrelations.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/nocountprocs.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/pas_conversion.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/perfxmlrpc.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/processes.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/procparams.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/reindex_history.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/reportserver.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/rrdcpu.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/rrdmin.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/rrdmin2.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/smtpsnpp.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/standalone_datapoint_rename.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/standarderrormessage.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/statusconnecttimeout.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/usercommands.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/winminseverity.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/wmiignore.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/zcollectordecoding.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/zenmigrate.py
   branches/zenoss-1.1.x/Products/ZenModel/migrate/zlinks.py
   branches/zenoss-1.1.x/Products/ZenModel/skins/zenmodel/css_inline_or_link.py
   branches/zenoss-1.1.x/Products/ZenModel/skins/zenmodel/getLoginMessage.py
   branches/zenoss-1.1.x/Products/ZenModel/skins/zenmodel/isLoggedOut.py
   branches/zenoss-1.1.x/Products/ZenModel/skins/zenmodel/logoutUser.py
   branches/zenoss-1.1.x/Products/ZenModel/skins/zenmodel/scDatePopup.py
   branches/zenoss-1.1.x/Products/ZenModel/skins/zenmodel/scDatePush.py
   branches/zenoss-1.1.x/Products/ZenModel/skins/zenmodel/scGenericPopup.py
   branches/zenoss-1.1.x/Products/ZenModel/skins/zenmodel/scGetSortedTableState.py
   branches/zenoss-1.1.x/Products/ZenModel/skins/zenmodel/scSortedTableGetBatch.py
   branches/zenoss-1.1.x/Products/ZenModel/skins/zenmodel/scSortedTableHeader.py
   branches/zenoss-1.1.x/Products/ZenModel/skins/zenmodel/scSortedTableHeaderStyle.py
   branches/zenoss-1.1.x/Products/ZenModel/skins/zenmodel/scSortedTableHref.py
   branches/zenoss-1.1.x/Products/ZenModel/skins/zenmodel/scSortedTableInit.py
   branches/zenoss-1.1.x/Products/ZenModel/skins/zenmodel/scSortedTableNavigation.py
   branches/zenoss-1.1.x/Products/ZenModel/skins/zenmodel/scSortedTableSetAtt.py
   branches/zenoss-1.1.x/Products/ZenModel/skins/zenmodel/scUrlPopup.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/ClassifierTest.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/IpUtilTest.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/ToManyPerfTest.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/ZenModelBaseTest.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/ZenStatusTest.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/__init__.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/devicePopulator.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/getAllCountsProf.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/Devices/__init__.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/Devices/testDeviceChanges.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/Devices/testDeviceDetail.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/Devices/testDeviceNavBar.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/Devices/testDeviceNavigation.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/Devices/testDevicePerformance.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/Devices/testDeviceStatus.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/Monitors/__init__.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/Monitors/testMonitorNavigation.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/Monitors/testMonitorScreens.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/Systems/__init__.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/Systems/testSystemChanges.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/Systems/testSystemDevices.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/Systems/testSystemNavBar.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/Systems/testSystemNavigation.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/Systems/testSystemPerformance.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/Systems/testSystemStatus.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/__init__.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/suite.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/testCompanies.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/testDmdIndex.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/testDmdLeft.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/testGroups.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/testLocations.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/testNetworks.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/testProducts.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/testSearch.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/testServiceAreas.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/portal/testServices.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/testDevice.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/testDeviceClass.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/testEvents.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/testFileSystem.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/testHardDisk.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/testIpAddress.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/testIpInterface.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/testIpNetwork.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/testIpRouteEntry.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/testIpService.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/testMibOrganizer.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/testOrganizer.py
   branches/zenoss-1.1.x/Products/ZenModel/tests/testWinService.py
   branches/zenoss-1.1.x/Products/ZenModel/zenbuild.py
   branches/zenoss-1.1.x/Products/ZenModel/zendmd.py
   branches/zenoss-1.1.x/Products/ZenModel/zenmib.py
   branches/zenoss-1.1.x/Products/ZenRRD/Exceptions.py
   branches/zenoss-1.1.x/Products/ZenRRD/FileCleanup.py
   branches/zenoss-1.1.x/Products/ZenRRD/RRDDaemon.py
   branches/zenoss-1.1.x/Products/ZenRRD/RRDMGraph.py
   branches/zenoss-1.1.x/Products/ZenRRD/RRDRelativeThresh.py
   branches/zenoss-1.1.x/Products/ZenRRD/RRDToolItem.py
   branches/zenoss-1.1.x/Products/ZenRRD/RRDUtil.py
   branches/zenoss-1.1.x/Products/ZenRRD/RenderServer.py
   branches/zenoss-1.1.x/Products/ZenRRD/SnmpDaemon.py
   branches/zenoss-1.1.x/Products/ZenRRD/__init__.py
   branches/zenoss-1.1.x/Products/ZenRRD/plugins/__init__.py
   branches/zenoss-1.1.x/Products/ZenRRD/plugins/aggregateCpu.py
   branches/zenoss-1.1.x/Products/ZenRRD/plugins/aggregateDisks.py
   branches/zenoss-1.1.x/Products/ZenRRD/plugins/aggregateFreeMemory.py
   branches/zenoss-1.1.x/Products/ZenRRD/plugins/aggregateIdle.py
   branches/zenoss-1.1.x/Products/ZenRRD/plugins/aggregateNetwork.py
   branches/zenoss-1.1.x/Products/ZenRRD/plugins/aggregateSwap.py
   branches/zenoss-1.1.x/Products/ZenRRD/plugins/aggregateTraffic.py
   branches/zenoss-1.1.x/Products/ZenRRD/plugins/areaLine.py
   branches/zenoss-1.1.x/Products/ZenRRD/plugins/plugin.py
   branches/zenoss-1.1.x/Products/ZenRRD/plugins/randomExample.py
   branches/zenoss-1.1.x/Products/ZenRRD/plugins/upperLower.py
   branches/zenoss-1.1.x/Products/ZenRRD/rpn.py
   branches/zenoss-1.1.x/Products/ZenRRD/tests/RenderServerTest.py
   branches/zenoss-1.1.x/Products/ZenRRD/tests/badPackets.py
   branches/zenoss-1.1.x/Products/ZenRRD/tests/test.py
   branches/zenoss-1.1.x/Products/ZenRRD/tests/testttgraph.py
   branches/zenoss-1.1.x/Products/ZenRRD/tests/xtest.py
   branches/zenoss-1.1.x/Products/ZenRRD/utils.py
   branches/zenoss-1.1.x/Products/ZenRRD/zencommand.py
   branches/zenoss-1.1.x/Products/ZenRRD/zenperfsnmp.py
   branches/zenoss-1.1.x/Products/ZenRRD/zenperfxmlrpc.py
   branches/zenoss-1.1.x/Products/ZenRRD/zenprocess.py
   branches/zenoss-1.1.x/Products/ZenRRD/zenstep.py
   branches/zenoss-1.1.x/Products/ZenRelations/Exceptions.py
   branches/zenoss-1.1.x/Products/ZenRelations/ExportDevices.py
   branches/zenoss-1.1.x/Products/ZenRelations/ExportRM.py
   branches/zenoss-1.1.x/Products/ZenRelations/ImportDevices.py
   branches/zenoss-1.1.x/Products/ZenRelations/ImportRM.py
   branches/zenoss-1.1.x/Products/ZenRelations/PrimaryPathObjectManager.py
   branches/zenoss-1.1.x/Products/ZenRelations/RelCopySupport.py
   branches/zenoss-1.1.x/Products/ZenRelations/RelSchema.py
   branches/zenoss-1.1.x/Products/ZenRelations/RelationshipBase.py
   branches/zenoss-1.1.x/Products/ZenRelations/RelationshipManager.py
   branches/zenoss-1.1.x/Products/ZenRelations/ToManyContRelationship.py
   branches/zenoss-1.1.x/Products/ZenRelations/ToManyRelationship.py
   branches/zenoss-1.1.x/Products/ZenRelations/ToManyRelationshipBase.py
   branches/zenoss-1.1.x/Products/ZenRelations/ToOneRelationship.py
   branches/zenoss-1.1.x/Products/ZenRelations/ZenPropertyManager.py
   branches/zenoss-1.1.x/Products/ZenRelations/__init__.py
   branches/zenoss-1.1.x/Products/ZenRelations/checkrel.py
   branches/zenoss-1.1.x/Products/ZenRelations/schemadoc.py
   branches/zenoss-1.1.x/Products/ZenRelations/tests/TestSchema.py
   branches/zenoss-1.1.x/Products/ZenRelations/tests/ZenRelationsBaseTest.py
   branches/zenoss-1.1.x/Products/ZenRelations/tests/__init__.py
   branches/zenoss-1.1.x/Products/ZenRelations/tests/dataImportExport.py
   branches/zenoss-1.1.x/Products/ZenRelations/tests/testFullZopeZenRelations.py
   branches/zenoss-1.1.x/Products/ZenRelations/tests/testImportExport.py
   branches/zenoss-1.1.x/Products/ZenRelations/tests/testZenPropertyManager.py
   branches/zenoss-1.1.x/Products/ZenRelations/tests/testZenRelations.py
   branches/zenoss-1.1.x/Products/ZenRelations/utils.py
   branches/zenoss-1.1.x/Products/ZenReports/ReportLoader.py
   branches/zenoss-1.1.x/Products/ZenReports/ReportServer.py
   branches/zenoss-1.1.x/Products/ZenReports/__init__.py
   branches/zenoss-1.1.x/Products/ZenReports/plugins/Plugin.py
   branches/zenoss-1.1.x/Products/ZenReports/plugins/Utilization.py
   branches/zenoss-1.1.x/Products/ZenReports/plugins/__init__.py
   branches/zenoss-1.1.x/Products/ZenReports/plugins/cpu.py
   branches/zenoss-1.1.x/Products/ZenReports/plugins/filesystems.py
   branches/zenoss-1.1.x/Products/ZenReports/plugins/interface.py
   branches/zenoss-1.1.x/Products/ZenReports/plugins/memory.py
   branches/zenoss-1.1.x/Products/ZenReports/plugins/threshold.py
   branches/zenoss-1.1.x/Products/ZenStatus/AsyncPing.py
   branches/zenoss-1.1.x/Products/ZenStatus/Ping.py
   branches/zenoss-1.1.x/Products/ZenStatus/PingThread.py
   branches/zenoss-1.1.x/Products/ZenStatus/StatusMonitor.py
   branches/zenoss-1.1.x/Products/ZenStatus/TestPing.py
   branches/zenoss-1.1.x/Products/ZenStatus/ZenTcpClient.py
   branches/zenoss-1.1.x/Products/ZenStatus/__init__.py
   branches/zenoss-1.1.x/Products/ZenStatus/intersect.py
   branches/zenoss-1.1.x/Products/ZenStatus/pingjob.py
   branches/zenoss-1.1.x/Products/ZenStatus/pingtree.py
   branches/zenoss-1.1.x/Products/ZenStatus/sendevent.py
   branches/zenoss-1.1.x/Products/ZenStatus/test/configget.py
   branches/zenoss-1.1.x/Products/ZenStatus/zencacti.py
   branches/zenoss-1.1.x/Products/ZenStatus/zencommand.py
   branches/zenoss-1.1.x/Products/ZenStatus/zenping.py
   branches/zenoss-1.1.x/Products/ZenStatus/zenstatus.py
   branches/zenoss-1.1.x/Products/ZenUtils/BasicLoader.py
   branches/zenoss-1.1.x/Products/ZenUtils/Chain.py
   branches/zenoss-1.1.x/Products/ZenUtils/CheckRelations.py
   branches/zenoss-1.1.x/Products/ZenUtils/CmdBase.py
   branches/zenoss-1.1.x/Products/ZenUtils/ConfDaemon.py
   branches/zenoss-1.1.x/Products/ZenUtils/Driver.py
   branches/zenoss-1.1.x/Products/ZenUtils/Exceptions.py
   branches/zenoss-1.1.x/Products/ZenUtils/FixIps.py
   branches/zenoss-1.1.x/Products/ZenUtils/Graphics.py
   branches/zenoss-1.1.x/Products/ZenUtils/IpUtil.py
   branches/zenoss-1.1.x/Products/ZenUtils/LocationDump.py
   branches/zenoss-1.1.x/Products/ZenUtils/Logger.py
   branches/zenoss-1.1.x/Products/ZenUtils/Map.py
   branches/zenoss-1.1.x/Products/ZenUtils/NJobs.py
   branches/zenoss-1.1.x/Products/ZenUtils/ObjectCache.py
   branches/zenoss-1.1.x/Products/ZenUtils/PObjectCache.py
   branches/zenoss-1.1.x/Products/ZenUtils/PortScan.py
   branches/zenoss-1.1.x/Products/ZenUtils/Search.py
   branches/zenoss-1.1.x/Products/ZenUtils/Security.py
   branches/zenoss-1.1.x/Products/ZenUtils/Time.py
   branches/zenoss-1.1.x/Products/ZenUtils/ToManyRebuildKeys.py
   branches/zenoss-1.1.x/Products/ZenUtils/TwistedAuth.py
   branches/zenoss-1.1.x/Products/ZenUtils/Utils.py
   branches/zenoss-1.1.x/Products/ZenUtils/Version.py
   branches/zenoss-1.1.x/Products/ZenUtils/ZCmdBase.py
   branches/zenoss-1.1.x/Products/ZenUtils/ZenDaemon.py
   branches/zenoss-1.1.x/Products/ZenUtils/ZenTales.py
   branches/zenoss-1.1.x/Products/ZenUtils/ZenZopeThread.py
   branches/zenoss-1.1.x/Products/ZenUtils/ZeoConn.py
   branches/zenoss-1.1.x/Products/ZenUtils/ZeoPoolBase.py
   branches/zenoss-1.1.x/Products/ZenUtils/__init__.py
   branches/zenoss-1.1.x/Products/ZenUtils/guid.py
   branches/zenoss-1.1.x/Products/ZenUtils/tests/testVersion.py
   branches/zenoss-1.1.x/Products/ZenUtils/tests/testZeoPoolBase.py
   branches/zenoss-1.1.x/Products/ZenWidgets/ZenTableManager.py
   branches/zenoss-1.1.x/Products/ZenWidgets/ZenTableState.py
   branches/zenoss-1.1.x/Products/ZenWidgets/__init__.py
Log:
"back-port" copyright clarifications to 1.1.X

Modified: branches/zenoss-1.1.x/Products/COPYRIGHT.txt
===================================================================
--- branches/zenoss-1.1.x/Products/COPYRIGHT.txt	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/COPYRIGHT.txt	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,28 +1,9 @@
-All files in the directories:
-DataCollector   
-NcoProduct      
-PingMonitor     
-SiteScopeParser 
-SnmpCollector   
-ZenEvents       
-ZenModel        
-ZenRelations
-ZenRRD          
-ZenUtils
-ZenWidgets
+This program is part of Zenoss Core, an open source monitoring platform.
 
-Copyright (c) 2002 Zenoss, Inc. All rights reserved.
+Copyright (C) 2007, Zenoss Inc.
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 2 as published by
+the Free Software Foundation.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+For complete information please visit: http://www.zenoss.com/oss/

Modified: branches/zenoss-1.1.x/Products/DataCollector/ApplyDataMap.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/ApplyDataMap.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/ApplyDataMap.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2005 Zenoss, Inc. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 import time
 import types

Modified: branches/zenoss-1.1.x/Products/DataCollector/CollectorClient.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/CollectorClient.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/CollectorClient.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2003 Zenoss, Inc. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__="""CollectorClient
 

Modified: branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/CiscoDhcpHelperAddress.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/CiscoDhcpHelperAddress.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/CiscoDhcpHelperAddress.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__ = """CommandParser
 

Modified: branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/CiscoShowHardware.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/CiscoShowHardware.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/CiscoShowHardware.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__ = """CiscoShowHardware
 

Modified: branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/CommandParser.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/CommandParser.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/CommandParser.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__ = """CommandParser
 

Modified: branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Linux_ifconfig.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Linux_ifconfig.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Linux_ifconfig.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 import re
 

Modified: branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Linux_netstat_an.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Linux_netstat_an.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Linux_netstat_an.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__ = """CommandParser
 

Modified: branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Linux_netstat_rn.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Linux_netstat_rn.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Linux_netstat_rn.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__ = """CommandParser
 

Modified: branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Uname_A.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Uname_A.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Uname_A.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__ = """CommandParser
 

Modified: branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Unix_df_k.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Unix_df_k.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Unix_df_k.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__ = """CommandParser
 

Modified: branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Windows_ipconfig_all.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Windows_ipconfig_all.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/Windows_ipconfig_all.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__ = """CommandParser
 

Modified: branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/__init__.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/__init__.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/CommandParsers/__init__.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,3 +1,15 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 from Uname_A import Uname_A
 from Unix_df_k import Unix_df_k
 
@@ -18,3 +30,4 @@
 
     dataCollector.addCommandParser(CiscoDhcpHelperAddress)
     dataCollector.addCommandParser(CiscoShowHardware)
+

Modified: branches/zenoss-1.1.x/Products/DataCollector/Exceptions.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/Exceptions.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/Exceptions.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Zenoss, Inc. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__="""Exceptions
 

Modified: branches/zenoss-1.1.x/Products/DataCollector/PortscanClient.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/PortscanClient.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/PortscanClient.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,3 +1,20 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+# For complete information please visit: http://www.zenoss.com/oss/
 import logging
 
 from twisted.internet import reactor, error

Modified: branches/zenoss-1.1.x/Products/DataCollector/SnmpClient.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/SnmpClient.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/SnmpClient.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,3 +1,20 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+# For complete information please visit: http://www.zenoss.com/oss/
 import socket
 import logging
 log = logging.getLogger("zen.SnmpClient")

Modified: branches/zenoss-1.1.x/Products/DataCollector/SnmpSession.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/SnmpSession.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/SnmpSession.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Zenoss, Inc. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__="""snmp
 

Modified: branches/zenoss-1.1.x/Products/DataCollector/SshClient.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/SshClient.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/SshClient.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2003 Zenoss, Inc. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__="""SshClient
 

Modified: branches/zenoss-1.1.x/Products/DataCollector/SshSession.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/SshSession.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/SshSession.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,3 +1,15 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 #!/usr/bin/env python
 from twisted.conch.ssh import transport, userauth, connection, common, keys, channel
 from twisted.internet import defer, protocol, reactor

Modified: branches/zenoss-1.1.x/Products/DataCollector/TelnetClient.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/TelnetClient.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/TelnetClient.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2003 Zenoss, Inc. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__="""TelnetSession
 

Modified: branches/zenoss-1.1.x/Products/DataCollector/TelnetSession.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/TelnetSession.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/TelnetSession.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2003 Zenoss, Inc. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__="""TelnetSession
 

Modified: branches/zenoss-1.1.x/Products/DataCollector/__init__.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/__init__.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/__init__.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,7 +1,15 @@
-################################################################
-#   Copyright (c) 2002 Zenoss, Inc. All rights reserved.
+###########################################################################
 #
-#################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 """__init__
 

Modified: branches/zenoss-1.1.x/Products/DataCollector/maps/commandmaps/ifconfigMap.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/maps/commandmaps/ifconfigMap.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/maps/commandmaps/ifconfigMap.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -0,0 +1,13 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
+

Modified: branches/zenoss-1.1.x/Products/DataCollector/maps/commandmaps/vxprintMap.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/maps/commandmaps/vxprintMap.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/maps/commandmaps/vxprintMap.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -0,0 +1,13 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
+

Modified: branches/zenoss-1.1.x/Products/DataCollector/plugins/CollectorPlugin.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/plugins/CollectorPlugin.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/plugins/CollectorPlugin.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2005 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 import re
 import struct

Modified: branches/zenoss-1.1.x/Products/DataCollector/plugins/DataMaps.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/plugins/DataMaps.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/plugins/DataMaps.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -1,8 +1,16 @@
-#################################################################
+###########################################################################
 #
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 #   Copyright (c) 2003 Zentinel Systems, Inc. All rights reserved.
-#
-#################################################################
 
 class RelationshipMap(list):
     relname = ""

Modified: branches/zenoss-1.1.x/Products/DataCollector/plugins/__init__.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/plugins/__init__.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/plugins/__init__.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -0,0 +1,13 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
+

Modified: branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/__init__.py
===================================================================
--- branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/__init__.py	2007-04-20 13:25:38 UTC (rev 4776)
+++ branches/zenoss-1.1.x/Products/DataCollector/plugins/zenoss/__init__.py	2007-04-20 13:42:48 UTC (rev 4777)
@@ -0,0 +1,13 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################...
 
[truncated message content]

[Zenoss-commit] r4776 - in trunk/Products: . DataCollector DataCollector/CommandParsers DataCollector/maps/commandmaps DataCollector/plugins DataCollector/plugins/zenoss DataCollector/plugins/zenoss/cmd DataCollector/plugins/zenoss/cmd/darwin DataCollector/plugins/zenoss/cmd/linux DataCollector/plugins/zenoss/portscan DataCollector/plugins/zenoss/snmp ZenEvents ZenEvents/skins/zenevents ZenEvents/tests ZenHub ZenHub/services ZenModel ZenModel/data ZenModel/migrate ZenModel/skins/zenmodel ZenModel/tests ZenModel/tests/portal ZenModel/tests/portal/Devices ZenModel/tests/portal/Monitors ZenModel/tests/portal/Systems ZenRRD ZenRRD/plugins ZenRRD/tests ZenRelations ZenRelations/tests ZenReports ZenReports/plugins ZenStatus ZenStatus/test ZenUtils ZenUtils/patches ZenUtils/tests ZenWidgets ZenWin

[<sv...@ze...>]

Author: ecn
Date: 2007-04-20 09:25:38 -0400 (Fri, 20 Apr 2007)
New Revision: 4776

Modified:
   trunk/Products/COPYRIGHT.txt
   trunk/Products/DataCollector/ApplyDataMap.py
   trunk/Products/DataCollector/CollectorClient.py
   trunk/Products/DataCollector/CommandParsers/CiscoDhcpHelperAddress.py
   trunk/Products/DataCollector/CommandParsers/CiscoShowHardware.py
   trunk/Products/DataCollector/CommandParsers/CommandParser.py
   trunk/Products/DataCollector/CommandParsers/Linux_ifconfig.py
   trunk/Products/DataCollector/CommandParsers/Linux_netstat_an.py
   trunk/Products/DataCollector/CommandParsers/Linux_netstat_rn.py
   trunk/Products/DataCollector/CommandParsers/Uname_A.py
   trunk/Products/DataCollector/CommandParsers/Unix_df_k.py
   trunk/Products/DataCollector/CommandParsers/Windows_ipconfig_all.py
   trunk/Products/DataCollector/CommandParsers/__init__.py
   trunk/Products/DataCollector/Exceptions.py
   trunk/Products/DataCollector/Plugins.py
   trunk/Products/DataCollector/PortscanClient.py
   trunk/Products/DataCollector/SnmpClient.py
   trunk/Products/DataCollector/SnmpSession.py
   trunk/Products/DataCollector/SshClient.py
   trunk/Products/DataCollector/SshSession.py
   trunk/Products/DataCollector/TelnetClient.py
   trunk/Products/DataCollector/TelnetSession.py
   trunk/Products/DataCollector/__init__.py
   trunk/Products/DataCollector/maps/commandmaps/ifconfigMap.py
   trunk/Products/DataCollector/maps/commandmaps/vxprintMap.py
   trunk/Products/DataCollector/plugins/CollectorPlugin.py
   trunk/Products/DataCollector/plugins/DataMaps.py
   trunk/Products/DataCollector/plugins/__init__.py
   trunk/Products/DataCollector/plugins/zenoss/__init__.py
   trunk/Products/DataCollector/plugins/zenoss/cmd/__init__.py
   trunk/Products/DataCollector/plugins/zenoss/cmd/darwin/__init__.py
   trunk/Products/DataCollector/plugins/zenoss/cmd/darwin/cpu.py
   trunk/Products/DataCollector/plugins/zenoss/cmd/darwin/ifconfig.py
   trunk/Products/DataCollector/plugins/zenoss/cmd/darwin/memory.py
   trunk/Products/DataCollector/plugins/zenoss/cmd/darwin/netstat_an.py
   trunk/Products/DataCollector/plugins/zenoss/cmd/darwin/process.py
   trunk/Products/DataCollector/plugins/zenoss/cmd/darwin/swap.py
   trunk/Products/DataCollector/plugins/zenoss/cmd/df.py
   trunk/Products/DataCollector/plugins/zenoss/cmd/linux/__init__.py
   trunk/Products/DataCollector/plugins/zenoss/cmd/linux/ifconfig.py
   trunk/Products/DataCollector/plugins/zenoss/cmd/linux/memory.py
   trunk/Products/DataCollector/plugins/zenoss/cmd/linux/netstat_an.py
   trunk/Products/DataCollector/plugins/zenoss/cmd/linux/netstat_rn.py
   trunk/Products/DataCollector/plugins/zenoss/cmd/linux/process.py
   trunk/Products/DataCollector/plugins/zenoss/cmd/uname.py
   trunk/Products/DataCollector/plugins/zenoss/portscan/IpServiceMap.py
   trunk/Products/DataCollector/plugins/zenoss/portscan/__init__.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/APCDeviceMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/CiscoHSRP.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/CiscoMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/CpuMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/DellCPUMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/DellDeviceMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/DellPCIMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/DeviceMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/HPCPUMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/HPDeviceMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/HRFileSystemMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/HRSWInstalledMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/HRSWRunMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/InformantHardDiskMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/InterfaceMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/IpServiceMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/NewDeviceMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/PowerwareDeviceMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/RouteMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/SysedgeDiskMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/SysedgeFileSystemMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/SysedgeMap.py
   trunk/Products/DataCollector/plugins/zenoss/snmp/__init__.py
   trunk/Products/DataCollector/zendisc.py
   trunk/Products/DataCollector/zenmodeler.py
   trunk/Products/ZenEvents/ActionRule.py
   trunk/Products/ZenEvents/ActionRuleWindow.py
   trunk/Products/ZenEvents/Availability.py
   trunk/Products/ZenEvents/BetterEventDetail.py
   trunk/Products/ZenEvents/CustomEventView.py
   trunk/Products/ZenEvents/DbAccessBase.py
   trunk/Products/ZenEvents/DbConnectionPool.py
   trunk/Products/ZenEvents/Event.py
   trunk/Products/ZenEvents/EventClass.py
   trunk/Products/ZenEvents/EventClassInst.py
   trunk/Products/ZenEvents/EventClassifier.py
   trunk/Products/ZenEvents/EventCommand.py
   trunk/Products/ZenEvents/EventDetail.py
   trunk/Products/ZenEvents/EventFilter.py
   trunk/Products/ZenEvents/EventManagerBase.py
   trunk/Products/ZenEvents/EventServer.py
   trunk/Products/ZenEvents/Exceptions.py
   trunk/Products/ZenEvents/MessageProcessing.py
   trunk/Products/ZenEvents/MySqlEventManager.py
   trunk/Products/ZenEvents/MySqlSendEvent.py
   trunk/Products/ZenEvents/Schedule.py
   trunk/Products/ZenEvents/SendEvent.py
   trunk/Products/ZenEvents/SyslogProcessing.py
   trunk/Products/ZenEvents/UpdateCheck.py
   trunk/Products/ZenEvents/WhereClause.py
   trunk/Products/ZenEvents/ZEvent.py
   trunk/Products/ZenEvents/ZenEventClasses.py
   trunk/Products/ZenEvents/__init__.py
   trunk/Products/ZenEvents/interfaces.py
   trunk/Products/ZenEvents/skins/zenevents/scHistoryEventInit.py
   trunk/Products/ZenEvents/syslog_h.py
   trunk/Products/ZenEvents/tests/sendEvents.py
   trunk/Products/ZenEvents/tests/sendSyslog.py
   trunk/Products/ZenEvents/tests/testEventClassifier.py
   trunk/Products/ZenEvents/tests/testMySqlEventManager.py
   trunk/Products/ZenEvents/tests/testMySqlSendEvent.py
   trunk/Products/ZenEvents/xtest.py
   trunk/Products/ZenEvents/zenactions.py
   trunk/Products/ZenEvents/zenmail.py
   trunk/Products/ZenEvents/zensendsyslog.py
   trunk/Products/ZenEvents/zensyslog.py
   trunk/Products/ZenEvents/zentrap.py
   trunk/Products/ZenHub/HubService.py
   trunk/Products/ZenHub/PBDaemon.py
   trunk/Products/ZenHub/XmlRpcService.py
   trunk/Products/ZenHub/__init__.py
   trunk/Products/ZenHub/pbClient.py
   trunk/Products/ZenHub/pbClient3.py
   trunk/Products/ZenHub/pbclient2.py
   trunk/Products/ZenHub/services/Beat.py
   trunk/Products/ZenHub/services/CommandConfig.py
   trunk/Products/ZenHub/services/EventService.py
   trunk/Products/ZenHub/services/PerformanceConfig.py
   trunk/Products/ZenHub/services/ProcessConfig.py
   trunk/Products/ZenHub/services/RRDService.py
   trunk/Products/ZenHub/services/SnmpPerfConfig.py
   trunk/Products/ZenHub/services/StatusConfig.py
   trunk/Products/ZenHub/services/WebConfig.py
   trunk/Products/ZenHub/services/WmiConfig.py
   trunk/Products/ZenHub/services/XmlRPCConfig.py
   trunk/Products/ZenHub/services/ZenRender.py
   trunk/Products/ZenHub/services/__init__.py
   trunk/Products/ZenHub/xmlClient.py
   trunk/Products/ZenHub/zenhub.py
   trunk/Products/ZenModel/AdministrativeRole.py
   trunk/Products/ZenModel/AdministrativeRoleable.py
   trunk/Products/ZenModel/BasicDataSource.py
   trunk/Products/ZenModel/BasicDeviceLoader.py
   trunk/Products/ZenModel/BatchDeviceLoader.py
   trunk/Products/ZenModel/CPU.py
   trunk/Products/ZenModel/CiscoLoader.py
   trunk/Products/ZenModel/Classifier.py
   trunk/Products/ZenModel/ClassifierEntry.py
   trunk/Products/ZenModel/CmdDeviceLoader.py
   trunk/Products/ZenModel/Commandable.py
   trunk/Products/ZenModel/ConfigurationError.py
   trunk/Products/ZenModel/ConfmonPropManager.py
   trunk/Products/ZenModel/DataRoot.py
   trunk/Products/ZenModel/Device.py
   trunk/Products/ZenModel/DeviceClass.py
   trunk/Products/ZenModel/DeviceComponent.py
   trunk/Products/ZenModel/DeviceGroup.py
   trunk/Products/ZenModel/DeviceHW.py
   trunk/Products/ZenModel/DeviceManagerBase.py
   trunk/Products/ZenModel/DeviceOrganizer.py
   trunk/Products/ZenModel/DeviceReport.py
   trunk/Products/ZenModel/DeviceResultInt.py
   trunk/Products/ZenModel/DmdBuilder.py
   trunk/Products/ZenModel/EventView.py
   trunk/Products/ZenModel/Exceptions.py
   trunk/Products/ZenModel/ExpansionCard.py
   trunk/Products/ZenModel/FileSystem.py
   trunk/Products/ZenModel/HWComponent.py
   trunk/Products/ZenModel/HardDisk.py
   trunk/Products/ZenModel/Hardware.py
   trunk/Products/ZenModel/HardwareClass.py
   trunk/Products/ZenModel/IpAddress.py
   trunk/Products/ZenModel/IpInterface.py
   trunk/Products/ZenModel/IpNetwork.py
   trunk/Products/ZenModel/IpRouteEntry.py
   trunk/Products/ZenModel/IpService.py
   trunk/Products/ZenModel/IpServiceClass.py
   trunk/Products/ZenModel/IpServiceLoader.py
   trunk/Products/ZenModel/Location.py
   trunk/Products/ZenModel/Lockable.py
   trunk/Products/ZenModel/MEProduct.py
   trunk/Products/ZenModel/MaintenanceWindow.py
   trunk/Products/ZenModel/MaintenanceWindowable.py
   trunk/Products/ZenModel/ManagedEntity.py
   trunk/Products/ZenModel/Manufacturer.py
   trunk/Products/ZenModel/ManufacturerRoot.py
   trunk/Products/ZenModel/MibBase.py
   trunk/Products/ZenModel/MibModule.py
   trunk/Products/ZenModel/MibNode.py
   trunk/Products/ZenModel/MibNotification.py
   trunk/Products/ZenModel/MibOrganizer.py
   trunk/Products/ZenModel/Monitor.py
   trunk/Products/ZenModel/MonitorClass.py
   trunk/Products/ZenModel/NagiosCmd.py
   trunk/Products/ZenModel/NagiosTemplate.py
   trunk/Products/ZenModel/OSComponent.py
   trunk/Products/ZenModel/OSProcess.py
   trunk/Products/ZenModel/OSProcessClass.py
   trunk/Products/ZenModel/OSProcessOrganizer.py
   trunk/Products/ZenModel/OperatingSystem.py
   trunk/Products/ZenModel/Organizer.py
   trunk/Products/ZenModel/PerformanceConf.py
   trunk/Products/ZenModel/PerformanceView.py
   trunk/Products/ZenModel/ProductClass.py
   trunk/Products/ZenModel/RRDDataPoint.py
   trunk/Products/ZenModel/RRDDataSource.py
   trunk/Products/ZenModel/RRDGraph.py
   trunk/Products/ZenModel/RRDTemplate.py
   trunk/Products/ZenModel/RRDThreshold.py
   trunk/Products/ZenModel/RRDView.py
   trunk/Products/ZenModel/Report.py
   trunk/Products/ZenModel/ReportClass.py
   trunk/Products/ZenModel/Service.py
   trunk/Products/ZenModel/ServiceClass.py
   trunk/Products/ZenModel/ServiceOrganizer.py
   trunk/Products/ZenModel/SiteError.py
   trunk/Products/ZenModel/Software.py
   trunk/Products/ZenModel/SoftwareClass.py
   trunk/Products/ZenModel/StatusColor.py
   trunk/Products/ZenModel/StatusMonitorConf.py
   trunk/Products/ZenModel/System.py
   trunk/Products/ZenModel/TerminalServer.py
   trunk/Products/ZenModel/UBRRouter.py
   trunk/Products/ZenModel/UserCommand.py
   trunk/Products/ZenModel/UserSettings.py
   trunk/Products/ZenModel/WinService.py
   trunk/Products/ZenModel/XmlDataLoader.py
   trunk/Products/ZenModel/ZDeviceLoader.py
   trunk/Products/ZenModel/ZVersion.py
   trunk/Products/ZenModel/ZenDate.py
   trunk/Products/ZenModel/ZenMenu.py
   trunk/Products/ZenModel/ZenMenuItem.py
   trunk/Products/ZenModel/ZenMenuable.py
   trunk/Products/ZenModel/ZenModelBase.py
   trunk/Products/ZenModel/ZenModelItem.py
   trunk/Products/ZenModel/ZenModelRM.py
   trunk/Products/ZenModel/ZenPack.py
   trunk/Products/ZenModel/ZenPackLoader.py
   trunk/Products/ZenModel/ZenPackable.py
   trunk/Products/ZenModel/ZenPacker.py
   trunk/Products/ZenModel/ZenStatus.py
   trunk/Products/ZenModel/ZenossInfo.py
   trunk/Products/ZenModel/ZentinelPortal.py
   trunk/Products/ZenModel/__init__.py
   trunk/Products/ZenModel/data/scrub.py
   trunk/Products/ZenModel/identify.py
   trunk/Products/ZenModel/interfaces.py
   trunk/Products/ZenModel/migrate/Migrate.py
   trunk/Products/ZenModel/migrate/__init__.py
   trunk/Products/ZenModel/migrate/about_zenoss.py
   trunk/Products/ZenModel/migrate/advanced_query.py
   trunk/Products/ZenModel/migrate/ar_schedule.py
   trunk/Products/ZenModel/migrate/betterstandarderrormessage.py
   trunk/Products/ZenModel/migrate/casesensitive_catalogs.py
   trunk/Products/ZenModel/migrate/changeeventaction.py
   trunk/Products/ZenModel/migrate/changeeventclasses.py
   trunk/Products/ZenModel/migrate/clearid.py
   trunk/Products/ZenModel/migrate/command.py
   trunk/Products/ZenModel/migrate/datapoints.py
   trunk/Products/ZenModel/migrate/defaultcommandtimeout.py
   trunk/Products/ZenModel/migrate/deviceTemplatesProperty.py
   trunk/Products/ZenModel/migrate/devicepriority.py
   trunk/Products/ZenModel/migrate/evenbetterstandarderrormessage.py
   trunk/Products/ZenModel/migrate/event_commands.py
   trunk/Products/ZenModel/migrate/event_newclasses.py
   trunk/Products/ZenModel/migrate/eventclassmapping.py
   trunk/Products/ZenModel/migrate/eventdbname.py
   trunk/Products/ZenModel/migrate/evtprops.py
   trunk/Products/ZenModel/migrate/hoist_perf_data.py
   trunk/Products/ZenModel/migrate/import_export_filesystem.py
   trunk/Products/ZenModel/migrate/indexhtml.py
   trunk/Products/ZenModel/migrate/innodb.py
   trunk/Products/ZenModel/migrate/interfacename_convert.py
   trunk/Products/ZenModel/migrate/keypath.py
   trunk/Products/ZenModel/migrate/kill_cricket.py
   trunk/Products/ZenModel/migrate/loadaveragereport.py
   trunk/Products/ZenModel/migrate/maxoids.py
   trunk/Products/ZenModel/migrate/menus.py
   trunk/Products/ZenModel/migrate/mibs.py
   trunk/Products/ZenModel/migrate/monitors.py
   trunk/Products/ZenModel/migrate/mwrelations.py
   trunk/Products/ZenModel/migrate/nocountprocs.py
   trunk/Products/ZenModel/migrate/packs.py
   trunk/Products/ZenModel/migrate/pas_conversion.py
   trunk/Products/ZenModel/migrate/perfxmlrpc.py
   trunk/Products/ZenModel/migrate/processes.py
   trunk/Products/ZenModel/migrate/procparams.py
   trunk/Products/ZenModel/migrate/reindex_history.py
   trunk/Products/ZenModel/migrate/reportserver.py
   trunk/Products/ZenModel/migrate/rrdcpu.py
   trunk/Products/ZenModel/migrate/rrdmin.py
   trunk/Products/ZenModel/migrate/rrdmin2.py
   trunk/Products/ZenModel/migrate/smtpsnpp.py
   trunk/Products/ZenModel/migrate/standalone_datapoint_rename.py
   trunk/Products/ZenModel/migrate/standarderrormessage.py
   trunk/Products/ZenModel/migrate/statusconnecttimeout.py
   trunk/Products/ZenModel/migrate/usercommands.py
   trunk/Products/ZenModel/migrate/winminseverity.py
   trunk/Products/ZenModel/migrate/wmiignore.py
   trunk/Products/ZenModel/migrate/zCollectorPlugins.py
   trunk/Products/ZenModel/migrate/zcollectordecoding.py
   trunk/Products/ZenModel/migrate/zenmigrate.py
   trunk/Products/ZenModel/migrate/zenpackdatasources.py
   trunk/Products/ZenModel/migrate/zenuilayer.py
   trunk/Products/ZenModel/migrate/zlinks.py
   trunk/Products/ZenModel/migrate/zlocal.py
   trunk/Products/ZenModel/skins/zenmodel/css_inline_or_link.py
   trunk/Products/ZenModel/skins/zenmodel/getLoginMessage.py
   trunk/Products/ZenModel/skins/zenmodel/isLoggedOut.py
   trunk/Products/ZenModel/skins/zenmodel/logoutUser.py
   trunk/Products/ZenModel/skins/zenmodel/scDatePopup.py
   trunk/Products/ZenModel/skins/zenmodel/scDatePush.py
   trunk/Products/ZenModel/skins/zenmodel/scGenericPopup.py
   trunk/Products/ZenModel/skins/zenmodel/scGetSortedTableState.py
   trunk/Products/ZenModel/skins/zenmodel/scSortedTableGetBatch.py
   trunk/Products/ZenModel/skins/zenmodel/scSortedTableHeader.py
   trunk/Products/ZenModel/skins/zenmodel/scSortedTableHeaderStyle.py
   trunk/Products/ZenModel/skins/zenmodel/scSortedTableHref.py
   trunk/Products/ZenModel/skins/zenmodel/scSortedTableInit.py
   trunk/Products/ZenModel/skins/zenmodel/scSortedTableNavigation.py
   trunk/Products/ZenModel/skins/zenmodel/scSortedTableSetAtt.py
   trunk/Products/ZenModel/skins/zenmodel/scUrlPopup.py
   trunk/Products/ZenModel/tests/ClassifierTest.py
   trunk/Products/ZenModel/tests/IpUtilTest.py
   trunk/Products/ZenModel/tests/ToManyPerfTest.py
   trunk/Products/ZenModel/tests/ZenModelBaseTest.py
   trunk/Products/ZenModel/tests/ZenStatusTest.py
   trunk/Products/ZenModel/tests/__init__.py
   trunk/Products/ZenModel/tests/devicePopulator.py
   trunk/Products/ZenModel/tests/getAllCountsProf.py
   trunk/Products/ZenModel/tests/portal/Devices/__init__.py
   trunk/Products/ZenModel/tests/portal/Devices/testDeviceChanges.py
   trunk/Products/ZenModel/tests/portal/Devices/testDeviceDetail.py
   trunk/Products/ZenModel/tests/portal/Devices/testDeviceNavBar.py
   trunk/Products/ZenModel/tests/portal/Devices/testDeviceNavigation.py
   trunk/Products/ZenModel/tests/portal/Devices/testDevicePerformance.py
   trunk/Products/ZenModel/tests/portal/Devices/testDeviceStatus.py
   trunk/Products/ZenModel/tests/portal/Monitors/__init__.py
   trunk/Products/ZenModel/tests/portal/Monitors/testMonitorNavigation.py
   trunk/Products/ZenModel/tests/portal/Monitors/testMonitorScreens.py
   trunk/Products/ZenModel/tests/portal/Systems/__init__.py
   trunk/Products/ZenModel/tests/portal/Systems/testSystemChanges.py
   trunk/Products/ZenModel/tests/portal/Systems/testSystemDevices.py
   trunk/Products/ZenModel/tests/portal/Systems/testSystemNavBar.py
   trunk/Products/ZenModel/tests/portal/Systems/testSystemNavigation.py
   trunk/Products/ZenModel/tests/portal/Systems/testSystemPerformance.py
   trunk/Products/ZenModel/tests/portal/Systems/testSystemStatus.py
   trunk/Products/ZenModel/tests/portal/__init__.py
   trunk/Products/ZenModel/tests/portal/suite.py
   trunk/Products/ZenModel/tests/portal/testCompanies.py
   trunk/Products/ZenModel/tests/portal/testDmdIndex.py
   trunk/Products/ZenModel/tests/portal/testDmdLeft.py
   trunk/Products/ZenModel/tests/portal/testGroups.py
   trunk/Products/ZenModel/tests/portal/testLocations.py
   trunk/Products/ZenModel/tests/portal/testNetworks.py
   trunk/Products/ZenModel/tests/portal/testProducts.py
   trunk/Products/ZenModel/tests/portal/testSearch.py
   trunk/Products/ZenModel/tests/portal/testServiceAreas.py
   trunk/Products/ZenModel/tests/portal/testServices.py
   trunk/Products/ZenModel/tests/testDevice.py
   trunk/Products/ZenModel/tests/testDeviceClass.py
   trunk/Products/ZenModel/tests/testEvents.py
   trunk/Products/ZenModel/tests/testFileSystem.py
   trunk/Products/ZenModel/tests/testHardDisk.py
   trunk/Products/ZenModel/tests/testIpAddress.py
   trunk/Products/ZenModel/tests/testIpInterface.py
   trunk/Products/ZenModel/tests/testIpNetwork.py
   trunk/Products/ZenModel/tests/testIpRouteEntry.py
   trunk/Products/ZenModel/tests/testIpService.py
   trunk/Products/ZenModel/tests/testMibOrganizer.py
   trunk/Products/ZenModel/tests/testOrganizer.py
   trunk/Products/ZenModel/tests/testWinService.py
   trunk/Products/ZenModel/zenbuild.py
   trunk/Products/ZenModel/zendmd.py
   trunk/Products/ZenModel/zenmib.py
   trunk/Products/ZenRRD/Exceptions.py
   trunk/Products/ZenRRD/FileCleanup.py
   trunk/Products/ZenRRD/RRDDaemon.py
   trunk/Products/ZenRRD/RRDMGraph.py
   trunk/Products/ZenRRD/RRDRelativeThresh.py
   trunk/Products/ZenRRD/RRDToolItem.py
   trunk/Products/ZenRRD/RRDUtil.py
   trunk/Products/ZenRRD/RenderServer.py
   trunk/Products/ZenRRD/SnmpDaemon.py
   trunk/Products/ZenRRD/ThresholdManager.py
   trunk/Products/ZenRRD/__init__.py
   trunk/Products/ZenRRD/plugins/__init__.py
   trunk/Products/ZenRRD/plugins/aggregateCpu.py
   trunk/Products/ZenRRD/plugins/aggregateDisks.py
   trunk/Products/ZenRRD/plugins/aggregateFreeMemory.py
   trunk/Products/ZenRRD/plugins/aggregateIdle.py
   trunk/Products/ZenRRD/plugins/aggregateNetwork.py
   trunk/Products/ZenRRD/plugins/aggregateSwap.py
   trunk/Products/ZenRRD/plugins/aggregateTraffic.py
   trunk/Products/ZenRRD/plugins/areaLine.py
   trunk/Products/ZenRRD/plugins/plugin.py
   trunk/Products/ZenRRD/plugins/randomExample.py
   trunk/Products/ZenRRD/plugins/upperLower.py
   trunk/Products/ZenRRD/rpn.py
   trunk/Products/ZenRRD/tests/RenderServerTest.py
   trunk/Products/ZenRRD/tests/badPackets.py
   trunk/Products/ZenRRD/tests/test.py
   trunk/Products/ZenRRD/tests/testttgraph.py
   trunk/Products/ZenRRD/tests/xtest.py
   trunk/Products/ZenRRD/utils.py
   trunk/Products/ZenRRD/zencommand.py
   trunk/Products/ZenRRD/zenperfsnmp.py
   trunk/Products/ZenRRD/zenperfxmlrpc.py
   trunk/Products/ZenRRD/zenprocess.py
   trunk/Products/ZenRRD/zenrender.py
   trunk/Products/ZenRRD/zenstep.py
   trunk/Products/ZenRRD/zenx.py
   trunk/Products/ZenRelations/Exceptions.py
   trunk/Products/ZenRelations/ExportDevices.py
   trunk/Products/ZenRelations/ExportRM.py
   trunk/Products/ZenRelations/ImportDevices.py
   trunk/Products/ZenRelations/ImportRM.py
   trunk/Products/ZenRelations/PrimaryPathObjectManager.py
   trunk/Products/ZenRelations/RelCopySupport.py
   trunk/Products/ZenRelations/RelSchema.py
   trunk/Products/ZenRelations/RelationshipBase.py
   trunk/Products/ZenRelations/RelationshipManager.py
   trunk/Products/ZenRelations/ToManyContRelationship.py
   trunk/Products/ZenRelations/ToManyRelationship.py
   trunk/Products/ZenRelations/ToManyRelationshipBase.py
   trunk/Products/ZenRelations/ToOneRelationship.py
   trunk/Products/ZenRelations/ZItem.py
   trunk/Products/ZenRelations/ZenPropertyManager.py
   trunk/Products/ZenRelations/__init__.py
   trunk/Products/ZenRelations/checkrel.py
   trunk/Products/ZenRelations/schemadoc.py
   trunk/Products/ZenRelations/tests/TestSchema.py
   trunk/Products/ZenRelations/tests/ZenRelationsBaseTest.py
   trunk/Products/ZenRelations/tests/__init__.py
   trunk/Products/ZenRelations/tests/dataImportExport.py
   trunk/Products/ZenRelations/tests/testFullZopeZenRelations.py
   trunk/Products/ZenRelations/tests/testImportExport.py
   trunk/Products/ZenRelations/tests/testZenPropertyManager.py
   trunk/Products/ZenRelations/tests/testZenRelations.py
   trunk/Products/ZenRelations/utils.py
   trunk/Products/ZenReports/ReportLoader.py
   trunk/Products/ZenReports/ReportRunner.py
   trunk/Products/ZenReports/ReportServer.py
   trunk/Products/ZenReports/Utilization.py
   trunk/Products/ZenReports/Utils.py
   trunk/Products/ZenReports/__init__.py
   trunk/Products/ZenReports/plugins/__init__.py
   trunk/Products/ZenReports/plugins/cpu.py
   trunk/Products/ZenReports/plugins/filesystems.py
   trunk/Products/ZenReports/plugins/interface.py
   trunk/Products/ZenReports/plugins/memory.py
   trunk/Products/ZenReports/plugins/threshold.py
   trunk/Products/ZenStatus/AsyncPing.py
   trunk/Products/ZenStatus/Ping.py
   trunk/Products/ZenStatus/PingThread.py
   trunk/Products/ZenStatus/StatusMonitor.py
   trunk/Products/ZenStatus/TestPing.py
   trunk/Products/ZenStatus/ZenTcpClient.py
   trunk/Products/ZenStatus/__init__.py
   trunk/Products/ZenStatus/intersect.py
   trunk/Products/ZenStatus/pingjob.py
   trunk/Products/ZenStatus/pingtree.py
   trunk/Products/ZenStatus/sendevent.py
   trunk/Products/ZenStatus/test/configget.py
   trunk/Products/ZenStatus/zencacti.py
   trunk/Products/ZenStatus/zenping.py
   trunk/Products/ZenStatus/zenstatus.py
   trunk/Products/ZenUtils/BasicLoader.py
   trunk/Products/ZenUtils/Chain.py
   trunk/Products/ZenUtils/CheckRelations.py
   trunk/Products/ZenUtils/CmdBase.py
   trunk/Products/ZenUtils/ConfDaemon.py
   trunk/Products/ZenUtils/Driver.py
   trunk/Products/ZenUtils/Exceptions.py
   trunk/Products/ZenUtils/FixIps.py
   trunk/Products/ZenUtils/Graphics.py
   trunk/Products/ZenUtils/IpUtil.py
   trunk/Products/ZenUtils/LocationDump.py
   trunk/Products/ZenUtils/Logger.py
   trunk/Products/ZenUtils/Map.py
   trunk/Products/ZenUtils/NJobs.py
   trunk/Products/ZenUtils/ObjectCache.py
   trunk/Products/ZenUtils/PBUtil.py
   trunk/Products/ZenUtils/PObjectCache.py
   trunk/Products/ZenUtils/PortScan.py
   trunk/Products/ZenUtils/Search.py
   trunk/Products/ZenUtils/Security.py
   trunk/Products/ZenUtils/Skins.py
   trunk/Products/ZenUtils/Step.py
   trunk/Products/ZenUtils/Time.py
   trunk/Products/ZenUtils/ToManyRebuildKeys.py
   trunk/Products/ZenUtils/Utils.py
   trunk/Products/ZenUtils/Version.py
   trunk/Products/ZenUtils/ZCmdBase.py
   trunk/Products/ZenUtils/ZenDaemon.py
   trunk/Products/ZenUtils/ZenScriptBase.py
   trunk/Products/ZenUtils/ZenTales.py
   trunk/Products/ZenUtils/ZenZopeThread.py
   trunk/Products/ZenUtils/ZeoConn.py
   trunk/Products/ZenUtils/ZeoPoolBase.py
   trunk/Products/ZenUtils/__init__.py
   trunk/Products/ZenUtils/guid.py
   trunk/Products/ZenUtils/patches/__init__.py
   trunk/Products/ZenUtils/patches/pasmonkey.py
   trunk/Products/ZenUtils/tests/testVersion.py
   trunk/Products/ZenUtils/tests/testZeoPoolBase.py
   trunk/Products/ZenUtils/zenpack.py
   trunk/Products/ZenUtils/zproprmlocal.py
   trunk/Products/ZenWidgets/ZenTableManager.py
   trunk/Products/ZenWidgets/ZenTableState.py
   trunk/Products/ZenWidgets/__init__.py
   trunk/Products/ZenWin/StatusTest.py
   trunk/Products/ZenWin/WinCollector.py
   trunk/Products/ZenWin/WinEventlog.py
   trunk/Products/ZenWin/WinServiceTest.py
   trunk/Products/ZenWin/wmiclient.py
   trunk/Products/ZenWin/zeneventlog.py
   trunk/Products/ZenWin/zenwin.py
   trunk/Products/ZenWin/zenwinmodeler.py
Log:
fixed #1185


Modified: trunk/Products/COPYRIGHT.txt
===================================================================
--- trunk/Products/COPYRIGHT.txt	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/COPYRIGHT.txt	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,9 +1,10 @@
-This program is part of Zenoss Core, an open source monitoring platform.
-
-Copyright (C) 2007, Zenoss Inc.
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 2 as published by
-the Free Software Foundation.
-
-For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#############################################################################

Modified: trunk/Products/DataCollector/ApplyDataMap.py
===================================================================
--- trunk/Products/DataCollector/ApplyDataMap.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/ApplyDataMap.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2005 Zenoss, Inc. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 import time
 import types

Modified: trunk/Products/DataCollector/CollectorClient.py
===================================================================
--- trunk/Products/DataCollector/CollectorClient.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/CollectorClient.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2003 Zenoss, Inc. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__="""CollectorClient
 

Modified: trunk/Products/DataCollector/CommandParsers/CiscoDhcpHelperAddress.py
===================================================================
--- trunk/Products/DataCollector/CommandParsers/CiscoDhcpHelperAddress.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/CommandParsers/CiscoDhcpHelperAddress.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__ = """CommandParser
 

Modified: trunk/Products/DataCollector/CommandParsers/CiscoShowHardware.py
===================================================================
--- trunk/Products/DataCollector/CommandParsers/CiscoShowHardware.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/CommandParsers/CiscoShowHardware.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__ = """CiscoShowHardware
 

Modified: trunk/Products/DataCollector/CommandParsers/CommandParser.py
===================================================================
--- trunk/Products/DataCollector/CommandParsers/CommandParser.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/CommandParsers/CommandParser.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__ = """CommandParser
 

Modified: trunk/Products/DataCollector/CommandParsers/Linux_ifconfig.py
===================================================================
--- trunk/Products/DataCollector/CommandParsers/Linux_ifconfig.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/CommandParsers/Linux_ifconfig.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 import re
 

Modified: trunk/Products/DataCollector/CommandParsers/Linux_netstat_an.py
===================================================================
--- trunk/Products/DataCollector/CommandParsers/Linux_netstat_an.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/CommandParsers/Linux_netstat_an.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__ = """CommandParser
 

Modified: trunk/Products/DataCollector/CommandParsers/Linux_netstat_rn.py
===================================================================
--- trunk/Products/DataCollector/CommandParsers/Linux_netstat_rn.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/CommandParsers/Linux_netstat_rn.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__ = """CommandParser
 

Modified: trunk/Products/DataCollector/CommandParsers/Uname_A.py
===================================================================
--- trunk/Products/DataCollector/CommandParsers/Uname_A.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/CommandParsers/Uname_A.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__ = """CommandParser
 

Modified: trunk/Products/DataCollector/CommandParsers/Unix_df_k.py
===================================================================
--- trunk/Products/DataCollector/CommandParsers/Unix_df_k.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/CommandParsers/Unix_df_k.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__ = """CommandParser
 

Modified: trunk/Products/DataCollector/CommandParsers/Windows_ipconfig_all.py
===================================================================
--- trunk/Products/DataCollector/CommandParsers/Windows_ipconfig_all.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/CommandParsers/Windows_ipconfig_all.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__ = """CommandParser
 

Modified: trunk/Products/DataCollector/CommandParsers/__init__.py
===================================================================
--- trunk/Products/DataCollector/CommandParsers/__init__.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/CommandParsers/__init__.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,3 +1,15 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 from Uname_A import Uname_A
 from Unix_df_k import Unix_df_k
 
@@ -18,3 +30,4 @@
 
     dataCollector.addCommandParser(CiscoDhcpHelperAddress)
     dataCollector.addCommandParser(CiscoShowHardware)
+

Modified: trunk/Products/DataCollector/Exceptions.py
===================================================================
--- trunk/Products/DataCollector/Exceptions.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/Exceptions.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2002 Zenoss, Inc. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__="""Exceptions
 

Modified: trunk/Products/DataCollector/Plugins.py
===================================================================
--- trunk/Products/DataCollector/Plugins.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/Plugins.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,3 +1,20 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+# For complete information please visit: http://www.zenoss.com/oss/
 from Products.ZenUtils.Utils import importClass
 import sys
 import os

Modified: trunk/Products/DataCollector/PortscanClient.py
===================================================================
--- trunk/Products/DataCollector/PortscanClient.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/PortscanClient.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,3 +1,20 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+# For complete information please visit: http://www.zenoss.com/oss/
 import logging
 
 from twisted.internet import reactor, error

Modified: trunk/Products/DataCollector/SnmpClient.py
===================================================================
--- trunk/Products/DataCollector/SnmpClient.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/SnmpClient.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,3 +1,20 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+# For complete information please visit: http://www.zenoss.com/oss/
 import socket
 import logging
 log = logging.getLogger("zen.SnmpClient")

Modified: trunk/Products/DataCollector/SnmpSession.py
===================================================================
--- trunk/Products/DataCollector/SnmpSession.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/SnmpSession.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,10 +1,17 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 import warnings
 warnings.warn("SnmpSession is deprecated", DeprecationWarning)
-#################################################################
-#
-#   Copyright (c) 2002 Zenoss, Inc. All rights reserved.
-#
-#################################################################
 
 __doc__="""snmp
 

Modified: trunk/Products/DataCollector/SshClient.py
===================================================================
--- trunk/Products/DataCollector/SshClient.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/SshClient.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2003 Zenoss, Inc. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__="""SshClient
 

Modified: trunk/Products/DataCollector/SshSession.py
===================================================================
--- trunk/Products/DataCollector/SshSession.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/SshSession.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,3 +1,15 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 #!/usr/bin/env python
 from twisted.conch.ssh import transport, userauth, connection, common, keys, channel
 from twisted.internet import defer, protocol, reactor

Modified: trunk/Products/DataCollector/TelnetClient.py
===================================================================
--- trunk/Products/DataCollector/TelnetClient.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/TelnetClient.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2003 Zenoss, Inc. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__="""TelnetSession
 

Modified: trunk/Products/DataCollector/TelnetSession.py
===================================================================
--- trunk/Products/DataCollector/TelnetSession.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/TelnetSession.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2003 Zenoss, Inc. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__="""TelnetSession
 

Modified: trunk/Products/DataCollector/__init__.py
===================================================================
--- trunk/Products/DataCollector/__init__.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/__init__.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,7 +1,15 @@
-################################################################
-#   Copyright (c) 2002 Zenoss, Inc. All rights reserved.
+###########################################################################
 #
-#################################################################
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 """__init__
 

Modified: trunk/Products/DataCollector/maps/commandmaps/ifconfigMap.py
===================================================================
--- trunk/Products/DataCollector/maps/commandmaps/ifconfigMap.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/maps/commandmaps/ifconfigMap.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -0,0 +1,13 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
+

Modified: trunk/Products/DataCollector/maps/commandmaps/vxprintMap.py
===================================================================
--- trunk/Products/DataCollector/maps/commandmaps/vxprintMap.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/maps/commandmaps/vxprintMap.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -0,0 +1,13 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
+

Modified: trunk/Products/DataCollector/plugins/CollectorPlugin.py
===================================================================
--- trunk/Products/DataCollector/plugins/CollectorPlugin.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/plugins/CollectorPlugin.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2005 Confmon Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 import re
 import struct

Modified: trunk/Products/DataCollector/plugins/DataMaps.py
===================================================================
--- trunk/Products/DataCollector/plugins/DataMaps.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/plugins/DataMaps.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,8 +1,16 @@
-#################################################################
+###########################################################################
 #
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 #   Copyright (c) 2003 Zentinel Systems, Inc. All rights reserved.
-#
-#################################################################
 
 class RelationshipMap(list):
     relname = ""

Modified: trunk/Products/DataCollector/plugins/__init__.py
===================================================================
--- trunk/Products/DataCollector/plugins/__init__.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/plugins/__init__.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -0,0 +1,13 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
+

Modified: trunk/Products/DataCollector/plugins/zenoss/__init__.py
===================================================================
--- trunk/Products/DataCollector/plugins/zenoss/__init__.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/plugins/zenoss/__init__.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -0,0 +1,13 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
+

Modified: trunk/Products/DataCollector/plugins/zenoss/cmd/__init__.py
===================================================================
--- trunk/Products/DataCollector/plugins/zenoss/cmd/__init__.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/plugins/zenoss/cmd/__init__.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -0,0 +1,13 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
+

Modified: trunk/Products/DataCollector/plugins/zenoss/cmd/darwin/__init__.py
===================================================================
--- trunk/Products/DataCollector/plugins/zenoss/cmd/darwin/__init__.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/plugins/zenoss/cmd/darwin/__init__.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -0,0 +1,13 @@
+###########################################################################
+#
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
+

Modified: trunk/Products/DataCollector/plugins/zenoss/cmd/darwin/cpu.py
===================================================================
--- trunk/Products/DataCollector/plugins/zenoss/cmd/darwin/cpu.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/plugins/zenoss/cmd/darwin/cpu.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2006 Zenoss Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+###########################################################################
 
 __doc__="""CpuMap
 

Modified: trunk/Products/DataCollector/plugins/zenoss/cmd/darwin/ifconfig.py
===================================================================
--- trunk/Products/DataCollector/plugins/zenoss/cmd/darwin/ifconfig.py	2007-04-20 13:02:21 UTC (rev 4775)
+++ trunk/Products/DataCollector/plugins/zenoss/cmd/darwin/ifconfig.py	2007-04-20 13:25:38 UTC (rev 4776)
@@ -1,8 +1,15 @@
-#################################################################
+###########################################################################
 #
-#   Copyright (c) 2007 Zenoss Corporation. All rights reserved.
+# This program is part of Zenoss Core, an open source monitoring platform.
+# Copyright (C) 2007, Zenoss Inc.
 #
-#################################################################
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as published by
+# the Free Software Foundation.
+#
+# For complete information please visit: http://www.zenoss.com/oss/
+#
+######################################################...
 
[truncated message content]

[Zenoss-commit] r4775 - trunk/Products/ZenEvents

[<sv...@ze...>]

Author: jstevens
Date: 2007-04-20 09:02:21 -0400 (Fri, 20 Apr 2007)
New Revision: 4775

Modified:
   trunk/Products/ZenEvents/EventClass.py
Log:
Part of the refactor of Organizer and subclasses

Modified: trunk/Products/ZenEvents/EventClass.py
===================================================================
--- trunk/Products/ZenEvents/EventClass.py	2007-04-20 13:00:52 UTC (rev 4774)
+++ trunk/Products/ZenEvents/EventClass.py	2007-04-20 13:02:21 UTC (rev 4775)
@@ -19,6 +19,7 @@
 from Products.ZenModel.Organizer import Organizer
 from Products.ZenModel.ZenPackable import ZenPackable
 from Products.ZenModel.ManagedEntity import ManagedEntity
+from Products.ZenModel.ZenPackable import ZenPackable
 
 from Products.ZenUtils.Utils import prepId as globalPrepId
 
@@ -37,7 +38,7 @@
 addEventClass = DTMLFile('dtml/addEventClass',globals())
 
 
-class EventClass(EventClassPropertyMixin, Organizer, ManagedEntity):
+class EventClass(EventClassPropertyMixin, Organizer, ManagedEntity, ZenPackable):
     """
     EventClass organizer
     """

[Zenoss-commit] r4774 - in trunk/Products: ZenEvents ZenModel ZenModel/skins/zenmodel

[<sv...@ze...>]

Author: jstevens
Date: 2007-04-20 09:00:52 -0400 (Fri, 20 Apr 2007)
New Revision: 4774

Modified:
   trunk/Products/ZenEvents/EventManagerBase.py
   trunk/Products/ZenModel/EventView.py
   trunk/Products/ZenModel/skins/zenmodel/deviceOsDetail.pt
Log:
fixes #1234
 * various ui cleanup on os detail page

Modified: trunk/Products/ZenEvents/EventManagerBase.py
===================================================================
--- trunk/Products/ZenEvents/EventManagerBase.py	2007-04-20 12:58:05 UTC (rev 4773)
+++ trunk/Products/ZenEvents/EventManagerBase.py	2007-04-20 13:00:52 UTC (rev 4774)
@@ -1023,6 +1023,22 @@
         if status < 0: status = "unknown"
         elif status > 3: status = 3
         return "zenstatus_%s" % status
+        
+        
+    def getStatusImgSrc(self, status):
+        ''' Return the img source for a status number
+        '''
+        if status < 0:
+            src = 'magenta'
+        if status == 0:
+            src = 'green'
+        elif status == 1:
+            src = 'yellow'
+        elif status == 2:
+            src = 'yellow'
+        else:
+            src = 'red'
+        return 'misc_/SiteScopeParser/%sball_img' % src
 
 
     def getEventCssClass(self, severity, acked=False):

Modified: trunk/Products/ZenModel/EventView.py
===================================================================
--- trunk/Products/ZenModel/EventView.py	2007-04-20 12:58:05 UTC (rev 4773)
+++ trunk/Products/ZenModel/EventView.py	2007-04-20 13:00:52 UTC (rev 4774)
@@ -87,6 +87,12 @@
         return self.getEventManager().getEventOwnerListME(self, severity, state)
 
     
+    def getStatusImgSrc(self, status):
+        ''' Return the image source for a status number
+        '''
+        return self.getEventManager().getStatusImgSrc(status)
+
+
     def getStatusCssClass(self, status):
         """Return the css class for a status number.
         """

Modified: trunk/Products/ZenModel/skins/zenmodel/deviceOsDetail.pt
===================================================================
--- trunk/Products/ZenModel/skins/zenmodel/deviceOsDetail.pt	2007-04-20 12:58:05 UTC (rev 4773)
+++ trunk/Products/ZenModel/skins/zenmodel/deviceOsDetail.pt	2007-04-20 13:00:52 UTC (rev 4774)
@@ -21,8 +21,6 @@
 <!-- BEGIN TABLE CONTENTS -->
     <tr tal:condition="batch">
         <th class="tableheader"></th>
-        <th class="tableheader" align="center">O</th>
-        <th class="tableheader" align="center">A</th>
         <th tal:replace="structure python:here.ZenTableManager.getTableHeader(
                             tableName,'primarySortKey','Name')"/>
         <th tal:replace="structure python:here.ZenTableManager.getTableHeader(
@@ -33,6 +31,8 @@
         <th tal:condition="here/zIfDescription"
             tal:replace="structure python:here.ZenTableManager.getTableHeader(
                             tableName,'description','Descr')"/>
+        <th class="tableheader" align="center">O</th>
+        <th class="tableheader" align="center">A</th>
         <th class="tableheader" align="center">Lock</th>
     </tr>
     <tr tal:condition="not:batch">
@@ -47,18 +47,6 @@
          <input type="checkbox" name="componentNames:list" 
                 tal:attributes="value intf/getRelationshipManagerId"/>
       </td>
-      <td class="tablevalues" align="center">
-      <img border="0"
-        tal:attributes="src python:test(intf.operStatus==1,
-                'misc_/SiteScopeParser/greenball_img',
-                'misc_/SiteScopeParser/redball_img')">
-      </td>
-      <td class="tablevalues" align="center">
-      <img border="0"
-        tal:attributes="src python:test(intf.adminStatus==1,
-                'misc_/SiteScopeParser/greenball_img',
-                'misc_/SiteScopeParser/redball_img')">
-      </td>
       <td class="tablevalues">
       <a class=tablevalues tal:content="intf/viewName" 
         tal:attributes="href intf/getPrimaryUrlPath">eth0</a>
@@ -87,13 +75,25 @@
         A really nice interface
       </td>
       <td class="tablevalues" align="center">
+      <img border="0"
+        tal:attributes="src python:test(intf.operStatus==1,
+                'misc_/SiteScopeParser/greenball_img',
+                'misc_/SiteScopeParser/redball_img')">
+      </td>
+      <td class="tablevalues" align="center">
+      <img border="0"
+        tal:attributes="src python:test(intf.adminStatus==1,
+                'misc_/SiteScopeParser/greenball_img',
+                'misc_/SiteScopeParser/redball_img')">
+      </td>
+      <td class="tablevalues" align="center">
       <img tal:condition="intf/isLockedFromDeletion" border="0" src="locked-delete-icon.png">
       <img tal:condition="intf/isLockedFromUpdates" border="0" src="locked-update-icon.png">
       </td>
     </tr>
     </tal:block>
     <tr>
-        <td colspan=7 class="tableheader" align='center'>
+        <td colspan="9" class="tableheader" align='center'>
             <form metal:use-macro="here/zenTableNavigation/macros/navtool"></form>
         </td>
     </tr>
@@ -123,8 +123,6 @@
     <tr>
         <th class="tableheader"></th>
         <th tal:replace="structure python:here.ZenTableManager.getTableHeader(
-                            tableName,'getServiceClass','Class')"/>
-        <th tal:replace="structure python:here.ZenTableManager.getTableHeader(
                         tableName,'caption','Caption')"/>
         <th tal:replace="structure python:here.ZenTableManager.getTableHeader(
                         tableName,'startMode','StartMode')"/>
@@ -143,24 +141,24 @@
            <input type="checkbox" name="componentNames:list" 
                   tal:attributes="value srv/getRelationshipManagerId"/>
         </td>
-        <td tal:content="structure srv/getServiceClassLink"/>
-        <td><a class="tablevalues" tal:content="srv/caption"
+        <td class="tablevalues"><a class="tablevalues" tal:content="srv/caption"
                 tal:attributes="href srv/getPrimaryUrlPath">evtsys</a>
         </td>
         <td class="tablevalues" tal:content="srv/startMode"/>
         <td class="tablevalues" tal:content="srv/startName"/>
         <td class="tablevalues" tal:content="srv/name"/>
-        <td tal:define="status srv/getStatus"
-            tal:attributes="class python:here.getStatusCssClass(status)"
-            tal:content="python:here.convertStatus(status)"/>
-        <td class="tablevalues" align="center">
+		<td class="tablevalues" align="center" width="40">
+			<img border="0"
+			tal:attributes="src python:here.getStatusImgSrc(srv.getStatus())">
+		</td>
+        <td class="tablevalues" align="center" width="40">
         <img tal:condition="srv/isLockedFromDeletion" border="0" src="locked-delete-icon.png">
         <img tal:condition="srv/isLockedFromUpdates" border="0" src="locked-update-icon.png">
         </td>
     </tr>
     </tal:block>
     <tr>
-        <td colspan="5" class="tableheader" align='center'
+        <td colspan="7" class="tableheader" align='center'
 			tal:define="useOnlyMonitored python:1">
             <form metal:use-macro="here/zenTableNavigation/macros/navtool"/>
         </td>
@@ -221,23 +219,26 @@
            <input type="checkbox" name="componentNames:list" 
                   tal:attributes="value proc/getRelationshipManagerId"/>
         </td>
-        <td tal:content="structure proc/getOSProcessClassLink"/>
-        <td><a class="tablevalues" tal:content="python:proc.name()[:50]"
+        <td class="tablevalues" 
+				tal:content="structure proc/getOSProcessClassLink"/>
+        <td class="tablevalues">
+				<a class="tablevalues" tal:content="python:proc.name()[:50]"
                 tal:attributes="href proc/getPrimaryUrlPath">evtsys</a>
         </td>
-        <td tal:content="proc/alertOnRestart"/>
-        <td tal:content="proc/getFailSeverityString"/>
-        <td tal:define="status proc/getStatus"
-            tal:attributes="class python:here.getStatusCssClass(status)"
-            tal:content="python:here.convertStatus(status)"/>
-        <td class="tablevalues" align="center">
+        <td class="tablevalues" tal:content="proc/alertOnRestart"/>
+        <td class="tablevalues" tal:content="proc/getFailSeverityString"/>
+		<td class="tablevalues" align="center" width="40">
+			<img border="0"
+			tal:attributes="src python:here.getStatusImgSrc(proc.getStatus())">
+		</td>
+        <td class="tablevalues" align="center" width="40">
         <img tal:condition="proc/isLockedFromDeletion" border="0" src="locked-delete-icon.png">
         <img tal:condition="proc/isLockedFromUpdates" border="0" src="locked-update-icon.png">
         </td>
     </tr>
     </tal:block>
     <tr>
-        <td colspan="6" class="tableheader" align='center'>
+        <td colspan="7" class="tableheader" align='center'>
             <form metal:use-macro="here/zenTableNavigation/macros/navtool">
             </form>
         </td>
@@ -269,8 +270,6 @@
     <tr>
         <th class="tableheader"></th>
         <th tal:replace="structure python:here.ZenTableManager.getTableHeader(
-                            tableName,'getServiceClass','Class')"/>
-        <th tal:replace="structure python:here.ZenTableManager.getTableHeader(
                             tableName,'getKeyword','Name')">Name
         </th>
         <th tal:replace="structure python:here.ZenTableManager.getTableHeader(
@@ -297,28 +296,28 @@
            <input type="checkbox" name="componentNames:list" 
                   tal:attributes="value srv/getRelationshipManagerId"/>
         </td>
-        <td tal:content="structure srv/getServiceClassLink"/>
-        <td><a class="tablevalues" tal:content="srv/name"
+        <td class="tablevalues"><a class="tablevalues" tal:content="srv/name"
                 tal:attributes="href srv/getPrimaryUrlPath">evtsys</a>
         </td>
-        <td tal:content="srv/protocol"/>
-        <td tal:content="srv/port"/>
-        <td>
+        <td class="tablevalues" tal:content="srv/protocol"/>
+        <td class="tablevalues" tal:content="srv/port"/>
+        <td class="tablevalues">
             <span tal:omit-tag="" tal:repeat="ip srv/ipaddresses"
                 tal:content="ip"/>
         </td>
-        <td tal:content="srv/getDescription"/>
-        <td tal:define="status srv/getStatus"
-            tal:attributes="class python:here.getStatusCssClass(status)"
-            tal:content="python:here.convertStatus(status)"/>
-        <td class="tablevalues" align="center">
+        <td class="tablevalues" tal:content="srv/getDescription"/>
+		<td class="tablevalues" align="center" width="40">
+			<img border="0"
+			tal:attributes="src python:here.getStatusImgSrc(srv.getStatus())">
+		</td>
+        <td class="tablevalues" align="center" width="40">
         <img tal:condition="srv/isLockedFromDeletion" border="0" src="locked-delete-icon.png">
         <img tal:condition="srv/isLockedFromUpdates" border="0" src="locked-update-icon.png">
         </td>
     </tr>
     </tal:block>
     <tr>
-        <td colspan="6" class="tableheader" align='center'
+        <td colspan="8" class="tableheader" align='center'
 			tal:define="useOnlyMonitored python:1">
             <form metal:use-macro="here/zenTableNavigation/macros/navtool"></form>
         </td>
@@ -404,14 +403,14 @@
         tal:content="fsys/storageDevice">vol
       </td>
       -->
-      <td class="tablevalues" align="center">
+      <td class="tablevalues" align="center" width="40">
       <img tal:condition="fsys/isLockedFromDeletion" border="0" src="locked-delete-icon.png">
       <img tal:condition="fsys/isLockedFromUpdates" border="0" src="locked-update-icon.png">
       </td>
     </tr>
     </tal:block>
     <tr>
-        <td colspan="5" class="tableheader" align='center'
+        <td colspan="7" class="tableheader" align='center'
 			tal:define="useOnlyMonitored python:1">
             <form metal:use-macro="here/zenTableNavigation/macros/navtool">
             </form>
@@ -486,7 +485,7 @@
     </tr>
     </tal:block>
     <tr>
-        <td colspan="5" class="tableheader" align='center'>
+        <td colspan="7" class="tableheader" align='center'>
             <form metal:use-macro="here/zenTableNavigation/macros/navtool">
             </form>
         </td>

[Zenoss-commit] r4773 - trunk/Products

[<sv...@ze...>]

Author: ecn
Date: 2007-04-20 08:58:05 -0400 (Fri, 20 Apr 2007)
New Revision: 4773

Modified:
   trunk/Products/COPYRIGHT.txt
Log:
 * simplify copyright file even more


Modified: trunk/Products/COPYRIGHT.txt
===================================================================
--- trunk/Products/COPYRIGHT.txt	2007-04-20 12:56:44 UTC (rev 4772)
+++ trunk/Products/COPYRIGHT.txt	2007-04-20 12:58:05 UTC (rev 4773)
@@ -1,15 +1,9 @@
-Copyright (c) 2007 Zenoss, Inc. All rights reserved.
+This program is part of Zenoss Core, an open source monitoring platform.
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+Copyright (C) 2007, Zenoss Inc.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 2 as published by
+the Free Software Foundation.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+For complete information please visit: http://www.zenoss.com/oss/

[Zenoss-commit] r4772 - trunk/Products

[<sv...@ze...>]

Author: ecn
Date: 2007-04-20 08:56:44 -0400 (Fri, 20 Apr 2007)
New Revision: 4772

Modified:
   trunk/Products/COPYRIGHT.txt
Log:
 * simplify copyright file


Modified: trunk/Products/COPYRIGHT.txt
===================================================================
--- trunk/Products/COPYRIGHT.txt	2007-04-19 20:50:32 UTC (rev 4771)
+++ trunk/Products/COPYRIGHT.txt	2007-04-20 12:56:44 UTC (rev 4772)
@@ -1,18 +1,5 @@
-All files in the directories:
-DataCollector   
-NcoProduct      
-PingMonitor     
-SiteScopeParser 
-SnmpCollector   
-ZenEvents       
-ZenModel        
-ZenRelations
-ZenRRD          
-ZenUtils
-ZenWidgets
+Copyright (c) 2007 Zenoss, Inc. All rights reserved.
 
-Copyright (c) 2002 Zenoss, Inc. All rights reserved.
-
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2

[Zenoss-commit] r4771 - trunk/bin

[<sv...@ze...>]

Author: ecn
Date: 2007-04-19 16:50:32 -0400 (Thu, 19 Apr 2007)
New Revision: 4771

Modified:
   trunk/bin/zenoss
Log:
ignore zenwin and friends if you don't have the requisite libs


Modified: trunk/bin/zenoss
===================================================================
--- trunk/bin/zenoss	2007-04-19 19:24:17 UTC (rev 4770)
+++ trunk/bin/zenoss	2007-04-19 20:50:32 UTC (rev 4771)
@@ -43,8 +43,12 @@
 C="$C zenactions"
 C="$C zentrap"
 C="$C zencommand"
-C="$C zenwin"
-C="$C zeneventlog"
+if [ -f $ZENHOME/lib/python/pywmi.py ]
+then
+    C="$C zenwin"
+    C="$C zeneventlog"
+    C="$C zenmodeler"
+fi
 for i in $ZENHOME/Products/*/daemons/*
 do
    if [ -x "$i" ]