[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/wbem WBEMClientCIMXML.java, 1.21.2.62, 1.21.2.63

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem
In directory vz-cvs-3.sog:/tmp/cvs-serv28206/src/org/sblim/cimclient/internal/wbem

Modified Files:
      Tag: Experimental
	WBEMClientCIMXML.java 
Log Message:
3521157 - JSR48 1.0.0: PROP_ENABLE_*_LOGGING is Level, not 0/1

Index: WBEMClientCIMXML.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java,v
retrieving revision 1.21.2.62
retrieving revision 1.21.2.63
diff -u -d -r1.21.2.62 -r1.21.2.63
--- WBEMClientCIMXML.java	3 May 2012 11:14:13 -0000	1.21.2.62
+++ WBEMClientCIMXML.java	10 May 2012 23:23:42 -0000	1.21.2.63
@@ -64,6 +64,7 @@
  * 3521119    2012-04-24  blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
  * 3521328    2012-04-25  blaschke-oss JSR48 1.0.0: remove WBEMClient associators and references
  * 3522904    2012-05-02  blaschke-oss Add new API WBEMClientSBLIM.isActive()
+ * 3521157    2012-05-10  blaschke-oss JSR48 1.0.0: PROP_ENABLE_*_LOGGING is Level, not 0/1
  */
 package org.sblim.cimclient.internal.wbem;
 
@@ -356,11 +357,9 @@
 		if (pKey.startsWith("javax.wbem.")) {
 			// Process JSR48 properties
 			if (pKey.equals(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING)) {
-				return Level.OFF.equals(this.iConfiguration.getLogConsoleLevel()) ? "0" : "1";
-			} else if (pKey.equals(WBEMClientConstants.PROP_ENABLE_DEBUG)) {
-				return this.iConfiguration.isLogDebug() ? "1" : "0";
+				return this.iConfiguration.getLogConsoleLevel().getName();
 			} else if (pKey.equals(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING)) {
-				return Level.OFF.equals(this.iConfiguration.getLogFileLevel()) ? "0" : "1";
+				return this.iConfiguration.getLogFileLevel().getName();
 			} else if (pKey.equals(WBEMClientConstants.PROP_LOG_BYTE_LIMIT)) {
 				return Integer.toString(this.iConfiguration.getLogFileSizeLimit());
 			} else if (pKey.equals(WBEMClientConstants.PROP_LOG_DIR)) {
@@ -402,14 +401,10 @@
 			// Process JSR48 properties
 			if (pKey.equals(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING)) {
 				this.iConfiguration.setDomainProperty(
-						WBEMConfigurationProperties.LOG_CONSOLE_LEVEL, pValue.equals("0") ? "OFF"
-								: "ALL");
-			} else if (pKey.equals(WBEMClientConstants.PROP_ENABLE_DEBUG)) {
-				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.LOG_DEBUG, pValue
-						.equals("0") ? "false" : "true");
+						WBEMConfigurationProperties.LOG_CONSOLE_LEVEL, pValue);
 			} else if (pKey.equals(WBEMClientConstants.PROP_ENABLE_FILE_LOGGING)) {
 				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.LOG_FILE_LEVEL,
-						pValue.equals("0") ? "OFF" : "ALL");
+						pValue);
 			} else if (pKey.equals(WBEMClientConstants.PROP_LOG_BYTE_LIMIT)) {
 				this.iConfiguration.setDomainProperty(
 						WBEMConfigurationProperties.LOG_FILE_SIZE_LIMIT, pValue);