Menu
▾
▴
sblim-commit — CVS Commit Info for SBLIM
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(1) |
Mar
(45) |
Apr
(150) |
May
(145) |
Jun
(150) |
Jul
(79) |
Aug
(313) |
Sep
(160) |
Oct
(309) |
Nov
(115) |
Dec
(60) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(160) |
Feb
(144) |
Mar
(127) |
Apr
(48) |
May
(102) |
Jun
(54) |
Jul
(245) |
Aug
(94) |
Sep
(152) |
Oct
(162) |
Nov
(166) |
Dec
(740) |
| 2007 |
Jan
(752) |
Feb
(437) |
Mar
(328) |
Apr
(373) |
May
(569) |
Jun
(399) |
Jul
(369) |
Aug
(627) |
Sep
(100) |
Oct
(306) |
Nov
(166) |
Dec
(282) |
| 2008 |
Jan
(68) |
Feb
(145) |
Mar
(180) |
Apr
(160) |
May
(277) |
Jun
(229) |
Jul
(1188) |
Aug
(51) |
Sep
(97) |
Oct
(99) |
Nov
(95) |
Dec
(170) |
| 2009 |
Jan
(39) |
Feb
(73) |
Mar
(120) |
Apr
(121) |
May
(104) |
Jun
(262) |
Jul
(57) |
Aug
(171) |
Sep
(131) |
Oct
(88) |
Nov
(64) |
Dec
(83) |
| 2010 |
Jan
(55) |
Feb
(67) |
Mar
(124) |
Apr
(64) |
May
(130) |
Jun
(75) |
Jul
(164) |
Aug
(64) |
Sep
(44) |
Oct
(17) |
Nov
(43) |
Dec
(31) |
| 2011 |
Jan
(21) |
Feb
(10) |
Mar
(43) |
Apr
(46) |
May
(52) |
Jun
(71) |
Jul
(7) |
Aug
(16) |
Sep
(51) |
Oct
(14) |
Nov
(33) |
Dec
(15) |
| 2012 |
Jan
(12) |
Feb
(61) |
Mar
(129) |
Apr
(76) |
May
(70) |
Jun
(52) |
Jul
(29) |
Aug
(41) |
Sep
(32) |
Oct
(23) |
Nov
(38) |
Dec
(26) |
| 2013 |
Jan
(35) |
Feb
(37) |
Mar
(51) |
Apr
(15) |
May
(52) |
Jun
(15) |
Jul
(23) |
Aug
(21) |
Sep
(46) |
Oct
(69) |
Nov
(57) |
Dec
(26) |
| 2014 |
Jan
(5) |
Feb
(13) |
Mar
(17) |
Apr
(1) |
May
(5) |
Jun
|
Jul
(2) |
Aug
(2) |
Sep
(1) |
Oct
(16) |
Nov
(8) |
Dec
(4) |
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(1) |
Jun
(4) |
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
|
From: Dave B. <bla...@us...> - 2012-09-13 20:29:59
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files
In directory vz-cvs-3.sog:/tmp/cvs-serv16366/src/org/sblim/cimclient/doc-files
Modified Files:
Tag: Experimental
history.html
Log Message:
3567429 - Update detailed release history HTML for 2.2.0
Index: history.html
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files/history.html,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- history.html 16 Mar 2012 11:36:11 -0000 1.1.2.1
+++ history.html 13 Sep 2012 20:29:56 -0000 1.1.2.2
@@ -18,6 +18,7 @@
* Flag Date Prog Description
*-------------------------------------------------------------------------------
* 3505681 2012-03-16 blaschke-oss Add detailed release history HTML
+ * 3567429 2012-09-13 blaschke-oss Update detailed release history HTML for 2.2.0
-->
</head>
<body style="background-color: white;">
@@ -28,10 +29,153 @@
upgraded to the standardized JSR48 API and released to the public for
the first time in February of 2007. It continues to ship on a quarterly
basis, as close as possible to the middle (15th) of the last month of
- the quarter (March, June, September, December). The 2.0.x code stream
- (releases 2.0.1 through 2.0.9) requires Java 1.4 while the 2.1.x code
- stream (releases 2.1.0 through 2.1.12) requires Java 5. The 2.0.x code
- stream was sunset in December of 2010.</p>
+ each quarter (March, June, September, December).</p>
+ <table border="1" cellpadding="5" cellspacing="0" width="50%">
+ <tr><th>Code Stream</th><th>Versions</th><th>Java Version</th><th>State</th>
+ <tr><td>2.0.x</td><td>2.0.1-2.0.9</td><td>1.4</td><td>Sunset December 2010</td>
+ <tr><td>2.1.x</td><td>2.1.0-2.1.12</td><td>1.5</td><td>Maintenance mode September 2012</td>
+ <tr><td>2.2.x</td><td>2.2.0</td><td>1.5</td><td>Active</td>
+ </table>
+ <h2>Version 2.2.0</h2>
+ <p>Version 2.2.0 was released on September 14, 2012. It is fully compliant
+ with the final JSR48 1.0.0 specification. In order to comply, several
+ APIs were removed while several others changed their behavior. The
+ changes made along with their workarounds are described in the following
+ table:</p>
+ <table border="1" cellpadding="5" cellspacing="0" width="100%">
+ <tr><th>Change</th><th>Workaround</th></tr>
+ <tr><td>Constructor CIMObjectPath(pObjectName, pNamespace) removed</td><td>Use CIMObjectPath(null, null, null, pNamespace, pObjectName, null) instead</td></tr>
+ <tr><td>Constructor CIMObjectPath(pObjectName, pNamespace, pKeys) removed</td><td>Use CIMObjectPath(null, null, null, pNamespace, pObjectName, pKeys) instead</td></tr>
+ <tr><td>Constructor CIMObjectPath(pHost, pNamespace, pObjectName, pKeys) removed</td><td>Use CIMObjectPath(null, pHost, null, pNamespace, pObjectName, pKeys) instead</td></tr>
+ <tr><td>Method WBEMClient.associators(pObjectName, pAssociationClass, pResultClass, pRole, pResultRole, pIncludeQualifiers, pIncludeClassOrigin, pPropertyList) removed</td><td>For classes, use WBEMClient.associatorClasses(pObjectName, pAssociationClass, pResultClass, pRole, pResultRole, pIncludeQualifiers, pIncludeClassOrigin, pPropertyList) instead; for instances, use WBEMClient.associatorInstances(pObjectName, pAssociationClass, pResultClass, pRole, pResultRole, pIncludeClassOrigin, pPropertyList) instead</td></tr>
+ <tr><td>Method WBEMClient.references(pObjectName, pResultClass, pRole, pIncludeQualifiers, pIncludeClassOrigin, pPropertyList) removed</td><td>For classes, use WBEMClient.referenceClasses(pObjectName, pResultClass, pRole, pIncludeQualifiers, pIncludeClassOrigin, pPropertyList) instead; for instances, use WBEMClient.referenceInstances(pObjectName, pResultClass, pRole, pIncludeClassOrigin, pPropertyList) instead</td></tr>
+ <tr><td>Constructor CIMDataType(pType, 0) no longer supported, will result in IllegalArgumentException</td><td>Use corresponding CIMDataType.x_ARRAY_T constant instead</td></tr>
+ <tr><td>Constructor CIMDataType(null) no longer supported, will result in IllegalArgumentException</td><td>Use CIMDataType("") instead</td></tr>
+ <tr><td>Constructor CIMObjectPath("") no longer supported, will result in IllegalArgumentException</td><td>Use valid ObjectPath instead</td></tr>
+ <tr><td>Method WBEMClient.execQueryInstance() pReturnQueryResultClass and pContinueOnError parameters changed from Boolean to boolean</td><td>Use boolean instead of Boolean</td></tr>
+ <tr><td>Constructor CIMObjectPath(pScheme, pHost, pPort, pNamespace, pObjectName, pKeys) throws IllegalArgumentException if pKeys contains CIMProperty with pKey=false</td><td>Use pKey=true when constructing key properties instead</td></tr>
+ <tr><td>Constructor CIMObjectPath(pScheme, pHost, pPort, pNamespace, pObjectName, pKeys, pXmlSchemaName) throws IllegalArgumentException if pKeys contains CIMProperty with pKey=false</td><td>Use pKey=true when constructing key properties instead</td></tr>
+ </table>
+ <p>In addition, the behavior of CIMInstance is changing significantly to
+ comply with the final JSR48 1.0.0 specification. Up until now, the keys
+ from the CIMObjectPath (first constructor parameter) were merged with
+ the properties from the CIMProperty[] (second constructor parameter)
+ such that getProperty() would return a key that was not in
+ CIMProperty[]. From now on, the getProperties(), getProperty(),
+ getPropertyCount() and getPropertyValue() methods will only act upon
+ properties from the CIMProperty[]. To achieve the corresponding
+ functionality with keys from the CIMObjectPath, use getKeys(),
+ getObjectPath().getKey(), getObjectPath().length and
+ getObjectPath().getKeyValue() instead.</p>
+ <p>Version 2.2.0 also contains several new features:</p>
+ <ul>
+ <li>One new internal API - WBEMClientSBLIM.enumerateNamespaces - can be
+ used to obtain a CloseableIterator of namespaces (#3516848)</li>
+ <li>One new internal API - WBEMClientSBLIM.isActive - can be
+ used to determine if the client is active (initialized and not
+ closed) or inactive (#3522904)</li>
+ <li>A new Java property - sblim.wbem.httpWwwAuthenticateInfo - can be
+ used to specify the WWW-Authenticate info to use when sending the
+ first HTTP request to a server (#3524050)M/li>
+ <li>A new sample - Jsr48IndicationTester - demonstrates a general
+ purpose indication test program with a command line interface
+ (#3529066)</li>
+ <li>Four new internal APIs - LogAndTraceManager.addCIMXMLTraceListener,
+ removeCIMXMLTraceListener, clearCIMXMLTraceListeners, and
+ getCIMXMLTraceListeners - can be used to trace CIM-XML requests and
+ responses (#3554738)</li>
+ </ul>
+ <p>Version 2.2.0 also contains several changes that might affect existing
+ applications:</p>
+ <ul>
+ <li>The JSR48 API CIMObjectPath.toString() has been enhanced to produce
+ consistent output - this may result in different output from
+ previous releases, but the API documentation already states "This
+ method is intended to be used only for debugging purposes. The
+ format of the value returned may vary between implementations."
+ (#3510090)</li>
+ <li>The internal classes WBEMAuthenticationException and
+ WBEMTransportException have been deleted after being deprecated in
+ version 2.1.0.(#3525128)</li>
+ <li>The internal API CIMResponse.isSuccessul has been deleted after
+ being deprecated in version 2.1.1.(#3525135)</li>
+ <li>The internal constant WBEMConstants.PROTOCOL_CIMXML has been
+ deleted after being deprecated in version 2.1.3.(#3525138)</li>
+ <li>The internal constant WBEMConstants.PROTOCOL_CIMXML has been
+ deleted after being deprecated in version 2.1.3.(#3525138)</li>
+ <li>The internal API CIMDeleteNameSpaceOp.getNamespace has been deleted
+ after being deprecated in version 2.1.5.(#3525145)</li>
+ <li>The internal API CIMGetClassOp.getPropertyLis has been deleted
+ after being deprecated in version 2.1.0.(#3525150)</li>
+ <li>The JSR48 properties PROP_ENABLE_CONSOLE_LOGGING and
+ PROP_ENABLE_FILE_LOGGING are now levels ("OFF", "ALL", etc.)
+ instead of "0" and "1" (#3521157)</li>
+ <li>The internal API WBEMListenerSBLIM.getInstance has been deleted,
+ use "new WBEMListenerSBLIM" instead (#3529062)</li>
+ <li>Two new Java properties - sblim.wbem.sslClientPeerVerification and
+ sblim.wbem.sslListenerPeerVerification - can be used to control SSL
+ peer authentication for client/listener; users who had previously
+ enabled client/listener peer verification by setting the value of
+ javax.net.ssl.trustStore will additionally have to set one or both
+ of these new properties to a non-default value in order to enable
+ peer verification (see <em><a href="secure.html">Getting started
+ with secure connections</a></em> and <em><a href="secure_indications.html">
+ Getting started with secure indications</a></em> for details)
+ (#3536399)</li>
+ </ul>
+ <p>The complete list of changes follows:</p>
+ <table border="1" cellpadding="5" cellspacing="0" width="100%">
+ <tr><th>Bug ID</th><th>Bug Summary</th></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3500619&group_id=128809&atid=712784">3500619</td><td>JSR48 1.0.0: CIMClass association/key clean up</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3505681&group_id=128809&atid=712784">3505681</td><td>Add detailed release history HTML</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3510321&group_id=128809&atid=712784">3510321</td><td>Handle CDATA in CimXmlSerializer</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3510090&group_id=128809&atid=712784">3510090</td><td>Fix CIMObjectPath.toString() inconsistencies</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3511454&group_id=128809&atid=712784">3511454</td><td>SAX nodes not reinitialized properly</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3513353&group_id=128809&atid=712784">3513353</td><td>TCK: CIMDataType arrays must have length >= 1</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3513349&group_id=128809&atid=712784">3513349</td><td>TCK: CIMDataType must not accept null string</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3513343&group_id=128809&atid=712784">3513343</td><td>TCK: CIMObjectPath must validate XML schema name</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3513347&group_id=128809&atid=712784">3513347</td><td>TCK: CIMObjectPath allows empty string</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3513357&group_id=128809&atid=712784">3513357</td><td>Handle multiple CDATAs in CimXmlSerializer</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3514537&group_id=128809&atid=712784">3514537</td><td>TCK: execQueryInstances requires boolean, not Boolean</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3514685&group_id=128809&atid=712784">3514685</td><td>TCK: getProperty must return default values</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3515180&group_id=128809&atid=712784">3515180</td><td>JSR48 log dir/file should handle UNIX/Win separators</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3516848&group_id=128809&atid=712784">3516848</td><td>enumerateNamespaces() method to WBEMClient</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3517503&group_id=128809&atid=712784">3517503</td><td>Missing parm in CIMDataType ctor javadoc</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3513228&group_id=128809&atid=712784">3513228</td><td>Reliable Indications support can create lots of threads</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3466280&group_id=128809&atid=712784">3466280</td><td>get instance failure for CIM_IndicationSubscription</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3521131&group_id=128809&atid=712784">3521131</td><td>Sync up javax.* javadoc with JSR48 1.0.0 Final II</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3521119&group_id=128809&atid=712784">3521119</td><td>JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3521328&group_id=128809&atid=712784">3521328</td><td>JSR48 1.0.0: remove WBEMClient associators and references</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3522904&group_id=128809&atid=712784">3522904</td><td>Add new API WBEMClientSBLIM.isActive()</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3523918&group_id=128809&atid=712784">3523918</td><td>"java.io.IOException: Unexpected EOF" returned as HTTP 401</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3525128&group_id=128809&atid=712784">3525128</td><td>Remove WBEMTransportException/WBEMAuthenticationException</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3525135&group_id=128809&atid=712784">3525135</td><td>Remove CIMResponse.isSuccessul</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3525138&group_id=128809&atid=712784">3525138</td><td>Remove WBEMConstants.PROTOCOL_CIMXML</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3525145&group_id=128809&atid=712784">3525145</td><td>Remove CIMDeleteNameSpaceOp.getNamespace</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3525150&group_id=128809&atid=712784">3525150</td><td>Remove CIMGetClassOp.getPropertyLis</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3525657&group_id=128809&atid=712784">3525657</td><td>Sync up javax.* javadoc with JSR48 1.0.0 Final III</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3521157&group_id=128809&atid=712784">3521157</td><td>JSR48 1.0.0: PROP_ENABLE_*_LOGGING is Level, not 0/1</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3525914&group_id=128809&atid=712784">3525914</td><td>TCK: SetPropertyTest.testSetProperty failing</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3526675&group_id=128809&atid=712784">3526675</td><td>Unit test fails on Java 7</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3526679&group_id=128809&atid=712784">3526679</td><td>DOM parser ignores ERROR node CODE</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3526681&group_id=128809&atid=712784">3526681</td><td>CIMError valid status codes out-of-date</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3527580&group_id=128809&atid=712784">3527580</td><td>WBEMClient should not throw IllegalArgumentException</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3529062&group_id=128809&atid=712784">3529062</td><td>WBEMListenerFactory should return new instance</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3529065&group_id=128809&atid=712784">3529065</td><td>Enable WBEMListener get/setProperty</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3524050&group_id=128809&atid=712784">3524050</td><td>Improve WWW-Authenticate in HTTPClient.java</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3529066&group_id=128809&atid=712784">3529066</td><td>Add Jsr48IndicationTester</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3545797&group_id=128809&atid=712784">3545797</td><td>Support new error code of SFCB</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3535383&group_id=128809&atid=712784">3535383</td><td>HashDoS fix 3498482</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3553858&group_id=128809&atid=712784">3553858</td><td>Append duplicate HTTP header fields instead of replace</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3554738&group_id=128809&atid=712784">3554738</td><td>dump CIM xml by LogAndTraceBroker.trace()</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3536398&group_id=128809&atid=712784">3536398</td><td>Update HTML to reflect secure indication support</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3529151&group_id=128809&atid=712784">3529151</td><td>TCK: CIMInstance property APIs include keys from COP</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3536399&group_id=128809&atid=712784">3536399</td><td>Add client/listener peer authentication properties</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3562235&group_id=128809&atid=712784">3562235</td><td>LogAndTraceBrokerTest breaks unit test tracing</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3565581&group_id=128809&atid=712784">3565581</td><td>TCK: remove unnecessary overriding methods</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3555752&group_id=128809&atid=712784">3555752</td><td>Sync up javax.* javadoc with JSR48 1.0.0 Final IV</td></tr>
+ <tr><td><a href="http://sourceforge.net/tracker/index.php?func=detail&aid=3567429&group_id=128809&atid=712784">3567429</td><td>Update detailed release history HTML for 2.2.0</td></tr>
+ </table>
<h2>Version 2.1.12</h2>
<p>Version 2.1.12 was released on March 15, 2012. It contains several new
features:</p>
|
|
From: Dave B. <bla...@us...> - 2012-09-13 12:54:29
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files In directory vz-cvs-3.sog:/tmp/cvs-serv20467/src/org/sblim/cimclient/doc-files Modified Files: logging.html Log Message: 2.2.0 release work (format) Index: logging.html =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files/logging.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- logging.html 6 Sep 2012 14:46:48 -0000 1.8 +++ logging.html 13 Sep 2012 12:54:27 -0000 1.9 @@ -99,7 +99,6 @@ }); </pre></div></div> <p>The <code>System.out.println()</code> would of course be replaced with the API calls of the applications logger</p> -<p> <h2>Classic Logging</h2> <p>You say "That's interesting stuff, but I just want my plain old log files back." No problem, the SBLIM CIM Client for Java offers this as well. Via configuration properties you can set up classical file logging out of |
|
From: Dave B. <bla...@us...> - 2012-09-13 12:01:59
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient
In directory vz-cvs-3.sog:/tmp/cvs-serv17692/src/org/sblim/cimclient
Modified Files:
Tag: Experimental
WBEMListenerSBLIM.java
Log Message:
2.2.0 release work (format)
Index: WBEMListenerSBLIM.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/WBEMListenerSBLIM.java,v
retrieving revision 1.5.2.15
retrieving revision 1.5.2.16
diff -u -d -r1.5.2.15 -r1.5.2.16
--- WBEMListenerSBLIM.java 24 Jun 2012 01:06:52 -0000 1.5.2.15
+++ WBEMListenerSBLIM.java 13 Sep 2012 12:01:56 -0000 1.5.2.16
@@ -99,7 +99,7 @@
String key = (String) e.nextElement();
String value = pProperties.getProperty(key);
setProperty(key, value);
- }
+ }
}
WBEMConfiguration config = WBEMListenerSBLIM.this.iConfiguration;
if (!(pIndicationListener instanceof IndicationListener)
@@ -168,8 +168,7 @@
}
- protected final WBEMConfiguration iConfiguration = new
- WBEMConfiguration(new Properties());
+ protected final WBEMConfiguration iConfiguration = new WBEMConfiguration(new Properties());
private Map<Integer, WBEMListenerImpl> iPortMap = new HashMap<Integer, WBEMListenerImpl>();
|
|
From: Dave B. <bla...@us...> - 2012-09-13 12:01:58
|
Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/http
In directory vz-cvs-3.sog:/tmp/cvs-serv17692/utst/org/sblim/cimclient/unittest/http
Modified Files:
Tag: Experimental
SSLConfigurationTest.java
Log Message:
2.2.0 release work (format)
Index: SSLConfigurationTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/http/SSLConfigurationTest.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -d -r1.1.2.12 -r1.1.2.13
--- SSLConfigurationTest.java 27 Aug 2012 21:52:21 -0000 1.1.2.12
+++ SSLConfigurationTest.java 13 Sep 2012 12:01:56 -0000 1.1.2.13
@@ -80,15 +80,15 @@
System.setProperty(WBEMConfigurationProperties.SSL_LISTENER_PEER_VERIFICATION, "ignore");
// PEER VERIFICATION disabled globally (should PASS)
- connect(WBEMConfiguration.getGlobalConfiguration(),
- WBEMConfiguration.getGlobalConfiguration());
+ connect(WBEMConfiguration.getGlobalConfiguration(), WBEMConfiguration
+ .getGlobalConfiguration());
// PEER VERIFICATION disabled but truststore configured (should PASS and
// give WARNING)
System.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH,
"/any/path/even/if/not/validated");
- connect(WBEMConfiguration.getGlobalConfiguration(),
- WBEMConfiguration.getGlobalConfiguration());
+ connect(WBEMConfiguration.getGlobalConfiguration(), WBEMConfiguration
+ .getGlobalConfiguration());
// CLIENT_PEER_VERIFICATION enabled globally but no truststore
// configured (should FAIL)
@@ -96,8 +96,8 @@
System.setProperty(WBEMConfigurationProperties.SSL_LISTENER_PEER_VERIFICATION, "ignore");
System.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, "");
try {
- connect(WBEMConfiguration.getGlobalConfiguration(),
- WBEMConfiguration.getGlobalConfiguration());
+ connect(WBEMConfiguration.getGlobalConfiguration(), WBEMConfiguration
+ .getGlobalConfiguration());
fail("Connection established with client peer verification enabled but no truststore configured");
} catch (Exception e) {
// expected to fail
@@ -107,8 +107,8 @@
System.setProperty(WBEMConfigurationProperties.SSL_CLIENT_PEER_VERIFICATION, "false");
System.setProperty(WBEMConfigurationProperties.SSL_LISTENER_PEER_VERIFICATION, "require");
try {
- connect(WBEMConfiguration.getGlobalConfiguration(),
- WBEMConfiguration.getGlobalConfiguration());
+ connect(WBEMConfiguration.getGlobalConfiguration(), WBEMConfiguration
+ .getGlobalConfiguration());
fail("Connection established with listener peer verification enabled but no truststore configured (n)");
} catch (Exception e) {
// expected to fail
@@ -119,8 +119,8 @@
System.setProperty(WBEMConfigurationProperties.SSL_LISTENER_PEER_VERIFICATION, "ignore");
System.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, "somebadpath");
try {
- connect(WBEMConfiguration.getGlobalConfiguration(),
- WBEMConfiguration.getGlobalConfiguration());
+ connect(WBEMConfiguration.getGlobalConfiguration(), WBEMConfiguration
+ .getGlobalConfiguration());
fail("Connection established with client peer verification enabled but truststore misconfigured");
} catch (Exception e) {
// expected to fail
@@ -131,8 +131,8 @@
System.setProperty(WBEMConfigurationProperties.SSL_LISTENER_PEER_VERIFICATION, "require");
System.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, "somebadpath");
try {
- connect(WBEMConfiguration.getGlobalConfiguration(),
- WBEMConfiguration.getGlobalConfiguration());
+ connect(WBEMConfiguration.getGlobalConfiguration(), WBEMConfiguration
+ .getGlobalConfiguration());
fail("Connection established with listener peer verification enabled but truststore misconfigured");
} catch (Exception e) {
// expected to fail
@@ -159,8 +159,8 @@
Properties clientConfiguration = new Properties();
Properties serverConfiguration = new Properties();
- serverConfiguration.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH,
- keystore.getFile());
+ serverConfiguration.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH, keystore
+ .getFile());
serverConfiguration.setProperty(WBEMConfigurationProperties.KEYSTORE_PASSWORD, "password");
serverConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, "");
serverConfiguration
@@ -212,15 +212,15 @@
}
// CLIENT_PEER_VERIFICATION enabled at domain-level with valid
// truststore (should PASS)
- clientConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH,
- truststore.getFile());
+ clientConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, truststore
+ .getFile());
connect(new WBEMConfiguration(clientConfiguration), new WBEMConfiguration(
serverConfiguration));
// CLIENT_PEER_VERIFICATION enabled at domain-level with notrust
// truststore (should FAIL)
- clientConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH,
- notrust.getFile());
+ clientConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, notrust
+ .getFile());
try {
connect(new WBEMConfiguration(clientConfiguration), new WBEMConfiguration(
serverConfiguration));
@@ -230,10 +230,10 @@
}
// CLIENT_PEER_VERIFICATION enabled at domain-level with untrusted
// server keystore (should FAIL)
- clientConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH,
- truststore.getFile());
- serverConfiguration.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH,
- stranger.getFile());
+ clientConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, truststore
+ .getFile());
+ serverConfiguration.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH, stranger
+ .getFile());
try {
connect(new WBEMConfiguration(clientConfiguration), new WBEMConfiguration(
serverConfiguration));
@@ -263,14 +263,14 @@
Properties clientConfiguration = new Properties();
Properties serverConfiguration = new Properties();
- serverConfiguration.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH,
- keystore.getFile());
+ serverConfiguration.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH, keystore
+ .getFile());
serverConfiguration.setProperty(WBEMConfigurationProperties.KEYSTORE_PASSWORD, "password");
serverConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, "");
serverConfiguration
.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PASSWORD, "password");
- clientConfiguration.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH,
- keystore.getFile());
+ clientConfiguration.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH, keystore
+ .getFile());
clientConfiguration.setProperty(WBEMConfigurationProperties.KEYSTORE_PASSWORD, "password");
clientConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, "");
clientConfiguration
@@ -317,15 +317,15 @@
}
// LISTENER_PEER_VERIFICATION enabled at domain-level with valid
// truststore (should PASS)
- serverConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH,
- truststore.getFile());
+ serverConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, truststore
+ .getFile());
connect(new WBEMConfiguration(clientConfiguration), new WBEMConfiguration(
serverConfiguration));
// LISTENER_PEER_VERIFICATION enabled at domain-level with notrust
// truststore (should FAIL)
- serverConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH,
- notrust.getFile());
+ serverConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, notrust
+ .getFile());
try {
connect(new WBEMConfiguration(clientConfiguration), new WBEMConfiguration(
serverConfiguration));
@@ -335,10 +335,10 @@
}
// LISTENER_PEER_VERIFICATION enabled at domain-level with untrusted
// client keystore (should FAIL)
- serverConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH,
- truststore.getFile());
- clientConfiguration.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH,
- stranger.getFile());
+ serverConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, truststore
+ .getFile());
+ clientConfiguration.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH, stranger
+ .getFile());
try {
connect(new WBEMConfiguration(clientConfiguration), new WBEMConfiguration(
serverConfiguration));
@@ -348,8 +348,8 @@
}
// LISTENER_PEER_VERIFICATION enabled at domain-level but no client
// keystore (should FAIL)
- serverConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH,
- truststore.getFile());
+ serverConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, truststore
+ .getFile());
clientConfiguration.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH, "");
try {
connect(new WBEMConfiguration(clientConfiguration), new WBEMConfiguration(
@@ -362,10 +362,10 @@
// (should PASS)
serverConfiguration.setProperty(WBEMConfigurationProperties.SSL_LISTENER_PEER_VERIFICATION,
"accept");
- serverConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH,
- truststore.getFile());
- clientConfiguration.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH,
- keystore.getFile());
+ serverConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, truststore
+ .getFile());
+ clientConfiguration.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH, keystore
+ .getFile());
connect(new WBEMConfiguration(clientConfiguration), new WBEMConfiguration(
serverConfiguration));
@@ -373,10 +373,10 @@
// keystore (should PASS)
serverConfiguration.setProperty(WBEMConfigurationProperties.SSL_LISTENER_PEER_VERIFICATION,
"accept");
- serverConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH,
- truststore.getFile());
- clientConfiguration.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH,
- stranger.getFile());
+ serverConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, truststore
+ .getFile());
+ clientConfiguration.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH, stranger
+ .getFile());
connect(new WBEMConfiguration(clientConfiguration), new WBEMConfiguration(
serverConfiguration));
@@ -384,8 +384,8 @@
// (should PASS)
serverConfiguration.setProperty(WBEMConfigurationProperties.SSL_LISTENER_PEER_VERIFICATION,
"accept");
- serverConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH,
- truststore.getFile());
+ serverConfiguration.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, truststore
+ .getFile());
clientConfiguration.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH, "");
connect(new WBEMConfiguration(clientConfiguration), new WBEMConfiguration(
serverConfiguration));
@@ -830,8 +830,8 @@
*/
private int startServer(final WBEMConfiguration pConfiguration) throws IOException,
InterruptedException {
- final ServerSocket socket = HttpSocketFactory.getInstance()
- .getServerSSLContext(pConfiguration).getServerSocketFactory().createServerSocket(0);
+ final ServerSocket socket = HttpSocketFactory.getInstance().getServerSSLContext(
+ pConfiguration).getServerSocketFactory().createServerSocket(0);
if (pConfiguration.getSslListenerPeerVerification().equalsIgnoreCase("ignore")) {
((SSLServerSocket) socket).setNeedClientAuth(false);
|
|
From: Dave B. <bla...@us...> - 2012-09-13 10:08:31
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv28224 Modified Files: NEWS Log Message: 3555752 - Sync up javax.* javadoc with JSR48 1.0.0 Final IV Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.320 retrieving revision 1.321 diff -u -d -r1.320 -r1.321 --- NEWS 13 Sep 2012 09:29:24 -0000 1.320 +++ NEWS 13 Sep 2012 10:08:29 -0000 1.321 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3555752 Sync up javax.* javadoc with JSR48 1.0.0 Final IV 3565581 TCK: remove unnecessary overriding methods 3562235 LogAndTraceBrokerTest breaks unit test tracing 3536399 Add client/listener peer authentication properties |
|
From: Dave B. <bla...@us...> - 2012-09-13 09:39:24
|
Update of /cvsroot/sblim/jsr48-client/src/javax/wbem/client
In directory vz-cvs-3.sog:/tmp/cvs-serv24166/src/javax/wbem/client
Modified Files:
Tag: Experimental
WBEMClient.java
Log Message:
3555752 - Sync up javax.* javadoc with JSR48 1.0.0 Final IV
Index: WBEMClient.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/javax/wbem/client/WBEMClient.java,v
retrieving revision 1.2.2.20
retrieving revision 1.2.2.21
diff -u -d -r1.2.2.20 -r1.2.2.21
--- WBEMClient.java 10 May 2012 22:46:46 -0000 1.2.2.20
+++ WBEMClient.java 13 Sep 2012 09:39:22 -0000 1.2.2.21
@@ -31,6 +31,7 @@
* 3521131 2012-04-24 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final II
* 3521328 2012-04-25 blaschke-oss JSR48 1.0.0: remove WBEMClient associators and references
* 3525657 2012-05-10 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final III
+ * 3555752 2012-09-13 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final IV
*/
package javax.wbem.client;
@@ -48,7 +49,7 @@
import javax.wbem.CloseableIterator;
import javax.wbem.WBEMException;
-//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_02) on Sun Apr 22 15:31:54 EDT 2012
+//Sync'd against JSR48 1.0.0 javadoc (version 1.7.0_03) on Tue Aug 07 02:02:55 EDT 2012
/**
* The <code>WBEMClient</code> interface is used to invoke WBEM operations
* against a WBEM Server. A <code>WBEMClient</code> implementation can be
@@ -118,6 +119,8 @@
* or more <code>CIMClass</code>es meeting the specified criteria
* are returned.
* @throws UnsupportedOperationException
+ * If the client implementation (or protocol) does not support
+ * the operation.
* @throws WBEMException
* If unsuccessful, one of the following status codes shall be
* returned along with zero or more instances of
@@ -605,6 +608,9 @@
*
* @param pClass
* The <code>CIMClass</code> to be created.
+ * @throws UnsupportedOperationException
+ * If the client implementation (or protocol) does not support
+ * the operation.
* @throws WBEMException
* If unsuccessful, one of the following status codes must be
* returned. The ORDERED list is:
@@ -658,6 +664,9 @@
* @param pPath
* The <code>CIMObjectPath</code> identifying the namespace and
* class name to delete.
+ * @throws UnsupportedOperationException
+ * If the client implementation (or protocol) does not support
+ * the operation.
* @throws WBEMException
* If unsuccessful, one of the following status codes must be
* returned. The ORDERED list is:
@@ -706,6 +715,9 @@
* @param pPath
* The <code>CIMObjectPath</code> identifying the name and
* namespace of the CIM qualifier type to delete.
+ * @throws UnsupportedOperationException
+ * If the client implementation (or protocol) does not support
+ * the operation.
* @throws WBEMException
* If unsuccessful, one of the following status codes must be
* returned. The ORDERED list is:
@@ -750,6 +762,9 @@
* method on all returned <code>CIMClass</code>es. If
* <code>false</code>, the class origin will not be present.
* @return A <code>CloseableIterator</code> of <code>CIMClass</code>es.
+ * @throws UnsupportedOperationException
+ * If the client implementation (or protocol) does not support
+ * the operation.
* @throws WBEMException
* If unsuccessful, one of the following status codes must be
* returned. The ORDERED list is:
@@ -785,6 +800,9 @@
* contains only the names of the first level children of the
* class.
* @return A <code>CloseableIterator</code> of <code>CIMObjectPath</code>s.
+ * @throws UnsupportedOperationException
+ * If the client implementation (or protocol) does not support
+ * the operation.
* @throws WBEMException
* If unsuccessful, one of the following status codes must be
* returned. The ORDERED list is:
@@ -1131,7 +1149,9 @@
* qualifier types are to be enumerated.
* @return A <code>CloseableIterator</code> of <code>CIMQualifierType</code>
* s.
- *
+ * @throws UnsupportedOperationException
+ * If the client implementation (or protocol) does not support
+ * the operation.
* @throws WBEMException
* If unsuccessful, one of the following status codes must be
* returned. The ORDERED list is:
@@ -1378,6 +1398,9 @@
* <code>null</code> value indicates that all properties should
* be returned.
* @return <code>CIMClass</code> meeting the criteria specified.
+ * @throws UnsupportedOperationException
+ * If the client implementation (or protocol) does not support
+ * the operation.
* @throws WBEMException
* If unsuccessful, one of the following status codes must be
* returned. The ORDERED list is:
@@ -1580,6 +1603,9 @@
* <code>CIMObjectPath</code> that identifies the
* <code>CIMQualifierType</code> to return.
* @return The <code>CIMQualifierType</code> object.
+ * @throws UnsupportedOperationException
+ * If the client implementation (or protocol) does not support
+ * the operation.
* @throws WBEMException
* If unsuccessful, one of the following status codes must be
* returned. The ORDERED list is:
@@ -1657,6 +1683,9 @@
*
* @param pClass
* <code>CIMClass</code> to be modified.
+ * @throws UnsupportedOperationException
+ * If the client implementation (or protocol) does not support
+ * the operation.
* @throws WBEMException
* If unsuccessful, one of the following status codes must be
* returned. The ORDERED list is:
@@ -1760,6 +1789,8 @@
* @return If successful, a <code>CloseableIterator</code> referencing zero
* or more <code>CIMClass</code>es meeting the specified criteria.
* @throws UnsupportedOperationException
+ * If the client implementation (or protocol) does not support
+ * the operation.
* @throws WBEMException
* If unsuccessful, one of the following status codes shall be
* returned along with zero or more instance of
@@ -2170,6 +2201,9 @@
*
* @param pQualifierType
* The CIM qualifier type to be added.
+ * @throws UnsupportedOperationException
+ * If the client implementation (or protocol) does not support
+ * the operation.
* @throws WBEMException
* If unsuccessful, one of the following status codes must be
* returned. The ORDERED list is:
|
|
From: Dave B. <bla...@us...> - 2012-09-13 09:29:27
|
Update of /cvsroot/sblim/jsr48-client/src/javax/wbem
In directory vz-cvs-3.sog:/tmp/cvs-serv23726/src/javax/wbem
Modified Files:
WBEMException.java
Log Message:
3565581 - TCK: remove unnecessary overriding methods
Index: WBEMException.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/javax/wbem/WBEMException.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- WBEMException.java 14 Mar 2012 10:39:53 -0000 1.14
+++ WBEMException.java 13 Sep 2012 09:29:24 -0000 1.15
@@ -23,6 +23,7 @@
* 2959039 2010-02-25 blaschke-oss Fix WBEMException.toString() logic
* 3490032 2012-02-21 blaschke-oss TCK: WBEMException must validate error ID
* 3496301 2012-03-02 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final
+ * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods
*/
package javax.wbem;
@@ -330,16 +331,6 @@
return this.iErrorID;
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Throwable#getMessage()
- */
- @Override
- public String getMessage() {
- return super.getMessage() != null ? super.getMessage() : getCIMMessage();
- }
-
/**
* Prints out the ID and the optional detailed message.
*
|
|
From: Dave B. <bla...@us...> - 2012-09-13 09:29:26
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv23726 Modified Files: NEWS Log Message: 3565581 - TCK: remove unnecessary overriding methods Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.319 retrieving revision 1.320 diff -u -d -r1.319 -r1.320 --- NEWS 10 Sep 2012 10:30:17 -0000 1.319 +++ NEWS 13 Sep 2012 09:29:24 -0000 1.320 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3565581 TCK: remove unnecessary overriding methods 3562235 LogAndTraceBrokerTest breaks unit test tracing 3536399 Add client/listener peer authentication properties 3529151 TCK: CIMInstance property APIs include keys from COP |
|
From: Dave H. <hel...@us...> - 2012-09-12 16:52:36
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SFCB - Small Footprint CIM Broker".
The branch, master has been updated
via 1c60dd048a5efb3330bbb9436bc82d18d74f012f (commit)
from f0e0a831d3aae6a1955a9882a7441fd5cde68169 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1c60dd048a5efb3330bbb9436bc82d18d74f012f
Author: Dave Heller <hel...@us...>
Date: Wed Sep 12 12:50:53 2012 -0400
[ 3567083 ] configure should fail if sfcUtil.so not found
-----------------------------------------------------------------------
Summary of changes:
diff --git a/NEWS b/NEWS
index 85431fb..c645f4b 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ Bugs fixed:
- 3541554 insecure LD_LIBRARY_PATH usage
- 3546279 Core dump in providerDrv on Qualifier not found
- 3564757 stageschema.sh should detect errors in sfcbrepos
+- 3567083 configure should fail if sfcUtil.so not found
Changes in 1.4.2
================
diff --git a/configure.ac b/configure.ac
index 883f61d..2691ea0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -451,9 +451,8 @@ fi
AC_CHECK_LIB(pthread,main)
AC_CHECK_LIB(dl,main)
AC_CHECK_LIB(z,main,[SFCB_LIBZ=-lz],[AC_MSG_ERROR([Could not find required libz])])
-#AC_CHECK_LIB(sfcUtil,newStringBuffer,[SFC_COMM=-lsfcUtil],[AC_MSG_ERROR([Could not find required sfcUtil])])
-AC_CHECK_LIB(sfcUtil,newStringBuffer)
-#AC_SEARCH_LIBS(newStringBuffer,sfcUtil,[SFC_COMM=-lsfcUtil],[AC_MSG_ERROR([Could not find required sfcUtil])])
+AC_CHECK_LIB(sfcUtil,newStringBuffer,, \
+ [AC_MSG_ERROR([Could not find required sfcUtil. Is sfcCommon installed?])])
if test "$enable_indications" = "yes" ; then
LOAD_INDICATION_PROVIDER=
AC_DEFINE(HAVE_INDICATIONS,1,[Indication support enabled.])
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Dave H. <hel...@us...> - 2012-09-10 21:40:53
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SFCC - Small Footprint CIM Client".
The branch, master has been updated
via edf0098727b4f22101d153eb48b75b76286b5070 (commit)
from 6c78d522c560523af0f68868fa1ce98b1e4070b9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit edf0098727b4f22101d153eb48b75b76286b5070
Author: Dave Heller <hel...@us...>
Date: Mon Sep 10 17:38:20 2012 -0400
[ 3555103 ] wrong declaration of release attribute in _CIMCArgsFT
-----------------------------------------------------------------------
Summary of changes:
diff --git a/NEWS b/NEWS
index 0ffe4a9..0eb97b7 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ Bugs:
- 3530609: Various BEAM Errors
- 3435363: Wrong call of curl_global_cleanup()
- 3547832: memory leak in backend/cimxml/grammer.c
+- 3555103: wrong declaration of release attribute in _CIMCArgsFT
Changes in 2.2.3
================
diff --git a/cimc/cimcft.h b/cimc/cimcft.h
index 773ee3b..80613d5 100644
--- a/cimc/cimcft.h
+++ b/cimc/cimcft.h
@@ -434,7 +434,7 @@ extern "C" {
struct _CIMCArgsFT {
int ftVersion;
- CIMCStatus (*release) (CIMCArgs args);
+ CIMCStatus (*release) (CIMCArgs* args);
CIMCArgs* (*clone) (CIMCArgs* args, CIMCStatus* rc);
CIMCStatus (*addArg) (CIMCArgs* args, const char* name, CIMCValue* value, CIMCType type);
CIMCData (*getArg) (CIMCArgs * args, const char * name, CIMCStatus * rc);
diff --git a/contributions.txt b/contributions.txt
index 4aad521..3629fae 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -57,3 +57,4 @@ J. Bart Whiteley, Novell
Michal Minar
------------
07/31/2012 [ 3547832 ] memory leak in backend/cimxml/grammer.c
+09/10/2012 [ 3555103 ] wrong declaration of release attribute in _CIMCArgsFT
hooks/post-receive
--
SFCC - Small Footprint CIM Client
|
|
From: Dave B. <bla...@us...> - 2012-09-10 10:30:20
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv26353 Modified Files: NEWS Log Message: 3562235 - LogAndTraceBrokerTest breaks unit test tracing Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.318 retrieving revision 1.319 diff -u -d -r1.318 -r1.319 --- NEWS 10 Sep 2012 10:18:44 -0000 1.318 +++ NEWS 10 Sep 2012 10:30:17 -0000 1.319 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3562235 LogAndTraceBrokerTest breaks unit test tracing 3536399 Add client/listener peer authentication properties 3529151 TCK: CIMInstance property APIs include keys from COP 3536398 Update HTML to reflect secure indication support |
|
From: Dave B. <bla...@us...> - 2012-09-10 10:18:46
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util
In directory vz-cvs-3.sog:/tmp/cvs-serv26020/src/org/sblim/cimclient/internal/util
Modified Files:
WBEMConfiguration.java WBEMConfigurationDefaults.java
Log Message:
3536399 - Add client/listener peer authentication properties
Index: WBEMConfigurationDefaults.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util/WBEMConfigurationDefaults.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- WBEMConfigurationDefaults.java 25 May 2012 11:21:00 -0000 1.30
+++ WBEMConfigurationDefaults.java 10 Sep 2012 10:18:43 -0000 1.31
@@ -35,6 +35,7 @@
* 3492214 2012-02-23 blaschke-oss Add a SenderIPAddress property indications
* 3492224 2012-02-23 blaschke-oss Need two different timeouts for Socket connections
* 3521157 2012-05-10 blaschke-oss JSR48 1.0.0: PROP_ENABLE_*_LOGGING is Level, not 0/1
+ * 3536399 2012-08-25 hellerda Add client/listener peer authentication properties
*/
package org.sblim.cimclient.internal.util;
@@ -280,4 +281,14 @@
*/
public static final String SSL_DEF_PROTOCOL = "SSL";
+ /**
+ * SSL_CLIENT_PEER_VERIFICATION
+ */
+ public static final String SSL_CLIENT_PEER_VERIFICATION = "false";
+
+ /**
+ * SSL_LISTENER_PEER_VERIFICATION
+ */
+ public static final String SSL_LISTENER_PEER_VERIFICATION = "ignore";
+
}
Index: WBEMConfiguration.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util/WBEMConfiguration.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- WBEMConfiguration.java 21 Jun 2012 12:28:33 -0000 1.43
+++ WBEMConfiguration.java 10 Sep 2012 10:18:43 -0000 1.44
@@ -41,6 +41,7 @@
* 3492224 2012-02-23 blaschke-oss Need two different timeouts for Socket connections
* 3521157 2012-05-10 blaschke-oss JSR48 1.0.0: PROP_ENABLE_*_LOGGING is Level, not 0/1
* 3524050 2012-06-06 blaschke-oss Improve WWW-Authenticate in HTTPClient.java
+ * 3536399 2012-08-25 hellerda Add client/listener peer authentication properties
*/
package org.sblim.cimclient.internal.util;
@@ -674,6 +675,30 @@
}
/**
+ * Returns whether the client will attempt to authenticate the CIMOM
+ *
+ * @return <code>true</code> if the client will attempt to authenticate the
+ * CIMOM by verifying the server certificate <code>false</code>
+ * otherwise
+ */
+ public boolean getSslClientPeerVerification() {
+ return Boolean.valueOf(
+ getProperty(WBEMConfigurationProperties.SSL_CLIENT_PEER_VERIFICATION,
+ WBEMConfigurationDefaults.SSL_CLIENT_PEER_VERIFICATION)).booleanValue();
+ }
+
+ /**
+ * Returns how the listener will handle to authentication of the indication
+ * sender endpoint.
+ *
+ * @return The listener peer verification mode
+ */
+ public String getSslListenerPeerVerification() {
+ return getProperty(WBEMConfigurationProperties.SSL_LISTENER_PEER_VERIFICATION,
+ WBEMConfigurationDefaults.SSL_LISTENER_PEER_VERIFICATION);
+ }
+
+ /**
* Returns the number of retries the client will attempt when the connection
* was refused.
*
|
|
From: Dave B. <bla...@us...> - 2012-09-07 16:40:34
|
Update of /cvsroot/sblim/jsr48-client/src/javax/wbem
In directory vz-cvs-3.sog:/tmp/cvs-serv8059/src/javax/wbem
Modified Files:
Tag: Experimental
WBEMException.java
Log Message:
3565581 - TCK: remove unnecessary overriding methods
Index: WBEMException.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/javax/wbem/WBEMException.java,v
retrieving revision 1.3.2.11
retrieving revision 1.3.2.12
diff -u -d -r1.3.2.11 -r1.3.2.12
--- WBEMException.java 2 Mar 2012 17:58:10 -0000 1.3.2.11
+++ WBEMException.java 7 Sep 2012 16:40:31 -0000 1.3.2.12
@@ -23,6 +23,7 @@
* 2959039 2010-02-25 blaschke-oss Fix WBEMException.toString() logic
* 3490032 2012-02-21 blaschke-oss TCK: WBEMException must validate error ID
* 3496301 2012-03-02 blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final
+ * 3565581 2012-09-07 blaschke-oss TCK: remove unnecessary overriding methods
*/
package javax.wbem;
@@ -330,16 +331,6 @@
return this.iErrorID;
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Throwable#getMessage()
- */
- @Override
- public String getMessage() {
- return super.getMessage() != null ? super.getMessage() : getCIMMessage();
- }
-
/**
* Prints out the ID and the optional detailed message.
*
|
|
From: Dave B. <bla...@us...> - 2012-09-06 23:26:39
|
Update of /cvsroot/sblim/jsr48-client
In directory vz-cvs-3.sog:/tmp/cvs-serv26045
Modified Files:
Tag: CIM_CLIENT_2_1_12_M
sblim-cim-client2.spec ChangeLog build.xml
Log Message:
2.1.12.1 release work
Index: sblim-cim-client2.spec
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/sblim-cim-client2.spec,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -d -r1.25.2.1 -r1.25.2.2
--- sblim-cim-client2.spec 15 Mar 2012 16:01:36 -0000 1.25.2.1
+++ sblim-cim-client2.spec 6 Sep 2012 23:26:36 -0000 1.25.2.2
@@ -1,7 +1,7 @@
%define name sblim-cim-client2
%define project_folder %{name}-%{version}-src
%define archive_folder build
-%define version 2.1.12
+%define version 2.1.12.1
%define release 1jpp
%define section free
@@ -158,6 +158,11 @@
# -----------------------------------------------------------------------------
%changelog
+* Thu Sep 06 2012 Dave Blaschke <bla...@us...>
+- Maintenance release 2.1.12.1
+ o 3554738 dump CIM xml by LogAndTraceBroker.trace()
+ o 3545797 Support new error code of SFCB
+
* Thu Mar 15 2012 Dave Blaschke <bla...@us...>
- New release 2.1.12
o 3504344 Sync Experimental/HEAD branches
Index: build.xml
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/build.xml,v
retrieving revision 1.47.2.1
retrieving revision 1.47.2.2
diff -u -d -r1.47.2.1 -r1.47.2.2
--- build.xml 15 Mar 2012 16:01:36 -0000 1.47.2.1
+++ build.xml 6 Sep 2012 23:26:36 -0000 1.47.2.2
@@ -36,7 +36,7 @@
<property name="Manifest.name" value="SBLIM CIM Client for Java" />
<property name="Manifest.title" value="SBLIM CIM Client for Java" />
<property name="Manifest.vendor" value="IBM Corporation 2005, 2012" />
- <property name="Manifest.version" value="2.1.12" />
+ <property name="Manifest.version" value="2.1.12.1" />
<property name="Directory.source.core" value="${basedir}/src" />
<property name="Directory.source.samples" value="${basedir}/smpl" />
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -d -r1.24 -r1.24.2.1
--- ChangeLog 15 Mar 2012 13:28:39 -0000 1.24
+++ ChangeLog 6 Sep 2012 23:26:36 -0000 1.24.2.1
@@ -1,3 +1,29 @@
+Release 2.1.12.1
+================
+
+Thu Sep 06 14:57:13 CDT 2012 blaschke-oss
+
+ 3554738 dump CIM xml by LogAndTraceBroker.trace()
+
+ LogAndTraceBrokerTest.java 1.9.2.1
+ DebugInputStream.java 1.8.10.1
+ CIMIndicationHandler.java 1.29.2.1
+ WBEMClientCIMXML.java 1.67.2.2
+ LogAndTraceBroker.java 1.25.2.1
+ unittest.html 1.15.2.1
+ logging.html 1.7.16.1
+ LogAndTraceManager.java 1.7.26.1
+ CIMXMLTraceListener.java 1.2.2.2
+ Jsr48OperationSample.java 1.12.8.1
+ NEWS 1.273.2.2
+
+Thu Sep 06 06:23:13 CDT 2012 blaschke-oss
+
+ 3545797 Support new error code of SFCB
+
+ WBEMClientCIMXML.java 1.67.2.1
+ NEWS 1.273.2.1
+
Release 2.1.12
==============
|
|
From: Dave B. <bla...@us...> - 2012-09-06 19:57:46
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files
In directory vz-cvs-3.sog:/tmp/cvs-serv26220/src/org/sblim/cimclient/doc-files
Modified Files:
Tag: CIM_CLIENT_2_1_12_M
logging.html unittest.html
Log Message:
3554738 - dump CIM xml by LogAndTraceBroker.trace()
Index: unittest.html
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files/unittest.html,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -d -r1.15 -r1.15.2.1
--- unittest.html 14 Mar 2012 13:12:19 -0000 1.15
+++ unittest.html 6 Sep 2012 19:57:14 -0000 1.15.2.1
@@ -26,6 +26,7 @@
* 3293248 2011-05-03 blaschke-oss Support for CIM_ERROR instances within ERROR
* 3397922 2011-08-30 blaschke-oss support OctetString
* 3484014 2012-02-03 blaschke-oss Add LogAndTraceBroker.isLoggable for message/trace
+ * 3554738 2012-09-06 blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
-->
</head>
<body style="background-color: white;">
@@ -343,6 +344,9 @@
<tr><td>testTrace</td>
<td>Tests if a log message is forwarded correctly to the log&trace listeners.
This test checks the message level, locale, exception parameter.</td></tr>
+ <tr><td>testCIMXMLTrace</td>
+ <td>Tests if a log message is forwarded correctly to the CIM-XML trace listeners.
+ This test checks the message level, message and outgoing indicator.</td></tr>
</table>
<h3>util.WBEMConfigurationTest</h3>
Index: logging.html
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files/logging.html,v
retrieving revision 1.7
retrieving revision 1.7.16.1
diff -u -d -r1.7 -r1.7.16.1
--- logging.html 13 May 2010 12:50:18 -0000 1.7
+++ logging.html 6 Sep 2012 19:57:14 -0000 1.7.16.1
@@ -2,7 +2,7 @@
<html><head>
<!--
*
- * (C) Copyright IBM Corp. 2007, 2010
+ * (C) Copyright IBM Corp. 2007, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -20,6 +20,7 @@
* 2799260 2009-06-01 raman_arora Fix left over @author tag from Java5 upgrade
* 2972697 2010-03-18 blaschke-oss Fix spelling errors in HTML files
* 2990370 2010-04-22 blaschke-oss Development/unittest HTML out of date
+ * 3554738 2012-09-06 blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
-->
</head>
<body style="background-color: white;">
@@ -78,6 +79,26 @@
});
</pre></div></div>
<p>The <code>System.out.println()</code> would of course be replaced with the API calls of the applications logger</p>
+<h2>CIM-XML Trace Listeners</h2>
+<p>An application can register itself as a listener for CIM-XML trace messages. In order to do so it must implement
+the <a href="../CIMXMLTraceListener.html"><code>CIMXMLTraceListener
+</code></a> interface and call <a href="../LogAndTraceManager.html#addCIMXMLTraceListener(org.sblim.cimclient.CIMXMLTraceListener)">
+<code>addCIMXMLTraceListener()</code></a> on the <a href="../LogAndTraceManager.html"><code>LogAndTraceManager</code></a> instance.</p>
+<p>The following code snippet gives an example:</p>
+<div style="border: 1px dashed #3c78b5; font-size: 14px; font-family: Courier; margin: 10px; line-height: 17px;">
+<div style="background-color: #f0f0f0; padding: 10px;">
+<pre>
+LogAndTraceManager manager = LogAndTraceManager.getManager();
+
+manager.addCIMXMLTraceListener(new CIMXMLTraceListener() {
+
+ public void trace(Level pLevel, String pMessage, boolean pOutgoing) {
+ System.out.println("CIM-XML "+(pOutgoing ? "sent" : "received")
+ +" by client at level "+pLevel+": "+pMessage);
+ }
+});
+</pre></div></div>
+<p>The <code>System.out.println()</code> would of course be replaced with the API calls of the applications logger</p>
<h2>Classic Logging</h2>
<p>You say "That's interesting stuff, but I just want my plain old log files back." No problem, the SBLIM
CIM Client for Java offers this as well. Via configuration properties you can set up classical file logging out of
|
|
From: Dave B. <bla...@us...> - 2012-09-06 19:57:19
|
Update of /cvsroot/sblim/jsr48-client
In directory vz-cvs-3.sog:/tmp/cvs-serv26220
Modified Files:
Tag: CIM_CLIENT_2_1_12_M
NEWS
Log Message:
3554738 - dump CIM xml by LogAndTraceBroker.trace()
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/NEWS,v
retrieving revision 1.273.2.1
retrieving revision 1.273.2.2
diff -u -d -r1.273.2.1 -r1.273.2.2
--- NEWS 6 Sep 2012 11:23:14 -0000 1.273.2.1
+++ NEWS 6 Sep 2012 19:57:16 -0000 1.273.2.2
@@ -1,5 +1,6 @@
Version 2.1.12.1
================
+3554738 dump CIM xml by LogAndTraceBroker.trace()
3545797 Support new error code of SFCB
Version 2.1.12
|
|
From: Dave B. <bla...@us...> - 2012-09-06 19:57:18
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem
In directory vz-cvs-3.sog:/tmp/cvs-serv26220/src/org/sblim/cimclient/internal/wbem
Modified Files:
Tag: CIM_CLIENT_2_1_12_M
WBEMClientCIMXML.java
Log Message:
3554738 - dump CIM xml by LogAndTraceBroker.trace()
Index: WBEMClientCIMXML.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java,v
retrieving revision 1.67.2.1
retrieving revision 1.67.2.2
diff -u -d -r1.67.2.1 -r1.67.2.2
--- WBEMClientCIMXML.java 6 Sep 2012 11:23:13 -0000 1.67.2.1
+++ WBEMClientCIMXML.java 6 Sep 2012 19:57:14 -0000 1.67.2.2
@@ -58,9 +58,11 @@
* 3423064 2011-10-13 blaschke-oss Add UpdateExpiredPassword Header for Reqs from Java Client
* 3496355 2012-03-02 blaschke-oss JSR48 1.0.0: add new WBEMClientConstants
* 3545797 2012-09-06 blaschke-oss Support new error code of SFCB
+ * 3554738 2012-09-06 blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
*/
package org.sblim.cimclient.internal.wbem;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -126,6 +128,7 @@
import org.sblim.cimclient.internal.http.io.TrailerException;
import org.sblim.cimclient.internal.logging.LogAndTraceBroker;
import org.sblim.cimclient.internal.logging.Messages;
+import org.sblim.cimclient.internal.logging.TimeStamp;
import org.sblim.cimclient.internal.util.MOF;
import org.sblim.cimclient.internal.util.WBEMConfiguration;
import org.sblim.cimclient.internal.util.WBEMConfigurationDefaults;
@@ -1770,8 +1773,16 @@
OutputStream os = connection.getOutputStream();
- if (this.iConfiguration.isCimXmlTracingEnabled()) CIMClientXML_HelperImpl.dumpDocument(
- LogAndTraceBroker.getBroker().getXmlTraceStream(), pDocument); // debug
+ if (this.iConfiguration.isCimXmlTracingEnabled()
+ || LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) {
+ OutputStream pos = new ByteArrayOutputStream();
+ CIMClientXML_HelperImpl.dumpDocument(pos, pDocument);
+ OutputStream debugStream = LogAndTraceBroker.getBroker().getXmlTraceStream();
+ if (this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null) debugStream
+ .write(pos.toString().getBytes());
+ if (LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) logger
+ .traceCIMXML(Level.FINEST, pos.toString(), true);
+ }
CIMClientXML_HelperImpl.serialize(os, pDocument);
os.flush();
os.close();
@@ -1818,7 +1829,8 @@
InputStream is = connection.getInputStream();
OutputStream debugStream = LogAndTraceBroker.getBroker().getXmlTraceStream();
- if (this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null) {
+ if ((this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null)
+ || LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) {
is = new DebugInputStream(is, debugStream);
}
@@ -1891,12 +1903,19 @@
// sending multiple requests without any response)
if (retries > 0) {
OutputStream debugStream = LogAndTraceBroker.getBroker().getXmlTraceStream();
- if (this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null) {
- String resultStr = "HTTP " + resultCode + " " + connection.getResponseMessage()
- + " (retrying request)\n";
- debugStream.write("<--- error response begin ----\n".getBytes());
- debugStream.write(resultStr.toString().getBytes());
- debugStream.write("\n---- error response end ----->\n".getBytes());
+ if ((this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null)
+ || LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) {
+ StringBuilder resultStr = new StringBuilder("<--- error response begin ");
+ resultStr.append(TimeStamp.formatWithMillis(System.currentTimeMillis()));
+ resultStr.append(" ----\nHTTP ");
+ resultStr.append(resultCode);
+ resultStr.append(' ');
+ resultStr.append(connection.getResponseMessage());
+ resultStr.append(" (retrying request)\n---- error response end ----->\n");
+ if (this.iConfiguration.isCimXmlTracingEnabled() && debugStream != null) debugStream
+ .write(resultStr.toString().getBytes());
+ if (LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) logger
+ .traceCIMXML(Level.FINEST, resultStr.toString(), false);
}
}
} while (retries-- > 0);
|
Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem
In directory vz-cvs-3.sog:/tmp/cvs-serv21848/utst/org/sblim/cimclient/unittest/wbem
Modified Files:
XMLHostStrTest.java CIMBuilder.java ParserTest.java
ModifyInstanceTest.java TVPair.java
Log Message:
3529151 - TCK: CIMInstance property APIs include keys from COP
Index: ModifyInstanceTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem/ModifyInstanceTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ModifyInstanceTest.java 12 Jun 2009 02:33:23 -0000 1.7
+++ ModifyInstanceTest.java 6 Sep 2012 19:12:24 -0000 1.8
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -18,6 +18,7 @@
* 2204488 2008-10-28 raman_arora Fix code to remove compiler warnings
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
+ * 3529151 2012-08-22 blaschke-oss TCK: CIMInstance property APIs include keys from COP
*/
package org.sblim.cimclient.unittest.wbem;
@@ -129,7 +130,8 @@
"TestClass", "root/cimv2")),
mkProp("ClassProp", CIMDataType.CLASS_T, new CIMClass("TestClass", null, null, null,
null)),
- mkProp("InstProp", CIMDataType.OBJECT_T, new CIMInstance(REF_INST_OP, null)) });
+ mkProp("InstProp", CIMDataType.OBJECT_T, new CIMInstance(REF_INST_OP,
+ new CIMProperty<?>[] { KEY_PROP })) });
/**
* testWithPropList
Index: ParserTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem/ParserTest.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ParserTest.java 9 May 2012 14:18:44 -0000 1.24
+++ ParserTest.java 6 Sep 2012 19:12:24 -0000 1.25
@@ -28,6 +28,7 @@
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
* 2823494 2009-08-03 rgummada Change Boolean constructor to static
* 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
+ * 3529151 2012-08-22 blaschke-oss TCK: CIMInstance property APIs include keys from COP
*/
package org.sblim.cimclient.unittest.wbem;
@@ -476,14 +477,14 @@
new CIMObjectPath(null, "CL3E2289", null, "root/ibm", "IBMTS_Account",
new CIMProperty[] {
new CIMProperty<String>("SystemName", CIMDataType.STRING_T,
- "icat", false, false, null),
+ "icat", true, false, null),
new CIMProperty<String>("SystemCreationClassName",
- CIMDataType.STRING_T, "IBMTS_Account", false, false,
+ CIMDataType.STRING_T, "IBMTS_Account", true, false,
null),
new CIMProperty<String>("Name", CIMDataType.STRING_T, "dummy1",
- false, false, null),
+ true, false, null),
new CIMProperty<String>("CreationClassName",
- CIMDataType.STRING_T, "IBMTS_Account", false, false,
+ CIMDataType.STRING_T, "IBMTS_Account", true, false,
null) })) }, "data/SVCMethodRsp.smpl0.xml");
/**
Index: TVPair.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem/TVPair.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- TVPair.java 16 Aug 2010 17:20:50 -0000 1.14
+++ TVPair.java 6 Sep 2012 19:12:24 -0000 1.15
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2010
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -25,6 +25,7 @@
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
* 2823494 2009-08-03 rgummada Change Boolean constructor to static
* 3027615 2010-07-12 blaschke-oss Use CLASS_ARRAY_T instead of new CIMDataType(CLASS,0)
+ * 3529151 2012-08-22 blaschke-oss TCK: CIMInstance property APIs include keys from COP
*/
package org.sblim.cimclient.unittest.wbem;
@@ -173,7 +174,7 @@
private static CIMInstance mkInst(String pKeyStr) {
CIMProperty<String> key = new CIMProperty<String>("Name", CIMDataType.STRING_T, pKeyStr,
true, false, null);
- return new CIMInstance(Common.LOCALPATH.build("Clazz", null, new CIMProperty[] { key }),
+ return new CIMInstance(Common.LOCALPATH.build("Clazz", null, null),
new CIMProperty[] { key });
}
Index: CIMBuilder.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem/CIMBuilder.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- CIMBuilder.java 9 May 2012 14:18:44 -0000 1.21
+++ CIMBuilder.java 6 Sep 2012 19:12:24 -0000 1.22
@@ -28,6 +28,7 @@
* 3411879 2011-09-20 blaschke-oss TCK: CIM element value must match type
* 3500619 2012-03-16 blaschke-oss JSR48 1.0.0: CIMClass association/key clean up
* 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
+ * 3529151 2012-08-22 blaschke-oss TCK: CIMInstance property APIs include keys from COP
*/
package org.sblim.cimclient.unittest.wbem;
@@ -462,14 +463,14 @@
public static CIMInstance[] buildInstances() {
if (cInstA != null) return cInstA;
cInstA = new CIMInstance[] {
- new CIMInstance(Common.LOCALPATH.build("CIMAnythingClass0", null,
- getKeyProps(false)), null),
- new CIMInstance(Common.LOCALPATH
- .build("CIMAnythingClass1", null, getKeyProps(true)), null),
- new CIMInstance(Common.LOCALPATH.build("CIMAnythingClass0", null,
- getKeyProps(false)), getAllProps(false)),
- new CIMInstance(Common.LOCALPATH
- .build("CIMAnythingClass1", null, getKeyProps(true)), getAllProps(true)) };
+ new CIMInstance(Common.LOCALPATH.build("CIMAnythingClass0", null, null),
+ getKeyProps(false)),
+ new CIMInstance(Common.LOCALPATH.build("CIMAnythingClass1", null, null),
+ getKeyProps(true)),
+ new CIMInstance(Common.LOCALPATH.build("CIMAnythingClass0", null, null),
+ getAllProps(false)),
+ new CIMInstance(Common.LOCALPATH.build("CIMAnythingClass1", null, null),
+ getAllProps(true)) };
return cInstA;
}
Index: XMLHostStrTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem/XMLHostStrTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- XMLHostStrTest.java 12 Jun 2009 02:33:23 -0000 1.7
+++ XMLHostStrTest.java 6 Sep 2012 19:12:24 -0000 1.8
@@ -1,5 +1,5 @@
/**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -15,8 +15,9 @@
* 1742873 2007-06-25 ebak IPv6 ready cim-client
* 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL
* 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1)
- * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
+ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2)
* 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics
+ * 3529151 2012-08-22 blaschke-oss TCK: CIMInstance property APIs include keys from COP
*/
package org.sblim.cimclient.unittest.wbem;
@@ -79,12 +80,14 @@
private static final CIMObjectPath INSTANCEPATH = new CIMObjectPath(PROTOCOL, HOST, PORT,
NAMESPACE, CLASSNAME, new CIMProperty[] { new CIMProperty<String>("KeyProp",
- CIMDataType.STRING_T, "Hello") });
+ CIMDataType.STRING_T, "Hello", true, false, null) });
private static final MethodRspChecker METHOD_RSP_CHKR = new MethodRspChecker(new CIMObjectPath(
- PROTOCOL, HOST, PORT, NAMESPACE, CLASSNAME, null),
- new CIMArgument[] { new CIMArgument<CIMObjectPath>("outParam", new CIMDataType(
- CLASSNAME), INSTANCEPATH) }, "data/MethodRspWithReference.xml");
+ PROTOCOL, HOST, PORT, NAMESPACE, CLASSNAME,
+ new CIMProperty[] { new CIMProperty<String>("KeyProp", CIMDataType.STRING_T, "Hello",
+ true, false, null) }), new CIMArgument[] { new CIMArgument<CIMObjectPath>(
+ "outParam", new CIMDataType(CLASSNAME), INSTANCEPATH) },
+ "data/MethodRspWithReference.xml");
@SuppressWarnings("null")
private void checkClassPath(CIMObjectPath pClassPath) {
|
|
From: Dave B. <bla...@us...> - 2012-09-06 19:12:26
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv21848 Modified Files: NEWS Log Message: 3529151 - TCK: CIMInstance property APIs include keys from COP Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.316 retrieving revision 1.317 diff -u -d -r1.316 -r1.317 --- NEWS 6 Sep 2012 17:38:27 -0000 1.316 +++ NEWS 6 Sep 2012 19:12:24 -0000 1.317 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3529151 TCK: CIMInstance property APIs include keys from COP 3536398 Update HTML to reflect secure indication support 3554738 dump CIM xml by LogAndTraceBroker.trace() 3553858 Append duplicate HTTP header fields instead of replace |
|
From: Dave B. <bla...@us...> - 2012-09-06 17:38:29
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv7939 Modified Files: NEWS Log Message: 3536398 - Update HTML to reflect secure indication support Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.315 retrieving revision 1.316 diff -u -d -r1.315 -r1.316 --- NEWS 6 Sep 2012 14:46:47 -0000 1.315 +++ NEWS 6 Sep 2012 17:38:27 -0000 1.316 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3536398 Update HTML to reflect secure indication support 3554738 dump CIM xml by LogAndTraceBroker.trace() 3553858 Append duplicate HTTP header fields instead of replace 3535383 HashDoS fix 3498482 |
|
From: Dave B. <bla...@us...> - 2012-09-06 14:46:51
|
Update of /cvsroot/sblim/jsr48-client/smpl/org/sblim/cimclient/samples
In directory vz-cvs-3.sog:/tmp/cvs-serv24094/smpl/org/sblim/cimclient/samples
Modified Files:
Jsr48OperationSample.java
Log Message:
3554738 - dump CIM xml by LogAndTraceBroker.trace()
Index: Jsr48OperationSample.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/smpl/org/sblim/cimclient/samples/Jsr48OperationSample.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Jsr48OperationSample.java 9 May 2012 14:18:43 -0000 1.13
+++ Jsr48OperationSample.java 6 Sep 2012 14:46:48 -0000 1.14
@@ -23,6 +23,7 @@
* 3190335 2011-02-23 blaschke-oss Erroneous use of SystemName property in samples
* 3267429 2011-04-01 blaschke-oss Samples should close client
* 3521119 2012-04-24 blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
+ * 3554738 2012-08-16 blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
*/
package org.sblim.cimclient.samples;
@@ -332,7 +333,18 @@
public static void main(String[] args) throws Exception {
// Uncomment following two lines to enable writing XML trace to stdout.
// System.setProperty("sblim.wbem.cimxmlTracing", "true");
- // LogAndTraceBroker.getBroker().setXmlTraceStream(System.out);
+ // LogAndTraceManager.getManager().setXmlTraceStream(System.out);
+
+ // Uncomment following lines and corresponding removeCIMXMLTraceListener
+ // call below to enable writing XML trace to stdout.
+ // CIMXMLTraceListener xmlListener = new CIMXMLTraceListener() {
+ // public void traceCIMXML(Level pLevel, String pMessage, boolean
+ // pOutgoing) {
+ // System.out.println("client" + (pOutgoing ? "->" : "<-") + "server: "
+ // + pMessage);
+ // }
+ // };
+ // LogAndTraceManager.getManager().addCIMXMLTraceListener(xmlListener);
// Initialize client. This will not trigger any communication with
// the CIMOM.
@@ -393,6 +405,7 @@
// delete the instance again
client.deleteInstance(path);
System.out.println("Instance " + path + " deleted");
+ // LogAndTraceManager.getManager().removeCIMXMLTraceListener(xmlListener);
client.close();
}
}
|
|
From: Dave B. <bla...@us...> - 2012-09-06 14:46:50
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/indications
In directory vz-cvs-3.sog:/tmp/cvs-serv24094/src/org/sblim/cimclient/internal/wbem/indications
Modified Files:
CIMIndicationHandler.java
Log Message:
3554738 - dump CIM xml by LogAndTraceBroker.trace()
Index: CIMIndicationHandler.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/indications/CIMIndicationHandler.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- CIMIndicationHandler.java 17 Aug 2012 02:47:40 -0000 1.31
+++ CIMIndicationHandler.java 6 Sep 2012 14:46:48 -0000 1.32
@@ -42,13 +42,16 @@
* 3492214 2012-02-23 blaschke-oss Add a SenderIPAddress property indications
* 3513228 2012-04-23 blaschke-oss Reliable Indications support can create lots of threads
* 3553858 2012-08-06 blaschke-oss Append duplicate HTTP header fields instead of replace
+ * 3554738 2012-08-16 blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
*/
package org.sblim.cimclient.internal.wbem.indications;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.OutputStream;
import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Hashtable;
@@ -495,8 +498,9 @@
}
InputStream inputstream = null;
- if (this.iSessionProperties.isCimXmlTracingEnabled()
- && LogAndTraceBroker.getBroker().getXmlTraceStream() != null) {
+ if ((this.iSessionProperties.isCimXmlTracingEnabled() && LogAndTraceBroker.getBroker()
+ .getXmlTraceStream() != null)
+ || LogAndTraceBroker.getBroker().isLoggableCIMXMLTrace(Level.FINEST)) {
inputstream = new DebugInputStream(pReader.getInputStream(), LogAndTraceBroker
.getBroker().getXmlTraceStream());
} else {
@@ -753,8 +757,16 @@
// TODO: check this error code, may not be appropriate
throw new HttpException(400, "Bad Request");
}
- if (this.iSessionProperties.isCimXmlTracingEnabled()) CIMClientXML_HelperImpl.dumpDocument(
- LogAndTraceBroker.getBroker().getXmlTraceStream(), responseDoc); // debug
+ if (this.iSessionProperties.isCimXmlTracingEnabled()
+ || this.iLogger.isLoggableCIMXMLTrace(Level.FINEST)) {
+ OutputStream pos = new ByteArrayOutputStream();
+ CIMClientXML_HelperImpl.dumpDocument(pos, responseDoc);
+ OutputStream debugStream = this.iLogger.getXmlTraceStream();
+ if (this.iSessionProperties.isCimXmlTracingEnabled() && debugStream != null) debugStream
+ .write(pos.toString().getBytes());
+ if (this.iLogger.isLoggableCIMXMLTrace(Level.FINEST)) this.iLogger.traceCIMXML(
+ Level.FINEST, pos.toString(), true);
+ }
CIMClientXML_HelperImpl.serialize(pWriter.getOutputStream(), responseDoc);
pWriter.getHeader().addField("CIMExport", "MethodResponse");
}
|
|
From: Dave B. <bla...@us...> - 2012-09-06 11:23:16
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem
In directory vz-cvs-3.sog:/tmp/cvs-serv7361/src/org/sblim/cimclient/internal/wbem
Modified Files:
Tag: CIM_CLIENT_2_1_12_M
WBEMClientCIMXML.java
Log Message:
3545797 - Support new error code of SFCB
Index: WBEMClientCIMXML.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java,v
retrieving revision 1.67
retrieving revision 1.67.2.1
diff -u -d -r1.67 -r1.67.2.1
--- WBEMClientCIMXML.java 14 Mar 2012 11:33:40 -0000 1.67
+++ WBEMClientCIMXML.java 6 Sep 2012 11:23:13 -0000 1.67.2.1
@@ -57,6 +57,7 @@
* 3277928 2011-04-06 blaschke-oss CIM-XML tracing cannot be enabled in the field
* 3423064 2011-10-13 blaschke-oss Add UpdateExpiredPassword Header for Reqs from Java Client
* 3496355 2012-03-02 blaschke-oss JSR48 1.0.0: add new WBEMClientConstants
+ * 3545797 2012-09-06 blaschke-oss Support new error code of SFCB
*/
package org.sblim.cimclient.internal.wbem;
@@ -1720,6 +1721,20 @@
this.iConfiguration.setCustomSocketFactory(pFactory);
}
+ private String getHttpErrorString(int pStatusCode) {
+ switch (pStatusCode) {
+ case 401:
+ return "401 - UNAUTHORIZED";
+ case 403:
+ return "403 - FORBIDDEN";
+ case 405:
+ return "405 - METHOD NOT ALLOWED";
+ case 407:
+ return "407 - PROXY AUTHENTICATION REQUIRED";
+ }
+ return null;
+ }
+
private InputStreamReader transmitRequest(String pCimMethod, HttpHeader pHeader,
Document pDocument) throws IOException, ProtocolException, WBEMException {
@@ -1727,6 +1742,7 @@
logger.entry();
HttpUrlConnection connection = null;
+ int exceptionNum = WBEMException.CIM_ERR_FAILED;
// retry HTTP MPOST only if failure is more than 24 hours old
if (this.iMPostFailed) {
@@ -1779,10 +1795,10 @@
}
String cimError = headers.getField("CIMError");
+ exceptionNum = WBEMException.CIM_ERR_FAILED;
switch (resultCode) {
- // 200
- case HttpURLConnection.HTTP_OK:
+ case HttpURLConnection.HTTP_OK: // 200
if (this.iConfiguration.isHttpContentLengthRetryEnabled()) {
String contentLengthField = headers.getField("Content-length");
@@ -1791,8 +1807,8 @@
int lengthToCheck = this.iConfiguration.getHttpContentLengthThreshold();
if (contentLength < lengthToCheck) {
- logger.trace(Level.FINE, "Content Length below :" + lengthToCheck
- + " ...retrying !");
+ logger.trace(Level.FINE, "Content Length below " + lengthToCheck
+ + ", retrying");
break;
}
}
@@ -1808,13 +1824,7 @@
return new InputStreamReader(is, charset);
- // 500
- case HttpURLConnection.HTTP_INTERNAL_ERROR:
- logger.trace(Level.FINER, "Received HTTP Error 500 - HTTP_INTERNAL_ERROR");
- break;
-
- // 501
- case HttpURLConnection.HTTP_NOT_IMPLEMENTED:
+ case HttpURLConnection.HTTP_NOT_IMPLEMENTED: // 501
// TODO if there is an error with the default xml
// encoder/decoder, load the correct version
// The problem is that the CIMOM does not return the DTD
@@ -1824,85 +1834,54 @@
if (cimProtocolVersion == null && cimError == null && useMPost) {
logger
.trace(Level.FINER,
- "Received HTTP Error 501 - HTTP NOT IMPLEMENTED - falling back to HTTP POST");
+ "Received HTTP Error 501 - NOT IMPLEMENTED with M-POST, falling back to POST");
this.iMPostFailTime = System.currentTimeMillis();
useMPost = false;
this.iMPostFailed = true;
++retries;
break;
}
- if (cimProtocolVersion == null || cimProtocolVersion.length() == 0) {
- cimProtocolVersion = "1.0";
- }
- logger.trace(Level.FINER, "Received HTTP Error 501 - HTTP NOT IMPLEMENTED"
- + (cimError != null ? " - " + cimError : ""));
- retries = 0;
- break;
- // 400
- case HttpURLConnection.HTTP_BAD_REQUEST:
- if (cimError != null) {
- logger.trace(Level.FINER, "Received HTTP Error 400 - BAD REQUEST - "
- + cimError);
- } else {
- logger.trace(Level.FINER, "Received HTTP Error 400 - BAD REQUEST");
- }
+ logger.trace(Level.FINER, "Received HTTP Error 501 - NOT IMPLEMENTED"
+ + (cimError != null ? "(CIMError: \"" + cimError + "\")" : "")
+ + ", skipping retries");
retries = 0;
break;
- // 401
- case HttpURLConnection.HTTP_UNAUTHORIZED:
- logger
- .trace(Level.FINER,
- "Received HTTP Error 401 - UNAUTHORIZED. Throwing WBEMAuthenticationException!");
- connection.disconnect();
- throw new WBEMException(WBEMException.CIM_ERR_ACCESS_DENIED,
- "HTTP 401 - Unauthorized", null);
-
- // 403
- case HttpURLConnection.HTTP_FORBIDDEN:
- logger.trace(Level.FINER, "Received HTTP Error 403 - FORBIDDEN.");
+ case HttpURLConnection.HTTP_BAD_REQUEST: // 400
+ logger.trace(Level.FINER, "Received HTTP Error 400 - BAD REQUEST"
+ + getHttpErrorString(resultCode)
+ + (cimError != null ? " (CIMError: \"" + cimError + "\")" : "")
+ + ", skipping retries");
retries = 0;
break;
- // 407
- case HttpURLConnection.HTTP_PROXY_AUTH:
- logger
- .trace(Level.FINER,
- "Received HTTP Error 407 - ERR PROXY AUTHENTICATION. Throwing CIMAuthenticationException!");
- connection.disconnect();
- throw new WBEMException(WBEMException.CIM_ERR_ACCESS_DENIED,
- "HTTP 407 - Err Proxy Authentication");
-
- // 405
- case HttpURLConnection.HTTP_BAD_METHOD:
- logger.trace(Level.FINER, "Received HTTP Error 405 - BAD METHOD.");
+ case HttpURLConnection.HTTP_FORBIDDEN: // 403
+ case HttpURLConnection.HTTP_BAD_METHOD: // 405
+ logger.trace(Level.FINER, "Received HTTP Error "
+ + getHttpErrorString(resultCode) + ", skipping retries");
retries = 0;
break;
- // 505 Version Not Supported
- case 505:
- // 510 Not Extended
- case 510:
- logger.trace(Level.FINER, "Received HTTP Error " + resultCode
- + " on M-POST. Retrying with POST.");
- if (useMPost) {
- this.iMPostFailTime = System.currentTimeMillis();
- useMPost = false;
- this.iMPostFailed = true;
- ++retries;
- }
+ case HttpURLConnection.HTTP_UNAUTHORIZED: // 401
+ case HttpURLConnection.HTTP_PROXY_AUTH: // 407
+ logger.trace(Level.FINER, "Received HTTP Error "
+ + getHttpErrorString(resultCode) + ", skipping retries");
+ exceptionNum = WBEMException.CIM_ERR_ACCESS_DENIED;
+ retries = 0;
break;
default:
- logger
- .trace(Level.FINER,
- "No known HTTP error recognized. Retrying with POST.");
if (useMPost) {
+ logger.trace(Level.FINER, "Received HTTP Error " + resultCode
+ + " with M-POST, falling back to POST");
this.iMPostFailTime = System.currentTimeMillis();
useMPost = false;
this.iMPostFailed = true;
++retries;
+ } else {
+ logger.trace(Level.FINER, "Received HTTP Error " + resultCode
+ + ", retrying");
}
}
@@ -1936,15 +1915,59 @@
} catch (Exception e) {
errorOP = null;
}
+ logger.trace(Level.FINER, "Found PGErrorDetail field with value \"" + errorOP + "\"");
+ }
+
+ // Look for SFCB error details, decode and include in exception
+ // if it exists
+ String errorSFCB = connection.getHeaderField("SFCBErrorDetail");
+ if (errorSFCB != null) {
+ try {
+ errorSFCB = URLDecoder.decode(errorSFCB, "UTF-8");
+ } catch (Exception e) {
+ errorSFCB = null;
+ }
+ logger.trace(Level.FINER, "Found SFCBErrorDetail field with value \"" + errorSFCB
+ + "\"");
+ }
+
+ // Format of WBEMException message is:
+ //
+ // HTTP StatusCode - ReasonPhrase (CIMError: "ErrorString", OpenPegasus
+ // Error: "ErrorString", SFCB Error: "ErrorString")
+ //
+ // For example:
+ // HTTP 503 - Service Unavailable (SFCB Error:
+ // "Max Session Limit Exceeded")
+ StringBuffer errorMsg = new StringBuffer("HTTP ");
+ errorMsg.append(connection.getResponseCode());
+ errorMsg.append(" - ");
+ errorMsg.append(connection.getResponseMessage());
+ if (errorCIM != null || errorOP != null || errorSFCB != null) {
+ errorMsg.append(" (");
+ if (errorCIM != null) {
+ errorMsg.append("CIMError: \"");
+ errorMsg.append(errorCIM);
+ errorMsg.append('"');
+ }
+ if (errorOP != null) {
+ if (errorCIM != null) errorMsg.append(", ");
+ errorMsg.append("OpenPegasus Error: \"");
+ errorMsg.append(errorOP);
+ errorMsg.append('"');
+ }
+ if (errorSFCB != null) {
+ if (errorCIM != null || errorOP != null) errorMsg.append(", ");
+ errorMsg.append("SFCB Error: \"");
+ errorMsg.append(errorSFCB);
+ errorMsg.append('"');
+ }
+ errorMsg.append(')');
}
- String errorMsg = "HTTP " + connection.getResponseCode() + " - "
- + connection.getResponseMessage()
- + (errorCIM != null ? (", CIMError: " + errorCIM) : "")
- + (errorOP != null ? (", OpenPegasus Error Detail: \"" + errorOP + "\"") : "");
connection.disconnect();
- throw new WBEMException(WBEMException.CIM_ERR_FAILED, errorMsg);
+ throw new WBEMException(exceptionNum, errorMsg.toString());
}
private HttpUrlConnection newConnection(String pCimMethod, HttpHeader pHeader, boolean pUseMPost) {
|
|
From: Dave H. <hel...@us...> - 2012-09-04 17:18:14
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SFCB - Small Footprint CIM Broker".
The branch, master has been updated
via f0e0a831d3aae6a1955a9882a7441fd5cde68169 (commit)
from eba660d8585a29416d44b2245ed804b38114ac81 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f0e0a831d3aae6a1955a9882a7441fd5cde68169
Author: Dave Heller <hel...@us...>
Date: Tue Sep 4 13:16:15 2012 -0400
[ 3564757 ] stageschema.sh should detect errors in sfcbrepos
-----------------------------------------------------------------------
Summary of changes:
diff --git a/NEWS b/NEWS
index c8667a5..85431fb 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,7 @@ Bugs fixed:
- 3527714 Every other EnumerateClasses fails
- 3541554 insecure LD_LIBRARY_PATH usage
- 3546279 Core dump in providerDrv on Qualifier not found
+- 3564757 stageschema.sh should detect errors in sfcbrepos
Changes in 1.4.2
================
diff --git a/test/stageschema.sh b/test/stageschema.sh
index f675ee7..5321224 100755
--- a/test/stageschema.sh
+++ b/test/stageschema.sh
@@ -109,6 +109,9 @@ else
fi
# Rebuild the repository
-sfcbrepos -f
+if [ $unstage -ne 1 ]
+then
+ sfcbrepos -f || exit 1
+fi
exit 0
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Michael Chase-S. <mc...@us...> - 2012-08-30 05:59:58
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SFCB - Small Footprint CIM Broker".
The branch, master has been updated
via eba660d8585a29416d44b2245ed804b38114ac81 (commit)
from 58d715277c881a056833e1c69f480c0872e4f00d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit eba660d8585a29416d44b2245ed804b38114ac81
Author: Michael Chase-Salerno <br...@li...>
Date: Thu Aug 30 01:59:20 2012 -0400
- 3555395 Additional auth lib return codes
-----------------------------------------------------------------------
Summary of changes:
diff --git a/Makefile.am b/Makefile.am
index 8ebf6e4..c244030 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -402,7 +402,7 @@ sfcbmofpp_SOURCES=mofpp.c
sfcbdump_SOURCES=sfcbdump.c
sfcbinst2mof_SOURCES=sfcbinst2mof.c
-sfcbinst2mof_LDADD = -lsfcFileRepository
+sfcbinst2mof_LDADD = -lsfcFileRepository -lsfcBrokerCore
sfcbtrace_SOURCES=sfcbtrace.c
sfcbtrace_LDADD = -lsfcBrokerCore
diff --git a/NEWS b/NEWS
index af1a090..c8667a5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
Changes in 1.4.3
================
-Everything in 1.3.13, 1.3.14, and 1.3.15 (see below), plus:
+Everything in 1.3.13, 1.3.14, 1.3.15, and 1.3.16 (see below), plus:
New features:
- 3441679 Add a feature to validate CMPI types
@@ -101,6 +101,7 @@ Changes in 1.3.16
New Features:
- 3538858 custom routine to log indInst objinfo
+- 3555395 Additional auth lib return codes
Bugs fixed:
diff --git a/cimRequest.c b/cimRequest.c
index bd8dbdb..6c98f86 100644
--- a/cimRequest.c
+++ b/cimRequest.c
@@ -324,7 +324,7 @@ methodErrResponse(RequestHdr * hdr, char *error)
#ifdef ALLOW_UPDATE_EXPIRED_PW
static char *
-getErrExpiredSegment()
+getErrExpiredSegment(char * type)
{
char* msg = sfcb_snprintf("<ERROR CODE=\"2\" \
DESCRIPTION=\"User Account Expired\">\n\
@@ -332,10 +332,10 @@ DESCRIPTION=\"User Account Expired\">\n\
<PROPERTY NAME=\"ErrorType\" TYPE=\"uint16\">\
<VALUE>1</VALUE></PROPERTY>\n\
<PROPERTY NAME=\"OtherErrorType\" TYPE=\"string\">\
-<VALUE>Password Expired</VALUE></PROPERTY>\n\
+<VALUE>%s</VALUE></PROPERTY>\n\
<PROPERTY NAME=\"ProbableCause\" TYPE=\"uint16\">\
<VALUE>117</VALUE></PROPERTY>\n\
-</INSTANCE>\n</ERROR>\n");
+</INSTANCE>\n</ERROR>\n",type);
return msg;
}
@@ -1787,7 +1787,7 @@ static Scanner scanners[] = {
static int scanner_count = sizeof(scanners) / sizeof(Scanner);
RespSegments
-handleCimRequest(CimRequestContext * ctx, int flags)
+handleCimRequest(CimRequestContext * ctx, int flags, char * more)
{
RespSegments rs;
RequestHdr hdr;
@@ -1867,9 +1867,9 @@ handleCimRequest(CimRequestContext * ctx, int flags)
}
else { /* expired user tried to invoke non-UpdatePassword request */
if (hdr.methodCall) {
- rs = methodErrResponse(&hdr, getErrExpiredSegment());
+ rs = methodErrResponse(&hdr, getErrExpiredSegment(more));
} else {
- rs = iMethodErrResponse(&hdr, getErrExpiredSegment());
+ rs = iMethodErrResponse(&hdr, getErrExpiredSegment(more));
}
}
}
diff --git a/cimRequest.h b/cimRequest.h
index e1512cc..c513528 100644
--- a/cimRequest.h
+++ b/cimRequest.h
@@ -87,7 +87,7 @@ typedef struct requestHdr {
unsigned int sessionId;
} RequestHdr;
-extern RespSegments handleCimRequest(CimRequestContext * ctx, int flags);
+extern RespSegments handleCimRequest(CimRequestContext * ctx, int flags, char *more);
extern int cleanupCimXmlRequest(RespSegments * rs);
#ifdef ALLOW_UPDATE_EXPIRED_PW
diff --git a/cimRsRequest.c b/cimRsRequest.c
index e02f71b..707abc2 100644
--- a/cimRsRequest.c
+++ b/cimRsRequest.c
@@ -448,8 +448,8 @@ RequestHdr
scanCimRsRequest(CimRequestContext *ctx, char *cimRsData, int *rc)
{
//fprintf(stderr, "path is '%s'\nverb is '%s'\n", ctx->path, ctx->verb);
- RequestHdr reqHdr = { NULL, 0, 0, 0, 0, 0, 0, 0,
- NULL, 0, 0, 0, NULL, 0, 0,
+ RequestHdr reqHdr = { NULL, 0, 0, 0, NULL, NULL, 0, 0,
+ NULL, 0, NULL, NULL, NULL, NULL, NULL, 0,
};
if (strncasecmp(ctx->path, "/cimrs", 6) != 0) {
diff --git a/cimXmlParser.c b/cimXmlParser.c
index 512a1bf..5ca7eec 100644
--- a/cimXmlParser.c
+++ b/cimXmlParser.c
@@ -1690,6 +1690,7 @@ scanCimXmlRequest(CimRequestContext *ctx, char *xmlData, int *rc)
control.reqHdr.binCtx = calloc(1, sizeof(BinRequestContext));
control.reqHdr.principal = ctx->principal;
control.reqHdr.sessionId = ctx->sessionId;
+ control.reqHdr.role = NULL;
control.paramValues.last = control.paramValues.first = NULL;
control.properties.last = control.properties.first = NULL;
control.qualifiers.last = control.qualifiers.first = NULL;
diff --git a/httpAdapter.c b/httpAdapter.c
index 47aa3cc..e7c5a4d 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -118,6 +118,8 @@ static void print_cert(const char *cert_file, const STACK_OF(X509_NAME) *);
#define AUTH_PASS 1
#define AUTH_FAIL 0
#define AUTH_EXPIRED -1
+#define AUTH_SERVTEMP -2
+#define AUTH_SERVPERM -3
static key_t httpProcSemKey;
static key_t httpWorkSemKey;
@@ -153,10 +155,11 @@ struct auth_extras {
char* clientIp;
void* authHandle;
const char* role;
+ char* ErrorDetail;
};
typedef struct auth_extras AuthExtras;
-AuthExtras extras = {NULL, NULL, NULL, NULL};
+AuthExtras extras = {NULL, NULL, NULL, NULL, NULL};
void releaseAuthHandle() {
_SFCB_ENTER(TRACE_HTTPDAEMON, "releaseAuthHandle");
@@ -312,6 +315,8 @@ baValidate(char *cred, char **principal)
if (ret == AUTH_PASS) ret = AUTH_PASS;
else if (ret == AUTH_EXPIRED) ret = AUTH_EXPIRED;
+ else if (ret == AUTH_SERVTEMP) ret = AUTH_SERVTEMP;
+ else if (ret == AUTH_SERVPERM) ret = AUTH_SERVPERM;
else ret = AUTH_FAIL;
}
@@ -620,7 +625,7 @@ writeChunkHeaders(BinRequestContext * ctx)
static char op[] = { "CIMOperation: MethodResponse\r\n" };
static char tenc[] = { "Transfer-encoding: chunked\r\n" };
static char trls[] =
- { "Trailer: CIMError, CIMStatusCode, CIMStatusCodeDescription\r\n" };
+ { "Trailer: CIMError, CIMStatusCode, CIMStatusCodeDescription, SFCBErrorDetail\r\n" };
static char cclose[] = "Connection: close\r\n";
_SFCB_ENTER(TRACE_HTTPDAEMON, "writeChunkHeaders");
@@ -1041,7 +1046,6 @@ doHttpRequest(CommHndl conn_fd)
}
#endif
}
-
#if defined USE_SSL
if (doBa && sfcbSSLMode) {
if (ccVerifyMode != CC_VERIFY_IGNORE) {
@@ -1068,6 +1072,9 @@ doHttpRequest(CommHndl conn_fd)
int authorized = 0;
int barc = 0;
+ // Reserve space for the additional headers
+ char * more=calloc(300,sizeof(char));
+
#ifdef HAVE_UDS
if (!discardInput && doUdsAuth) {
struct sockaddr_un sun;
@@ -1101,28 +1108,50 @@ doHttpRequest(CommHndl conn_fd)
// fprintf(stderr, "client is: %s\n", ipstr);
barc = baValidate(inBuf.authorization,&inBuf.principal);
+ if (extras.ErrorDetail) {
+ snprintf(more,256,"SFCBErrorDetail: %s\r\n",extras.ErrorDetail);
+ }
+
#ifdef ALLOW_UPDATE_EXPIRED_PW
if (barc == AUTH_EXPIRED) {
- hcrFlags |= HCR_EXPIRED_PW;
- }
- else if (barc == AUTH_PASS) {
- hcrFlags = 0; /* clear flags so non-expired user doesn't update pw */
- }
- else if (barc == AUTH_FAIL) {
+ hcrFlags |= HCR_EXPIRED_PW;
+ // Add the error detail to the CIM_Error instance
+ if (extras.ErrorDetail) {
+ snprintf(more,256,"%s",extras.ErrorDetail);
+ } else {
+ snprintf(more,256,"%s","Expired Password");
+ }
+ } else if (barc == AUTH_PASS) {
#else
- if (barc != AUTH_PASS) {
+ if (barc == AUTH_EXPIRED) {
+ strcat(more,"WWW-Authenticate: Basic realm=\"cimom\"\r\n");
+ genError(conn_fd, &inBuf, 401, "Unauthorized", more);
+ /* we continue to parse headers and empty the socket
+ to be graceful with the client */
+ discardInput=1;
+ } else if (barc == AUTH_PASS) {
#endif
- char more[] =
- "WWW-Authenticate: Basic realm=\"cimom\"\r\n";
- genError(conn_fd, &inBuf, 401, "Unauthorized", more);
- /*
- * we continue to parse headers and empty the socket to be graceful
- * with the client
- */
- discardInput = 1;
- }
- }
+ hcrFlags = 0; /* clear flags so non-expired user doesn't update pw */
+ } else if (barc == AUTH_SERVPERM) {
+ genError(conn_fd, &inBuf, 500, "Server Error", more);
+ /* we continue to parse headers and empty the socket
+ to be graceful with the client */
+ discardInput=1;
+ } else if (barc == AUTH_SERVTEMP) {
+ genError(conn_fd, &inBuf, 503, "Service Unavailable", more);
+ /* we continue to parse headers and empty the socket
+ to be graceful with the client */
+ discardInput=1;
+ } else if (barc == AUTH_FAIL) {
+ strcat(more,"WWW-Authenticate: Basic realm=\"cimom\"\r\n");
+ genError(conn_fd, &inBuf, 401, "Unauthorized", more);
+ /* we continue to parse headers and empty the socket
+ to be graceful with the client */
+ discardInput=1;
+ }
+ } // if (inBuf.authorization) {
+
#if defined USE_SSL
else if (sfcbSSLMode && ccVerifyMode != CC_VERIFY_IGNORE) {
/*
@@ -1141,6 +1170,10 @@ doHttpRequest(CommHndl conn_fd)
_SFCB_TRACE(1, ("--- exiting after missing content length."));
commClose(conn_fd);
freeBuffer(&inBuf);
+ if (more) {
+ free(more);
+ more=NULL;
+ }
exit(1);
}
@@ -1154,12 +1187,20 @@ doHttpRequest(CommHndl conn_fd)
genError(conn_fd, &inBuf, 400, "Bad Request", NULL);
_SFCB_TRACE(1, ("--- exiting after request timeout."));
commClose(conn_fd);
+ if (more) {
+ free(more);
+ more=NULL;
+ }
exit(1);
}
if (discardInput) {
releaseAuthHandle();
free(hdr);
freeBuffer(&inBuf);
+ if (more) {
+ free(more);
+ more=NULL;
+ }
_SFCB_RETURN(discardInput - 1);
}
@@ -1203,10 +1244,14 @@ doHttpRequest(CommHndl conn_fd)
}
#endif
- response = handleCimRequest(&ctx, hcrFlags);
+ response = handleCimRequest(&ctx, hcrFlags, more);
} else {
response = nullResponse;
}
+ if (more) {
+ free(more);
+ more=NULL;
+ }
free(hdr);
_SFCB_TRACE(1, ("--- Generate http response"));
diff --git a/sfcBasicPAMAuthentication.c b/sfcBasicPAMAuthentication.c
index 1f7b111..d3554e0 100644
--- a/sfcBasicPAMAuthentication.c
+++ b/sfcBasicPAMAuthentication.c
@@ -32,6 +32,7 @@ struct auth_extras {
char* clientIp;
void* authHandle;
const char* role;
+ char* ErrorDetail;
};
typedef struct auth_extras AuthExtras;
@@ -100,7 +101,19 @@ _sfcBasicAuthenticateRemote(char *user, char *pw, AuthExtras *extras)
retval = 1;
}
else if (rc == PAM_NEW_AUTHTOK_REQD || rc == PAM_ACCT_EXPIRED) {
- retval = -1;
+ retval = -1; // Only valid if sfcb is built with --enable-expired-pw-update
+ }
+ else if (rc == PAM_AUTHINFO_UNAVAIL ) {
+ retval = -2; // Temporary server error
+ if (extras) {
+ extras->ErrorDetail="PAM info unavailable.";
+ }
+ }
+ else if (rc == PAM_SERVICE_ERR ) {
+ retval = -3; // Permanent server error
+ if (extras) {
+ extras->ErrorDetail="PAM server unreachable.";
+ }
}
else {
retval = 0;
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
