sblim-commit — CVS Commit Info for SBLIM

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-466-g2f234a0

[Dave H. <hel...@us...>]

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  2f234a060bbdae2fe9d12770018f113ef5b1466d (commit)
      from  0af3c710a4c89cfe0b84c74fcda34bb9db65bbd7 (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 2f234a060bbdae2fe9d12770018f113ef5b1466d
Author: Dave Heller <hel...@us...>
Date:   Tue Aug 6 00:36:09 2013 -0400

    [sfcb-tix:#60] fix providerMgr trace for localconnect

-----------------------------------------------------------------------

Summary of changes:
 providerMgr.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/providerMgr.c b/providerMgr.c
index b1590a8..085eeb1 100644
--- a/providerMgr.c
+++ b/providerMgr.c
@@ -1508,12 +1508,16 @@ invokeProviders(BinRequestContext * binCtx, int *err, int *count)
   _SFCB_TRACE(1, ("--- %d providers", binCtx->pCount));
   for (i = 0; i < binCtx->pCount; i++, binCtx->pDone++) {
     binCtx->provA = binCtx->pAs[i];
-    _SFCB_TRACE_VAR_PTR(ProviderInfo *info, pReg->ft->getProviderById(pReg, binCtx->provA.ids.provId));
-
-    _SFCB_TRACE(1, ("--- Calling provider id: %d type=%lu %s (%s)",
-        info->id, info->type, info->providerName, info->className));
+    if (pReg) {
+      _SFCB_TRACE_VAR_PTR(ProviderInfo *info, pReg->ft->getProviderById(pReg,
+          binCtx->provA.ids.provId));
+      _SFCB_TRACE(1, ("--- Calling provider id: %d type=%lu %s (%s)",
+          info->id, info->type, info->providerName, info->className));
+    } else {
+      _SFCB_TRACE(1, ("--- Calling provider id: %d", binCtx->provA.ids.provId));
+    }
     resp[i] = intInvokeProvider(binCtx, sockets);
-    _SFCB_TRACE(1, ("--- back from calling provider id: %d", info->id));
+    _SFCB_TRACE(1, ("--- back from calling provider id: %d", binCtx->provA.ids.provId));
     *count += resp[i]->count;
     resp[i]->rc--;
     if (*err == 0 && resp[i]->rc != 0)


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] jsr48-client/utst/org/sblim/cimclient/unittest/slp/internal ConvertTest.java, 1.8, 1.9

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

Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/slp/internal
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1549/utst/org/sblim/cimclient/unittest/slp/internal

Modified Files:
	ConvertTest.java 
Log Message:
2650 SLP opaque value handling incorrect

Index: ConvertTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/slp/internal/ConvertTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ConvertTest.java	27 Aug 2009 14:31:35 -0000	1.8
+++ ConvertTest.java	1 Aug 2013 11:45:18 -0000	1.9
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2007, 2009
+ * (C) Copyright IBM Corp. 2007, 2013
  *
  * 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 @@
  * 2531371    2009-02-10  raman_arora  Upgrade client to JDK 1.5 (Phase 2)
  * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
  * 2823494    2009-08-03  rgummada     Change Boolean constructor to static
+ *    2650    2013-07-18  blaschke-oss SLP opaque value handling incorrect
  */
 
 package org.sblim.cimclient.unittest.slp.internal;
@@ -29,6 +30,7 @@
 import org.sblim.cimclient.unittest.GenericUTestExts;
 import org.sblim.cimclient.unittest.TestCase;
 import org.sblim.slp.ServiceLocationAttribute;
+import org.sblim.slp.ServiceLocationException;
 import org.sblim.slp.internal.AttributeHandler;
 import org.sblim.slp.internal.Convert;
 
@@ -40,8 +42,8 @@
 
 	private static final String[] RAW_STRINGS = { "(hi,joe)", "hello~(hi,joe!) world" };
 
-	private static final String[] ESCAPED_STRINGS = { "\\28hi\\2cjoe\\29",
-			"hello\\7e\\28hi\\2cjoe\\21\\29 world" };
+	private static final String[] ESCAPED_STRINGS = { "\\28hi\\2Cjoe\\29",
+			"hello\\7E\\28hi\\2Cjoe\\21\\29 world" };
 
 	/**
 	 * testEscaping
@@ -95,6 +97,88 @@
 		}
 	}
 
+	private static final String[] ATTR_TAG = { //
+	"attrib-integer1", // 0
+			"attrib-integer2", // 1
+			"attrib-integer3", // 2
+			"attrib-boolean1", // 3
+			"attrib-boolean2", // 4
+			"attrib-opaque1", // 5
+			"attrib-opaque2", // 6
+			"attrib-opaque3", // 7
+			"attrib-opaque4", // 8
+			"attrib-opaque5", // 9
+			"attrib-opaque6", // 10
+	};
+
+	private static final Object[][] ATTR_VAL = {//
+	new Object[] { new Integer(42) }, // 0
+			new Object[] { new Integer(12), new Integer(34) }, // 1
+			new Object[] { new Integer(-86) }, // 2
+			new Object[] { Boolean.TRUE }, // 3
+			new Object[] { Boolean.TRUE, Boolean.FALSE }, // 4
+			new Object[] { new byte[] { 0x00 } }, // 5
+			new Object[] { new byte[] { 0x01, 0x02 } }, // 6
+			new Object[] { new byte[] { 0x03 }, new byte[] { 0x04 } }, // 7
+			new Object[] { new byte[] { 5, 6 }, new byte[] { 7, 8 } }, // 8
+			new Object[] { new byte[] { 62, 63, 64, 65, 66 } }, // 9
+			new Object[] { new byte[] { -34, -79 } }, // 10
+	};
+
+	private static final String[] ATTR_EXP = {//
+	"(attrib-integer1=42)", // 0
+			"(attrib-integer2=12,34)", // 1
+			"(attrib-integer3=-86)", // 2
+			"(attrib-boolean1=true)", // 3
+			"(attrib-boolean2=true,false)", // 4
+			"(attrib-opaque1=\\FF\\00)", // 5
+			"(attrib-opaque2=\\FF\\01\\02)", // 6
+			"(attrib-opaque3=\\FF\\03,\\FF\\04)", // 7
+			"(attrib-opaque4=\\FF\\05\\06,\\FF\\07\\08)", // 8
+			"(attrib-opaque5=\\FF\\3E\\3F\\40\\41\\42)", // 9
+			"(attrib-opaque6=\\FF\\DE\\B1)", // 10
+	};
+
+	/**
+	 * testValidAttribs
+	 * 
+	 * @throws Exception
+	 */
+	public void testValidAttribs() throws Exception {
+		verify("testValidAttribs arrays not of same length!", (ATTR_TAG.length == ATTR_VAL.length)
+				&& (ATTR_TAG.length == ATTR_EXP.length));
+
+		for (int i = 0; i < ATTR_TAG.length; i++) {
+			String tag = ATTR_TAG[i];
+			Vector<Object> val = GenericUTestExts.mkVec(ATTR_VAL[i]);
+			ServiceLocationAttribute sla = new ServiceLocationAttribute(tag, val);
+
+			verify("Unexpected attribute value for tag " + tag + ": " + sla.toString(), ATTR_EXP[i]
+					.equalsIgnoreCase(sla.toString()));
+		}
+	}
+
+	private static final String[] ATTR_BAD = { "(tag=\\FF)", "(tag=\\FF\\)", "(tag=\\FF\\1)",
+			"(tag=\\FF\\123)", "(tag=\\FF\\1G)", "(tag=\\FF789)", "(tag=\\FF\\\\1)" };
+
+	/**
+	 * testInvalidAttribs
+	 * 
+	 * @throws Exception
+	 */
+	public void testInvalidAttribs() throws Exception {
+		for (int i = 0; i < ATTR_BAD.length; i++) {
+			try {
+				new ServiceLocationAttribute(ATTR_BAD[i]);
+				fail("Invalid attribute " + ATTR_BAD[i] + " did not generate exception");
+			} catch (Exception e) {
+				debug(ATTR_BAD[i] + " produced " + e.getMessage());
+				verify("Attribute " + ATTR_BAD[i] + " generated unexpected exception "
+						+ e.getClass().getName(), e instanceof ServiceLocationException);
+			}
+		}
+	}
+
 	/**
 	 * @param pMsg
 	 */

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

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

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3766/src/org/sblim/cimclient/internal/wbem

Modified Files:
      Tag: Experimental
	WBEMClientCIMXML.java 
Log Message:
2651 IOException when tracing the cimxml

Index: WBEMClientCIMXML.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java,v
retrieving revision 1.21.2.75
retrieving revision 1.21.2.76
diff -u -d -r1.21.2.75 -r1.21.2.76
--- WBEMClientCIMXML.java	31 Jul 2013 14:13:16 -0000	1.21.2.75
+++ WBEMClientCIMXML.java	31 Jul 2013 14:19:22 -0000	1.21.2.76
@@ -78,7 +78,6 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -164,8 +163,6 @@
 
 	private final WBEMConfiguration iConfiguration = new WBEMConfiguration(new Properties());
 
-	private FileOutputStream iCimXmlTraceFile = null;
-
 	private Locale[] iLocales; // final
 
 	private HttpClientPool iHttpClientPool; // final

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/logging LogAndTraceBroker.java, 1.10.2.20, 1.10.2.21

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

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/logging
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3121/src/org/sblim/cimclient/internal/logging

Modified Files:
      Tag: Experimental
	LogAndTraceBroker.java 
Log Message:
2651 IOException when tracing the cimxml

Index: LogAndTraceBroker.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/logging/LogAndTraceBroker.java,v
retrieving revision 1.10.2.20
retrieving revision 1.10.2.21
diff -u -d -r1.10.2.20 -r1.10.2.21
--- LogAndTraceBroker.java	26 Jul 2013 17:57:28 -0000	1.10.2.20
+++ LogAndTraceBroker.java	31 Jul 2013 14:13:16 -0000	1.10.2.21
@@ -32,10 +32,12 @@
  * 3576396    2012-10-11  blaschke-oss Improve logging of config file name
  * 3596303    2013-01-04  blaschke-oss windows http response WWW-Authenticate: Negotiate fails
  *    2652    2013-07-26  blaschke-oss LogAndTraceBroker.setXmlTraceStream should not close previous stream
+ *    2651    2013-07-31  blaschke-oss IOException when tracing the cimxml 
  */
 
 package org.sblim.cimclient.internal.logging;
 
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -54,6 +56,7 @@
 import org.sblim.cimclient.LogAndTraceManager;
 import org.sblim.cimclient.LogListener;
 import org.sblim.cimclient.TraceListener;
+import org.sblim.cimclient.WBEMConfigurationProperties;
 import org.sblim.cimclient.internal.util.WBEMConfiguration;
 import org.sblim.cimclient.internal.util.WBEMConstants;
 
@@ -116,6 +119,8 @@
 
 	private OutputStream iXmlTraceStream = null;
 
+	private OutputStream iXmlTraceFile = null;
+
 	private final String iTHIS_CLASS = this.getClass().getName();
 
 	private final String iTHROWABLE = Throwable.class.getName();
@@ -148,6 +153,20 @@
 		this.iCIMXMLTraceListeners = new ArrayList<CIMXMLTraceListener>();
 		loadVersionTxt();
 		registerInternalListeners();
+		initXmlTraceFile();
+	}
+
+	@Override
+	protected void finalize() throws Throwable {
+		try {
+			if (this.iXmlTraceFile != null && (!this.iXmlTraceFile.equals(System.out))
+					&& (!this.iXmlTraceFile.equals(System.err))) this.iXmlTraceFile.close();
+		} catch (IOException e) {
+			// bad luck
+		} finally {
+			this.iXmlTraceFile = null;
+			super.finalize();
+		}
 	}
 
 	/**
@@ -738,6 +757,39 @@
 		this.iXmlTraceStream = pStream;
 	}
 
+	/*
+	 * Initializes the CIM-XML trace file (sblim.wbem.cimxmlTraceStream) during
+	 * initialization of LogAndTraceBroker - the trace file is used if CIM-XML
+	 * tracing is enabled (sblim.wbem.cimxmlTracing=true) but there is no
+	 * CIM-XML trace stream set via setXmlTraceStream()
+	 */
+	private void initXmlTraceFile() {
+		try {
+			if (WBEMConfiguration.getGlobalConfiguration().isCimXmlTracingEnabled()) {
+				String filename = WBEMConfiguration.getGlobalConfiguration().getCimXmlTraceStream();
+				if (filename != null && filename.length() > 0 && this.iXmlTraceFile == null
+						&& getXmlTraceStream() == null) {
+					if (filename.equalsIgnoreCase("System.out")) {
+						this.iXmlTraceFile = System.out;
+					} else if (filename.equalsIgnoreCase("System.err")) {
+						this.iXmlTraceFile = System.err;
+					} else {
+						try {
+							this.iXmlTraceFile = new FileOutputStream(filename);
+						} catch (IOException e) {
+							trace(Level.FINE, "Unable to open "
+									+ WBEMConfigurationProperties.CIMXML_TRACE_STREAM + "="
+									+ filename, e);
+						}
+					}
+					setXmlTraceStream(this.iXmlTraceFile);
+				}
+			}
+		} catch (Exception e) {
+			// Don't crash for logging
+		}
+	}
+
 	/**
 	 * Analyzes the stack trace and determines from where the
 	 * <code>LogAndTraceBroker</code> was called.

[Sblim-commit] jsr48-client NEWS,1.358,1.359

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

Update of /cvsroot/sblim/jsr48-client
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6049

Modified Files:
	NEWS 
Log Message:
2604 SAXException messages should contain node name

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/NEWS,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -d -r1.358 -r1.359
--- NEWS	29 Jul 2013 15:02:18 -0000	1.358
+++ NEWS	29 Jul 2013 15:30:24 -0000	1.359
@@ -1,5 +1,6 @@
 Changes in HEAD
 ================
+   2604 SAXException messages should contain node name
    2647 Add two ssl protocol properties for http server and client
    
 Version 2.2.3

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/util WBEMConfiguration.java, 1.51, 1.52

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

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4932/src/org/sblim/cimclient/internal/util

Modified Files:
	WBEMConfiguration.java 
Log Message:
2647 Add two ssl protocol properties for http server and client

Index: WBEMConfiguration.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util/WBEMConfiguration.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- WBEMConfiguration.java	30 May 2013 13:10:35 -0000	1.51
+++ WBEMConfiguration.java	29 Jul 2013 15:02:18 -0000	1.52
@@ -49,6 +49,7 @@
  *    2628    2013-03-26  blaschke-oss Limit size of LinkedList of CIMEvents to be dispatched
  *    2635    2013-05-16  blaschke-oss Slowloris DoS attack for CIM indication listener port
  *    2642    2013-05-21  blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers
+ *    2647    2013-07-01  blaschke-oss Add two ssl protocol properties for http server and client
  */
 
 package org.sblim.cimclient.internal.util;
@@ -721,6 +722,24 @@
 	}
 
 	/**
+	 * getSslClientProtocol
+	 * 
+	 * @return The SSL protocol for SSLContext.getInstance() for client
+	 */
+	public String getSslClientProtocol() {
+		return getProperty(WBEMConfigurationProperties.SSL_CLIENT_PROTOCOL, null);
+	}
+
+	/**
+	 * getSslListenerProtocol
+	 * 
+	 * @return The SSL protocol for SSLContext.getInstance() for listener
+	 */
+	public String getSslListenerProtocol() {
+		return getProperty(WBEMConfigurationProperties.SSL_LISTENER_PROTOCOL, null);
+	}
+
+	/**
 	 * Returns the certificate algorithm the key manager will use
 	 * 
 	 * @return The key mangers algorithm

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/http HttpClient.java, 1.12.2.37, 1.12.2.38

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

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/http
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3584/src/org/sblim/cimclient/internal/http

Modified Files:
      Tag: Experimental
	HttpClient.java 
Log Message:
2654 Check jcc idle time with CIMOM keepalive timeout to avoid EOF

Index: HttpClient.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/http/HttpClient.java,v
retrieving revision 1.12.2.37
retrieving revision 1.12.2.38
diff -u -d -r1.12.2.37 -r1.12.2.38
--- HttpClient.java	21 May 2013 15:06:49 -0000	1.12.2.37
+++ HttpClient.java	29 Jul 2013 14:27:33 -0000	1.12.2.38
@@ -71,6 +71,7 @@
  *    2621    2013-02-23  blaschke-oss Not all chunked input has trailers
  *    2618    2013-02-27  blaschke-oss Need to add property to disable weak cipher suites for the secure indication
  *    2642    2013-05-21  blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers
+ *    2654    2013-07-29  blaschke-oss Check jcc idle time with CIMOM keepalive timeout to avoid EOF
  */
 package org.sblim.cimclient.internal.http;
 
