From: Dave B. <bla...@us...> - 2012-04-25 11:30:57
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem In directory vz-cvs-3.sog:/tmp/cvs-serv23711/src/org/sblim/cimclient/internal/wbem Modified Files: Tag: Experimental WBEMClientCIMXML.java Log Message: 3521328 - JSR48 1.0.0: remove WBEMClient associators and references Index: WBEMClientCIMXML.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java,v retrieving revision 1.21.2.60 retrieving revision 1.21.2.61 diff -u -d -r1.21.2.60 -r1.21.2.61 --- WBEMClientCIMXML.java 25 Apr 2012 02:34:36 -0000 1.21.2.60 +++ WBEMClientCIMXML.java 25 Apr 2012 11:30:55 -0000 1.21.2.61 @@ -62,6 +62,7 @@ * 3515180 2012-04-05 blaschke-oss JSR48 log dir/file should handle UNIX/Win separators * 3516848 2012-04-11 blaschke-oss enumerateNamespaces() method to WBEMClient * 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors + * 3521328 2012-04-25 blaschke-oss JSR48 1.0.0: remove WBEMClient associators and references */ package org.sblim.cimclient.internal.wbem; @@ -615,52 +616,6 @@ } } - public CloseableIterator associators(CIMObjectPath pObjectName, String pAssociationClass, - String pResultClass, String pRole, String pResultRole, boolean pIncludeQualifiers, - boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException { - - final String operation = "Associators"; - final LogAndTraceBroker logger = LogAndTraceBroker.getBroker(); - logger.entry(); - - checkState(); - - try { - - if (pObjectName == null || pObjectName.getNamespace() == null - || pObjectName.getObjectName() == null) { throw new WBEMException( - WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); } - - HttpHeader hh = new HttpHeader(); - hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", - "US-ASCII")); - - Document doc = this.iXmlHelper.newDocument(); - this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.associators_request(doc, - pObjectName, pAssociationClass, pResultClass, pRole, pResultRole, - pIncludeQualifiers, pIncludeClassOrigin, pPropertyList)); - - InputStreamReader is = transmitRequest("Associators", hh, doc); - - return getIterator(is, pObjectName); - - } catch (WBEMException e) { - logger.trace(Level.FINE, operation + " request resulted in CIM Error", e); - throw e; - } catch (Exception e) { - if (e.getCause() != null && e.getCause() instanceof WBEMException) { - logger - .trace(Level.FINE, operation + " request resulted in CIM Error", e - .getCause()); - throw (WBEMException) e.getCause(); - } - logger.trace(Level.FINE, operation + " request failed", e); - throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e); - } finally { - logger.exit(); - } - } - public synchronized void close() { final LogAndTraceBroker logger = LogAndTraceBroker.getBroker(); logger.entry(); @@ -1664,51 +1619,6 @@ } } - public CloseableIterator references(CIMObjectPath pObjectName, String pResultClass, - String pRole, boolean pIncludeQualifiers, boolean pIncludeClassOrigin, - String[] pPropertyList) throws WBEMException { - - final String operation = "References"; - final LogAndTraceBroker logger = LogAndTraceBroker.getBroker(); - logger.entry(); - - checkState(); - - try { - if (pObjectName == null || pObjectName.getNamespace() == null - || pObjectName.getObjectName() == null) { throw new WBEMException( - WBEMException.CIM_ERR_INVALID_PARAMETER, "Invalid object path"); } - - HttpHeader hh = new HttpHeader(); - hh.addField("CIMObject", HttpHeader.encode(pObjectName.getNamespace(), "UTF-8", - "US-ASCII")); - - Document doc = this.iXmlHelper.newDocument(); - this.iXmlHelper.createCIMMessage(doc, this.iXmlHelper.references_request(doc, - pObjectName, pResultClass, pRole, pIncludeQualifiers, pIncludeClassOrigin, - pPropertyList)); - - InputStreamReader is = transmitRequest("References", hh, doc); - - return getIterator(is, pObjectName); - - } catch (WBEMException e) { - logger.trace(Level.FINE, operation + " request resulted in CIM Error", e); - throw e; - } catch (Exception e) { - if (e.getCause() != null && e.getCause() instanceof WBEMException) { - logger - .trace(Level.FINE, operation + " request resulted in CIM Error", e - .getCause()); - throw (WBEMException) e.getCause(); - } - logger.trace(Level.FINE, operation + " request failed", e); - throw new WBEMException(WBEMException.CIM_ERR_FAILED, null, null, e); - } finally { - logger.exit(); - } - } - public void setLocales(Locale[] pLocales) { this.iLocales = (pLocales != null && pLocales.length > 0) ? pLocales : WBEMConstants.DEFAULT_LOCALES; |