Menu
▾
▴
[Hyperic-hq-discuss] hq r3841 - in trunk: . plugins/system/src/org/hyperic/hq/plugin/system src/org/hyperic/hq/bizapp/client/shell src/org/hyperic/hq/bizapp/server/session src/org/hyperic/hq/livedata/agent/server src/org/hyperic/hq/product thirdparty/lib
Author: rmorgan Date: 2007-03-23 13:30:59 -0800 (Fri, 23 Mar 2007) New Revision: 3841 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=3841 Added: trunk/thirdparty/lib/xpp3_min-1.1.3.4.O.jar trunk/thirdparty/lib/xstream-1.2.1.jar Modified: trunk/build.xml trunk/plugins/system/src/org/hyperic/hq/plugin/system/SystemLiveDataPlugin.java trunk/src/org/hyperic/hq/bizapp/client/shell/ClientShell_livedata_get.java trunk/src/org/hyperic/hq/bizapp/server/session/LiveDataBossEJBImpl.java trunk/src/org/hyperic/hq/livedata/agent/server/LiveDataCommandsServer.java trunk/src/org/hyperic/hq/product/LiveDataPluginManager.java Log: Use XStream encode objects rather than JSON. Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2007-03-23 21:21:14 UTC (rev 3840) +++ trunk/build.xml 2007-03-23 21:30:59 UTC (rev 3841) @@ -386,6 +386,8 @@ <include name="jug-asl-2.0.0.jar" /> <include name="commons-httpclient-3.0.1.jar" /> <include name="groovy-all-1.0.jar" /> + <include name="xstream-1.2.1.jar" /> + <include name="xpp3_min-1.1.3.4.O.jar" /> <!-- replacement j2ee compile required for instantj since our installer doesn't install tools.jar --> @@ -803,6 +805,8 @@ <include name="mx4j/*.jar"/> <!-- for live data translation --> <include name="json.jar"/> + <include name="xstream-1.2.1.jar"/> + <include name="xpp3_min-1.1.3.4.O.jar"/> </fileset> </copy> @@ -1210,7 +1214,10 @@ <include name="jdom_b8.jar" /> <include name="jsch-0.1.23.jar"/> <include name="getopt.jar"/> + <!-- For live data translation --> <include name="json.jar"/> + <include name="xstream-1.2.1.jar"/> + <include name="xpp3_min-1.1.3.4.O.jar"/> </fileset> <fileset dir="${sigar.lib}" includes="*.*" /> Modified: trunk/plugins/system/src/org/hyperic/hq/plugin/system/SystemLiveDataPlugin.java =================================================================== --- trunk/plugins/system/src/org/hyperic/hq/plugin/system/SystemLiveDataPlugin.java 2007-03-23 21:21:14 UTC (rev 3840) +++ trunk/plugins/system/src/org/hyperic/hq/plugin/system/SystemLiveDataPlugin.java 2007-03-23 21:30:59 UTC (rev 3841) @@ -27,11 +27,10 @@ import org.hyperic.hq.product.LiveDataPlugin; import org.hyperic.hq.product.PluginException; -import org.hyperic.hq.livedata.shared.LiveDataTranslator; import org.hyperic.sigar.Sigar; import org.hyperic.sigar.SigarException; import org.hyperic.util.config.ConfigResponse; -import org.json.JSONArray; +import com.thoughtworks.xstream.XStream; public class SystemLiveDataPlugin extends LiveDataPlugin { @@ -79,8 +78,9 @@ for (int i = 0; i < _COMMANDS.length; i++) { System.out.println("Running command " + _COMMANDS[i]); Object o = p.getData(_COMMANDS[i], emtpy); - JSONArray js = LiveDataTranslator.encode(o); - System.out.println(js.toString(2)); + + XStream xstream = new XStream(); + System.out.println(xstream.toXML(o)); } } } Modified: trunk/src/org/hyperic/hq/bizapp/client/shell/ClientShell_livedata_get.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/client/shell/ClientShell_livedata_get.java 2007-03-23 21:21:14 UTC (rev 3840) +++ trunk/src/org/hyperic/hq/bizapp/client/shell/ClientShell_livedata_get.java 2007-03-23 21:30:59 UTC (rev 3841) @@ -66,10 +66,9 @@ String s = _entityFetcher.getLiveData(id, args[2], response); - JSONArray json = new JSONArray(s); this.getShell().getOutStream().println("Printing output from " + args[2] + " command:"); - this.getShell().getOutStream().println(json.toString(2)); + this.getShell().getOutStream().println(s); } catch (Exception e) { throw new ShellCommandExecException(e); Modified: trunk/src/org/hyperic/hq/bizapp/server/session/LiveDataBossEJBImpl.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/session/LiveDataBossEJBImpl.java 2007-03-23 21:21:14 UTC (rev 3840) +++ trunk/src/org/hyperic/hq/bizapp/server/session/LiveDataBossEJBImpl.java 2007-03-23 21:30:59 UTC (rev 3841) @@ -73,12 +73,9 @@ /** * Get live data for a given resource * - * The data returned is the string representation of a JSONArray. This - * is mainly because JSONArray is not Serializable. To reconstruct the - * JSONArray object use: + * The data returned from getLiveData is an XML representation of the + * object that was returned by the LiveDataPlugin. * - * new JSONArray(string); - * * @ejb:interface-method */ public String getLiveData(int sessionId, AppdefEntityID id, Modified: trunk/src/org/hyperic/hq/livedata/agent/server/LiveDataCommandsServer.java =================================================================== --- trunk/src/org/hyperic/hq/livedata/agent/server/LiveDataCommandsServer.java 2007-03-23 21:21:14 UTC (rev 3840) +++ trunk/src/org/hyperic/hq/livedata/agent/server/LiveDataCommandsServer.java 2007-03-23 21:30:59 UTC (rev 3841) @@ -38,7 +38,6 @@ import org.hyperic.hq.product.ProductPlugin; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.json.JSONArray; import java.io.InputStream; import java.io.OutputStream; @@ -91,11 +90,11 @@ _log.info("Asked to invoke cmdGetData for " + args.getType()); try { - JSONArray o = _manager.getData(args.getType(), - args.getCommand(), - args.getConfig()); + String s = _manager.getData(args.getType(), + args.getCommand(), + args.getConfig()); LiveData_result res = new LiveData_result(); - res.setResult(o.toString()); + res.setResult(s); return res; } catch (Exception e) { throw new AgentRemoteException("Unable to invoke command", e); Modified: trunk/src/org/hyperic/hq/product/LiveDataPluginManager.java =================================================================== --- trunk/src/org/hyperic/hq/product/LiveDataPluginManager.java 2007-03-23 21:21:14 UTC (rev 3840) +++ trunk/src/org/hyperic/hq/product/LiveDataPluginManager.java 2007-03-23 21:30:59 UTC (rev 3841) @@ -25,13 +25,13 @@ package org.hyperic.hq.product; -import org.hyperic.hq.livedata.shared.LiveDataTranslator; import org.hyperic.util.config.ConfigResponse; import org.hyperic.util.config.ConfigSchema; -import org.json.JSONArray; import java.util.Properties; +import com.thoughtworks.xstream.XStream; + public class LiveDataPluginManager extends PluginManager { public LiveDataPluginManager(Properties props) { @@ -48,17 +48,15 @@ return (LiveDataPlugin)getPlugin(type); } - public JSONArray getData(String type, String command, ConfigResponse config) + public String getData(String type, String command, ConfigResponse config) throws PluginException { LiveDataPlugin p = getLiveDataPlugin(type); Object o = p.getData(command, config); - try { - return LiveDataTranslator.encode(o); - } catch (Exception e) { - throw new PluginException(e); - } + XStream xtream = new XStream(); + + return xtream.toXML(o); } public String[] getCommands(String type) Added: trunk/thirdparty/lib/xpp3_min-1.1.3.4.O.jar =================================================================== (Binary files differ) Property changes on: trunk/thirdparty/lib/xpp3_min-1.1.3.4.O.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/thirdparty/lib/xstream-1.2.1.jar =================================================================== (Binary files differ) Property changes on: trunk/thirdparty/lib/xstream-1.2.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |