Menu
▾
▴
zenoss-commit — svn commit list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(65) |
Mar
(276) |
Apr
(544) |
May
(638) |
Jun
(225) |
Jul
(204) |
Aug
(294) |
Sep
(532) |
Oct
(506) |
Nov
(324) |
Dec
(359) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(208) |
Feb
(225) |
Mar
(248) |
Apr
(388) |
May
(222) |
Jun
(47) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@ze...> - 2008-06-03 15:56:05
|
Author: ian
Date: 2008-06-03 11:56:11 -0400 (Tue, 03 Jun 2008)
New Revision: 9391
Added:
branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/zenoss-utils.js
Modified:
branches/zenoss-2.2.x/Products/ZenEvents/skins/zenevents/viewEvents.pt
branches/zenoss-2.2.x/Products/ZenEvents/skins/zenevents/viewHistoryEvents.pt
branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/Dashboard.pt
branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/administeredDevices.pt
branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/commandOutputTemplate.pt
branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/commandTestOutput.pt
branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceListMacro.pt
branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceLoggingHeader.pt
branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceOsDetail.pt
branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceStatus.pt
branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/discoverLoggingHeader.pt
branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/editSettings.pt
branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/templates.pt
branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt
branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/viewGraphReport.pt
branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/viewPerformanceDetail.pt
branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/zenossDotNet.pt
branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/zenrrdzoom.js
branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/ZenAutoCompleter-example.pt
branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/dialogmacros.pt
branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/devicezengrid.js
branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/geomap-2.1.js
branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/geomap.js
branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/zenoss-core.js
branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/locationGeoMap.pt
branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/simpleLocationGeoMap.pt
branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/zenuimacros.pt
Log:
* Refs #3217: Backporting r9343 into the 2.2.x branch
Modified: branches/zenoss-2.2.x/Products/ZenEvents/skins/zenevents/viewEvents.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenEvents/skins/zenevents/viewEvents.pt 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenEvents/skins/zenevents/viewEvents.pt 2008-06-03 15:56:11 UTC (rev 9391)
@@ -16,10 +16,6 @@
</div>
<link type="text/css" rel="stylesheet" href="css/zengrid.css"/>
-<script type="text/javascript" src="/zport/js/zenutils.js"></script>
-<script type="text/javascript" src="/zport/javascript/zengrid.js"></script>
-<script type="text/javascript"
- src="/zport/portal_skins/zenevents/zeneventsfuncs.js"></script>
<form name="control" method="post"
tal:attributes="action here/absolute_url_path"
tal:define="
@@ -88,12 +84,16 @@
<!-- BEGIN TABLE CONTENTS -->
<tr><td>
<div id="gridcontainer" style="width:100%;"> </div>
-<script tal:content="string:
+<script tal:define="ref python:test(here.dmd.ZenUsers.getUserSettings().eventConsoleRefresh, 'On', 'Off')"
+ tal:content="string:
var eventZenGridBuffer, eventZenGrid;
function updateEventConsoleMessage(msg) {
$('msgbox').innerHTML = msg;
}
-addLoadEvent( function() {
+addLoadEvent(function(){
+var loader = YAHOO.zenoss.getLoader();
+loader.require(['eventzengrid']);
+loader.insert({onSuccess: function() {
eventZenGridBuffer = new ZenGridBuffer();
eventZenGrid = new ZenGrid('gridcontainer',
'getJSONEventsInfo', 'mygrid', eventZenGridBuffer,
@@ -102,21 +102,9 @@
connect('filter', 'onkeyup', eventZenGrid.doEventLivesearch);
connect('state', 'onchange', eventZenGrid.refreshFromFormElement);
connect('severity', 'onchange', eventZenGrid.refreshFromFormElement);
-
-});">
+ eventZenGrid.turnRefresh${ref}();
+}})});">
</script>
-<script tal:condition="
-python:here.dmd.ZenUsers.getUserSettings().eventConsoleRefresh">
-addLoadEvent( function() {
- eventZenGrid.turnRefreshOn();
-});
-</script>
-<script tal:condition="
-python:not here.dmd.ZenUsers.getUserSettings().eventConsoleRefresh">
-addLoadEvent( function() {
- eventZenGrid.turnRefreshOff();
-});
-</script>
</td></tr>
<!-- END TABLE CONTENTS -->
</tal:block>
Modified: branches/zenoss-2.2.x/Products/ZenEvents/skins/zenevents/viewHistoryEvents.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenEvents/skins/zenevents/viewHistoryEvents.pt 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenEvents/skins/zenevents/viewHistoryEvents.pt 2008-06-03 15:56:11 UTC (rev 9391)
@@ -4,10 +4,6 @@
<span metal:define-macro="body">
<link type="text/css" rel="stylesheet" href="css/zengrid.css"/>
<script type="text/javascript"> var djConfig = { isDebug: true }; </script>
-<script type="text/javascript" src="/zport/js/zenutils.js"></script>
-<script type="text/javascript" src="/zport/javascript/zengrid.js"></script>
-<script type="text/javascript"
- src="/zport/portal_skins/zenevents/zeneventsfuncs.js"></script>
<script type="text/javascript" src="/zport/portal_skins/zenmodel/datePicker.js">
</script>
@@ -114,6 +110,9 @@
<script tal:content="string:
var eventZenGridBuffer, eventZenGrid;
addLoadEvent( function() {
+var loader = YAHOO.zenoss.getLoader();
+loader.require(['eventzengrid']);
+loader.insert({onSuccess:function(){
eventZenGridBuffer = new ZenGridBuffer();
eventZenGrid = new ZenGrid('gridcontainer',
'getJSONHistoryEventsInfo', 'mygrid', eventZenGridBuffer,
@@ -121,7 +120,7 @@
connect('filter', 'onkeyup', eventZenGrid.doEventLivesearch);
connect('state', 'onchange', eventZenGrid.refreshFromFormElement);
connect('severity', 'onchange', eventZenGrid.refreshFromFormElement);
-});">
+}})});">
</script>
<script type="text/javascript">
Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/Dashboard.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/Dashboard.pt 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/Dashboard.pt 2008-06-03 15:56:11 UTC (rev 9391)
@@ -44,8 +44,9 @@
ContainerObject.rightCol().addPortlet(p3);
}
}
-YAHOO.zenoss.loader.require(['portletsource']);
-YAHOO.zenoss.loader.insert({ 'onSuccess':initDashboardPortlets });
+var loader = YAHOO.zenoss.getLoader();
+loader.require(['portletsource']);
+loader.insert({ 'onSuccess':initDashboardPortlets });
</script>
</tal:block>
</tal:block>
Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/administeredDevices.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/administeredDevices.pt 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/administeredDevices.pt 2008-06-03 15:56:11 UTC (rev 9391)
@@ -17,10 +17,12 @@
q.input.name = 'deviceName'
}
-YAHOO.zenoss.loader.require(['zenautocomplete']);
-YAHOO.zenoss.loader.insert();
+var loader = YAHOO.zenoss.getLoader();
+loader.require(['zenautocomplete']);
+loader.insert(function(){
+ $('dialog').addLoadEvent('dialog_addAdministeredDevice', function() { createAnAutocompleter('deviceLiveSearch') ;} )
+});
// don't pass it a callback, calling it later manually
-$('dialog').addLoadEvent('dialog_addAdministeredDevice', function() { createAnAutocompleter('deviceLiveSearch') ;} )
</script>
Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/commandOutputTemplate.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/commandOutputTemplate.pt 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/commandOutputTemplate.pt 2008-06-03 15:56:11 UTC (rev 9391)
@@ -36,7 +36,6 @@
<div metal:use-macro="here/templates/macros/leftPane"/>
<div id="rightPane"/>
<div metal:use-macro="here/templates/macros/tabsPane"/>
- <script type="text/javascript">zenPageInit()</script>
<div id="contentPane">
Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/commandTestOutput.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/commandTestOutput.pt 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/commandTestOutput.pt 2008-06-03 15:56:11 UTC (rev 9391)
@@ -36,7 +36,6 @@
<div metal:use-macro="here/templates/macros/leftPane"/>
<div id="rightPane"/>
<div metal:use-macro="here/templates/macros/tabsPane"/>
- <script type="text/javascript">zenPageInit()</script>
<div id="contentPane">
Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceListMacro.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceListMacro.pt 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceListMacro.pt 2008-06-03 15:56:11 UTC (rev 9391)
@@ -247,23 +247,23 @@
<tal:block metal:define-macro="devGridBody">
<tr><td>
<link type="text/css" rel="stylesheet" href="css/zengrid.css"/>
- <script type="text/javascript"
- src="/zport/javascript/devicezengrid.js"></script>
-
<div id="gridcontainer" style="width:100%;"> </div>
<tal:block tal:define="ismanager python:test(
here.zport.has_permission('View', here.dmd),
'true', 'false')">
<script tal:content="string:
var devZenGridBuffer, devZenGrid;
- addLoadEvent( function() {
+ loader = YAHOO.zenoss.getLoader();
+ loader.require(['devicezengrid']);
+ loader.insert({onSuccess: function() {
isManager = ${ismanager};
devZenGridBuffer = new DeviceZenGridBuffer();
devZenGrid = new DeviceZenGrid('gridcontainer',
'getJSONDeviceInfo', 'mygrid', devZenGridBuffer,
'${here/absolute_url_path}');
connect('filter', 'onkeypress', devZenGrid.doEventLivesearch);
- });"></script>
+ }});
+"></script>
</tal:block>
</td></tr>
</tal:block>:w
Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceLoggingHeader.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceLoggingHeader.pt 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceLoggingHeader.pt 2008-06-03 15:56:11 UTC (rev 9391)
@@ -31,7 +31,6 @@
<div metal:use-macro="here/leftPane/macros/leftPane"/>
<div id="rightPane"/>
<div metal:use-macro="here/templates/macros/tabsPane"/>
- <script type="text/javascript">zenPageInit()</script>
<div id="contentPane">
<table class=" zentable">
Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceOsDetail.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceOsDetail.pt 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceOsDetail.pt 2008-06-03 15:56:11 UTC (rev 9391)
@@ -31,11 +31,13 @@
q.input.name = 'className'
}
-YAHOO.zenoss.loader.require(['zenautocomplete']);
-YAHOO.zenoss.loader.insert();
+var loader = YAHOO.zenoss.getLoader();
+loader.require(['zenautocomplete']);
+loader.insert( function(){
+ $('dialog').addLoadEvent('dialog_addIpService', function() { createIpServiceClassAutocompleter('ipServiceClassLiveSearch') ;} )
+ $('dialog').addLoadEvent('dialog_addWinService', function() { createWinServiceClassAutocompleter('winServiceClassLiveSearch') ;} )
+});
// don't pass it a callback, calling it later manually
-$('dialog').addLoadEvent('dialog_addIpService', function() { createIpServiceClassAutocompleter('ipServiceClassLiveSearch') ;} )
-$('dialog').addLoadEvent('dialog_addWinService', function() { createWinServiceClassAutocompleter('winServiceClassLiveSearch') ;} )
</script>
<tal:block
Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceStatus.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceStatus.pt 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceStatus.pt 2008-06-03 15:56:11 UTC (rev 9391)
@@ -92,8 +92,9 @@
'component-event-table', mycolumndefs, dataSource, oConfigs);
}
addLoadEvent(function() {
- YAHOO.zenoss.loader.require(["datatable", "datatablesamskin"]);
- YAHOO.zenoss.loader.insert({onSuccess:makeComponentDataTable});
+ var loader = YAHOO.zenoss.getLoader();
+ loader.require(["datatable", "datatablesamskin"]);
+ loader.insert({onSuccess:makeComponentDataTable});
});
</script>
</div>
Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/discoverLoggingHeader.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/discoverLoggingHeader.pt 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/discoverLoggingHeader.pt 2008-06-03 15:56:11 UTC (rev 9391)
@@ -31,7 +31,6 @@
<div metal:use-macro="here/templates/macros/leftPane"/>
<div id="rightPane"/>
<div metal:use-macro="here/templates/macros/tabsPane"/>
- <script type="text/javascript">zenPageInit()</script>
<div id="contentPane">
<table class=" zentable">
Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/editSettings.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/editSettings.pt 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/editSettings.pt 2008-06-03 15:56:11 UTC (rev 9391)
@@ -27,8 +27,9 @@
mySimpleDialog.render(currentDocument().body);
mySimpleDialog.show();
}
-YAHOO.zenoss.loader.require(['container']);
-YAHOO.zenoss.loader.insert();
+var loader=YAHOO.zenoss.getLoader();
+loader.require(['container']);
+loader.insert();
</script>
<form method=post tal:attributes="action string:${here/absolute_url_path}">
Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/templates.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/templates.pt 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/templates.pt 2008-06-03 15:56:11 UTC (rev 9391)
@@ -173,12 +173,24 @@
href="zenoss_ie6.css" >
<![endif]-->
<script type="text/javascript" src="js/MochiKit.js"></script>
- <script> var YAHOO_config={load:{base: '/zport/dmd/yui/'}};</script>
<script type="text/javascript" language="javascript"
src="/zport/dmd/yui/yahoo/yahoo-min.js"></script>
<script type="text/javascript" language="javascript"
src="/zport/dmd/yui/yuiloader/yuiloader-beta-min.js"></script>
<script type="text/javascript" src="javascript/zenoss-core.js"></script>
+ <script>
+ var loader = YAHOO.zenoss.getLoader();
+ loader.require(['zenossutils']);
+ loader.insert({onSuccess:function(){
+ removeElementAutoCompletes();
+ applyBrowserSpecificStyles();
+ addSelectionBar();
+ checkForCollapsed();
+ connectCheckboxListeners();
+ notifyParentOfNewUrl();
+ zenPageInit();
+ }});
+ </script>
</tal:block>
<!-- ======================================================
Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/userCommandsMacros.pt 2008-06-03 15:56:11 UTC (rev 9391)
@@ -119,7 +119,12 @@
</li>
</ul>
</div>
-<script>registerSubmenu('RunCommands_parent','RunCommands_submenu');
+<script>
+var loader = YAHOO.zenoss.getLoader();
+loader.require(['zenossutils']);
+loader.insert({onSuccess:function(){
+ registerSubmenu('RunCommands_parent','RunCommands_submenu');
+}});
</script>
</li>
</tal:block>
Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/viewGraphReport.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/viewGraphReport.pt 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/viewGraphReport.pt 2008-06-03 15:56:11 UTC (rev 9391)
@@ -38,6 +38,11 @@
}
printableForm.submit();
}
+addLoadEvent(function() {
+ var loader = YAHOO.zenoss.getLoader();
+ loader.require(['swoopygraphs']);
+ loader.insert({onSuccess:function(){zenRRDInit()}});
+});
</script>
@@ -106,10 +111,6 @@
</tal:block>
-<script>
- document.write('<\/script><script src="zenrrdzoom.js"><\/script><script>');
-</script>
-
<!-- END TABLE CONTENTS -->
</tal:block>
Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/viewPerformanceDetail.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/viewPerformanceDetail.pt 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/viewPerformanceDetail.pt 2008-06-03 15:56:11 UTC (rev 9391)
@@ -43,27 +43,34 @@
id="refreshRate" size='2' value='60'/>
<script>
var button = $('refreshButton');
- var refreshMgr;
- function turnRefreshOff() {
- try {
- refreshMgr.cancelRefresh();
- } catch(e) { noop(); }
- setStyle(button,
- {'background-image':'url(img/refresh_on.png)'});
- button.onclick = turnRefreshOn;
- button.blur();
- }
- function turnRefreshOn () {
- var rate = $('refreshRate').value;
- var refreshMgr = new RefreshManager(rate,
- function(){resetGraphs($('drange_select').value)}
- );
- setStyle(button,
- {'background-image':'url(img/refresh_off.png)'});
- button.onclick = turnRefreshOff;
- button.blur();
- }
- turnRefreshOn();
+ var refreshMgr, turnRefreshOff, turnRefreshOn;
+ addLoadEvent(function() {
+ var loader = YAHOO.zenoss.getLoader();
+ loader.require(['swoopygraphs']);
+ loader.insert({onSuccess:function(){
+ zenRRDInit();
+ turnRefreshOff = function() {
+ try {
+ refreshMgr.cancelRefresh();
+ } catch(e) { noop(); }
+ setStyle(button,
+ {'background-image':'url(img/refresh_on.png)'});
+ button.onclick = turnRefreshOn;
+ button.blur();
+ }
+ turnRefreshOn = function() {
+ var rate = $('refreshRate').value;
+ var refreshMgr = new RefreshManager(rate,
+ function(){resetGraphs($('drange_select').value)}
+ );
+ setStyle(button,
+ {'background-image':'url(img/refresh_off.png)'});
+ button.onclick = turnRefreshOff;
+ button.blur();
+ }
+ turnRefreshOn();
+ }});
+ });
</script>
<tal:block metal:define-slot="filterslot">
</tal:block>
@@ -105,9 +112,6 @@
</tal:block>
</tal:block>
-<script>
- document.write('<\/script><script src="zenrrdzoom.js"><\/script><script>');
-</script>
<!-- END TABLE CONTENTS -->
Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/zenossDotNet.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/zenossDotNet.pt 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/zenossDotNet.pt 2008-06-03 15:56:11 UTC (rev 9391)
@@ -1,8 +1,9 @@
<tal:block metal:use-macro="here/templates/macros/page1">
<tal:block metal:fill-slot="contentPane">
<script>
- YAHOO.zenoss.loader.require(['container']);
- YAHOO.zenoss.loader.insert();
+ var loader=YAHOO.zenoss.getLoader();
+ loader.require(['container']);
+ loader.insert();
function installZenPack(packName) {
url = '/zport/dmd/ZenPackManager/fetchZenPack';
qs = {packName:packName};
Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/zenrrdzoom.js
===================================================================
--- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/zenrrdzoom.js 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/zenrrdzoom.js 2008-06-03 15:56:11 UTC (rev 9391)
@@ -7,9 +7,6 @@
#####################################################
*/
-
-
-
var zoom_factor = 1.5;
var pan_factor = 3; // Fraction of graph to move
var drange_re = /&drange=([0-9]*)/;
@@ -492,4 +489,5 @@
}
}
-addLoadEvent(zenRRDInit);
+YAHOO.register('swoopygraphs', YAHOO.zenoss, {});
+
Modified: branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/ZenAutoCompleter-example.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/ZenAutoCompleter-example.pt 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/ZenAutoCompleter-example.pt 2008-06-03 15:56:11 UTC (rev 9391)
@@ -15,8 +15,9 @@
);
}
-YAHOO.zenoss.loader.require(['zenautocomplete']);
-YAHOO.zenoss.loader.insert({onSuccess:createAnAutocompleter}); // pass it a callback
+var loader = YAHOO.zenoss.getLoader();
+loader.require(['zenautocomplete']);
+loader.insert({onSuccess:createAnAutocompleter}); // pass it a callback
</script>
Modified: branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/dialogmacros.pt
===================================================================
--- branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/dialogmacros.pt 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/dialogmacros.pt 2008-06-03 15:56:11 UTC (rev 9391)
@@ -1,7 +1,7 @@
<!--============Basic dialog box wrapper===============-->
<tal:block metal:define-macro="dialog">
-<div id="dialog" class="dialog">
-<div id="dialog_innercontent">
+<div id="dialog" class="dialog" style="visibility:hidden;position:absolute">
+<div id="dialog_innercontent" style="visibility:visible">
<tal:block metal:define-slot="dialog_content">
This is a dialog box.
</tal:block>
@@ -9,8 +9,15 @@
<img id="dialog_close" src="img/close.gif" class="dialog_close"/>
</div>
<script>
-var mydialog = new Dialog.Box($('dialog'));
-connect('dialog_close','onclick', mydialog.box.hide);
+loader = YAHOO.zenoss.getLoader();
+loader.require(['zenossutils']);
+loader.insert({
+ onSuccess: function(){
+ mydialog = new Dialog.Box($('dialog'));
+ connect('dialog_close','onclick', mydialog.box.hide);
+ $('dialog').style.visibility = '';
+ }
+});
</script>
</tal:block>
Modified: branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/devicezengrid.js
===================================================================
--- branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/devicezengrid.js 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/devicezengrid.js 2008-06-03 15:56:11 UTC (rev 9391)
@@ -1,5 +1,7 @@
var Class = YAHOO.zenoss.Class;
+YAHOO.namespace('YAHOO.zenoss.zengrid');
+
var isManager = true;
var ZenGridLoadingMsg = Class.create();
@@ -33,7 +35,7 @@
return new Coordinates((dims.w/2)+pos.x, (dims.h/2)+pos.y);
},
show: function(msg) {
- if (msg) setInnerHTML($('zengridload_content'),msg);
+ if (msg) YAHOO.zenoss.setInnerHTML($('zengridload_content'),msg);
var p = this.getViewportCenter();
var d = getElementDimensions(this.framework);
var pos = new Coordinates(p.x-(d.w/2),p.y-(d.h/2));
@@ -393,11 +395,11 @@
populateRow: function(row, data) {
var stuffz = row.getElementsByTagName('div')
for (i=0;i<stuffz.length;i++) {
- setInnerHTML(stuffz[i], data[i]);
+ YAHOO.zenoss.setInnerHTML(stuffz[i], data[i]);
}
if (isManager) {
var cb = '<input type="checkbox" style="visibility:hidden"/>';
- setInnerHTML(stuffz[0], cb);
+ YAHOO.zenoss.setInnerHTML(stuffz[0], cb);
setStyle(stuffz[0], {'width':'20px'});
}
},
@@ -509,7 +511,7 @@
table = this.zgtable;
var cells = getElementsByTagAndClassName('div', 'cell_inner', table);
for (i=0;(cell=cells[i]);i++){
- setInnerHTML(cell, '');
+ YAHOO.zenoss.setInnerHTML(cell, '');
}
},
setTableNumRows: function(numrows) {
@@ -565,13 +567,13 @@
var firstcol = yo[0];
if (isManager) {
mydata = concat([''],mydata);
- setInnerHTML(divs[0], chkbox);
+ YAHOO.zenoss.setInnerHTML(divs[0], chkbox);
setStyle(divs[0], {'width':'21px'});
connect($(evid), 'onclick', this.markAsChecked);
}
for (j=isManager?1:0;j<yo.length;j++) {
var cellwidth = this.abswidths[j]
- setInnerHTML(divs[j], unescape(mydata[j]));
+ YAHOO.zenoss.setInnerHTML(divs[j], unescape(mydata[j]));
yo[j].title = scrapeText(divs[j]);
}
@@ -748,7 +750,7 @@
500);
},
updateStatusBar: function(rownum) {
- setInnerHTML($('currentRows'), rownum+1 + '-' +
+ YAHOO.zenoss.setInnerHTML($('currentRows'), rownum+1 + '-' +
parseInt(parseInt(rownum)+
Math.min(parseInt(this.numRows), parseInt(this.buffer.totalRows))
) + ' of ' + this.buffer.totalRows);
@@ -837,3 +839,4 @@
}
}
+YAHOO.register("devicezengrid", YAHOO.zenoss.zengrid, {});
Modified: branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/geomap-2.1.js
===================================================================
--- branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/geomap-2.1.js 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/geomap-2.1.js 2008-06-03 15:56:11 UTC (rev 9391)
@@ -292,8 +292,5 @@
}
-addLoadEvent(function() {
- YAHOO.zenoss.loader.require("container");
- YAHOO.zenoss.loader.insert({onSuccess:geomap_initialize})
-});
+YAHOO.register('simplegeomap', YAHOO.zenoss, {});
Modified: branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/geomap.js
===================================================================
--- branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/geomap.js 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/geomap.js 2008-06-03 15:56:11 UTC (rev 9391)
@@ -262,8 +262,4 @@
}
-addLoadEvent(function() {
- YAHOO.zenoss.loader.require("container");
- YAHOO.zenoss.loader.insert({onSuccess:geomap_initialize})
-});
-
+YAHOO.register('geomap', YAHOO.zenoss, {});
Modified: branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/zenoss-core.js
===================================================================
--- branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/zenoss-core.js 2008-06-03 15:49:38 UTC (rev 9390)
+++ branches/zenoss-2.2.x/Products/ZenWidgets/skins/zenui/javascript/zenoss-core.js 2008-06-03 15:56:11 UTC (rev 9391)
@@ -1,1169 +1,97 @@
-// Set up the Javascript loader
-loader = new YAHOO.util.YUILoader();
-loader.base = '/zport/dmd/yui/';
-
-// Register zenoss scripts
-loader.addModule({
- name: "datatablesamskin",
- type: "css",
- fullpath: "/zport/dmd/yui/datatable/assets/skins/sam/datatable.css"
-});
-loader.addModule({
- name: "autocompleteskin",
- type: "css",
- fullpath: "/zport/dmd/yui/autocomplete/assets/skins/sam/autocomplete.css"
-});
-loader.addModule({
- name: "zenautocomplete",
- type: "js",
- fullpath: "/zport/dmd/javascript/zenautocomplete.js",
- requires: ["autocomplete", "animation", "autocompleteskin"]
-});
-loader.addModule({
- name: "portlet",
- type: "js",
- fullpath: "/zport/dmd/javascript/portlet.js",
- requires: ["dragdrop", "event", "dom", "animation",
- "datasource", "datatable", "datatablesamskin",
- "container", "button","zenautocomplete"]
-});
-loader.addModule({
- name: "portletsource",
- type: "js",
- fullpath: "/zport/ZenPortletManager/get_source",
- requires: ["portlet"]
-});
-
-//Declare the Zenoss namespace
-YAHOO.namespace("zenoss");
-
-// Put the loader somewhere accessible
-YAHOO.namespace("zenoss.loader");
-YAHOO.zenoss.loader = loader;
-
-
-// Define a helpful "class" function (thanks, Prototype)
-
-var Class={
- create:function(){
- return function(){
- bindMethods(this);
- this.__init__.apply(this,arguments);
- }
- }
+// Graceful degradation of Firebug console object
+// via http://ajaxian.com/archives/graceful-degradation-of-firebug-console-object
+if (! ("console" in window) || !("firebug" in console)) {
+ var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml", "group"
+ , "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"];
+ window.console = {};
+ for (var i = 0; i <names.length; ++i) window.console[names[i]] = function() {};
}
-YAHOO.zenoss.Class = Class;
-
-
-function bindMethodsTo(src, scope) {
- for (var property in src) {
- if (typeof src[property]=='function') {
- src[property] = method(scope, src[property]);
+// Set up the Javascript loader
+function getLoader() {
+ loader = new YAHOO.util.YUILoader({
+ onProgress: function(o) {
+ console.info(o.name + " module loaded.");
+ },
+ onFailure: function(msg, xhrreq) {
+ console.warn('FAILURE: ' + msg)
}
- }
-}
-
-// Subclassing! (thanks, me)
-
-var Subclass={
- create: function(klass){
- return function() {
- this.superclass = {};
- for (var property in klass.prototype) {
- if (!(property in this))
- this[property] = klass.prototype[property];
- this.superclass[property] = klass.prototype[property];
- }
- bindMethods(this);
- bindMethodsTo(this.superclass, this);
- this.__init__.apply(this, arguments);
- }
- }
-}
-YAHOO.zenoss.Subclass = Subclass;
-
-
-function purge(d) {
- var a = d.attributes, i, l, n;
- if (a) {
- l = a.length;
- for (i = 0; i < l; i += 1) {
- n = a[i].name;
- if (typeof d[n] === 'function') {
- d[n] = null;
- }
- }
- }
- a = d.childNodes;
- if (a) {
- l = a.length;
- for (i = 0; i < l; i += 1) {
- purge(d.childNodes[i]);
- }
- }
-}
-YAHOO.zenoss.purge = purge;
-
-// Code from Julien Lecomte of Yahoo!
-YAHOO.zenoss.loader.require(['dom', 'event']);
-YAHOO.zenoss.loader.insert();
-function setInnerHTML (el, html) {
- el = YAHOO.util.Dom.get(el);
- if (!el || typeof html !== 'string') {
- return null;
- }
- // Break circular references.
- (function (o) {
- var a = o.attributes, i, l, n, c;
- if (a) {
- l = a.length;
- for (i = 0; i <l; i += 1) {
- n = a[i].name;
- if (typeof o[n] === 'function') {
- o[n] = null;
- }
- }
- }
- a = o.childNodes;
- if (a) {
- l = a.length;
- for (i = 0; i <l; i += 1) {
- c = o.childNodes[i];
- // Purge child nodes.
- arguments.callee(c);
- // Removes all listeners attached to the element via YUI's addListener.
- YAHOO.util.Event.purgeElement(c);
- }
- }
- })(el);
- // Remove scripts from HTML string, and set innerHTML property
- el.innerHTML = html.replace(/<script[^>]*>((.|[\r\n])*?)<\\?\/script>/ig, "");
- // Return a reference to the first child
- return el.firstChild;
-};
-YAHOO.zenoss.setInnerHTML = setInnerHTML;
-
-function unescapeHTML(str) {
- if (!YAHOO.zenoss._dummydiv) YAHOO.zenoss._dummydiv=DIV(null, null);
- _dummydiv = YAHOO.zenoss._dummydiv;
- _dummydiv.innerHTML = str;
- return _dummydiv.textContent;
-}
-YAHOO.zenoss.unescapeHTML = unescapeHTML;
-
-function getSelectValues(element) {
- var element = $(element);
- var values = [];
- forEach(element.options, function(opt){
- if(opt.selected) values.push(opt.value);
});
- return values;
-}
-YAHOO.zenoss.getSelectValues = getSelectValues;
+ loader.base = '/zport/dmd/yui/';
-/************************************
- * Less universally useful stuff
- * (formerly separate scripts)
- ***********************************/
-
-function toggleElement(elementid) {
- var element = $(elementid);
- if (element.visible == 0) {
- element.style.display = "none";
- element.visible = 1;
- } else {
- element.style.display = "";
- element.visible = 0;
- }
-}
-
-
-/* Panel Effects */
-
-function toggleVisible(elem) {
- toggleElementClass("invisible", elem);
-}
-
-function makeVisible(elem) {
- removeElementClass(elem, "invisible");
-}
-
-function makeInvisible(elem) {
- addElementClass(elem, "invisible");
-}
-
-function isVisible(elem) {
- return !hasElementClass(elem, "invisible");
-}
-
-function getCookie(name) {
- var s = document.cookie.indexOf(name + "=");
- if ((!s) && name!=document.cookie.substring(0,name.length)) {
- return null;
- }
- if (s < 0) {
- return null;
- }
- var e = document.cookie.indexOf(';', s+name.length+1);
- if (e<0) e = document.cookie.length;
- if (e==s) {
- return '';
- }
- return unescape(document.cookie.substring(s+name.length+1, e));
-}
-
-function setCookie( name, value, expires, path, domain, secure ) {
- var today = new Date();
- today.setTime( today.getTime() );
- if ( expires ) {
- expires = expires * 1000 * 60 * 60 * 24;
- }
- var expires_date = new Date( today.getTime() + (expires) );
- document.cookie = name + "=" +escape( value ) +
- ( ( expires ) ? ";expires=" + expires_date.toGMTString() : "" ) +
- ( ( path ) ? ";path=" + path : "" ) +
- ( ( domain ) ? ";domain=" + domain : "" ) +
- ( ( secure ) ? ";secure" : "" );
-}
-
-function deleteCookie(name,path,domain) {
- if (getCookie(name)) {
- document.cookie =
- name + '=' +
- ( (path) ? ';path=' + path : '') +
- ( (domain) ? ';domain=' + domain : '') +
- ';expires=Thu, 01-Jan-1970 00:00:01 GMT';
- }
-}
-
-function hideLeftPane() {
- var leftPane = $('leftPane');
- var rightPane = $('rightPane');
- //showElement('leftPaneToggle');
- makeInvisible(leftPane);
- makeInvisible($('paneToggle'));
- setStyle('paneToggle', {
- 'background-image':'url(img/paneToggle_bg_collapsed.gif)',
- 'border-right':'1px solid black'
+ // Register zenoss scripts
+ loader.addModule({
+ name: "datatablesamskin",
+ type: "css",
+ fullpath: "/zport/dmd/yui/datatable/assets/skins/sam/datatable.css"
});
- if ($('breadCrumbPane')) {
- setStyle('breadCrumbPane', { 'padding-left':'35px'});}
- setStyle('rightPane', {'margin-left':'12px'});
- setStyle('leftPaneToggle', {
- 'background':'transparent url(img/leftpanetoggle_bg.gif) top left repeat-x',
- 'height':'30px',
- 'width':'30px'
+ loader.addModule({
+ name: "autocompleteskin",
+ type: "css",
+ fullpath: "/zport/dmd/yui/autocomplete/assets/skins/sam/autocomplete.css"
});
- disconnectAll('leftPaneToggle');
- connect('leftPaneToggle', 'onclick', function(){
- clearTimeout(t);
- doShowing();
+ loader.addModule({
+ name: "zenautocomplete",
+ type: "js",
+ fullpath: "/zport/dmd/javascript/zenautocomplete.js",
+ requires: ["autocomplete", "animation", "autocompleteskin","zenossutils"]
});
- doHover();
-}
-
-function showLeftPane() {
- var leftPane = $('leftPane');
- var rightPane = $('rightPane');
- makeVisible(leftPane);
- makeVisible($('paneToggle'));
- //hideElement('leftPaneToggle');
- setStyle('paneToggle', {
- 'background-image':'url(img/paneToggle_bg.gif)',
- 'border-right':'1px solid black'
+ loader.addModule({
+ name: "portlet",
+ type: "js",
+ fullpath: "/zport/dmd/javascript/portlet.js",
+ requires: ["dragdrop", "event", "dom", "animation",
+ "datasource", "datatable", "datatablesamskin",
+ "container", "button","zenautocomplete", "zenossutils"]
});
- if ($('breadCrumbPane')) {
- setStyle('breadCrumbPane', { 'padding-left':'120px'});}
- setStyle(rightPane, {'margin-left':'120px'});
- setStyle('leftPaneToggle', {
- 'background':'#5a6f8f url(img/leftpanetoggle_bg_expanded.gif) ' +
- 'top left repeat-x',
- 'height':'30px',
- 'width':'115px'
+ loader.addModule({
+ name: "portletsource",
+ type: "js",
+ fullpath: "/zport/ZenPortletManager/get_source",
+ requires: ["portlet"]
});
- disconnectAll('leftPaneToggle');
- connect('leftPaneToggle','onclick',toggleLeftPane);
- cancelHover();
-}
-
-function toggleLeftPane() {
- var leftPane = $('leftPane');
- if (!isVisible(leftPane)) { showLeftPane() }
- else { hideLeftPane() }
-}
-
-function doHiding() {
- hideElement($('leftPane'));
- hideElement($('paneToggle'));
-}
-
-function doShowing() {
- showElement($('leftPane'));
- showElement($('paneToggle'));
-}
-
-var t;
-function doHover() {
- var leftPane = $('leftPane');
- var paneToggle = $('paneToggle');
- var leftPaneToggle = $('leftPaneToggle');
- var lpPopup = leftPane;
- setStyle(paneToggle, {
- 'z-index':'10000'
+ loader.addModule({
+ name: "zenossutils",
+ type: "js",
+ fullpath: "/zport/javascript/zenoss-utils.js",
+ requires: ['dom', 'event']
});
- setStyle(lpPopup, {
- 'position':'absolute',
-// 'background-color':'white',
-// 'padding':'2px',
-// 'padding-top':'2px',
- 'z-index':'10000'
+ loader.addModule({
+ name: "devicezengrid",
+ type: "js",
+ fullpath: "/zport/dmd/javascript/devicezengrid.js",
+ requires: ['zenossutils']
});
- connect(leftPane, 'onmouseover', function(){
- clearTimeout(t);
- doShowing();
+ loader.addModule({
+ name: "eventzengrid",
+ type: "js",
+ fullpath: "/zport/dmd/javascript/zengrid.js",
+ requires: ['zenossutils']
});
- connect($('paneToggle'), 'onmouseover', function(){
- clearTimeout(t);
- doShowing();
+ loader.addModule({
+ name: 'geomap',
+ type: 'js',
+ fullpath: '/zport/dmd/javascript/geomap.js',
+ requires: ['zenossutils', 'container']
});
- connect(paneToggle,'onmouseout',function(){
- t=setTimeout('doHiding()',500);
+ loader.addModule({
+ name: 'simplegeomap',
+ type: 'js',
+ fullpath: '/zport/dmd/javascript/geomap-2.1.js',
+ requires: ['zenossutils', 'container']
});
- connect(leftPane, 'onmouseout', function(){
- t=setTimeout('doHiding()',500);
+ loader.addModule({
+ name: 'swoopygraphs',
+ type: 'js',
+ fullpath: '/zport/dmd/zenrrdzoom.js',
+ requires: ['zenossutils']
});
- connect('leftPaneToggle', 'onmouseout', function(){
- t=setTimeout('doHiding()',500);
- });
- connect(paneToggle, 'onclick', function(){
- clearTimeout(t);
- toggleLeftPane();
- });
- connect('leftPaneToggle','onmouseover', function() {
- setStyle('leftPaneToggle', {
- 'background':'transparent ' +
- 'url("img/leftpanetoggle_bg_depressed.gif") top left repeat-x'
- })
- });
- connect('leftPaneToggle','onmouseout', function() {
- setStyle('leftPaneToggle', {
- 'background':'transparent ' +
- 'url("img/leftpanetoggle_bg.gif") top left repeat-x'
- })
- });
- connect('leftPaneToggle', 'onclick', function(){
- clearTimeout(t);
- doShowing();
- });
- setCookie('Zenoss_Collapsed_Menu', 'true',30,'/','','');
+ return loader;
}
-function cancelHover() {
- var leftPane = $('leftPane');
- var paneToggle = $('paneToggle');
- if (leftPane && paneToggle) {
- setStyle(paneToggle, {'z-index':'1'});
- setStyle(leftPane, {'z-index':'1'});
- disconnectAll(paneToggle);
- disconnectAll(leftPane);
- disconnectAll('leftPaneToggle');
- connect('leftPaneToggle', 'onclick', toggleLeftPane);
- connect('leftPaneToggle','onmouseover', function() {
- setStyle('leftPaneToggle', {
- 'background':'transparent ' +
- 'url("img/leftpanetoggle_bg_expanded_depressed.gif") '+
- 'top left repeat-x'
- })
- });
- connect('leftPaneToggle','onmouseout', function() {
- setStyle('leftPaneToggle', {
- 'background':'transparent ' +
- 'url("img/leftpanetoggle_bg_expanded.gif") top left repeat-x'
- })
- });
- deleteCookie('Zenoss_Collapsed_Menu','/','');
- updateNodeAttributes(leftPane, {
- 'style':'display:block'
- });}
-}
+//Declare the Zenoss namespace
+YAHOO.namespace("zenoss");
-function checkForCollapsed() {
- var x = getCookie('Zenoss_Collapsed_Menu');
- if ($('leftPaneToggle')){
- if (!x){
- disconnectAll('leftPaneToggle');
- connect('leftPaneToggle','onclick',toggleLeftPane);
- connect('leftPaneToggle','onmouseover', function() {
- setStyle('leftPaneToggle', {
- 'background':'transparent ' +
- 'url("img/leftpanetoggle_bg_expanded_depressed.gif") top left repeat-x'
- })
- });
- connect('leftPaneToggle','onmouseout', function() {
- setStyle('leftPaneToggle', {
- 'background':'transparent ' +
- 'url("img/leftpanetoggle_bg_expanded.gif") top left repeat-x'
- })
- });
- } else {
- hideLeftPane();
- }
- }
-}
+// Put the loader somewhere accessible
+YAHOO.zenoss.getLoader = getLoader;
-function getChildCheckboxes(element) {
- return filter(
- function(x){return x.type=='checkbox'},
- element.getElementsByTagName('input')
- )
-}
-
-var tablesOnPage=0;
-function insertSelBar(table, index) {
- var getselall = function() {
- return function() {selectAllCheckboxes(table)}
- }
- var getselnone = function() {
- return function() {selectNoneCheckboxes(table)}
- }
- var all = LI({id:'selectall_' + index}, 'All');
- var nun = LI({id:'selectnone_' + index}, 'None');
- var selbar = DIV({'class':'zentable_selectionbar'},
- [ 'Select: ', UL(null, [all, nun ]) ]);
- insertSiblingNodesBefore(table, selbar);
- connect(all, 'onclick', getselall());
- connect(nun, 'onclick', getselnone());
-}
-
-function selectAllCheckboxes(table) {
- var cbs = getChildCheckboxes(table);
- map(function(x){x.checked=true},cbs);
-}
-
-function selectNoneCheckboxes(table) {
- var cbs = getChildCheckboxes(table);
- map(function(x){x.checked=null},cbs);
-}
-
-function addSelectionBar() {
- var tables = getElementsByTagAndClassName('table', 'innerzentable');
- for (i=0;i<tables.length;i++) {
- if (!getNodeAttribute(tables[i], 'noselectionbar')) {
- var inputs = tables[i].getElementsByTagName('input');
- var cbs = filter(function(x){return x.type=='checkbox'}, inputs);
- if (cbs.length>1) insertSelBar(tables[i], i);
- }
- }
-}
-
-function applyBrowserSpecificStyles() {
- if (navigator.userAgent.match('Mac')) {
- var searchform=$("searchform-label");
- if (searchform)
- setStyle(searchform, {
- 'left':'-5em'
- });
- }
-}
-
-var removeAutoComplete = function(el) {
- setNodeAttribute(el, 'autocomplete', 'off');
-}
-
-var removeElementAutoCompletes = function() {
- var inputs = $$('input');
- map(removeAutoComplete, inputs);
-}
-
-addLoadEvent(removeElementAutoCompletes);
-addLoadEvent(applyBrowserSpecificStyles);
-addLoadEvent(addSelectionBar);
-addLoadEvent(checkForCollapsed);
-
-
-postJSONDoc = function (url, postVars) {
- var req = getXMLHttpRequest();
- req.open("POST", url, true);
- req.setRequestHeader("Content-type",
- "application/x-www-form-urlencoded");
- var data = queryString(postVars);
- var d = sendXMLHttpRequest(req, data);
- return d.addCallback(evalJSONRequest);
-
-}
-
-var cancelWithTimeout = function (deferred, timeout) {
- var canceller = callLater(timeout, function () {
- // cancel the deferred after timeout seconds
- deferred.cancel();
- //log("cancel load data")
- });
- return deferred.addCallback(function (res) {
- // if the deferred fires successfully, cancel the timeout
- canceller.cancel();
- return res;
- });
-};
-
-function handle(delta) {
- if (delta < 0)
- /* something. */;
- else
- /* something. */;
-}
-
-function wheel(event){
- var delta = 0;
- if (!event) event = window.event;
- if (event.wheelDelta) {
- delta = event.wheelDelta/120;
- if (window.opera) delta = -delta;
- } else if (event.detail) {
- delta = -event.detail/3;
- }
- if (delta)
- handle(delta);
- if (event.preventDefault)
- event.preventDefault();
- event.returnValue = false;
-}
-
-function captureSubmit(e){
- switch (e.key().string) {
- case 'KEY_ENTER':
- var submit = $('dialog_submit');
- submit.click();
- return;
- default:
- }
-}
-
-
-function checkValidId(e){
- var errmsg = $('errmsg');
- var input = $('new_id');
- var label = $('new_id_label');
- var new_id = escape(input.value);
- var submit = $('dialog_submit');
- var path = $('checkValidIdPath').value
-
- errmsg.innerHTML = "";
- Morph(input, {"style": {"color": "black"}});
- Morph(label, {"style": {"color": "white"}});
-
- d = callLater(0, doXHR, path+'/checkValidId', {queryString:{'id':new_id}});
- d.addCallback(function (r) {
- if (r.responseText == 'True') {
- submit.disabled = false;
- if (e && e.key().string == 'KEY_ENTER') submit.click();
- } else {
- submit.disabled = true;
- Morph(input, {"style": {"color": "red"}});
- Morph(label, {"style": {"color": "red"}});
- errmsg.innerHTML = r.responseText;
- shake(input);
- shake(label);
- shake(errmsg);
- }
- });
-}
-
-function connectTextareas() {
-
- var vDims, vPos, aDims, aPos, rightedge_area, rightedge_vp;
-
- var refreshVars = function() {
- vDims = getViewportDimensions();
- vPos = getViewportPosition();
- rightedge_vp = vDims.w + vPos.x;
- var area = $$('textarea')[0];
- aDims = getElementDimensions(area);
- aPos = getElementPosition(area);
- rightedge_area = aDims.w + aPos.x;
- }
-
- function resizeAll() {
- refreshVars();
- map(resizeArea, $$('textarea'));
- }
-
- function resizeArea(area) {
- var w = aDims.w + rightedge_vp-rightedge_area-50;
- setElementDimensions(area, {w:w});
- }
-
- connect(currentWindow(), 'onresize', function(e) {
- map(resizeAll, $$('textarea'));
- });
-
- map(resizeAll, $$('textarea'));
-}
-
-
-ImagePreloader = Class.create();
-ImagePreloader.prototype = {
- __init__: function() {
- bindMethods(this);
- this.buffer = new Image(25, 25);
- this.queue = new Array();
- this.lock = new DeferredLock();
- },
- add: function(img) {
- this.queue.push(img);
- this.start();
- },
- start: function() {
- var d = this.lock.acquire();
- d.addCallback(this.next);
- },
- next: function() {
- var img = this.queue.pop();
- if (img) this.buffer.src = img;
- this.lock.release();
- }
-}
-
-/* MENUS */
-var calcSubmenuPos = function(rel, sub) {
- // rel is the parent that triggered the submenu show
- var pPos = getElementPosition(rel);
- var pDims = getElementDimensions(rel);
- var sDims = getElementDimensions(sub);
- var vDims = getViewportDimensions();
- var vPos = getViewportPosition();
- finalDims = {x:0, y:0}
- // Check to see if the menu will appear outside the viewport
- // If so, make it fly out on the left
- totalX = pPos.x + pDims.w + sDims.w;
- finalDims.x = totalX>=vDims.w+vPos.x?-sDims.w+2:sDims.w-10;
- // Check to see if the menu bottom is outside the viewport
- // If so, move it up so that it fits
- totalY = pPos.y + sDims.h;
- finalDims.y = totalY>=vDims.h+vPos.y?0-(totalY-vDims.h)+vPos.y:0;
- return finalDims
-}
-
-
-var calcMenuPos = function(rel, menu) {
- var isIE//@cc_on=1
- var pPos = getElementPosition(rel);
- var pDims = getElementDimensions(rel);
- var vDims = getViewportDimensions();
- var mDims = getElementDimensions(menu);
- var vPos = getViewportPosition();
- finalDims = $(menu).className=='devmovemenuitems'?{x:0, y:0}:{x:0, y:24};
- totalX = pPos.x + mDims.w;
- finalDims.x = totalX>=vDims.w+vPos.x?pDims.w-mDims.w:3+finalDims.x;
- finalDims.x = $(menu).className=='devmovemenuitems'?4-pDims.w:finalDims.x;
- finalDims.x -= 1;
- totalY = pPos.y + pDims.h + mDims.h;
- var topmenu = getElementsByTagAndClassName('div', 'menu_top', menu)[0];
- if (totalY>=vDims.h+vPos.y) {
- finalDims.y = 0-(totalY-vDims.h)+vPos.y;
- setStyle(topmenu, {'background-image':'url(img/menu_top_rounded.gif)'});
- } else {
- setStyle(topmenu, {'background-image':'url(img/menu_top.gif)'});
- }
- if (isIE && $(menu).className!='devmovemenuitems') finalDims.y += 10;
- return finalDims
-}
-
-var showSubMenu = function(rel, sub) {
- var relPos = calcSubmenuPos(rel, sub);
- setElementPosition(sub, relPos);
- setStyle(sub, {'visibility':'visible','z-index':'10001'});
- hideOtherSubmenus(rel, sub);
-}
-
-var hideSubMenu = function(sub) {
- setStyle(sub, {'visibility':'hidden','z-index':'1'});
-}
-
-var hideMenu = function(menu) {
- setStyle(menu, {'visibility':'hidden','z-index':'1'});
- try {
- setStyle(getFirstParentByTagAndClassName(menu, 'div',
- 'tabletitlecontainer'), {'z-index':'1'});
- } catch(e){noop()}
- if (navigator.userAgent.match('Mac')) {
- try {setStyle(eventZenGrid.scrollbar, {'overflow':'auto'})}
- catch(e) {noop()};
- }
-}
-
-var showMenu = function(rel, menu) {
- dropOtherMenuButtons(rel);
- var relPos = calcMenuPos(rel, menu);
- setElementPosition(menu, relPos);
- setStyle(menu, {'visibility':'visible','z-index':'10000',
- 'zoom':1});
- if (navigator.userAgent.match('Mac')) {
- try {setStyle(eventZenGrid.scrollbar, {'overflow':'hidden'})}
- catch(e) {noop()};
- }
-}
-
-var showContextMenu = function() {
- var menu = $('contextmenuitems');
-
-}
-
-var dropOtherMenuButtons = function(button) {
- var lowerButton = function(btn) { setStyle(btn, {'z-index':'1'})};
- try {
- mymenu = getFirstParentByTagAndClassName($(button).parentNode, 'div',
- 'tabletitlecontainer');
- } catch(e) {
- mymenu = null;
- }
- others = $$("div.tabletitlecontainer");
- map(lowerButton, others);
- if (mymenu) setStyle(mymenu, {'z-index':'10000'});
-}
-
-var hideOtherSubmenus = function(menu, submenu) {
- var smartHideSub = function(sub){if ($(submenu)!=sub) hideSubMenu(sub)}
- map(smartHideSub, $$('div.submenu'));
-}
-
-var smto = Array();
-
-var registerSubmenu = function(menu, submenu) {
- try {
- connect(menu, 'onmouseover', function() {
- clearTimeout(smto[menu]);
- clearTimeout(smto[submenu]);
- showSubMenu(menu, submenu); });
- connect(submenu, 'onmouseover', function() {
- clearTimeout(smto[menu]);
- clearTimeout(smto[submenu]);
- showSubMenu(menu, submenu); });
- connect(menu, 'onmouseout', function() {
- smto[submenu] = setTimeout('hideSubMenu("'+submenu+'")', 500); });
- connect(submenu, 'onmouseout', function() {
- smto[submenu] = setTimeout('hideSubMenu("'+submenu+'")', 500); });
- connect(submenu, 'onclick', function() {
- hideSubMenu(submenu);
- });
- } catch(e) {noop()};
-}
-
-var registerMenu = function(button, menu) {
- connect(button, 'onclick', function() {
- clearTimeout(smto[menu]);
- showMenu(button, menu);
- addElementClass(button, 'menuselected');
- connect(button, 'onmouseover', function() {
- clearTimeout(smto[menu]);
- showMenu(button, menu);
- addElementClass(button, 'menuselected');
- });
- });
- connect(menu, 'onmouseover', function() {
- clearTimeout(smto[menu]);
- showMenu(button, menu);
- addElementClass(button, 'menuselected');
- connect(button, 'onmouseover', function() {
- clearTimeout(smto[menu]);
- showMenu(button, menu);
- addElementClass(button, 'menuselected');
- });
- });
- connect(menu, 'onclick', function() {
- hideMenu(menu);
- disconnectAll(button, 'onmouseover');
- });
- connect(button, 'onmouseout', function() {
- smto[menu] = setTimeout('hideMenu("'+menu+'");disconnectAll("'+
- button+'", "onmouseover");', 500); });
- connect(menu, 'onmouseout', function() {
- smto[menu] = setTimeout('hideMenu("'+menu+'");disconnectAll("'+
- button+'", "onmouseover");', 500); });
-}
-
-
-/* ZGDAgent */
-
-function notifyParentOfNewUrl() {
- try {
- var parwin = currentWindow().parent;
- var url = location.href;
- parwin.zmlistener.checkForDomainChange(url);
- }
- catch(e){ noop() }
-}
-
-addLoadEvent(notifyParentOfNewUrl);
-
-/* Selection stuff */
-var checkboxes;
-var currentCheckbox;
-var isCheckbox = function(elem) {
- return (elem.type=='checkbox') }
-
-function getCheckboxes(elem) {
- var inputs = getElementsByTagAndClassName('input', null);
- return filter(isCheckbox, inputs);
-}
-
-function selectCheckboxRange(start, end) {
- a = end>start?start:end;
- b = start==a?end:start;
- newstate = -checkboxes[end].checked;
- var todo = checkboxes.slice(a, b+1);
- for (i=0;(box=todo[i]);i++) {
- if ((!box.checked && newstate) ||
- (box.checked && !newstate)) box.click();
- //box.checked = newstate;
- }
-}
-
-function getIndex(box) {
- return findIdentical(checkboxes, box);
-}
-
-function handleChange(e) {
- var t = e.src();
- var shift = e.modifier().shift;
- if (isCheckbox(t) && shift) {
- if (currentCheckbox){
- selectCheckboxRange(
- getIndex(currentCheckbox), getIndex(t));
- currentCheckbox = t;
- }
- }
- currentCheckbox = t;
-}
-
-var CbCxs = new Array();
-function connectCheckboxListeners() {
- disconnectAllTo(handleChange);
- checkboxes = getCheckboxes();
- for (i=0; i<checkboxes.length; i++){
- var box = checkboxes[i];
- connect(box, 'onkeypress', handleChange);
- connect(box, 'onclick', handleChange);
- }
-}
-
-addLoadEvent(connectCheckboxListeners);
-
-/* zenmodelfuncs */
-
-function zenPageInit(){
-
- var as = $$('#leftPane a');
- for(var i=0; i< as.length; i++){
- if (location.href.indexOf('notabs') != -1 &&
- location.href==as[i].href) {
- as[i].className = 'selected';
- }
- else if( location.href.indexOf('notabs')==-1 &&
- as[i].href.indexOf('notabs')==-1 &&
- location.pathname.indexOf(as[i].pathname) != -1){
- as[i].className = 'selected';
- //lastLeft = as[i];
- }
- else {
- as[i].className = 'unselected';
- }
- }
-}
-
-function submitAction(myform, url) {
- myform.action=url
- myform.submit()
-}
-
-function submitViaEnter(evt, submitName) {
- evt = (evt) ? evt : event;
- var target = (evt.target) ? evt.target : evt.srcElement;
- var form = target.form;
- var charCode = (evt.charCode) ? evt.charCode :
- ((evt.which) ? evt.which : evt.keyCode);
- if (charCode == 13 || charCode == 3) {
- if (submitName) { form.action += "/" + submitName }
- form.submit();
- return false;
- }
- return true;
-}
-
-function blockSubmitViaEnter(evt) {
- evt = (evt) ? evt : event;
- var charCode = (evt.charCode) ? evt.charCode :
- ((evt.which) ? evt.which : evt.keyCode);
- if (charCode == 13 || charCode == 3) {
- return false;
- }
- return true;
-}
-
-isSelected = false;
-
-function toggleSelect(form) {
- if (isSelected == false) {
- for (i = 0; i < form.length; i++) {
- if (form.elements[i].name == "negateFilter") { continue }
- form.elements[i].checked = true ;
- }
- isSelected = true;
- form.SelectButton.value = "Deselect All";
- return isSelected;
- }
- else {
- for (i = 0; i < form.length; i++) {
- if (form.elements[i].name == "negateFilter") { continue }
- form.elements[i].checked = false ;
- }
- isSelected = false;
- form.SelectButton.value = "Select All";
- return isSelected;
- }
-}
-
-addLoadEvent(zenPageInit)
-
-/* DIALOGS */
-function getFormElements(parentbox) {
- var firstElement;
- var textBoxes = [];
- var submitButtons = [];
- var formElements = [];
- var traverse = function(node) {
- if ((node.tagName=='SELECT'||node.tagName=='INPUT'||
- node.tagName=='TEXTAREA')&&node.type!='hidden') {
- formElements[formElements.length]=node;
- if (!firstElement)
- firstElement = node;
- }
- if (node.tagName=='INPUT'&&(node.type=='text'||node.type=='password'))
- textBoxes[textBoxes.length]=node;
- if (node.tagName=='INPUT'&&(node.type=='submit'||node.type=='button')&&
- node.id!='dialog_cancel')
- submitButtons[submitButtons.length] = node;
- if (node.childNodes != null) {
- for (var i=0;i<node.childNodes.length;i++) {
- traverse(node.childNodes.item(i));
- }
- }
- }
- traverse(parentbox);
- return [firstElement, textBoxes, submitButtons, formElements]
-}
-
-var Dialog = {};
-Dialog.Box = Class.create();
-Dialog.Box.prototype = {
- __init__: function(id) {
- bindMethods(this);
- this.makeDimBg()...
[truncated message content] |
|
From: <sv...@ze...> - 2008-06-03 15:46:37
|
Author: ecn
Date: 2008-06-03 11:46:42 -0400 (Tue, 03 Jun 2008)
New Revision: 9389
Modified:
branches/zenoss-2.1.x/Products/ZenModel/DataRoot.py
Log:
reverting inadvertent change to 2.2.1 branch
Modified: branches/zenoss-2.1.x/Products/ZenModel/DataRoot.py
===================================================================
--- branches/zenoss-2.1.x/Products/ZenModel/DataRoot.py 2008-06-03 15:36:32 UTC (rev 9388)
+++ branches/zenoss-2.1.x/Products/ZenModel/DataRoot.py 2008-06-03 15:46:42 UTC (rev 9389)
@@ -500,7 +500,7 @@
"""remove a ZenPack"""
zp = zenPath('bin', 'zenpack')
for pack in ids:
- os.system('%s --remove %s' % (zp, pack))
+ os.system('%s run --remove %s' % (zp, pack))
self._p_jar.sync()
if REQUEST is not None:
return self.callZenScreen(REQUEST, redirect=True)
|
|
From: <sv...@ze...> - 2008-06-03 15:36:27
|
Author: ecn
Date: 2008-06-03 11:36:32 -0400 (Tue, 03 Jun 2008)
New Revision: 9388
Modified:
branches/zenoss-2.2.x/Products/ZenHub/services/PingConfig.py
branches/zenoss-2.2.x/Products/ZenStatus/zenping.py
Log:
back-patch #3120 to 2.2.x
Modified: branches/zenoss-2.2.x/Products/ZenHub/services/PingConfig.py
===================================================================
--- branches/zenoss-2.2.x/Products/ZenHub/services/PingConfig.py 2008-06-03 15:34:05 UTC (rev 9387)
+++ branches/zenoss-2.2.x/Products/ZenHub/services/PingConfig.py 2008-06-03 15:36:32 UTC (rev 9388)
@@ -54,6 +54,10 @@
return tree.root
+ def getDeviceConfig(self, device):
+ return device
+
+
def lookupByIp(self, dmd, fallbackIp):
"""Try to find the root device by our IP
"""
@@ -69,4 +73,4 @@
pingtree.addDevice(device)
def sendDeviceConfig(self, listener, config):
- listener.callRemote('updateConfig')
+ return listener.callRemote('updateConfig')
Modified: branches/zenoss-2.2.x/Products/ZenStatus/zenping.py
===================================================================
--- branches/zenoss-2.2.x/Products/ZenStatus/zenping.py 2008-06-03 15:34:05 UTC (rev 9387)
+++ branches/zenoss-2.2.x/Products/ZenStatus/zenping.py 2008-06-03 15:36:32 UTC (rev 9388)
@@ -30,7 +30,7 @@
from Products.ZenUtils.Utils import unused
unused(pingtree) # needed for pb
-from Products.ZenEvents.ZenEventClasses import Status_Ping
+from Products.ZenEvents.ZenEventClasses import Status_Ping, Clear
from Products.ZenHub.PBDaemon import FakeRemote, PBDaemon
from Products.ZenUtils.DaemonStats import DaemonStats
from Products.ZenUtils.Driver import drive, driveLater
@@ -57,7 +57,9 @@
reconfigured = True
loadingConfig = None
+
def __init__(self):
+ self.pingtree = None
PBDaemon.__init__(self, keeproot=True)
if not self.options.useFileDescriptor:
self.openPrivilegedPort('--ping')
@@ -75,17 +77,20 @@
def config(self):
return self.services.get('PingConfig', FakeRemote())
+
def stopOnError(self, error):
self.log.exception(error)
self.stop()
return error
+
def connected(self):
self.log.debug("Connected, getting config")
d = drive(self.loadConfig)
d.addCallback(self.pingCycle)
d.addErrback(self.stopOnError)
+
def sendPingEvent(self, pj):
"Send an event based on a ping job to the event backend."
evt = dict(device=pj.hostname,
@@ -103,7 +108,7 @@
self.sendEvent(evt)
def loadConfig(self, driver):
- "Get the configuration for zenpin"
+ "Get the configuration for zenping"
if self.loadingConfig:
self.log.warning("Configuration still loading. Started at %s" %
@@ -114,19 +119,7 @@
self.log.info('fetching monitor properties')
yield self.config().callRemote('propertyItems')
- items = dict(driver.next())
- for att in ("pingTimeOut",
- "pingTries",
- "pingChunk",
- "pingCycleInterval",
- "configCycleInterval",
- "maxPingFailures",
- ):
- before = getattr(self, att)
- after = items.get(att, before)
- setattr(self, att, after)
- self.configCycleInterval *= 60
- self.reconfigured = True
+ self.copyItems(driver.next())
driveLater(self.configCycleInterval, self.loadConfig)
@@ -149,7 +142,8 @@
yield self.config().callRemote('getPingTree',
self.options.name,
findIp())
- self.pingtree = driver.next()
+ oldtree, self.pingtree = self.pingtree, driver.next()
+ self.clearDeletedDevices(oldtree)
self.rrdStats.gauge('configTime',
self.configCycleInterval,
@@ -313,6 +307,12 @@
self.sendPingEvent(pj)
+ def remote_setPropertyItems(self, items):
+ "The config has changed, maybe the device list is different"
+ self.copyItems(items)
+ self.remote_updateConfig()
+
+
def remote_updateConfig(self):
self.log.debug("Asynch update config")
if self.loadingConfig:
@@ -322,11 +322,46 @@
self.log.error("Error loading config: %s" % result)
d.addErrback(reportError)
+
+ def copyItems(self, items):
+ items = dict(items)
+ for att in ("pingTimeOut",
+ "pingTries",
+ "pingChunk",
+ "pingCycleInterval",
+ "configCycleInterval",
+ "maxPingFailures",
+ ):
+ before = getattr(self, att)
+ after = items.get(att, before)
+ setattr(self, att, after)
+ self.configCycleInterval *= 60
+ self.reconfigured = True
+
+
+ def clearDevice(self, device):
+ self.sendEvent(dict(device=device,
+ eventClass=Status_Ping,
+ summary="No longer testing device",
+ severity=Clear))
+
+
+ def clearDeletedDevices(self, oldtree):
+ "Send clears for any device we stop pinging"
+ down = set()
+ if oldtree:
+ down = set([pj.hostname for pj in oldtree.pjgen() if pj.status])
+ all = set([pj.hostname for pj in self.pingtree.pjgen()])
+ for device in down - all:
+ self.clearDevice(device)
+
+
def remote_deleteDevice(self, device):
self.log.debug("Asynch delete device %s" % device)
+ self.clearDevice(device)
self.remote_updateConfig()
-
+
def findIp():
try:
return gethostbyname(getfqdn())
|
|
From: <sv...@ze...> - 2008-06-03 15:25:15
|
Author: ecn
Date: 2008-06-03 11:25:16 -0400 (Tue, 03 Jun 2008)
New Revision: 9386
Modified:
branches/zenoss-2.1.x/Products/ZenModel/DataRoot.py
Log:
back-patch #3212 to 2.2.x
Modified: branches/zenoss-2.1.x/Products/ZenModel/DataRoot.py
===================================================================
--- branches/zenoss-2.1.x/Products/ZenModel/DataRoot.py 2008-06-03 15:06:12 UTC (rev 9385)
+++ branches/zenoss-2.1.x/Products/ZenModel/DataRoot.py 2008-06-03 15:25:16 UTC (rev 9386)
@@ -500,7 +500,7 @@
"""remove a ZenPack"""
zp = zenPath('bin', 'zenpack')
for pack in ids:
- os.system('%s run --remove %s' % (zp, pack))
+ os.system('%s --remove %s' % (zp, pack))
self._p_jar.sync()
if REQUEST is not None:
return self.callZenScreen(REQUEST, redirect=True)
|
|
From: <sv...@ze...> - 2008-06-03 15:06:05
|
Author: ecn Date: 2008-06-03 11:06:12 -0400 (Tue, 03 Jun 2008) New Revision: 9385 Added: branches/zenoss-2.1.x/inst/externallibs/pyip-0.7.all.patch03 Log: refs #3149: backpatched to 2.2.x branch Added: branches/zenoss-2.1.x/inst/externallibs/pyip-0.7.all.patch03 |
|
From: <sv...@ze...> - 2008-06-03 04:39:30
|
Author: jstevens Date: 2008-06-03 00:39:37 -0400 (Tue, 03 Jun 2008) New Revision: 9384 Modified: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/MANIFEST.in Log: refs #613 Modified: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/MANIFEST.in =================================================================== --- trunk/zenpacks/ZenPacks.zenoss.ZenJMX/MANIFEST.in 2008-06-02 19:30:07 UTC (rev 9383) +++ trunk/zenpacks/ZenPacks.zenoss.ZenJMX/MANIFEST.in 2008-06-03 04:39:37 UTC (rev 9384) @@ -1 +1 @@ -include-recursive ZenPacks/zenoss/lib/* \ No newline at end of file +recursive-include ZenPacks/zenoss/ZenJMX/lib * \ No newline at end of file |
|
From: <sv...@ze...> - 2008-06-02 22:12:17
|
Author: jstevens
Date: 2008-06-01 17:46:43 -0400 (Sun, 01 Jun 2008)
New Revision: 9371
Modified:
trunk/Products/ZenModel/ZenPackPersistence.py
Log:
fixes #3268
Modified: trunk/Products/ZenModel/ZenPackPersistence.py
===================================================================
--- trunk/Products/ZenModel/ZenPackPersistence.py 2008-06-01 21:20:26 UTC (rev 9370)
+++ trunk/Products/ZenModel/ZenPackPersistence.py 2008-06-01 21:46:43 UTC (rev 9371)
@@ -72,7 +72,7 @@
# Subclasses should set this to the id of the ZenPack or they
# should override getZenPackName()
- ZENPACKID = None
+ # ZENPACKID = 'ZenPacks.my.name'
def getZenPackName(self):
'''
@@ -92,7 +92,8 @@
Return the ZenPack instance that provides this object.
"""
# NB: we can probably use self.dmd rather than passing in a context
- return context.dmd.ZenPackManager.packs._getOb(self.ZENPACKID, None)
+ return context.dmd.ZenPackManager.packs._getOb(
+ self.getZenPackName(), None)
def path(self, *parts):
@@ -116,7 +117,7 @@
"""A common method to allow Findables to index themselves."""
cat = getattr(self, ZENPACK_PERSISTENCE_CATALOG, None)
if cat is not None:
- cat.catalog_object(self, self.getPrimaryId())
+ cat.catalog_object(self, self.getPrimaryId())
super(ZenPackPersistence, self).index_object()
|
|
From: <sv...@ze...> - 2008-06-02 21:39:01
|
Author: ecn Date: 2008-06-02 11:50:17 -0400 (Mon, 02 Jun 2008) New Revision: 9377 Modified: branches/wmi-0.1.12.x/wmi/GNUmakefile Log: try #2 to get the right branch Modified: branches/wmi-0.1.12.x/wmi/GNUmakefile =================================================================== --- branches/wmi-0.1.12.x/wmi/GNUmakefile 2008-06-02 15:41:03 UTC (rev 9376) +++ branches/wmi-0.1.12.x/wmi/GNUmakefile 2008-06-02 15:50:17 UTC (rev 9377) @@ -55,7 +55,7 @@ tarball: -svn rm -m 'cleanup' http://dev.zenoss.org/svn/tags/wmi-$(VERSION) - svn cp -m "tagging wmi-$(VERSION)" http://dev.zenoss.org/svn/branches/wmi-0.1.12.x http://dev.zenoss.org/svn/tags/wmi-$(VERSION) + svn cp -m "tagging wmi-$(VERSION)" http://dev.zenoss.org/svn/branches/wmi-0.1.12.x/wmi http://dev.zenoss.org/svn/tags/wmi-$(VERSION) svn export http://dev.zenoss.org/svn/tags/wmi-$(VERSION) tar -cjf ../wmi-$(VERSION).tar.bz2 wmi-$(VERSION) rm -rf wmi-$(VERSION) |
|
From: <sv...@ze...> - 2008-06-02 21:36:57
|
Author: jstevens
Date: 2008-05-31 22:36:01 -0400 (Sat, 31 May 2008)
New Revision: 9368
Added:
trunk/Products/ZenModel/migrate/reindexZenPackPerstence.py
Modified:
trunk/Products/ZenModel/ZenPack.py
trunk/Products/ZenModel/migrate/__init__.py
Log:
fixes #3266
Modified: trunk/Products/ZenModel/ZenPack.py
===================================================================
--- trunk/Products/ZenModel/ZenPack.py 2008-05-31 00:55:59 UTC (rev 9367)
+++ trunk/Products/ZenModel/ZenPack.py 2008-06-01 02:36:01 UTC (rev 9368)
@@ -107,7 +107,7 @@
if oldClass and self.dsClass and isinstance(ds, oldClass):
ds.__class__ = self.dsClass
if self.reIndex and isinstance(ds, self.dsClass):
- ds.reIndex()
+ ds.index_object()
class ZenPack(ZenModelRM):
Modified: trunk/Products/ZenModel/migrate/__init__.py
===================================================================
--- trunk/Products/ZenModel/migrate/__init__.py 2008-05-31 00:55:59 UTC (rev 9367)
+++ trunk/Products/ZenModel/migrate/__init__.py 2008-06-01 02:36:01 UTC (rev 9368)
@@ -145,4 +145,5 @@
import runcommandspermission
import winmodelerUnderModeler
import removeWinModelerGraphPoints
-import happierZenPackRels
\ No newline at end of file
+import happierZenPackRels
+import reindexZenPackPerstence
\ No newline at end of file
Added: trunk/Products/ZenModel/migrate/reindexZenPackPerstence.py
|
|
From: <sv...@ze...> - 2008-06-02 21:23:39
|
Author: jstevens
Date: 2008-06-01 17:20:26 -0400 (Sun, 01 Jun 2008)
New Revision: 9370
Modified:
trunk/Products/ZenEvents/zenactions.py
trunk/Products/ZenModel/ZenossInfo.py
trunk/Products/ZenUtils/ZenPackCmd.py
Log:
fixes #3260
Modified: trunk/Products/ZenEvents/zenactions.py
===================================================================
--- trunk/Products/ZenEvents/zenactions.py 2008-06-01 19:43:57 UTC (rev 9369)
+++ trunk/Products/ZenEvents/zenactions.py 2008-06-01 21:20:26 UTC (rev 9370)
@@ -384,8 +384,8 @@
stderr=subprocess.STDOUT, env=os.environ)
# Trying to mimic how twisted returns results to us
# sort of.
+ output, _ = proc.communicate()
code = proc.wait()
- output = proc.stdout.read()
if code:
onError(output, startTime)
else:
Modified: trunk/Products/ZenModel/ZenossInfo.py
===================================================================
--- trunk/Products/ZenModel/ZenossInfo.py 2008-06-01 19:43:57 UTC (rev 9369)
+++ trunk/Products/ZenModel/ZenossInfo.py 2008-06-01 21:20:26 UTC (rev 9370)
@@ -534,10 +534,10 @@
log.info('Telling %s to %s' % (daemonName, action))
proc = subprocess.Popen([daemonPath, action], stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
+ output, _ = proc.communicate()
code = proc.wait()
if code:
- log.info('Error from %s: %s (%s)' % (daemonName, proc.stdout.read(),
- code))
+ log.info('Error from %s: %s (%s)' % (daemonName, output, code))
if action in ('stop', 'restart'):
time.sleep(2)
Modified: trunk/Products/ZenUtils/ZenPackCmd.py
===================================================================
--- trunk/Products/ZenUtils/ZenPackCmd.py 2008-06-01 19:43:57 UTC (rev 9369)
+++ trunk/Products/ZenUtils/ZenPackCmd.py 2008-06-01 21:20:26 UTC (rev 9370)
@@ -264,10 +264,11 @@
stderr=subprocess.PIPE,
shell=True,
cwd=eggPath)
+ out, err = p.communicate()
p.wait()
- errors = p.stderr.read()
- if errors:
- sys.stderr.write('%s\n' % errors)
+ if p.returncode:
+ raise ZenPackException('Error installing the egg (%s): %s' %
+ p.returncode, err)
zpDists = AddDistToWorkingSet(eggPath)
else:
zpDists = DoEasyInstall(eggPath)
@@ -736,10 +737,10 @@
stderr=subprocess.PIPE,
shell=True,
cwd=zp.eggPath())
- p.wait()
- errors = p.stderr.read()
- if errors:
- raise ZenPackException(errors)
+ out, err = p.communicate()
+ code = p.wait()
+ if code:
+ raise ZenPackException(err)
else:
DoEasyUninstall(packName)
# elif cleanupEasyInstallPth:
|
|
From: <sv...@ze...> - 2008-06-02 20:53:06
|
Author: jstevens
Date: 2008-06-01 15:43:57 -0400 (Sun, 01 Jun 2008)
New Revision: 9369
Modified:
trunk/Products/ZenUtils/ZenPackCmd.py
trunk/Products/ZenUtils/zenpack.py
Log:
fixes #3267
Modified: trunk/Products/ZenUtils/ZenPackCmd.py
===================================================================
--- trunk/Products/ZenUtils/ZenPackCmd.py 2008-06-01 02:36:01 UTC (rev 9368)
+++ trunk/Products/ZenUtils/ZenPackCmd.py 2008-06-01 19:43:57 UTC (rev 9369)
@@ -340,7 +340,7 @@
if existing.isEggPack():
forceNoFileDeletion = existing.eggPath() == dist.location
RemoveZenPack(dmd, existing.id,
- skipDepsCheck=False, leaveObjects=True,
+ skipDepsCheck=True, leaveObjects=True,
forceNoFileDeletion=forceNoFileDeletion,
uninstallEgg=False)
else:
@@ -348,7 +348,7 @@
# migrate scripts to be run below.
deferFileDeletion = True
oldzenpack.RemoveZenPack(dmd, existing.id,
- skipDepsCheck=False, leaveObjects=True,
+ skipDepsCheck=True, leaveObjects=True,
deleteFiles=False)
dmd.ZenPackManager.packs._setObject(packName, zenPack)
Modified: trunk/Products/ZenUtils/zenpack.py
===================================================================
--- trunk/Products/ZenUtils/zenpack.py 2008-06-01 02:36:01 UTC (rev 9368)
+++ trunk/Products/ZenUtils/zenpack.py 2008-06-01 19:43:57 UTC (rev 9369)
@@ -35,10 +35,8 @@
if not skipDepsCheck:
for pack in dmd.ZenPackManager.packs():
if packName in pack.requires:
- if log:
- log.error("Pack %s depends on pack %s, not removing",
- pack.id, packName)
- return False
+ raise ZenPackException('Pack %s depends on pack %s, '
+ 'not removing' % (pack.id, packName))
zp = None
try:
zp = dmd.ZenPackManager.packs._getOb(packName)
|
|
From: <sv...@ze...> - 2008-06-02 20:21:47
|
Author: ecn Date: 2008-06-02 11:40:15 -0400 (Mon, 02 Jun 2008) New Revision: 9374 Modified: branches/wmi-0.1.12.x/wmi/GNUmakefile Log: copy the tag from the correct branch Modified: branches/wmi-0.1.12.x/wmi/GNUmakefile =================================================================== --- branches/wmi-0.1.12.x/wmi/GNUmakefile 2008-06-02 15:39:52 UTC (rev 9373) +++ branches/wmi-0.1.12.x/wmi/GNUmakefile 2008-06-02 15:40:15 UTC (rev 9374) @@ -55,7 +55,7 @@ tarball: -svn rm -m 'cleanup' http://dev.zenoss.org/svn/tags/wmi-$(VERSION) - svn cp -m "tagging wmi-$(VERSION)" http://dev.zenoss.org/svn/trunk/wmi http://dev.zenoss.org/svn/tags/wmi-$(VERSION) + svn cp -m "tagging wmi-$(VERSION)" http://dev.zenoss.org/svn/branches/wmi-0.1.12.x http://dev.zenoss.org/svn/tags/wmi-$(VERSION) svn export http://dev.zenoss.org/svn/tags/wmi-$(VERSION) tar -cjf ../wmi-$(VERSION).tar.bz2 wmi-$(VERSION) rm -rf wmi-$(VERSION) |
|
From: <sv...@ze...> - 2008-06-02 20:10:20
|
Author: ecn Date: 2008-06-02 11:55:01 -0400 (Mon, 02 Jun 2008) New Revision: 9380 Modified: trunk/inst/externallibs/wmi-0.1.12.1.tar.bz2 Log: try to build the right tag Modified: trunk/inst/externallibs/wmi-0.1.12.1.tar.bz2 =================================================================== (Binary files differ) |
|
From: <sv...@ze...> - 2008-06-02 20:10:20
|
Author: ecn Date: 2008-06-02 11:41:03 -0400 (Mon, 02 Jun 2008) New Revision: 9376 Added: tags/wmi-0.1.12.1/ Log: tagging wmi-0.1.12.1 Copied: tags/wmi-0.1.12.1 (from rev 9375, branches/wmi-0.1.12.x) |
|
From: <sv...@ze...> - 2008-06-02 20:10:20
|
Author: ecn Date: 2008-06-02 11:52:22 -0400 (Mon, 02 Jun 2008) New Revision: 9379 Added: tags/wmi-0.1.12.1/ Log: tagging wmi-0.1.12.1 Copied: tags/wmi-0.1.12.1 (from rev 9378, branches/wmi-0.1.12.x/wmi) |
|
From: <sv...@ze...> - 2008-06-02 20:10:20
|
Author: ecn Date: 2008-06-02 11:39:52 -0400 (Mon, 02 Jun 2008) New Revision: 9373 Added: tags/wmi-0.1.12.1/ Log: tagging wmi-0.1.12.1 Copied: tags/wmi-0.1.12.1 (from rev 9372, branches/wmi-0.1.12.x) |
|
From: <sv...@ze...> - 2008-06-02 20:10:20
|
Author: ecn Date: 2008-06-02 11:50:35 -0400 (Mon, 02 Jun 2008) New Revision: 9378 Removed: tags/wmi-0.1.12.1/ Log: cleanup |
|
From: <sv...@ze...> - 2008-06-02 20:10:20
|
Author: ecn Date: 2008-06-02 11:39:20 -0400 (Mon, 02 Jun 2008) New Revision: 9372 Removed: tags/wmi-0.1.12.1/ Log: cleanup |
|
From: <sv...@ze...> - 2008-06-02 20:10:19
|
Author: ecn
Date: 2008-06-02 13:51:42 -0400 (Mon, 02 Jun 2008)
New Revision: 9382
Modified:
trunk/Products/ZenUtils/ZenDaemon.py
Log:
* only use logpath if we're a daemon
Modified: trunk/Products/ZenUtils/ZenDaemon.py
===================================================================
--- trunk/Products/ZenUtils/ZenDaemon.py 2008-06-02 17:48:13 UTC (rev 9381)
+++ trunk/Products/ZenUtils/ZenDaemon.py 2008-06-02 17:51:42 UTC (rev 9382)
@@ -100,8 +100,7 @@
zlog = logging.getLogger("zen")
zlog.setLevel(self.options.logseverity)
if self.options.watchdogPath or \
- self.options.daemon or \
- self.options.logpath:
+ self.options.daemon:
if self.options.logpath:
if not os.path.isdir(os.path.dirname(self.options.logpath)):
raise SystemExit("logpath:%s doesn't exist" %
|
Author: jstevens
Date: 2008-06-02 13:48:13 -0400 (Mon, 02 Jun 2008)
New Revision: 9381
Added:
trunk/zenpacks/OldNonEggPacks/ZenJMX/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/GNUmakefile
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/MANIFEST.in
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/README.txt
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/__init__.py
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/.cvsignore
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/__init__.py
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/bin/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/bin/java-functions.sh
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/daemons/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/daemons/zenjmx
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/datasources/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/datasources/JMXDataSource.py
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/datasources/__init__.py
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/migrate/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/migrate/ConvertJMXDataSources.py
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/migrate/__init__.py
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/objects/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/objects/objects.xml
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/skins/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/skins/ZenJMX/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/skins/ZenJMX/editJMXDataSource.pt
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/assembly/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/assembly/bin.xml
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/concurrent/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/concurrent/call/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/jmx/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/jmx/ContextListener.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/jmx/JBossDemo.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/jmx/JmxClient.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/jmx/JmxException.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/jmx/TomcatDemo.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/jmx/beans/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/jmx/beans/Server.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/jmx/beans/ServerMBean.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/xmlrpc/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/xmlrpc/XmlRpcClient.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/xmlrpc/XmlRpcDemo.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Configuration.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/DelayedCall.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Injector.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Main.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/OptionsFactory.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/OptionsPrinter.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Processor.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Reactor.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/CallFactory.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/ConfigurationCall.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/CountDownLatchObserver.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/HeartbeatCall.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/JmxCall.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/MultiValueAttributeCall.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/OperationCall.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/SingleValueAttributeCall.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/Summary.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/Utility.java
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/resources/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/resources/commons-logging.properties
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/resources/log4j.properties
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/zenjmx.conf
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/__init__.py
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/notes.txt
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/pom.xml
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/setup.py
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/target/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/target/maven-archiver/
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/target/maven-archiver/pom.properties
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/target/zenjmx-1.0-SNAPSHOT.jar
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/temp/
Removed:
trunk/zenpacks/ZenJMX/
Modified:
trunk/zenpacks/OldNonEggPacks/HPMonitor/__init__.py
Log:
refs #613
Modified: trunk/zenpacks/OldNonEggPacks/HPMonitor/__init__.py
===================================================================
--- trunk/zenpacks/OldNonEggPacks/HPMonitor/__init__.py 2008-06-02 15:55:01 UTC (rev 9380)
+++ trunk/zenpacks/OldNonEggPacks/HPMonitor/__init__.py 2008-06-02 17:48:13 UTC (rev 9381)
@@ -32,9 +32,9 @@
ZenPackBase.upgrade(self, app)
self.setupCollectorPlugins(app.zport.dmd)
- def remove(self, app, leaveObjects=False):
+ def remove(self, app):
self.cleanupOurPlugins(app.zport.dmd)
- ZenPackBase.remove(self, app, leaveObjects)
+ ZenPackBase.remove(self, app)
def setupCollectorPlugins(self, dmd):
self.cleanupOldPlugins(dmd)
Copied: trunk/zenpacks/OldNonEggPacks/ZenJMX (from rev 9371, trunk/zenpacks/ZenJMX)
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/GNUmakefile
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/MANIFEST.in
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/README.txt
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/__init__.py
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/.cvsignore
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/__init__.py
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/bin/java-functions.sh
Property changes on: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/bin/java-functions.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/daemons/zenjmx
Property changes on: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/daemons/zenjmx
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/datasources/JMXDataSource.py
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/datasources/__init__.py
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/migrate/ConvertJMXDataSources.py
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/migrate/__init__.py
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/objects/objects.xml
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/skins/ZenJMX/editJMXDataSource.pt
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/assembly/bin.xml
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/jmx/ContextListener.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/jmx/JBossDemo.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/jmx/JmxClient.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/jmx/JmxException.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/jmx/TomcatDemo.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/jmx/beans/Server.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/jmx/beans/ServerMBean.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/xmlrpc/XmlRpcClient.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/xmlrpc/XmlRpcDemo.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Configuration.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/DelayedCall.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Injector.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Main.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/OptionsFactory.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/OptionsPrinter.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Processor.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/Reactor.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/CallFactory.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/ConfigurationCall.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/CountDownLatchObserver.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/HeartbeatCall.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/JmxCall.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/MultiValueAttributeCall.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/OperationCall.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/SingleValueAttributeCall.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/Summary.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/java/com/zenoss/zenpacks/zenjmx/call/Utility.java
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/resources/commons-logging.properties
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/src/main/resources/log4j.properties
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/zenjmx.conf
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/__init__.py
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/notes.txt
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/pom.xml
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/setup.py
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/target/maven-archiver/pom.properties
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/target/zenjmx-1.0-SNAPSHOT.jar
Property changes on: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/target/zenjmx-1.0-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
|
|
From: <sv...@ze...> - 2008-06-02 20:10:19
|
Author: jstevens
Date: 2008-06-02 15:30:07 -0400 (Mon, 02 Jun 2008)
New Revision: 9383
Added:
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/GNUmakefile
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/pom.xml
Removed:
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/pom.xml
Modified:
trunk/zenpacks/ZenPacks.zenoss.ZenJMX/GNUmakefile
Log:
refs #613
Modified: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/GNUmakefile
===================================================================
--- trunk/zenpacks/ZenPacks.zenoss.ZenJMX/GNUmakefile 2008-06-02 17:51:42 UTC (rev 9382)
+++ trunk/zenpacks/ZenPacks.zenoss.ZenJMX/GNUmakefile 2008-06-02 19:30:07 UTC (rev 9383)
@@ -11,9 +11,6 @@
#
###########################################################################
-ZENJMX_HOME=$(PWD)/ZenPacks/zenoss/ZenJMX
-LIB_DIR=$(ZENJMX_HOME)/lib
-TARGET=$(ZENJMX_HOME)/target
default: egg
@@ -24,16 +21,11 @@
build:
- mvn assembly:assembly
+ cd ZenPacks/zenoss/ZenJMX; make install
- mkdir -p ${LIB_DIR} ; \
- cd ${LIB_DIR} ; \
- tar xzf ${TARGET}/*-bin.tar.gz
- cp ${ZENJMX_HOME}/zenjmx.conf ${LIB_DIR}
-
-
clean:
- rm -rf build dist ${LIB_DIR} ${TARGET}
+ rm -rf build dist
rm -rf *.egg-info
- find . -name *.pyc | xargs rm
\ No newline at end of file
+ find . -name *.pyc | xargs rm
+ cd ZenPacks/zenoss/ZenJMX; make clean
\ No newline at end of file
Added: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/GNUmakefile
Copied: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/ZenPacks/zenoss/ZenJMX/pom.xml (from rev 9382, trunk/zenpacks/ZenPacks.zenoss.ZenJMX/pom.xml)
Deleted: trunk/zenpacks/ZenPacks.zenoss.ZenJMX/pom.xml
|
|
From: <sv...@ze...> - 2008-06-02 20:10:19
|
Author: ecn Date: 2008-06-02 11:40:39 -0400 (Mon, 02 Jun 2008) New Revision: 9375 Removed: tags/wmi-0.1.12.1/ Log: cleanup |
|
From: <sv...@ze...> - 2008-05-31 00:55:52
|
Author: jstevens
Date: 2008-05-30 20:55:59 -0400 (Fri, 30 May 2008)
New Revision: 9367
Modified:
trunk/Products/ZenUtils/zenpack.py
Log:
fixes #3264
Modified: trunk/Products/ZenUtils/zenpack.py
===================================================================
--- trunk/Products/ZenUtils/zenpack.py 2008-05-30 19:43:28 UTC (rev 9366)
+++ trunk/Products/ZenUtils/zenpack.py 2008-05-31 00:55:59 UTC (rev 9367)
@@ -210,7 +210,7 @@
if not isinstance(requires, list):
requires = [zp.strip() for zp in requires.split(',')]
missing = [zp for zp in requires
- if zp not in self.dataroot.packs.objectIds()]
+ if zp not in self.dataroot.ZenPackManager.packs.objectIds()]
if missing:
self.log.error('ZenPack %s was not installed because'
% self.options.installPackName
|
|
From: <sv...@ze...> - 2008-05-30 19:43:23
|
Author: ecn
Date: 2008-05-30 15:43:28 -0400 (Fri, 30 May 2008)
New Revision: 9366
Modified:
trunk/Products/DataCollector/WmiClient.py
trunk/Products/DataCollector/zenmodeler.py
Log:
* provide new zenwinmodeler option to define zenwinmodeler command
Modified: trunk/Products/DataCollector/WmiClient.py
===================================================================
--- trunk/Products/DataCollector/WmiClient.py 2008-05-30 17:39:44 UTC (rev 9365)
+++ trunk/Products/DataCollector/WmiClient.py 2008-05-30 19:43:28 UTC (rev 9366)
@@ -50,7 +50,9 @@
def run(self):
- modeler = zenPath('bin', 'zenwinmodeler')
+ modeler = self.datacollector.options.zenwinmodeler
+ if not modeler.startswith('/'):
+ modeler = zenPath('bin', modeler)
args = ('run', '-d', self.device.id)
if '--weblog' in sys.argv:
args += ('--weblog',)
Modified: trunk/Products/DataCollector/zenmodeler.py
===================================================================
--- trunk/Products/DataCollector/zenmodeler.py 2008-05-30 17:39:44 UTC (rev 9365)
+++ trunk/Products/DataCollector/zenmodeler.py 2008-05-30 19:43:28 UTC (rev 9366)
@@ -459,6 +459,9 @@
self.parser.add_option('--nowmi',
dest='nowmi', action="store_true", default=False,
help="do not run zenwinmodeler to execute WMI plugins")
+ self.parser.add_option('--zenwinmodeler',
+ dest='zenwinmodeler', default="zenwinmodeler",
+ help="zenwinmodeler command to execute WMI plugins")
self.parser.add_option('--parallel', dest='parallel',
type='int', default=defaultParallel,
help="number of devices to collect from in parallel")
|
|
From: <sv...@ze...> - 2008-05-30 17:39:38
|
Author: ian Date: 2008-05-30 13:39:44 -0400 (Fri, 30 May 2008) New Revision: 9365 Modified: branches/zenoss-2.2.x/Products/ZenModel/ZVersion.py Log: * Incrementing ZVersion.py to 2.2.1 Modified: branches/zenoss-2.2.x/Products/ZenModel/ZVersion.py =================================================================== --- branches/zenoss-2.2.x/Products/ZenModel/ZVersion.py 2008-05-30 14:51:41 UTC (rev 9364) +++ branches/zenoss-2.2.x/Products/ZenModel/ZVersion.py 2008-05-30 17:39:44 UTC (rev 9365) @@ -10,4 +10,4 @@ # For complete information please visit: http://www.zenoss.com/oss/ # ########################################################################### -VERSION="2.2.0" +VERSION="2.2.1" |