@@ -551,6 +552,29 @@
 					logger.trace(Level.FINER, "Attempting http request (retry counters:" + IoRetry
 							+ "/" + AuthentificationRetry + ")");
 					long RequestTime = System.currentTimeMillis();
+
+					if (this.iPreviousResponseTime != -1) {
+						long time = RequestTime - this.iPreviousResponseTime;
+						long maxTime = this.iHttpClientPool.getConfigurationContext()
+								.getSocketIdleTimeout();
+						if (maxTime > 0 && time > maxTime) {
+							logger.trace(Level.FINER, "Closing socket after " + time
+									+ "ms of idle time");
+
+							if (this.iSocket != null && !this.iSocket.isClosed()) {
+								try {
+									this.iSocket.close();
+								} catch (IOException e) {
+									logger.trace(Level.FINER,
+											"Exception caught while closing socket", e);
+								}
+							}
+							this.iSocket = null;
+							this.iReset = true;
+							this.iResponse = null;
+						}
+					}
+
 					ResponseTime = -1;
 					resetSocket();
 					this.iReset = false;

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/util WBEMConfiguration.java, 1.17.2.41, 1.17.2.42 WBEMConfigurationDefaults.java, 1.11.2.25, 1.11.2.26

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

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3584/src/org/sblim/cimclient/internal/util

Modified Files:
      Tag: Experimental
	WBEMConfiguration.java WBEMConfigurationDefaults.java 
Log Message:
2654 Check jcc idle time with CIMOM keepalive timeout to avoid EOF

Index: WBEMConfigurationDefaults.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util/WBEMConfigurationDefaults.java,v
retrieving revision 1.11.2.25
retrieving revision 1.11.2.26
diff -u -d -r1.11.2.25 -r1.11.2.26
--- WBEMConfigurationDefaults.java	16 May 2013 18:55:51 -0000	1.11.2.25
+++ WBEMConfigurationDefaults.java	29 Jul 2013 14:27:33 -0000	1.11.2.26
@@ -40,6 +40,7 @@
  * 3598613    2013-01-11  blaschke-oss different data type in cim instance and cim object path
  *    2628    2013-03-26  blaschke-oss Limit size of LinkedList of CIMEvents to be dispatched
  *    2635    2013-05-16  blaschke-oss Slowloris DoS attack for CIM indication listener port
+ *    2654    2013-07-29  blaschke-oss Check jcc idle time with CIMOM keepalive timeout to avoid EOF
  */
 
 package org.sblim.cimclient.internal.util;
@@ -211,6 +212,11 @@
 	public static final String SOCKET_CONNECT_TIMEOUT = "0";
 
 	/**
+	 * SOCKET_IDLE_TIMEOUT
+	 */
+	public static final String SOCKET_IDLE_TIMEOUT = "0";
+
+	/**
 	 * KEY_CREDENTIALS_DEFAULT_ENABLED
 	 */
 	public static final String KEY_CREDENTIALS_DEFAULT_ENABLED = "false";

Index: WBEMConfiguration.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util/WBEMConfiguration.java,v
retrieving revision 1.17.2.41
retrieving revision 1.17.2.42
diff -u -d -r1.17.2.41 -r1.17.2.42
--- WBEMConfiguration.java	26 Jul 2013 18:35:14 -0000	1.17.2.41
+++ WBEMConfiguration.java	29 Jul 2013 14:27:33 -0000	1.17.2.42
@@ -51,6 +51,7 @@
  *    2642    2013-05-21  blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers
  *    2647    2013-07-01  blaschke-oss Add two ssl protocol properties for http server and client
  *    2653    2013-07-26  blaschke-oss FVT: java.lang.ExceptionInInitializerError during static init
+ *    2654    2013-07-29  blaschke-oss Check jcc idle time with CIMOM keepalive timeout to avoid EOF
  */
 
 package org.sblim.cimclient.internal.util;
@@ -922,6 +923,16 @@
 	}
 
 	/**
+	 * Returns the socket idle timeout
+	 * 
+	 * @return The socket idle timeout
+	 */
+	public int getSocketIdleTimeout() {
+		return Integer.parseInt(getProperty(WBEMConfigurationProperties.SOCKET_IDLE_TIMEOUT,
+				WBEMConfigurationDefaults.SOCKET_IDLE_TIMEOUT));
+	}
+
+	/**
 	 * isDefaultAuthorizationEnabled
 	 * 
 	 * @return true if default authorization is enabled

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-465-g0af3c71

[Chris B. <buc...@us...>]

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  0af3c710a4c89cfe0b84c74fcda34bb9db65bbd7 (commit)
      from  a8dd746ddcb115a28abe2bcd1af1be929cd3b15b (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 0af3c710a4c89cfe0b84c74fcda34bb9db65bbd7
Author: buccella <buc...@li...>
Date:   Sat Jul 27 17:11:40 2013 -0400

    [sfcb-tix:#66] SFCB_TRACE_VAR should be more restrictive

-----------------------------------------------------------------------

Summary of changes:
 interopProvider.c |   12 ++++++------
 providerDrv.c     |    4 ++--
 providerMgr.c     |    3 ++-
 trace.h           |    4 ++++
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/interopProvider.c b/interopProvider.c
index d71be3d..4591289 100644
--- a/interopProvider.c
+++ b/interopProvider.c
@@ -1591,8 +1591,8 @@ InteropProviderInvokeMethod(CMPIMethodMI * mi,
            subscriptionHt->ft->getNext(subscriptionHt, i,
                                        (void **) &suName, (void **) &su)) {
         if ((void *) su->fi == filterId) {
-          _SFCB_TRACE_VAR(CMPIString *str = CDToString(_broker, su->ha->hop, NULL));
-          _SFCB_TRACE_VAR(CMPIString *ns = CMGetNameSpace(su->ha->hop, NULL));
+          _SFCB_TRACE_VAR_PTR(CMPIString *str, CDToString(_broker, su->ha->hop, NULL));
+          _SFCB_TRACE_VAR_PTR(CMPIString *ns, CMGetNameSpace(su->ha->hop, NULL));
           _SFCB_TRACE(1,
                       ("--- invoke handler %s %s", (char *) ns->hdl,
                        (char *) str->hdl));
@@ -1641,8 +1641,8 @@ InteropProviderInvokeMethod(CMPIMethodMI * mi,
 
     CMPIInstance   *ci = in->ft->getArg(in, "handler", &st).value.inst;
     CMPIObjectPath *op = in->ft->getArg(in, "key", &st).value.ref;
-    _SFCB_TRACE_VAR(CMPIString *str = CDToString(_broker, op, NULL));
-    _SFCB_TRACE_VAR(CMPIString *ns = CMGetNameSpace(op, NULL));
+    _SFCB_TRACE_VAR_PTR(CMPIString *str, CDToString(_broker, op, NULL));
+    _SFCB_TRACE_VAR_PTR(CMPIString *ns, CMGetNameSpace(op, NULL));
     _SFCB_TRACE(1,
                 ("--- _addHandler %s %s", (char *) ns->hdl,
                  (char *) str->hdl));
@@ -1673,8 +1673,8 @@ InteropProviderInvokeMethod(CMPIMethodMI * mi,
   else if (strcasecmp(methodName, "_updateHandler") == 0) {
     CMPIInstance *ci=in->ft->getArg(in,"handler",&st).value.inst;
     CMPIObjectPath *op=in->ft->getArg(in,"key",&st).value.ref;
-    _SFCB_TRACE_VAR(CMPIString *str=CDToString(_broker,op,NULL));
-    _SFCB_TRACE_VAR(CMPIString *ns=CMGetNameSpace(op,NULL));
+    _SFCB_TRACE_VAR_PTR(CMPIString *str, CDToString(_broker,op,NULL));
+    _SFCB_TRACE_VAR_PTR(CMPIString *ns, CMGetNameSpace(op,NULL));
     _SFCB_TRACE(1,("--- _updateHandler %s %s",(char*)ns->hdl,(char*)str->hdl));
     updateHandler(ci,op);     
   }
diff --git a/providerDrv.c b/providerDrv.c
index bf9f6c4..2c3cb50 100644
--- a/providerDrv.c
+++ b/providerDrv.c
@@ -1338,8 +1338,8 @@ getClass(BinRequestHdr * hdr, ProviderInfo * info, int __attribute__ ((unused))
 
   _SFCB_ENTER(TRACE_PROVIDERDRV, "getClass");
 
-  _SFCB_TRACE_VAR(char *cn = CMGetClassName(path, NULL)->hdl);
-  _SFCB_TRACE_VAR(char *ns = CMGetNameSpace(path, NULL)->hdl);
+  _SFCB_TRACE_VAR_PTR(char *cn, CMGetClassName(path, NULL)->hdl);
+  _SFCB_TRACE_VAR_PTR(char *ns, CMGetNameSpace(path, NULL)->hdl);
   _SFCB_TRACE(1, ("--- Namespace %s ClassName %s", ns, cn));
 
   if (req->hdr.flags & FL_localOnly)
diff --git a/providerMgr.c b/providerMgr.c
index 96b27b8..b1590a8 100644
--- a/providerMgr.c
+++ b/providerMgr.c
@@ -1508,7 +1508,8 @@ invokeProviders(BinRequestContext * binCtx, int *err, int *count)
   _SFCB_TRACE(1, ("--- %d providers", binCtx->pCount));
   for (i = 0; i < binCtx->pCount; i++, binCtx->pDone++) {
     binCtx->provA = binCtx->pAs[i];
-    _SFCB_TRACE_VAR(ProviderInfo *info = pReg->ft->getProviderById(pReg, binCtx->provA.ids.provId));
+    _SFCB_TRACE_VAR_PTR(ProviderInfo *info, pReg->ft->getProviderById(pReg, binCtx->provA.ids.provId));
+
     _SFCB_TRACE(1, ("--- Calling provider id: %d type=%lu %s (%s)",
         info->id, info->type, info->providerName, info->className));
     resp[i] = intInvokeProvider(binCtx, sockets);
diff --git a/trace.h b/trace.h
index e7f37f3..2c6d8be 100644
--- a/trace.h
+++ b/trace.h
@@ -34,6 +34,10 @@ extern unsigned long *_ptr_sfcb_trace_mask;
 /* to wrap variables used only in trace statements */
 #define _SFCB_TRACE_VAR(f) f;
 
+/* we want the scope of variable v outside the if block */
+#define _SFCB_TRACE_VAR_PTR(v,f) \
+  v = ((*_ptr_sfcb_trace_mask & __traceMask)) ? f : NULL;
+
 #define _SFCB_TRACE(LEVEL,STR) \
   if ((*_ptr_sfcb_trace_mask & __traceMask) && (LEVEL<=_sfcb_debug) && (LEVEL>0) ) \
   _sfcb_trace(LEVEL,__FILE__,__LINE__,_sfcb_format_trace STR);


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/util WBEMConfiguration.java, 1.17.2.40, 1.17.2.41

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

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8368/src/org/sblim/cimclient/internal/util

Modified Files:
      Tag: Experimental
	WBEMConfiguration.java 
Log Message:
2653 FVT: java.lang.ExceptionInInitializerError during static init

Index: WBEMConfiguration.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util/WBEMConfiguration.java,v
retrieving revision 1.17.2.40
retrieving revision 1.17.2.41
diff -u -d -r1.17.2.40 -r1.17.2.41
--- WBEMConfiguration.java	1 Jul 2013 18:48:59 -0000	1.17.2.40
+++ WBEMConfiguration.java	26 Jul 2013 18:35:14 -0000	1.17.2.41
@@ -50,6 +50,7 @@
  *    2635    2013-05-16  blaschke-oss Slowloris DoS attack for CIM indication listener port
  *    2642    2013-05-21  blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers
  *    2647    2013-07-01  blaschke-oss Add two ssl protocol properties for http server and client
+ *    2653    2013-07-26  blaschke-oss FVT: java.lang.ExceptionInInitializerError during static init
  */
 
 package org.sblim.cimclient.internal.util;
@@ -69,8 +70,6 @@
 import javax.net.SocketFactory;
 
 import org.sblim.cimclient.WBEMConfigurationProperties;
-import org.sblim.cimclient.internal.logging.LogAndTraceBroker;
-import org.sblim.cimclient.internal.logging.Messages;
 
 /**
  * Class WBEMConfigurationFile is responsible for initializing the the
@@ -123,12 +122,12 @@
 				} else if (key.startsWith("ssl.")) {
 					String value = String.valueOf(entry.getValue());
 					Security.setProperty(key, value);
-				} else {
-					if (LogAndTraceBroker.isLoggingStarted()) {
-						LogAndTraceBroker.getBroker().message(Messages.INVALID_KEY_IN_CONFIG_FILE,
-								key);
-					}
-				}
+				} // else { LogAndTraceBroker is NOT initialized yet
+				// if (LogAndTraceBroker.isLoggingStarted()) {
+				// LogAndTraceBroker.getBroker().message(Messages.INVALID_KEY_IN_CONFIG_FILE,
+				// key);
+				// }
+				// }
 			}
 		} catch (IOException e) {
 			cLoadException = e;

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/logging LogAndTraceBroker.java, 1.10.2.19, 1.10.2.20

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

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/logging
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6080/src/org/sblim/cimclient/internal/logging

Modified Files:
      Tag: Experimental
	LogAndTraceBroker.java 
Log Message:
2652 LogAndTraceBroker.setXmlTraceStream should not close previous stream

Index: LogAndTraceBroker.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/logging/LogAndTraceBroker.java,v
retrieving revision 1.10.2.19
retrieving revision 1.10.2.20
diff -u -d -r1.10.2.19 -r1.10.2.20
--- LogAndTraceBroker.java	17 Jan 2013 02:44:40 -0000	1.10.2.19
+++ LogAndTraceBroker.java	26 Jul 2013 17:57:28 -0000	1.10.2.20
@@ -31,6 +31,7 @@
  * 3554738    2012-08-16  blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
  * 3576396    2012-10-11  blaschke-oss Improve logging of config file name
  * 3596303    2013-01-04  blaschke-oss windows http response WWW-Authenticate: Negotiate fails
+ *    2652    2013-07-26  blaschke-oss LogAndTraceBroker.setXmlTraceStream should not close previous stream
  */
 
 package org.sblim.cimclient.internal.logging;
@@ -734,14 +735,6 @@
 	 *            CIM-XML debugging is disabled.
 	 */
 	public void setXmlTraceStream(OutputStream pStream) {
-		if ((this.iXmlTraceStream != null) && (!this.iXmlTraceStream.equals(System.out))
-				&& (!this.iXmlTraceStream.equals(System.err))) {
-			try {
-				this.iXmlTraceStream.close();
-			} catch (IOException e) {
-				// just ignore it
-			}
-		}
 		this.iXmlTraceStream = pStream;
 	}
 

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

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

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6451/src/org/sblim/cimclient/internal/wbem

Modified Files:
      Tag: Experimental
	WBEMClientCIMXML.java 
Log Message:
2651 [UNDO] IOException when tracing the cimxml

Index: WBEMClientCIMXML.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java,v
retrieving revision 1.21.2.73
retrieving revision 1.21.2.74
diff -u -d -r1.21.2.73 -r1.21.2.74
--- WBEMClientCIMXML.java	24 Jul 2013 14:38:56 -0000	1.21.2.73
+++ WBEMClientCIMXML.java	25 Jul 2013 10:17:18 -0000	1.21.2.74
@@ -72,7 +72,6 @@
  * 3601894    2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
  *    2614    2013-02-21  blaschke-oss Remove redundant code in transmitRequest
  *    2616    2013-02-23  blaschke-oss Add new API WBEMClientSBLIM.sendIndication()
- *    2651    2013-07-23  blaschke-oss IOException when tracing the cimxml
  */
 package org.sblim.cimclient.internal.wbem;
 
@@ -164,9 +163,7 @@
 
 	private final WBEMConfiguration iConfiguration = new WBEMConfiguration(new Properties());
 
-	private static FileOutputStream iCimXmlTraceFile = null;
-
-	private static int iActiveInstances = 0;
+	private FileOutputStream iCimXmlTraceFile = null;
 
 	private Locale[] iLocales; // final
 
@@ -261,17 +258,15 @@
 			if (this.iConfiguration.isCimXmlTracingEnabled()
 					&& LogAndTraceBroker.getBroker().getXmlTraceStream() == null) {
 				String filename = this.iConfiguration.getCimXmlTraceStream();
-				if (filename != null && filename.length() > 0
-						&& WBEMClientCIMXML.iCimXmlTraceFile == null) {
+				if (filename != null && filename.length() > 0) {
 					if (filename.equalsIgnoreCase("System.out")) {
 						LogAndTraceBroker.getBroker().setXmlTraceStream(System.out);
 					} else if (filename.equalsIgnoreCase("System.err")) {
 						LogAndTraceBroker.getBroker().setXmlTraceStream(System.err);
 					} else {
 						try {
-							WBEMClientCIMXML.iCimXmlTraceFile = new FileOutputStream(filename);
-							LogAndTraceBroker.getBroker().setXmlTraceStream(
-									WBEMClientCIMXML.iCimXmlTraceFile);
+							this.iCimXmlTraceFile = new FileOutputStream(filename);
+							LogAndTraceBroker.getBroker().setXmlTraceStream(this.iCimXmlTraceFile);
 						} catch (IOException e) {
 							logger.trace(Level.FINE, "Unable to open "
 									+ WBEMConfigurationProperties.CIMXML_TRACE_STREAM + "="
@@ -282,7 +277,6 @@
 			}
 
 			this.iInitialized = true;
-			++WBEMClientCIMXML.iActiveInstances;
 
 		} finally {
 			logger.exit();
@@ -635,16 +629,12 @@
 			if (this.iHttpClientPool != null) {
 				this.iHttpClientPool.closePool();
 			}
-		} finally {
-			if (--WBEMClientCIMXML.iActiveInstances <= 0
-					&& WBEMClientCIMXML.iCimXmlTraceFile != null) {
-				try {
-					WBEMClientCIMXML.iCimXmlTraceFile.close();
-				} catch (IOException e) {
-					// Ignore CIM-XML trace file exception
-				}
-				WBEMClientCIMXML.iCimXmlTraceFile = null;
+			if (this.iCimXmlTraceFile != null) {
+				this.iCimXmlTraceFile.close();
 			}
+		} catch (IOException e) {
+			// Ignore CIM-XML trace file exception
+		} finally {
 			this.iClosed = true;
 			logger.exit();
 		}

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-464-ga8dd746

[Chris B. <buc...@us...>]

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  a8dd746ddcb115a28abe2bcd1af1be929cd3b15b (commit)
       via  33fe8f3d103e3930d0802f7e44ce21e7c7eafb53 (commit)
       via  05954c4d337032980763ce719d10a1fe598b9016 (commit)
      from  87e189a4a2d69057c482fe03092d5e39114b857b (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 a8dd746ddcb115a28abe2bcd1af1be929cd3b15b
Merge: 33fe8f3 87e189a
Author: buccella <buc...@li...>
Date:   Fri Jul 19 16:50:47 2013 -0400

    Merge branch 'master' of ssh://git.code.sf.net/p/sblim/sfcb

commit 33fe8f3d103e3930d0802f7e44ce21e7c7eafb53
Author: buccella <buc...@li...>
Date:   Thu Jul 18 13:10:14 2013 -0400

    [sfcb-tix:#63] Improve NamespaceProvider and ClassProvider Consistency

commit 05954c4d337032980763ce719d10a1fe598b9016
Author: buccella <buc...@li...>
Date:   Mon Jul 15 16:55:01 2013 -0400

    [sfcb-tix:#61] classProviderSf.c SIGSEGV if repo is not initialized

-----------------------------------------------------------------------

Summary of changes:
 classProvider.c         |   32 ++++++++++++
 classProviderGz.c       |   32 ++++++++++++
 classProviderMem.c      |   32 ++++++++++++
 classProviderSf.c       |   41 ++++++++++++++--
 interopServerProvider.c |  128 +++++++++++++++--------------------------------
 5 files changed, 174 insertions(+), 91 deletions(-)

diff --git a/classProvider.c b/classProvider.c
index 583997a..9a8765b 100644
--- a/classProvider.c
+++ b/classProvider.c
@@ -1208,6 +1208,38 @@ ClassProviderInvokeMethod(CMPIMethodMI * mi,
     st.rc = traverseChildren(cReg, parent, chldn);
   }
 
+  else if (strcasecmp(methodName, "listnamespaces") == 0) {
+
+    HashTableIterator *hit;
+    char           *key;
+    ClassRegister  *cReg;
+
+    CMPIArray* ar = CMNewArray(_broker, nsHt->ft->size(nsHt), CMPI_string, NULL);
+    int i = 0;
+
+    /* req for specific ns */
+    CMPIData nsd = CMGetArg(in, "ns", &st);
+    if (st.rc == CMPI_RC_OK) {
+      char* ns = CMGetCharPtr(nsd.value.string);
+        ClassRegister  *cReg = NULL;
+        cReg = nsHt->ft->get(nsHt, ns);
+        st.rc = (cReg) ? CMPI_RC_OK : CMPI_RC_ERR_NOT_FOUND;
+    }
+    else {
+      for (hit = nsHt->ft->getFirst(nsHt, (void **) &key, (void **) &cReg);
+           key && hit;
+           hit =
+             nsHt->ft->getNext(nsHt, hit, (void **) &key, (void **) &cReg)) {
+
+        CMSetArrayElementAt(ar, i++, key, CMPI_chars);
+      }
+  
+      CMAddArg(out, "nslist", &ar, CMPI_stringA);
+      st.rc = CMPI_RC_OK;
+    }
+
+  }
+
   else if (strcasecmp(methodName, "_startup") == 0) {
 
     /* let providerMgr know that we're odne init'ing  */
diff --git a/classProviderGz.c b/classProviderGz.c
index 34b0558..eb17c36 100644
--- a/classProviderGz.c
+++ b/classProviderGz.c
@@ -1078,6 +1078,38 @@ ClassProviderInvokeMethod(CMPIMethodMI * mi,
     st.rc = traverseChildren(cReg, parent, chldn);
   }
 
+  else if (strcasecmp(methodName, "listnamespaces") == 0) {
+
+    HashTableIterator *hit;
+    char           *key;
+    ClassRegister  *cReg;
+
+    CMPIArray* ar = CMNewArray(_broker, nsHt->ft->size(nsHt), CMPI_string, NULL);
+    int i = 0;
+
+    /* req for specific ns */
+    CMPIData nsd = CMGetArg(in, "ns", &st);
+    if (st.rc == CMPI_RC_OK) {
+      char* ns = CMGetCharPtr(nsd.value.string);
+        ClassRegister  *cReg = NULL;
+        cReg = nsHt->ft->get(nsHt, ns);
+        st.rc = (cReg) ? CMPI_RC_OK : CMPI_RC_ERR_NOT_FOUND;
+    }
+    else {
+      for (hit = nsHt->ft->getFirst(nsHt, (void **) &key, (void **) &cReg);
+           key && hit;
+           hit =
+             nsHt->ft->getNext(nsHt, hit, (void **) &key, (void **) &cReg)) {
+
+        CMSetArrayElementAt(ar, i++, key, CMPI_chars);
+      }
+  
+      CMAddArg(out, "nslist", &ar, CMPI_stringA);
+      st.rc = CMPI_RC_OK;
+    }
+
+  }
+
   else if (strcasecmp(methodName, "_startup") == 0) {
 
     /*
diff --git a/classProviderMem.c b/classProviderMem.c
index 1a2ce6b..411abca 100644
--- a/classProviderMem.c
+++ b/classProviderMem.c
@@ -1026,6 +1026,38 @@ ClassProviderInvokeMethod(CMPIMethodMI * mi,
     st.rc = traverseChildren(cReg, parent, chldn);
   }
 
+  else if (strcasecmp(methodName, "listnamespaces") == 0) {
+
+    HashTableIterator *hit;
+    char           *key;
+    ClassRegister  *cReg;
+
+    CMPIArray* ar = CMNewArray(_broker, nsHt->ft->size(nsHt), CMPI_string, NULL);
+    int i = 0;
+
+    /* req for specific ns */
+    CMPIData nsd = CMGetArg(in, "ns", &st);
+    if (st.rc == CMPI_RC_OK) {
+      char* ns = CMGetCharPtr(nsd.value.string);
+        ClassRegister  *cReg = NULL;
+        cReg = nsHt->ft->get(nsHt, ns);
+        st.rc = (cReg) ? CMPI_RC_OK : CMPI_RC_ERR_NOT_FOUND;
+    }
+    else {
+      for (hit = nsHt->ft->getFirst(nsHt, (void **) &key, (void **) &cReg);
+           key && hit;
+           hit =
+             nsHt->ft->getNext(nsHt, hit, (void **) &key, (void **) &cReg)) {
+
+        CMSetArrayElementAt(ar, i++, key, CMPI_chars);
+      }
+  
+      CMAddArg(out, "nslist", &ar, CMPI_stringA);
+      st.rc = CMPI_RC_OK;
+    }
+
+  }
+
   else if (strcasecmp(methodName, "_startup") == 0) {
 
     /* let providerMgr know that we're odne init'ing  */
diff --git a/classProviderSf.c b/classProviderSf.c
index b1f8f68..8e69599 100644
--- a/classProviderSf.c
+++ b/classProviderSf.c
@@ -493,7 +493,9 @@ gatherNameSpaces(char *dn, UtilHashTable * ns, int first)
       closedir(dir_test);
       cr = newClassRegister(n);
       if (cr) {
-        ns->ft->put(ns, strdup(n + nsBaseLen), cr);
+	/* couldn't open classSchemas, don't put it in the ht */
+        if (cr->f)
+          ns->ft->put(ns, strdup(n + nsBaseLen), cr);
         gatherNameSpaces(n, ns, 0);
       }
       free(n);
@@ -1387,7 +1389,7 @@ ClassProviderInvokeMethod(CMPIMethodMI * mi,
 
   cReg = getNsReg(ref, &rc);
   if (cReg == NULL) {
-    CMPIStatus      st = { CMPI_RC_ERR_INVALID_NAMESPACE, NULL };
+    st.rc = CMPI_RC_ERR_INVALID_NAMESPACE;
     semRelease(sfcbSem,INIT_CLASS_PROV_ID);
     _SFCB_RETURN(st);
   }
@@ -1422,7 +1424,6 @@ ClassProviderInvokeMethod(CMPIMethodMI * mi,
 
   else if (strcasecmp(methodName, "getallchildren") == 0) {
     int             ignprov = 0;
-    CMPIStatus      st;
     CMPIData        cn = CMGetArg(in, "class", &st);
 
     cReg->ft->wLock(cReg);
@@ -1483,9 +1484,41 @@ ClassProviderInvokeMethod(CMPIMethodMI * mi,
     st.rc = traverseChildren(cReg, parent, chldn);
   }
 
+  else if (strcasecmp(methodName, "listnamespaces") == 0) {
+
+    HashTableIterator *hit;
+    char           *key;
+    ClassRegister  *cReg;
+
+    CMPIArray* ar = CMNewArray(_broker, nsHt->ft->size(nsHt), CMPI_string, NULL);
+    int i = 0;
+
+    /* req for specific ns */
+    CMPIData nsd = CMGetArg(in, "ns", &st);
+    if (st.rc == CMPI_RC_OK) {
+      char* ns = CMGetCharPtr(nsd.value.string);
+        ClassRegister  *cReg = NULL;
+        cReg = nsHt->ft->get(nsHt, ns);
+        st.rc = (cReg) ? CMPI_RC_OK : CMPI_RC_ERR_NOT_FOUND;
+    }
+    else {
+      for (hit = nsHt->ft->getFirst(nsHt, (void **) &key, (void **) &cReg);
+           key && hit;
+           hit =
+             nsHt->ft->getNext(nsHt, hit, (void **) &key, (void **) &cReg)) {
+
+        CMSetArrayElementAt(ar, i++, key, CMPI_chars);
+      }
+  
+      CMAddArg(out, "nslist", &ar, CMPI_stringA);
+      st.rc = CMPI_RC_OK;
+    }
+
+  }
+
   else if (strcasecmp(methodName, "_startup") == 0) {
 
-    /* let providerMgr know that we're odne init'ing  */
+    /* let providerMgr know that we're done init'ing  */
     semRelease(sfcbSem,INIT_CLASS_PROV_ID);
 
     st.rc = CMPI_RC_OK;
diff --git a/interopServerProvider.c b/interopServerProvider.c
index 1a9e8e0..23ae182 100644
--- a/interopServerProvider.c
+++ b/interopServerProvider.c
@@ -103,55 +103,36 @@ getSfcbUuid()
 // ------------------------------------------------------------------
 
 static int
-genNameSpaceData(const char *ns, int dbl,
-                 const CMPIResult *rslt, CMPIObjectPath * op,
+genNameSpaceData(const char *ns, const CMPIResult *rslt, CMPIObjectPath * op,
                  CMPIInstance *ci)
 {
   if (ci) {
-    CMSetProperty(ci, "Name", ns + dbl + 1, CMPI_chars);
+    CMSetProperty(ci, "Name", ns, CMPI_chars);
     CMReturnInstance(rslt, ci);
   } else if (op) {
-    CMAddKey(op, "Name", ns + dbl + 1, CMPI_chars);
+    CMAddKey(op, "Name", ns, CMPI_chars);
     CMReturnObjectPath(rslt, op);
   }
   return 0;
 }
 
 static void
-gatherNameSpacesData(const char *dn, int dbl,
-                     const CMPIResult *rslt,
+gatherNameSpacesData(const CMPIResult *rslt, const CMPIContext* ctx,
                      CMPIObjectPath * op, CMPIInstance *ci)
 {
-  DIR            *dir,
-                 *de_test;
-  struct dirent  *de;
-  char           *n;
-  int             l;
-
-  dir = opendir(dn);
-  if (dir) {
-    while ((de = readdir(dir)) != NULL) {
-      if (strcmp(de->d_name, ".") == 0)
-        continue;
-      if (strcmp(de->d_name, "..") == 0)
-        continue;
-      l = strlen(dn) + strlen(de->d_name) + 4;
-      n = malloc(l + 8);
-      strcpy(n, dn);
-      strcat(n, "/");
-      strcat(n, de->d_name);
-      de_test = opendir(n);
-      if (de_test == NULL) {
-        free(n);
-        continue;
-      }
-      closedir(de_test);
-
-      genNameSpaceData(n,dbl,rslt,op,ci);
-      gatherNameSpacesData(n,dbl,rslt,op,ci);
-      free(n);
-    }
-    closedir(dir);
+  /* get the namespaces */
+  CMPIObjectPath* cpop = CMNewObjectPath(_broker, "root/interop", "$ClassProvider$", NULL);
+  CMPIArgs* outarg = CMNewArgs(_broker, NULL);
+  CBInvokeMethod(_broker, ctx, cpop, "listnamespaces", NULL, outarg, NULL);
+  CMPIData nsd = CMGetArgAt(outarg, 0, NULL, NULL);
+  CMPIArray* nsarray = nsd.value.array;
+
+  int i = 0;
+  int ac = CMGetArrayCount(nsarray, NULL);
+  CMPIData ns; 
+  for (; i < ac; i++) {
+    ns = CMGetArrayElementAt(nsarray, i, NULL);
+    genNameSpaceData(CMGetCharPtr(ns.value.string), rslt, op, ci);
   }
 }
 
@@ -163,34 +144,27 @@ NameSpaceProviderGetInstance(CMPIInstanceMI * mi,
                              const char **properties)
 {
   CMPIStatus      st = { CMPI_RC_OK, NULL };
-  char           *dirn,
-                 *dn,
-                  hostName[512];
-  DIR            *dir;
+  char            hostName[512];
   CMPIObjectPath *op;
   CMPIInstance   *ci;
   CMPIString     *name;
-  unsigned short  info = 0,
-      dbl;
+  unsigned short  info = 0;
 
   _SFCB_ENTER(TRACE_PROVIDERS, "NameSpaceProviderGetInstance");
 
-  if (getControlChars("registrationDir", &dirn)) {
-    dirn = "/var/lib/sfcb/registration";
-  }
-
   name = CMGetKey(cop, "name", NULL).value.string;
 
   if (name && name->hdl) {
-    dn = alloca(strlen(dirn) + 32 + strlen((char *) name->hdl));
-    strcpy(dn, dirn);
-    if (dirn[strlen(dirn) - 1] != '/')
-      strcat(dn, "/");
-    strcat(dn, "repository/");
-    dbl = strlen(dn);
-    strcat(dn, (char *) name->hdl);
-
-    if ((dir = opendir(dn)) != NULL) {
+
+    /* ask ClassProvider if ns exists */
+    CMPIObjectPath* cpop = CMNewObjectPath(_broker, "root/interop", "$ClassProvider$", NULL);
+    CMPIArgs* inarg = CMNewArgs(_broker, NULL);
+    CMPIValue nameval;
+    nameval.string = name;
+    CMAddArg(inarg, "ns", &nameval, CMPI_string);
+    CBInvokeMethod(_broker, ctx, cpop, "listnamespaces", inarg, NULL, &st);
+
+    if (st.rc == CMPI_RC_OK) {
       op=CMNewObjectPath(_broker,"root/interop","CIM_Namespace",NULL);
       ci=CMNewInstance(_broker,op,NULL);
         
@@ -202,13 +176,16 @@ NameSpaceProviderGetInstance(CMPIInstanceMI * mi,
       gethostname(hostName,511);
       CMSetProperty(ci,"SystemName",hostName,CMPI_chars);
       CMSetProperty(ci,"ClassInfo",&info,CMPI_uint16);
-      CMSetProperty(ci,"Name",dn+dbl,CMPI_chars);
+      CMSetProperty(ci,"Name",&nameval,CMPI_string);
       CMReturnInstance(rslt,ci);
-      closedir(dir);
-    } else
+    } 
+    else {
       st.rc = CMPI_RC_ERR_NOT_FOUND;
-  } else
+    }
+  } 
+  else {
     st.rc = CMPI_RC_ERR_INVALID_PARAMETER;
+  }
 
   _SFCB_RETURN(st);
 }
@@ -221,25 +198,13 @@ NameSpaceProviderEnumInstances(CMPIInstanceMI * mi,
                                const char **properties)
 {
   CMPIStatus      st = { CMPI_RC_OK, NULL };
-  char           *dir,
-                 *dn,
-                  hostName[512];
+  char            hostName[512];
   CMPIObjectPath *op;
   CMPIInstance   *ci;
   unsigned short  info = 0;
 
   _SFCB_ENTER(TRACE_PROVIDERS, "NameSpaceProviderEnumInstances");
 
-  if (getControlChars("registrationDir", &dir)) {
-    dir = "/var/lib/sfcb/registration";
-  }
-
-  dn = alloca(strlen(dir) + 32);
-  strcpy(dn, dir);
-  if (dir[strlen(dir) - 1] != '/')
-    strcat(dn, "/");
-  strcat(dn, "repository");
-
   op = CMNewObjectPath(_broker, "root/interop", "CIM_Namespace", NULL);
   ci = CMNewInstance(_broker, op, NULL);
 
@@ -254,7 +219,7 @@ NameSpaceProviderEnumInstances(CMPIInstanceMI * mi,
   CMSetProperty(ci, "SystemName", hostName, CMPI_chars);
   CMSetProperty(ci, "ClassInfo", &info, CMPI_uint16);
 
-  gatherNameSpacesData(dn, strlen(dn), rslt, NULL, ci);
+  gatherNameSpacesData(rslt, ctx, NULL, ci);
 
   _SFCB_RETURN(st);
 }
@@ -266,23 +231,11 @@ NameSpaceProviderEnumInstanceNames(CMPIInstanceMI * mi,
                                    const CMPIObjectPath * ref)
 {
   CMPIStatus      st = { CMPI_RC_OK, NULL };
-  char           *dir,
-                 *dn,
-                  hostName[512];
+  char            hostName[512];
   CMPIObjectPath *op;
 
   _SFCB_ENTER(TRACE_PROVIDERS, "NameSpaceProviderEnumInstanceNames");
 
-  if (getControlChars("registrationDir", &dir)) {
-    dir = "/var/lib/sfcb/registration";
-  }
-
-  dn = alloca(strlen(dir) + 32);
-  strcpy(dn, dir);
-  if (dir[strlen(dir) - 1] != '/')
-    strcat(dn, "/");
-  strcat(dn, "repository");
-
   op = CMNewObjectPath(_broker, "root/interop", "CIM_Namespace", NULL);
 
   CMAddKey(op, "CreationClassName", "CIM_Namespace", CMPI_chars);
@@ -295,7 +248,7 @@ NameSpaceProviderEnumInstanceNames(CMPIInstanceMI * mi,
   gethostname(hostName, 511);
   CMAddKey(op, "SystemName", hostName, CMPI_chars);
 
-  gatherNameSpacesData(dn, strlen(dn), rslt, op, NULL);
+  gatherNameSpacesData(rslt, ctx, op, NULL);
 
   _SFCB_RETURN(st);
 }
@@ -838,6 +791,7 @@ ServerProviderInitInstances(const CMPIContext *ctx)
   ISinst = CMNewInstance(_broker, ISop, &st);
   makeIndService(ISinst);
   memUnlinkInstance(ISinst); // Prevent cleanup of the instance
+
   return;
 }
 


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] cmpi-syslog NEWS, 1.15, 1.16 configure.ac, 1.7, 1.8 sblim-cmpi-syslog.rh.spec, 1.5, 1.6 sblim-cmpi-syslog.spec, 1.5, 1.6

[Dave H. <hel...@us...>]

Update of /cvsroot/sblim/cmpi-syslog
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27946

Modified Files:
	NEWS configure.ac sblim-cmpi-syslog.rh.spec 
	sblim-cmpi-syslog.spec 
Log Message:
version bump for 0.9.1-preview

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-syslog/NEWS,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- NEWS	24 Jul 2013 16:55:35 -0000	1.15
+++ NEWS	24 Jul 2013 17:15:27 -0000	1.16
@@ -1,3 +1,11 @@
+Changes in 0.9.1
+================
+
+Bugs Fixed:
+
+Features Added:
+
+
 Changes in 0.9.0
 ================
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/cmpi-syslog/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- configure.ac	24 Jul 2013 16:55:35 -0000	1.7
+++ configure.ac	24 Jul 2013 17:15:27 -0000	1.8
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(SBLIM Syslog Providers , 0.9.0, sbl...@li...,sblim-cmpi-syslog)
+AC_INIT(SBLIM Syslog Providers , 0.9.1-preview, sbl...@li...,sblim-cmpi-syslog)
 AC_CONFIG_SRCDIR([syslog-log/Syslog_LogRecord.c])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE

Index: sblim-cmpi-syslog.spec
===================================================================
RCS file: /cvsroot/sblim/cmpi-syslog/sblim-cmpi-syslog.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sblim-cmpi-syslog.spec	24 Jul 2013 16:55:35 -0000	1.5
+++ sblim-cmpi-syslog.spec	24 Jul 2013 17:15:27 -0000	1.6
@@ -7,7 +7,7 @@
 
 Summary: SBLIM Syslog providers
 Name: sblim-cmpi-syslog
-Version: 0.9.0
+Version: 0.9.1-preview
 Release: 1
 Group: Systems Management/Base
 URL: http://www.sblim.org

Index: sblim-cmpi-syslog.rh.spec
===================================================================
RCS file: /cvsroot/sblim/cmpi-syslog/sblim-cmpi-syslog.rh.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sblim-cmpi-syslog.rh.spec	24 Jul 2013 16:55:35 -0000	1.5
+++ sblim-cmpi-syslog.rh.spec	24 Jul 2013 17:15:27 -0000	1.6
@@ -7,7 +7,7 @@
 
 Summary: SBLIM Syslog providers
 Name: sblim-cmpi-syslog
-Version: 0.9.0
+Version: 0.9.1-preview
 Release: 1
 Group: Systems Management/Base
 URL: http://www.sblim.org

[Sblim-commit] cmpi-syslog/syslog-service/util syslog-service.sh, 1.6, 1.7 syslogserviceutil.c, 1.9, 1.10

[Dave H. <hel...@us...>]

Update of /cvsroot/sblim/cmpi-syslog/syslog-service/util
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27140/syslog-service/util

Modified Files:
	syslog-service.sh syslogserviceutil.c 
Log Message:
patchset and version bump for 0.9.0 release

Index: syslogserviceutil.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-syslog/syslog-service/util/syslogserviceutil.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- syslogserviceutil.c	8 Jun 2011 22:17:24 -0000	1.9
+++ syslogserviceutil.c	24 Jul 2013 16:55:35 -0000	1.10
@@ -79,7 +79,7 @@
                      svname);
         if (strcmp(svname, "syslogd")==0) svc->syslogd = pid;
         if (strcmp(svname, "klogd")==0) svc->klogd = pid;
-	if (strcmp(svname, "rsyslogd")==0) {
+	if (strcmp(svname, "rsyslog")==0) {
 	  /* rsyslog acts as both syslog and klogd */
 	  svc->syslogd = svc->klogd = pid;
 	}
@@ -154,11 +154,15 @@
      goto err;
    if (!(fcmdout = fopen(cmdout,"r")))
      goto err;
+/* there's no output from systemctl */
+/*
    if (fgets(result,resultlen,fcmdout)) {
      fclose(fcmdout);
      return 0;
    }
+*/
    fclose(fcmdout);
+   return 0;
  } 
 
 err:

Index: syslog-service.sh
===================================================================
RCS file: /cvsroot/sblim/cmpi-syslog/syslog-service/util/syslog-service.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- syslog-service.sh	8 Jun 2011 22:17:24 -0000	1.6
+++ syslog-service.sh	24 Jul 2013 16:55:35 -0000	1.7
@@ -23,45 +23,55 @@
 
 if [ -f /etc/redhat-release ]
 then
-if [ -x /etc/init.d/syslog ];
+if [ -x /etc/init.d/syslog ]
+then
+   initscript=syslog
+elif [ -x /etc/init.d/rsyslog ]
+then
+   initscript=rsyslog
+else
+   initscript=""
+fi
+
+if [ -n "$initscript" ]
 then
 case "$1" in
  start)
-   /etc/init.d/syslog start
+   /etc/init.d/$initscript start
    ;;
  stop)
-   /etc/init.d/syslog stop
+   /etc/init.d/$initscript stop
    ;;
  restart|reload)
-   /etc/init.d/syslog restart
+   /etc/init.d/$initscript restart
    ;;
  condrestart)
-   /etc/init.d/syslog condrestart
+   /etc/init.d/$initscript condrestart
    ;;
  status)
-   /etc/init.d/syslog status | awk '{print $3 " " $1}' | tr -d '=)='
+   /etc/init.d/$initscript status | awk '{print $3 " " $1}' | tr -d '=)='
    ;;
  *)
     echo "Unsupported method for RedHat!"
     exit 0
 esac
-elif [ -x /etc/init.d/rsyslog ];
+elif [ -f /lib/systemd/system/rsyslog.service ];
 then
 case "$1" in
  start)
-   /etc/init.d/rsyslog start
+   systemctl start rsyslog.service
    ;;
  stop)
-   /etc/init.d/rsyslog stop
+   systemctl stop rsyslog.service
    ;;
  restart|reload)
-   /etc/init.d/rsyslog restart
+   systemctl restart rsyslog.service
    ;;
  condrestart)
-   /etc/init.d/rsyslog condrestart
+   systemctl condrestart rsyslog.service
    ;;
  status)
-   output=`/etc/init.d/rsyslog status`
+   output=`systemctl status rsyslog.service`
    if echo "$output" | grep Active: | grep inactive > /dev/null 2>&1; then
        echo "stopped"
    else

[Sblim-commit] cmpi-syslog/syslog-log Syslog_LogRecord.c, 1.8, 1.9 Syslog_MessageLog.c, 1.6, 1.7

[Dave H. <hel...@us...>]

Update of /cvsroot/sblim/cmpi-syslog/syslog-log
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27140/syslog-log

Modified Files:
	Syslog_LogRecord.c Syslog_MessageLog.c 
Log Message:
patchset and version bump for 0.9.0 release

Index: Syslog_LogRecord.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-syslog/syslog-log/Syslog_LogRecord.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Syslog_LogRecord.c	22 May 2009 03:50:49 -0000	1.8
+++ Syslog_LogRecord.c	24 Jul 2013 16:55:35 -0000	1.9
@@ -172,12 +172,27 @@
   bzero(&logrecbuf, sizeof(Syslog_LogRecord));
 
   nd = CMGetKey(cop, "LogName", &st);
+  if (st.msg != NULL || nd.value.string == NULL) {
+    CMSetStatusWithChars(_broker, &st, CMPI_RC_ERR_FAILED,
+                         "Cannot read instance attribute.");
+    return st;
+  }
   logname = CMGetCharPtr(nd.value.string);
 
   nd = CMGetKey(cop, "RecordId", &st);
+  if (st.msg != NULL || nd.value.string == NULL) {
+    CMSetStatusWithChars(_broker, &st, CMPI_RC_ERR_FAILED,
+                         "Cannot read instance attribute.");
+    return st;
+  }
   recordid = CMGetCharPtr(nd.value.string);
 
   nd = CMGetKey(cop, "MessageTimestamp", &st);
+  if (st.msg != NULL || nd.value.string == NULL) {
+    CMSetStatusWithChars(_broker, &st, CMPI_RC_ERR_FAILED,
+                         "Cannot read instance attribute.");
+    return st;
+  }
   timestamp = CMGetCharPtr(nd.value.string);
 	  
   logrecbuf.logname=strdup(logname);

Index: Syslog_MessageLog.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-syslog/syslog-log/Syslog_MessageLog.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Syslog_MessageLog.c	22 May 2009 03:50:49 -0000	1.6
+++ Syslog_MessageLog.c	24 Jul 2013 16:55:35 -0000	1.7
@@ -142,6 +142,11 @@
   bzero(&logbuf, sizeof(Syslog_MessageLog));
 
   nd = CMGetKey(cop, "Name", &st); 
+  if (st.msg != NULL || nd.value.string == NULL) {
+    CMSetStatusWithChars(_broker, &st, CMPI_RC_ERR_FAILED,
+                         "Cannot read instance attribute.");
+    return st;
+  }
   name = CMGetCharPtr(nd.value.string);
   logbuf.svName=strdup(name);
   if (st.rc == CMPI_RC_OK &&

[Sblim-commit] cmpi-syslog ChangeLog, 1.16, 1.17 configure.ac, 1.5, 1.6 contributions.txt, 1.2, 1.3 sblim-cmpi-syslog.rh.spec, 1.3, 1.4 sblim-cmpi-syslog.spec, 1.3, 1.4

[Dave H. <hel...@us...>]

Update of /cvsroot/sblim/cmpi-syslog
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25813

Modified Files:
	ChangeLog configure.ac contributions.txt 
	sblim-cmpi-syslog.rh.spec sblim-cmpi-syslog.spec 
Log Message:
version bump for 0.8.1 release

Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/cmpi-syslog/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- configure.ac	8 Jun 2011 22:17:24 -0000	1.5
+++ configure.ac	24 Jul 2013 16:17:42 -0000	1.6
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(SBLIM Syslog Providers , 0.8.0, sbl...@li...,sblim-cmpi-syslog)
+AC_INIT(SBLIM Syslog Providers , 0.8.1, sbl...@li...,sblim-cmpi-syslog)
 AC_CONFIG_SRCDIR([syslog-log/Syslog_LogRecord.c])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/cmpi-syslog/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ChangeLog	3 Jun 2009 00:10:29 -0000	1.16
+++ ChangeLog	24 Jul 2013 16:17:42 -0000	1.17
@@ -1,3 +1,44 @@
+2011-06-08  Tyrel Datwyler <ty...@us...>
+
+	* NEWS,
+	configure.ac,
+	syslog-conf/test/system/linux/setting.c,
+	syslog-conf/util/syslogconfutil.h,
+	syslog-conf/util/syslogsettingparse.c,
+	syslog-log/test/runtest_pegasus.sh,
+	syslog-log/test/runtest_wbemcli.sh,
+	syslog-log/test/system/linux/logrecord.sh,
+	syslog-log/test/system/linux/messagelog.sh,
+	syslog-log/test/system/linux/msglogtest.sh,
+	syslog-log/util/sysloglogutil.h,
+	syslog-service/Syslog_Service.c,
+	syslog-service/test/runtest_pegasus.sh,
+	syslog-service/test/runtest_wbemcli.sh,
+	syslog-service/util/syslog-service.sh,
+	syslog-service/util/syslogserviceutil.c:
+
+	[3287560] Add rsyslog support for sblim-cmpi-syslog
+	(patch by Masatake Yamato)
+
+2009-08-24  Tyrel Datwyler <ty...@us...>
+
+	* NEWS,
+	syslog-service/util/syslogserviceutil.c:
+
+	[2843648] Missing fclose in sblim-cmpi-syslog
+	(patch by Michal Hrusecký)
+
+2009-08-19  Tyrel Datwyler <ty...@us...>
+
+	* NEWS,
+	syslog-conf/util/syslogconfutil.h,
+	syslog-log/util/sysloglogutil.c,
+	syslog-log/util/sysloglogutil.h,
+	syslog-service/util/syslogserviceutil.h:
+
+	[2839433] sblim-cmpi-syslog crash
+	(patch by Johan Henriksson)
+
 2009-05-22  Tyrel Datwyler <ty...@us...>
 
 	* syslog-service/Makefile.am:

Index: contributions.txt
===================================================================
RCS file: /cvsroot/sblim/cmpi-syslog/contributions.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- contributions.txt	8 Jun 2011 22:17:24 -0000	1.2
+++ contributions.txt	24 Jul 2013 16:17:42 -0000	1.3
@@ -27,3 +27,7 @@
 -----------------------
 
 06/08/2011 [ 3287560 ] Adding rsyslog support for sblim-cmpi-syslog
+
+Johan Henriksson
+-----------------------
+09/08/2011 [ 2839433 ] sblim-cmpi-syslog crash

Index: sblim-cmpi-syslog.spec
===================================================================
RCS file: /cvsroot/sblim/cmpi-syslog/sblim-cmpi-syslog.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sblim-cmpi-syslog.spec	3 Jun 2009 00:10:29 -0000	1.3
+++ sblim-cmpi-syslog.spec	24 Jul 2013 16:17:42 -0000	1.4
@@ -7,7 +7,7 @@
 
 Summary: SBLIM Syslog providers
 Name: sblim-cmpi-syslog
-Version: 0.8.0
+Version: 0.8.1
 Release: 1
 Group: Systems Management/Base
 URL: http://www.sblim.org

Index: sblim-cmpi-syslog.rh.spec
===================================================================
RCS file: /cvsroot/sblim/cmpi-syslog/sblim-cmpi-syslog.rh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sblim-cmpi-syslog.rh.spec	3 Jun 2009 00:10:29 -0000	1.3
+++ sblim-cmpi-syslog.rh.spec	24 Jul 2013 16:17:42 -0000	1.4
@@ -7,7 +7,7 @@
 
 Summary: SBLIM Syslog providers
 Name: sblim-cmpi-syslog
-Version: 0.8.0
+Version: 0.8.1
 Release: 1
 Group: Systems Management/Base
 URL: http://www.sblim.org

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

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

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20655/src/org/sblim/cimclient/internal/wbem

Modified Files:
      Tag: Experimental
	WBEMClientCIMXML.java 
Log Message:
2651 IOException when tracing the cimxml

Index: WBEMClientCIMXML.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java,v
retrieving revision 1.21.2.72
retrieving revision 1.21.2.73
diff -u -d -r1.21.2.72 -r1.21.2.73
--- WBEMClientCIMXML.java	23 Jul 2013 16:29:23 -0000	1.21.2.72
+++ WBEMClientCIMXML.java	24 Jul 2013 14:38:56 -0000	1.21.2.73
@@ -639,7 +639,6 @@
 			if (--WBEMClientCIMXML.iActiveInstances <= 0
 					&& WBEMClientCIMXML.iCimXmlTraceFile != null) {
 				try {
-					System.out.println("***DEB CLOSING CLIENT!!!");
 					WBEMClientCIMXML.iCimXmlTraceFile.close();
 				} catch (IOException e) {
 					// Ignore CIM-XML trace file exception

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

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

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22885/src/org/sblim/cimclient/internal/wbem

Modified Files:
      Tag: Experimental
	WBEMClientCIMXML.java 
Log Message:
2651 IOException when tracing the cimxml

Index: WBEMClientCIMXML.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java,v
retrieving revision 1.21.2.71
retrieving revision 1.21.2.72
diff -u -d -r1.21.2.71 -r1.21.2.72
--- WBEMClientCIMXML.java	23 Feb 2013 19:56:54 -0000	1.21.2.71
+++ WBEMClientCIMXML.java	23 Jul 2013 16:29:23 -0000	1.21.2.72
@@ -72,6 +72,7 @@
  * 3601894    2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
  *    2614    2013-02-21  blaschke-oss Remove redundant code in transmitRequest
  *    2616    2013-02-23  blaschke-oss Add new API WBEMClientSBLIM.sendIndication()
+ *    2651    2013-07-23  blaschke-oss IOException when tracing the cimxml
  */
 package org.sblim.cimclient.internal.wbem;
 
@@ -163,7 +164,9 @@
 
 	private final WBEMConfiguration iConfiguration = new WBEMConfiguration(new Properties());
 
-	private FileOutputStream iCimXmlTraceFile = null;
+	private static FileOutputStream iCimXmlTraceFile = null;
+
+	private static int iActiveInstances = 0;
 
 	private Locale[] iLocales; // final
 
@@ -258,15 +261,17 @@
 			if (this.iConfiguration.isCimXmlTracingEnabled()
 					&& LogAndTraceBroker.getBroker().getXmlTraceStream() == null) {
 				String filename = this.iConfiguration.getCimXmlTraceStream();
-				if (filename != null && filename.length() > 0) {
+				if (filename != null && filename.length() > 0
+						&& WBEMClientCIMXML.iCimXmlTraceFile == null) {
 					if (filename.equalsIgnoreCase("System.out")) {
 						LogAndTraceBroker.getBroker().setXmlTraceStream(System.out);
 					} else if (filename.equalsIgnoreCase("System.err")) {
 						LogAndTraceBroker.getBroker().setXmlTraceStream(System.err);
 					} else {
 						try {
-							this.iCimXmlTraceFile = new FileOutputStream(filename);
-							LogAndTraceBroker.getBroker().setXmlTraceStream(this.iCimXmlTraceFile);
+							WBEMClientCIMXML.iCimXmlTraceFile = new FileOutputStream(filename);
+							LogAndTraceBroker.getBroker().setXmlTraceStream(
+									WBEMClientCIMXML.iCimXmlTraceFile);
 						} catch (IOException e) {
 							logger.trace(Level.FINE, "Unable to open "
 									+ WBEMConfigurationProperties.CIMXML_TRACE_STREAM + "="
@@ -277,6 +282,7 @@
 			}
 
 			this.iInitialized = true;
+			++WBEMClientCIMXML.iActiveInstances;
 
 		} finally {
 			logger.exit();
@@ -629,12 +635,17 @@
 			if (this.iHttpClientPool != null) {
 				this.iHttpClientPool.closePool();
 			}
-			if (this.iCimXmlTraceFile != null) {
-				this.iCimXmlTraceFile.close();
-			}
-		} catch (IOException e) {
-			// Ignore CIM-XML trace file exception
 		} finally {
+			if (--WBEMClientCIMXML.iActiveInstances <= 0
+					&& WBEMClientCIMXML.iCimXmlTraceFile != null) {
+				try {
+					System.out.println("***DEB CLOSING CLIENT!!!");
+					WBEMClientCIMXML.iCimXmlTraceFile.close();
+				} catch (IOException e) {
+					// Ignore CIM-XML trace file exception
+				}
+				WBEMClientCIMXML.iCimXmlTraceFile = null;
+			}
 			this.iClosed = true;
 			logger.exit();
 		}

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-461-g87e189a

[Dave H. <hel...@us...>]

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  87e189a4a2d69057c482fe03092d5e39114b857b (commit)
      from  3001ff9bc963f6d71353c474102de43306e0a1cb (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 87e189a4a2d69057c482fe03092d5e39114b857b
Author: Dave Heller <hel...@us...>
Date:   Fri Jul 19 12:47:31 2013 -0400

    [sfcb-tix:#64] Support maxObjCount for HTTP chunking

-----------------------------------------------------------------------

Summary of changes:
 control.c       |    5 +++--
 httpAdapter.c   |    9 +++++++--
 result.c        |   13 +++++++++++++
 sfcBroker.c     |    6 ------
 sfcb.cfg.pre.in |    6 ++++++
 5 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/control.c b/control.c
index 5f6e1c0..eb6c8f9 100644
--- a/control.c
+++ b/control.c
@@ -96,8 +96,9 @@ Control         init[] = {
   {"doBasicAuth", CTL_BOOL, NULL, {.b=0}},
   {"doUdsAuth", CTL_BOOL, NULL, {.b=0}},
 
-  {"useChunking", CTL_BOOL, NULL, {.b=1}},
+  {"useChunking", CTL_STRING, "true", {0}},
   {"chunkSize", CTL_LONG, NULL, {.slong=50000}},
+  {"maxChunkObjCount", CTL_ULONG, NULL, {.ulong=0}},
 
   {"trimWhitespace", CTL_BOOL, NULL, {.b=1}},
 
@@ -167,7 +168,7 @@ sunsetControl()
 }
 
 static int 
-getUNum(char* str, unsigned long *val, unsigned int max) {
+getUNum(char* str, unsigned long *val, unsigned long max) {
 
   if (isdigit(str[0])) {
     unsigned long   tmp = strtoul(str, NULL, 0);
diff --git a/httpAdapter.c b/httpAdapter.c
index d1ddea3..950905e 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -2155,8 +2155,13 @@ httpDaemon(int argc, char *argv[], int sslMode, char *ipAddr,
 
   char* chunkStr;
   if (getControlChars("useChunking", &chunkStr) == 0) {
-    if (strcmp(chunkStr, "false") == 0)  chunkMode = CHUNK_NEVER;
-    else if (strcmp(chunkStr, "always") == 0)  chunkMode = CHUNK_FORCE;
+    if (strcmp(chunkStr, "false") == 0) {
+      chunkMode = CHUNK_NEVER;
+      mlogf(M_INFO, M_SHOW, "--- HTTP chunking disabled\n");
+    } else if (strcmp(chunkStr, "always") == 0) {
+      mlogf(M_INFO, M_SHOW, "--- HTTP chunking always\n");
+      chunkMode = CHUNK_FORCE;
+    }
   }
 
   name = argv[0];
diff --git a/result.c b/result.c
index ade2f20..d894e41 100644
--- a/result.c
+++ b/result.c
@@ -38,6 +38,7 @@ extern int      spRcvAck(int from);
 extern int      getConstClassSerializedSize(CMPIConstClass *);
 extern void     getSerializedConstClass(CMPIConstClass * cl, void *area);
 extern int      getControlNum(char *id, long *val);
+extern int      getControlULong(char *id, unsigned long *val);
 extern int      spSendResult2(int *to, int *from,
                               void *d1, unsigned long s1, void *d2,
                               unsigned long s2);
@@ -155,6 +156,18 @@ nextResultBufferPos(NativeResult * nr, int type, unsigned long length)
   if (nr->data == NULL)
     prepResultBuffer(nr, length);
 
+  unsigned long maxChunkObjCount;
+  if (getControlULong("maxChunkObjCount", &maxChunkObjCount))
+    maxChunkObjCount = 0;
+  if (maxChunkObjCount && nr->sNext > maxChunkObjCount && nr->requestor) {
+    /*
+     * hit maxChunkObjCount, send what we have
+     */
+    xferResultBuffer(nr, nr->requestor, 1, 1, length);
+    nr->dNext = 0;
+    nr->sNext = 0;
+  }
+
   /*
    * if there won't be enough room, send it off or make nr->data bigger 
    */
diff --git a/sfcBroker.c b/sfcBroker.c
index 92b659f..bc07632 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -610,7 +610,6 @@ main(int argc, char *argv[])
 #endif
   int             enableHttp = 0,
       enableHttps = 0,
-      useChunking = 0,
       doBa = 0,
       enableInterOp = 0,
       httpLocalOnly = 0;
@@ -826,11 +825,6 @@ main(int argc, char *argv[])
   sslMode = 0;
 #endif
 
-  if (getControlBool("useChunking", &useChunking))
-    useChunking = 0;
-  if (useChunking == 0)
-    mlogf(M_INFO, M_SHOW, "--- Chunking disabled\n");
-
   if (getControlBool("doBasicAuth", &doBa))
     doBa = 0;
   if (!doBa)
diff --git a/sfcb.cfg.pre.in b/sfcb.cfg.pre.in
index 5806b96..325d83d 100644
--- a/sfcb.cfg.pre.in
+++ b/sfcb.cfg.pre.in
@@ -77,6 +77,12 @@ useChunking:    true
 ## Default is 50000
 #chunkSize: 50000
 
+## Maximum number of objects to return per chunk. Note the actual number of
+## objects returned may be limited by chunkSize.  If 0, the maximum number of   
+## objects is unlimited.
+## Default is 0
+#maxChunkObjCount: 0
+
 ## Maximum ContentLength of an HTTP request allowed.
 ## Default is 100000000
 #httpMaxContentLength: 100000000


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] jsr48-client/utst/org/sblim/cimclient/unittest/slp/internal ConvertTest.java, 1.1.2.7, 1.1.2.8

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

Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/slp/internal
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23147/utst/org/sblim/cimclient/unittest/slp/internal

Modified Files:
      Tag: Experimental
	ConvertTest.java 
Log Message:
2650 SLP opaque value handling incorrect

Index: ConvertTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/slp/internal/ConvertTest.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- ConvertTest.java	3 Aug 2009 20:38:43 -0000	1.1.2.7
+++ ConvertTest.java	18 Jul 2013 17:59:44 -0000	1.1.2.8
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2007, 2009
+ * (C) Copyright IBM Corp. 2007, 2013
  *
  * 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 @@
  * 2531371    2009-02-10  raman_arora  Upgrade client to JDK 1.5 (Phase 2)
  * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
  * 2823494    2009-08-03  rgummada     Change Boolean constructor to static
+ *    2650    2013-07-18  blaschke-oss SLP opaque value handling incorrect
  */
 
 package org.sblim.cimclient.unittest.slp.internal;
@@ -29,6 +30,7 @@
 import org.sblim.cimclient.unittest.GenericUTestExts;
 import org.sblim.cimclient.unittest.TestCase;
 import org.sblim.slp.ServiceLocationAttribute;
+import org.sblim.slp.ServiceLocationException;
 import org.sblim.slp.internal.AttributeHandler;
 import org.sblim.slp.internal.Convert;
 
@@ -40,8 +42,8 @@
 
 	private static final String[] RAW_STRINGS = { "(hi,joe)", "hello~(hi,joe!) world" };
 
-	private static final String[] ESCAPED_STRINGS = { "\\28hi\\2cjoe\\29",
-			"hello\\7e\\28hi\\2cjoe\\21\\29 world" };
+	private static final String[] ESCAPED_STRINGS = { "\\28hi\\2Cjoe\\29",
+			"hello\\7E\\28hi\\2Cjoe\\21\\29 world" };
 
 	/**
 	 * testEscaping
@@ -95,6 +97,88 @@
 		}
 	}
 
+	private static final String[] ATTR_TAG = { //
+	"attrib-integer1", // 0
+			"attrib-integer2", // 1
+			"attrib-integer3", // 2
+			"attrib-boolean1", // 3
+			"attrib-boolean2", // 4
+			"attrib-opaque1", // 5
+			"attrib-opaque2", // 6
+			"attrib-opaque3", // 7
+			"attrib-opaque4", // 8
+			"attrib-opaque5", // 9
+			"attrib-opaque6", // 10
+	};
+
+	private static final Object[][] ATTR_VAL = {//
+	new Object[] { new Integer(42) }, // 0
+			new Object[] { new Integer(12), new Integer(34) }, // 1
+			new Object[] { new Integer(-86) }, // 2
+			new Object[] { Boolean.TRUE }, // 3
+			new Object[] { Boolean.TRUE, Boolean.FALSE }, // 4
+			new Object[] { new byte[] { 0x00 } }, // 5
+			new Object[] { new byte[] { 0x01, 0x02 } }, // 6
+			new Object[] { new byte[] { 0x03 }, new byte[] { 0x04 } }, // 7
+			new Object[] { new byte[] { 5, 6 }, new byte[] { 7, 8 } }, // 8
+			new Object[] { new byte[] { 62, 63, 64, 65, 66 } }, // 9
+			new Object[] { new byte[] { -34, -79 } }, // 10
+	};
+
+	private static final String[] ATTR_EXP = {//
+	"(attrib-integer1=42)", // 0
+			"(attrib-integer2=12,34)", // 1
+			"(attrib-integer3=-86)", // 2
+			"(attrib-boolean1=true)", // 3
+			"(attrib-boolean2=true,false)", // 4
+			"(attrib-opaque1=\\FF\\00)", // 5
+			"(attrib-opaque2=\\FF\\01\\02)", // 6
+			"(attrib-opaque3=\\FF\\03,\\FF\\04)", // 7
+			"(attrib-opaque4=\\FF\\05\\06,\\FF\\07\\08)", // 8
+			"(attrib-opaque5=\\FF\\3E\\3F\\40\\41\\42)", // 9
+			"(attrib-opaque6=\\FF\\DE\\B1)", // 10
+	};
+
+	/**
+	 * testValidAttribs
+	 * 
+	 * @throws Exception
+	 */
+	public void testValidAttribs() throws Exception {
+		verify("testValidAttribs arrays not of same length!", (ATTR_TAG.length == ATTR_VAL.length)
+				&& (ATTR_TAG.length == ATTR_EXP.length));
+
+		for (int i = 0; i < ATTR_TAG.length; i++) {
+			String tag = ATTR_TAG[i];
+			Vector<Object> val = GenericUTestExts.mkVec(ATTR_VAL[i]);
+			ServiceLocationAttribute sla = new ServiceLocationAttribute(tag, val);
+
+			verify("Unexpected attribute value for tag " + tag + ": " + sla.toString(), ATTR_EXP[i]
+					.equalsIgnoreCase(sla.toString()));
+		}
+	}
+
+	private static final String[] ATTR_BAD = { "(tag=\\FF)", "(tag=\\FF\\)", "(tag=\\FF\\1)",
+			"(tag=\\FF\\123)", "(tag=\\FF\\1G)", "(tag=\\FF789)", "(tag=\\FF\\\\1)" };
+
+	/**
+	 * testInvalidAttribs
+	 * 
+	 * @throws Exception
+	 */
+	public void testInvalidAttribs() throws Exception {
+		for (int i = 0; i < ATTR_BAD.length; i++) {
+			try {
+				new ServiceLocationAttribute(ATTR_BAD[i]);
+				fail("Invalid attribute " + ATTR_BAD[i] + " did not generate exception");
+			} catch (Exception e) {
+				debug(ATTR_BAD[i] + " produced " + e.getMessage());
+				verify("Attribute " + ATTR_BAD[i] + " generated unexpected exception "
+						+ e.getClass().getName(), e instanceof ServiceLocationException);
+			}
+		}
+	}
+
 	/**
 	 * @param pMsg
 	 */

[Sblim-commit] smis-hba ChangeLog, 1.1.1.1, 1.2 NEWS, 1.1.1.1, 1.2 configure.ac, 1.2, 1.3 provider-register.sh, 1.1.1.1, 1.2

[Dave H. <hel...@us...>]

Update of /cvsroot/sblim/smis-hba
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12583

Modified Files:
	ChangeLog NEWS configure.ac provider-register.sh 
Log Message:
SBLIM-2649: provider-register.sh should handle multiple occurrence of whitespace

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/smis-hba/NEWS,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- NEWS	12 May 2009 21:46:32 -0000	1.1.1.1
+++ NEWS	9 Jul 2013 17:42:14 -0000	1.2
@@ -1,3 +1,10 @@
+Changes in Version 1.0.1
+========================
+
+Bugs Fixed:
+- SBLIM-2649: provider-register.sh should handle multiple occurrence of whitespace
+
+
 Changes in 1.0.0
 ================
 Initial Release of SMI-S standard based HBA Providers. 

Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/smis-hba/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configure.ac	1 Sep 2009 16:59:02 -0000	1.2
+++ configure.ac	9 Jul 2013 17:42:14 -0000	1.3
@@ -19,7 +19,7 @@
 #    Process this file with autoconf to produce a configure script.
 #
 
-AC_INIT(SBLIM-HBA-PROVIDERS, 1.0.0, sbl...@li..., sblim-smis-hba)
+AC_INIT(SBLIM-HBA-PROVIDERS, 1.0.1-preview, sbl...@li..., sblim-smis-hba)
 
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR([src/cmpiSMIS_FCCard.c])

Index: provider-register.sh
===================================================================
RCS file: /cvsroot/sblim/smis-hba/provider-register.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- provider-register.sh	12 May 2009 21:46:32 -0000	1.1.1.1
+++ provider-register.sh	9 Jul 2013 17:42:14 -0000	1.2
@@ -50,13 +50,13 @@
     OUTFILE=$1
     shift
     regfiles=$*
-    PROVIDERMODULES=`cat $regfiles 2> /dev/null | grep -v '^[[:space:]]*#.*' | cut -d ' ' -f 4 | sort | uniq`
+    PROVIDERMODULES=`cat $regfiles 2> /dev/null | grep -v '^[[:space:]]*#.*' | sed 's/[ \t]\+/ /g' | cut -d ' ' -f 4 | sort | uniq`
     if test x"$PROVIDERMODULES" = x
     then
 	echo Failed to read registration files >&2
 	return 1
     fi
-    PROVIDERS=`cat $regfiles 2> /dev/null | grep -v '^[[:space:]]*#.*' | cut -d ' ' -f 3-4 | sort | uniq`
+    PROVIDERS=`cat $regfiles 2> /dev/null | grep -v '^[[:space:]]*#.*' | sed 's/[ \t]\+/ /g' | cut -d ' ' -f 3-4 | sort | uniq`
     
 # produce ProviderModules
     echo > $OUTFILE
@@ -96,7 +96,7 @@
     let serial=0
     for rf in $regfiles
     do
-      cat $rf | grep -v '^[[:space:]]*#.*' | while read CLASSNAME NAMESPACE PROVIDERNAME PROVIDERMODULE CAPS
+      cat $rf | grep -v '^[[:space:]]*#.*' | sed 's/[ \t]\+/ /g' | while read CLASSNAME NAMESPACE PROVIDERNAME PROVIDERMODULE CAPS
       do
 	let serial=serial+1
 	numcap=
@@ -245,7 +245,7 @@
   
     if ps -C cimserver > /dev/null 2>&1 
     then
-	PROVIDERMODULES=`cat $myregs 2> /dev/null | grep -v '^[[:space:]]*#.*' | cut -d ' ' -f 4 | sort | uniq`
+	PROVIDERMODULES=`cat $myregs 2> /dev/null | grep -v '^[[:space:]]*#.*' | sed 's/[ \t]\+/ /g' | cut -d ' ' -f 4 | sort | uniq`
 	if test x"$PROVIDERMODULES" = x
 	    then
 	    echo Failed to read registration files >&2
@@ -269,7 +269,7 @@
 	    echo "Error: wbemexec not found" >&2
 	    return 1
 	fi
-	CLASSES=`cat $myregs 2> /dev/null | grep -v '^[[:space:]]*#.*' | cut -d ' ' -f 1 | grep -v '^CIM_'`
+	CLASSES=`cat $myregs 2> /dev/null | grep -v '^[[:space:]]*#.*' | sed 's/[ \t]\+/ /g' | cut -d ' ' -f 1 | grep -v '^CIM_'`
 	for cls in $CLASSES
 	do
 	  chatter Delete CIM Class $cls
@@ -307,7 +307,7 @@
 #produce sfcb registraion
     for rf in $regfiles
     do
-      cat $rf | grep -v '^[[:space:]]*#.*' | while read CLASSNAME NAMESPACE PROVIDERNAME PROVIDERMODULE CAPS
+      cat $rf | grep -v '^[[:space:]]*#.*' | sed 's/[ \t]\+/ /g' | while read CLASSNAME NAMESPACE PROVIDERNAME PROVIDERMODULE CAPS
       do
 	chatter "Registering class" $CLASSNAME
 	cat >> $OUTFILE <<EOFC

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/smis-hba/ChangeLog,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ChangeLog	12 May 2009 21:46:32 -0000	1.1.1.1
+++ ChangeLog	9 Jul 2013 17:42:14 -0000	1.2
@@ -1,2 +1,5 @@
+2013-07-09	Dave Heller	<hel...@us...>
+		provider-register.sh should handle multiple occurrence of whitespace
+
 2009-04-29	Narasimha Sharoff	<nsh...@us...>
 		Initial version of SBLIM SMIS HBA providers.

[Sblim-commit] Git: sfcc- Small Footprint CIM Client branch, master, updated. 4d69257b56a92a251c42fb269711272acf595013

[Chris B. <buc...@us...>]

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  4d69257b56a92a251c42fb269711272acf595013 (commit)
       via  f9ef997f2b39e4c138dc96f6d23bc81fafcd89b5 (commit)
       via  7a3e7f7f436f5e4e03824104330c79c4dbb157fb (commit)
      from  1f82c33791fe33739a57cfcd511845918ac415bc (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 4d69257b56a92a251c42fb269711272acf595013
Author: buccella <buc...@li...>
Date:   Tue Jul 2 21:47:12 2013 -0400

    adjustments to fix for [bugs:#2646]

commit f9ef997f2b39e4c138dc96f6d23bc81fafcd89b5
Merge: 1f82c33 7a3e7f7
Author: buccella <buc...@li...>
Date:   Tue Jul 2 21:39:54 2013 -0400

    Merge changes from jameskyle for [bugs:#2646] sblim-sfcc does not compile on apple systems

commit 7a3e7f7f436f5e4e03824104330c79c4dbb157fb
Author: James Kyle <ja...@ja...>
Date:   Wed Jun 26 13:46:26 2013 -0700

    Now compiles under OS X.
    
    * Removes --version-script switch if darwin system is detected
    * autoconfiscate not looks for glibtoolize
    * __SOCKADDR_ARG defined to struct sockaddr if __APPLE__

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am                         |    6 +++---
 autoconfiscate.sh                   |   10 ++++++----
 backend/cimxml/indicationlistener.c |    4 ++++
 configure.ac                        |   15 +++++++++++++++
 contributions.txt                   |    4 ++++
 5 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e6ab239..b4d211b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,7 +109,7 @@ libcimcClientXML_la_SOURCES = \
 
 libcimcclient_la_LDFLAGS = \
        -version-info $(Libcimcclient_CURRENT):$(Libcimcclient_REVISION):$(Libcimcclient_AGE) \
-       -Wl,--version-script,$(srcdir)/cimc/libcimcclient.Versions
+       @HOST_LDFLAGS@,$(srcdir)/cimc/libcimcclient.Versions
 libcimcclient_la_LIBADD = -ldl
 libcimcclient_la_CPPFLAGS = -DSFCB_LIBDIR=\"$(SFCB_LIBDIR)\"
 
@@ -118,13 +118,13 @@ libcmpisfcc_la_LIBADD = -lcimcclient
 libcmpisfcc_la_DEPENDENCIES = libcimcclient.la
 libcmpisfcc_la_LDFLAGS = \
        -version-info $(Libcmpisfcc_CURRENT):$(Libcmpisfcc_REVISION):$(Libcmpisfcc_AGE) \
-       -Wl,--version-script,$(srcdir)/frontend/sfcc/libcmpisfcc.Versions
+       @HOST_LDFLAGS@,$(srcdir)/frontend/sfcc/libcmpisfcc.Versions
 
 libcimcClientXML_la_CPPFLAGS = -I$(srcdir)/backend/cimxml/sfcUtil -I$(srcdir)/backend/cimxml  -I$(srcdir)/frontend/sfcc -I$(srcdir)/cimc
 libcimcClientXML_la_LIBADD = -lcurl
 libcimcClientXML_la_LDFLAGS = \
        -version-info $(LibcimcClientXML_CURRENT):$(LibcimcClientXML_REVISION):$(LibcimcClientXML_AGE) \
-       -Wl,--version-script,$(srcdir)/backend/cimxml/libcimcClientXML.Versions
+       @HOST_LDFLAGS@,$(srcdir)/backend/cimxml/libcimcClientXML.Versions
 
 SUBDIRS = . TEST
 
diff --git a/autoconfiscate.sh b/autoconfiscate.sh
index 23f0fc0..589f682 100755
--- a/autoconfiscate.sh
+++ b/autoconfiscate.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
-aclocal &&
-autoheader &&
-libtoolize &&
-automake -af &&
+set -e
+
+aclocal
+autoheader
+test `which glibtoolize 2> /dev/null` && glibtoolize || libtoolize
+automake -af
 autoconf
diff --git a/backend/cimxml/indicationlistener.c b/backend/cimxml/indicationlistener.c
index 7e0606a..0d7d9fe 100755
--- a/backend/cimxml/indicationlistener.c
+++ b/backend/cimxml/indicationlistener.c
@@ -36,6 +36,10 @@ static int do_listen=1;
 #define hdrBufsize 5000
 #define hdrLimmit 5000
 
+#ifdef __APPLE__
+# define __SOCKADDR_ARG   struct sockaddr *__restrict
+#endif
+
 typedef struct _buffer {
    char *data, *content;
    int length, size, ptr, content_length,trailers;
diff --git a/configure.ac b/configure.ac
index 0b3950b..484dfb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,4 +77,19 @@ then
 fi
 
 AC_CONFIG_FILES([Makefile sfcc.spec TEST/Makefile ])
+
+#### Platform Specific Configuration ####
+AC_CANONICAL_HOST
+case $host_os in
+  darwin* )
+    HOST_LDFLAGS="-Wl"
+ 
+    ;;
+  *)
+    HOST_LDFLAGS="-Wl,--version-script"
+    ;;
+esac
+
+AC_SUBST(HOST_LDFLAGS)
+
 AC_OUTPUT
diff --git a/contributions.txt b/contributions.txt
index c08b7e1..c4bc908 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -59,3 +59,7 @@ Michal Minar
 ------------
 07/31/2012 [ 3547832 ] memory leak in backend/cimxml/grammer.c
 09/10/2012 [ 3555103 ] wrong declaration of release attribute in _CIMCArgsFT
+
+James Kyle
+----------
+07/02/2013 [bugs:#2646] sblim-sfcc does not compile on apple systems 


hooks/post-receive
-- 
sfcc- Small Footprint CIM Client

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node ValueObjectNode.java, 1.1.2.10, 1.1.2.11 KeyValueNode.java, 1.1.2.15, 1.1.2.16 NameSpaceNode.java, 1.1.2.7, 1.1.2.8 QualifierNode.java, 1.1.2.15, 1.1.2.16 ErrorNode.java, 1.1.2.10, 1.1.2.11 ValueRefArrayNode.java, 1.1.2.12, 1.1.2.13 CIMNode.java, 1.1.2.8, 1.1.2.9 ValueReferenceNode.java, 1.1.2.10, 1.1.2.11 QualiDeclNode.java, 1.1.2.13, 1.1.2.14

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

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2011/src/org/sblim/cimclient/internal/cimxml/sax/node

Modified Files:
      Tag: Experimental
	ValueObjectNode.java KeyValueNode.java NameSpaceNode.java 
	QualifierNode.java ErrorNode.java ValueRefArrayNode.java 
	CIMNode.java ValueReferenceNode.java QualiDeclNode.java 
Log Message:
2604 SAXException messages should contain node name

Index: ValueReferenceNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ValueReferenceNode.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- ValueReferenceNode.java	24 Apr 2012 12:52:05 -0000	1.1.2.10
+++ ValueReferenceNode.java	2 Jul 2013 01:55:25 -0000	1.1.2.11
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2012
+ * (C) Copyright IBM Corp. 2006, 2013
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -21,6 +21,7 @@
  * 2531371    2009-02-10  raman_arora  Upgrade client to JDK 1.5 (Phase 2)
  * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
  * 3466280    2012-04-23  blaschke-oss get instance failure for CIM_IndicationSubscription
+ *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
  */
 
 package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -94,7 +95,7 @@
 				this.iChildNodeName = pNodeNameEnum;
 				return;
 			}
-		throw new SAXException("Invalid child node:" + pNodeNameEnum
+		throw new SAXException("Invalid child node in " + getNodeName() + " node: " + pNodeNameEnum
 				+ "! Valid nodes are CLASSPATH, LOCALCLASSPATH, CLASSNAME, "
 				+ "INSTANCEPATH, LOCALINSTANCEPATH, INSTANCENAME");
 	}

Index: ValueObjectNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ValueObjectNode.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- ValueObjectNode.java	30 Jan 2013 14:57:10 -0000	1.1.2.10
+++ ValueObjectNode.java	2 Jul 2013 01:55:25 -0000	1.1.2.11
@@ -21,6 +21,7 @@
  * 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)
  * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
+ *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
  */
 
 package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -67,11 +68,12 @@
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (this.iCIMObject != null) throw new SAXException(
-				"This node can have only one child but an additional " + pNodeNameEnum
-						+ " node found!");
+		if (this.iCIMObject != null) throw new SAXException("This " + getNodeName()
+				+ " node can have only one child but an additional " + pNodeNameEnum
+				+ " node found!");
 		if (pNodeNameEnum != CLASS && pNodeNameEnum != INSTANCE) throw new SAXException(
-				"Child node can be CLASS or INSTANCE but a " + pNodeNameEnum + " node was found!");
+				getNodeName() + " node child node can be CLASS or INSTANCE but a " + pNodeNameEnum
+						+ " node was found!");
 	}
 
 	@Override

Index: ErrorNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ErrorNode.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- ErrorNode.java	3 May 2011 15:05:03 -0000	1.1.2.10
+++ ErrorNode.java	2 Jul 2013 01:55:25 -0000	1.1.2.11
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2011
+ * (C) Copyright IBM Corp. 2006, 2013
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -21,6 +21,7 @@
  * 2531371    2009-02-10  raman_arora  Upgrade client to JDK 1.5 (Phase 2)
  * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
  * 3293248    2011-05-03  blaschke-oss Support for CIM_ERROR instances within ERROR
+ *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
  */
 
 package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -69,7 +70,8 @@
 		try {
 			this.iCode = Integer.parseInt(code);
 		} catch (NumberFormatException e) {
-			throw new SAXException("Failed to parse CODE attribute!", e);
+			throw new SAXException("Failed to parse CODE attribute in " + getNodeName() + " node!",
+					e);
 		}
 		this.iDesc = pAttribs.getValue("DESCRIPTION");
 	}

Index: QualifierNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/QualifierNode.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -d -r1.1.2.15 -r1.1.2.16
--- QualifierNode.java	31 Mar 2012 00:02:16 -0000	1.1.2.15
+++ QualifierNode.java	2 Jul 2013 01:55:25 -0000	1.1.2.16
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2012
+ * (C) Copyright IBM Corp. 2006, 2013
  *
  * 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 @@
  * 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
  * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
+ *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
  */
 
 package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -159,7 +160,8 @@
 	private void setType(TypedIf pTypedIf) throws SAXException {
 		if (this.iType != null) return;
 		this.iType = pTypedIf.getType();
-		if (this.iType == null) throw new SAXException("Unknown type for Qualifier declaration!");
+		if (this.iType == null) throw new SAXException("Unknown type for Qualifier declaration in "
+				+ getNodeName() + " node!");
 	}
 
 }

Index: CIMNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/CIMNode.java,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -d -r1.1.2.8 -r1.1.2.9
--- CIMNode.java	27 Mar 2012 19:06:32 -0000	1.1.2.8
+++ CIMNode.java	2 Jul 2013 01:55:25 -0000	1.1.2.9
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2012
+ * (C) Copyright IBM Corp. 2006, 2013
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -19,6 +19,7 @@
  * 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)
  * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
  */
 
 package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -58,9 +59,11 @@
 	@Override
 	public void init(Attributes pAttribs, SAXSession pSession) throws SAXException {
 		this.iCimVersion = pAttribs.getValue("CIMVERSION");
-		if (this.iCimVersion == null) { throw new SAXException("CIMVERSION attribute is mandatory!"); }
+		if (this.iCimVersion == null) { throw new SAXException(
+				"CIMVERSION attribute is mandatory for " + getNodeName() + " node!"); }
 		this.iDtdVersion = pAttribs.getValue("DTDVERSION");
-		if (this.iDtdVersion == null) { throw new SAXException("DTDVERSION attribute is mandatory!"); }
+		if (this.iDtdVersion == null) { throw new SAXException(
+				"DTDVERSION attribute is mandatory for " + getNodeName() + " node!"); }
 		this.iContent = null;
 	}
 

Index: ValueRefArrayNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ValueRefArrayNode.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
--- ValueRefArrayNode.java	30 Jan 2013 14:57:10 -0000	1.1.2.12
+++ ValueRefArrayNode.java	2 Jul 2013 01:55:25 -0000	1.1.2.13
@@ -23,6 +23,7 @@
  * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
  * 3513349    2012-03-31  blaschke-oss TCK: CIMDataType must not accept null string
  * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
+ *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
  */
 
 package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -71,8 +72,8 @@
 
 	@Override
 	public void testChild(String pNodeNameEnum) throws SAXException {
-		if (pNodeNameEnum != VALUE_REFERENCE) throw new SAXException(
-				"Child node can be VALUE_REFERENCE only while it is " + pNodeNameEnum + "!");
+		if (pNodeNameEnum != VALUE_REFERENCE) throw new SAXException(getNodeName()
+				+ " node child node can be VALUE_REFERENCE only while it is " + pNodeNameEnum + "!");
 	}
 
 	@Override

Index: QualiDeclNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/QualiDeclNode.java,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -d -r1.1.2.13 -r1.1.2.14
--- QualiDeclNode.java	25 Apr 2012 02:34:37 -0000	1.1.2.13
+++ QualiDeclNode.java	2 Jul 2013 01:55:25 -0000	1.1.2.14
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2012
+ * (C) Copyright IBM Corp. 2006, 2013
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -24,6 +24,7 @@
  * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
  * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
  * 3521119    2012-04-24  blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
+ *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
  */
 
 package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -124,10 +125,11 @@
 	public void testChild(String pNodeNameEnum) throws SAXException {
 		if (pNodeNameEnum == VALUE || pNodeNameEnum == VALUE_ARRAY) {
 			if (this.iValueNodeName != null) throw new SAXException("Cannot add " + pNodeNameEnum
-					+ " node! This node already has got a " + this.iValueNodeName + " node.");
+					+ " node, this " + getNodeName() + " node has already got a "
+					+ this.iValueNodeName + " node!");
 		} else if (pNodeNameEnum == SCOPE) {
 			if (this.iHasScope) throw new SAXException("Cannot add " + pNodeNameEnum
-					+ " node, still this node has already got one!");
+					+ " node, this " + getNodeName() + " node has already got one!");
 		} else throw new SAXException(getNodeName() + " node cannot have " + pNodeNameEnum
 				+ " child node!");
 	}
@@ -143,7 +145,8 @@
 	private void setType(TypedIf pTypedIf) throws SAXException {
 		if (this.iType != null) return;
 		this.iType = pTypedIf.getType();
-		if (this.iType == null) throw new SAXException("Unknown type for Qualifier declaration!");
+		if (this.iType == null) throw new SAXException("Unknown type for Qualifier declaration in "
+				+ getNodeName() + " node!");
 	}
 
 	@Override
@@ -173,7 +176,8 @@
 
 	@Override
 	public void testCompletness() throws SAXException {
-		if (this.iType == null) throw new SAXException("Unknown type for Qualifier declaration!");
+		if (this.iType == null) throw new SAXException("Unknown type for Qualifier declaration in "
+				+ getNodeName() + " node!");
 	}
 
 	/**

Index: NameSpaceNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/NameSpaceNode.java,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- NameSpaceNode.java	23 Feb 2009 18:25:57 -0000	1.1.2.7
+++ NameSpaceNode.java	2 Jul 2013 01:55:25 -0000	1.1.2.8
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2013
  *
  * 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 @@
  * 1720707    2007-05-17  ebak         Conventional Node factory for CIM-XML SAX parser
  * 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)
+ *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
  */
 
 package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -76,7 +77,7 @@
 	@Override
 	public void testCompletness() throws SAXException {
 		if (this.iNameSpaceValue == null) throw new SAXException(
-				"NAME attribute must contain a value!");
+				"NAME attribute must contain a value in " + getNodeName() + " node!");
 	}
 
 	/**

Index: KeyValueNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/KeyValueNode.java,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -d -r1.1.2.15 -r1.1.2.16
--- KeyValueNode.java	30 Jan 2013 14:57:10 -0000	1.1.2.15
+++ KeyValueNode.java	2 Jul 2013 01:55:25 -0000	1.1.2.16
@@ -24,6 +24,7 @@
  * 2823494    2009-08-03  rgummada     Change Boolean constructor to static
  * 3572993    2012-10-01  blaschke-oss parseDouble("2.2250738585072012e-308") DoS vulnerability
  * 3602604    2013-01-29  blaschke-oss Clean up SAXException messages
+ *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
  */
 
 package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -125,15 +126,15 @@
 
 		if (this.iValueTypeStr.equals("numeric")) {
 			if (!setUInt64(pValue) && !setSInt64(pValue) && !setReal64(pValue)) throw new SAXException(
-					"Unparseable \"number\" value: " + pValue + "!");
+					"Unparseable \"number\" value in " + getNodeName() + " node: " + pValue + "!");
 		} else if (this.iValueTypeStr.equals(MOF.DT_STR)) {
 			if (!setDTAbsolute(pValue) && !setDTInterval(pValue)) {
 				this.iValue = pValue;
 				this.iType = CIMDataType.STRING_T;
 			}
 		} else if (this.iValueTypeStr.equals(MOF.DT_BOOL)) {
-			if (!setBoolean(pValue)) throw new SAXException("Unparseable \"boolean\" value: "
-					+ pValue + "!");
+			if (!setBoolean(pValue)) throw new SAXException("Unparseable \"boolean\" value in "
+					+ getNodeName() + " node: " + pValue + "!");
 		} else {
 			throw new SAXException("KEYVALUE node's VALUETYPE attribute must be " + MOF.DT_STR
 					+ ", " + MOF.DT_BOOL + " or numeric! " + pValue + " is not allowed!");

[Sblim-commit] jsr48-client/src/org/sblim/cimclient WBEMConfigurationProperties.java, 1.17.2.40, 1.17.2.41

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

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13736/src/org/sblim/cimclient

Modified Files:
      Tag: Experimental
	WBEMConfigurationProperties.java 
Log Message:
2647 Add two ssl protocol properties for http server and client

Index: WBEMConfigurationProperties.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/WBEMConfigurationProperties.java,v
retrieving revision 1.17.2.40
retrieving revision 1.17.2.41
diff -u -d -r1.17.2.40 -r1.17.2.41
--- WBEMConfigurationProperties.java	30 May 2013 13:36:45 -0000	1.17.2.40
+++ WBEMConfigurationProperties.java	1 Jul 2013 18:48:59 -0000	1.17.2.41
@@ -47,6 +47,7 @@
  *    2628    2013-03-26  blaschke-oss Limit size of LinkedList of CIMEvents to be dispatched
  *    2635    2013-05-16  blaschke-oss Slowloris DoS attack for CIM indication listener port
  *    2642    2013-05-21  blaschke-oss Seperate properties needed for cim client and listener to filter out ciphers
+ *    2647    2013-07-01  blaschke-oss Add two ssl protocol properties for http server and client
  */
 package org.sblim.cimclient;
 
@@ -462,6 +463,26 @@
 	public static final String SSL_PROTOCOL = "ssl.Protocol";
 
 	/**
+	 * The protocol used for SSLContext.getInstance(String protocol) by a
+	 * client. This property overrides any value set via the ssl.Protocol
+	 * property.<br/>
+	 * <br/>
+	 * Recognition: <code>On next SSL connection</code><br/>
+	 * Default: none
+	 */
+	public static final String SSL_CLIENT_PROTOCOL = "sblim.wbem.sslClientProtocol";
+
+	/**
+	 * The protocol used for SSLContext.getInstance(String protocol) by a
+	 * listener. This property overrides any value set via the ssl.Protocol
+	 * property.<br/>
+	 * <br/>
+	 * Recognition: <code>On next SSL connection</code><br/>
+	 * Default: none
+	 */
+	public static final String SSL_LISTENER_PROTOCOL = "sblim.wbem.sslListenerProtocol";
+
+	/**
 	 * The key manager factory algorithm name.<br />
 	 * <br />
 	 * <em>Security property: JRE global access via <code>Security.setProperty()</code> and <code>Security.getProperty()</code> !</em>