sblim-commit Mailing List for Standards Based Linux Instrumentation (Page 56)

Brought to you by: blaschke-oss, buccella, hellerda

sblim-commit — CVS Commit Info for SBLIM

You can subscribe to this list here.

2005	Jan	Feb (1)	Mar (45)	Apr (150)	May (145)	Jun (150)	Jul (79)	Aug (313)	Sep (160)	Oct (309)	Nov (115)	Dec (60)
2006	Jan (160)	Feb (144)	Mar (127)	Apr (48)	May (102)	Jun (54)	Jul (245)	Aug (94)	Sep (152)	Oct (162)	Nov (166)	Dec (740)
2007	Jan (752)	Feb (437)	Mar (328)	Apr (373)	May (569)	Jun (399)	Jul (369)	Aug (627)	Sep (100)	Oct (306)	Nov (166)	Dec (282)
2008	Jan (68)	Feb (145)	Mar (180)	Apr (160)	May (277)	Jun (229)	Jul (1188)	Aug (51)	Sep (97)	Oct (99)	Nov (95)	Dec (170)
2009	Jan (39)	Feb (73)	Mar (120)	Apr (121)	May (104)	Jun (262)	Jul (57)	Aug (171)	Sep (131)	Oct (88)	Nov (64)	Dec (83)
2010	Jan (55)	Feb (67)	Mar (124)	Apr (64)	May (130)	Jun (75)	Jul (164)	Aug (64)	Sep (44)	Oct (17)	Nov (43)	Dec (31)
2011	Jan (21)	Feb (10)	Mar (43)	Apr (46)	May (52)	Jun (71)	Jul (7)	Aug (16)	Sep (51)	Oct (14)	Nov (33)	Dec (15)
2012	Jan (12)	Feb (61)	Mar (129)	Apr (76)	May (70)	Jun (52)	Jul (29)	Aug (41)	Sep (32)	Oct (23)	Nov (38)	Dec (26)
2013	Jan (35)	Feb (37)	Mar (51)	Apr (15)	May (52)	Jun (15)	Jul (23)	Aug (21)	Sep (46)	Oct (69)	Nov (57)	Dec (26)
2014	Jan (5)	Feb (13)	Mar (17)	Apr (1)	May (5)	Jun	Jul (2)	Aug (2)	Sep (1)	Oct (16)	Nov (8)	Dec (4)
2015	Jan	Feb	Mar	Apr (1)	May (1)	Jun (4)	Jul	Aug (2)	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov	Dec

Flat | Threaded

<< < 1 .. 54 55 56 57 58 .. 596 > >> (Page 56 of 596)

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/cimxml CIMXMLParserImpl.java, 1.14.2.31, 1.14.2.32

From: Dave B. <bla...@us...> - 2011-05-03 18:10:20

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

Modified Files:
      Tag: Experimental
	CIMXMLParserImpl.java 
Log Message:
3297028 - Instances contain CIMClassProperty with DOM parser

Index: CIMXMLParserImpl.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v
retrieving revision 1.14.2.31
retrieving revision 1.14.2.32
diff -u -d -r1.14.2.31 -r1.14.2.32
--- CIMXMLParserImpl.java	3 May 2011 15:05:03 -0000	1.14.2.31
+++ CIMXMLParserImpl.java	3 May 2011 18:10:17 -0000	1.14.2.32
@@ -48,6 +48,7 @@
  * 3027479    2010-07-09  blaschke-oss Dead store to local variable
  * 3027615    2010-07-12  blaschke-oss Use CLASS_ARRAY_T instead of new CIMDataType(CLASS,0)
  * 3293248    2011-05-03  blaschke-oss Support for CIM_ERROR instances within ERROR
+ * 3297028    2011-05-03  blaschke-oss Instances contain CIMClassProperty with DOM parser
  */
 
 package org.sblim.cimclient.internal.cimxml;
@@ -1524,7 +1525,20 @@
 	 */
 	public static CIMProperty<?>[] parsePROPERTIES(Element pElement) throws CIMXMLParseException {
 		Vector<CIMClassProperty<?>> classPropVec = parseClassPropsToVec(pElement);
-		return classPropVec.toArray(new CIMProperty[0]);
+		// The following does not convert Vector<CIMClassProperty> to
+		// CIMProperty[], it is still CIMClassProperty[]!!! You can treat it
+		// like a CIMProperty (property.getValue(), etc.) but (property
+		// instanceof CIMProperty) will return false!
+		// return classPropVec.toArray(new CIMProperty[0]);
+
+		int arraySize = classPropVec.size();
+		CIMProperty<?>[] retA = new CIMProperty[arraySize];
+		for (int i = 0; i < arraySize; i++) {
+			CIMClassProperty<?> prop = classPropVec.get(i);
+			retA[i] = new CIMProperty<Object>(prop.getName(), prop.getDataType(), prop.getValue(),
+					prop.isKey(), prop.isPropagated(), prop.getOriginClass());
+		}
+		return retA;
 	}
 
 	/**

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/doc-files unittest.html, 1.1.2.13, 1.1.2.14

From: Dave B. <bla...@us...> - 2011-05-03 15:05:05

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files
In directory vz-cvs-3.sog:/tmp/cvs-serv16158/src/org/sblim/cimclient/doc-files

Modified Files:
      Tag: Experimental
	unittest.html 
Log Message:
3293248 - Support for CIM_ERROR instances within ERROR

Index: unittest.html
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files/unittest.html,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -d -r1.1.2.13 -r1.1.2.14
--- unittest.html	13 May 2010 18:55:41 -0000	1.1.2.13
+++ unittest.html	3 May 2011 15:05:03 -0000	1.1.2.14
@@ -3,7 +3,7 @@
   <head>
 <!--
  *
- * (C) Copyright IBM Corp. 2006, 2010
+ * (C) Copyright IBM Corp. 2006, 2011
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -23,6 +23,7 @@
  * 2972697    2010-03-18  blaschke-oss Fix spelling errors in HTML files
  * 2990370    2010-04-22  blaschke-oss Development/unittest HTML out of date
  * 2994252    2010-04-30  blaschke-oss CIMDateTimeInterval.getTotalMilliseconds() not unit tested
+ * 3293248    2011-05-03  blaschke-oss Support for CIM_ERROR instances within ERROR
 -->
   </head>
   <body style="background-color: white;">
@@ -44,6 +45,10 @@
         <tr><td>testEnumerateClassesPULL/SAX/DOM</td>
             <td>Parses a saved enumerateClasses XML response, iterates over it and
             checks that it matches with the reference data.</td></tr>
+        <tr><td>testEnumerateClassesErrorPULL/SAX/DOM</td>
+            <td>Parses a saved enumerateClasses XML response that contains CIM_Error
+            instances within an ERROR node, checks that it matches with the reference
+            data.</td></tr>
         <tr><td>testClosePULL/SAX/DOM</td>
             <td>Starts iterating over an enumerateClasses XML response and closes, the
             iterator before the last element is iterated. The testcase fails if the

[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-65-g18fb481

From: Michael Chase-S. <mc...@us...> - 2011-05-02 22:23:30

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  18fb48116e9ccd8787eee6dda92443d321575c5b (commit)
      from  4b32cde24cd555357d1137b8ababa20c7d46d4e8 (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 18fb48116e9ccd8787eee6dda92443d321575c5b
Author: Michael Chase-Salerno <br...@li...>
Date:   Mon May 2 18:23:04 2011 -0400

    [ 3190623 ] Set *IsSettable propperties to false for IndicationService
    Problem with auto-enable when tests are enabled.

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 16e3b4c..facb18a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-02 Michael Chase-Salerno <br...@li...>
+
+	* configure.ac
+	[ 3190623 ] Set *IsSettable propperties to false for IndicationService
+	Problem with auto-enable when tests are enabled. 
+
 2011-04-29 Michael Chase-Salerno <br...@li...>
 
 	* 20_indication.mof.pre.in, Makefile.am, configure.ac
diff --git a/configure.ac b/configure.ac
index cceff62..7a4bfc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,7 +180,6 @@ fi
 
 # Check and configure requested tests.
 if test "$enable_tests" == "yes"; then
-    enable_settableretry="yes"
 if test "$enable_local_connect_only" == "yes"; then
     enable_tests="localtests,gcov"
 else
@@ -188,6 +187,10 @@ else
     enable_tests="unit,gcov,wbemcli,xml,commands,slp,providers,cimrs"
 fi
 fi
+if test "$enable_tests" != ""; then
+    enable_settableretry="yes"
+fi
+
 
 OLDIFS="$IFS"
 IFS=","


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

[Sblim-commit] sfcb 20_indication.mof.pre.in, NONE, 1.1 ChangeLog, 1.654, 1.655 Makefile.am, 1.109, 1.110 NEWS, 1.581, 1.582 configure.ac, 1.116, 1.117 control.c, 1.34, 1.35 interopServerProvider.c, 1.31, 1.32 sfcb.cfg.pre.in, 1.24, 1.25 20_indication.mof, 1.4, NONE

From: Michael Chase-S. <mc...@us...> - 2011-04-29 21:40:55

Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv7235

Modified Files:
	ChangeLog Makefile.am NEWS configure.ac control.c 
	interopServerProvider.c sfcb.cfg.pre.in 
Added Files:
	20_indication.mof.pre.in 
Removed Files:
	20_indication.mof 
Log Message:
3190623 Set *IsSettable properties to false for IndicationService


Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.654
retrieving revision 1.655
diff -u -d -r1.654 -r1.655
--- ChangeLog	28 Apr 2011 21:48:28 -0000	1.654
+++ ChangeLog	29 Apr 2011 21:40:50 -0000	1.655
@@ -1,3 +1,9 @@
+2011-04-29 Michael Chase-Salerno <br...@li...>
+
+	* 20_indication.mof.pre.in, Makefile.am, configure.ac
+	control.c, interopServerProvider.c, sfcb.cfg.pre.in:
+	[ 3190623 ] Set *IsSettable propperties to false for IndicationService
+
 2011-04-28  Chris Buccella  <buc...@li...>
 
 	* cimcClientSfcbLocal.c:

--- NEW FILE: 20_indication.mof.pre.in ---
//
// instance of CIM_RegisteredProfile
// for Indications Profile
//

class SFCB_IndicationServiceCapabilities : CIM_IndicationServiceCapabilities
{
};

instance of SFCB_IndicationServiceCapabilities
{
  InstanceID = "CIM:SFCB_ISC";
  FilterCreationEnabledIsSettable           = FALSE;
  DeliveryRetryAttemptsIsSettable           = SETTABLE;
  DeliveryRetryIntervalIsSettable           = SETTABLE;
  SubscriptionRemovalActionIsSettable       = SETTABLE;
  SubscriptionRemovalTimeIntervalIsSettable = SETTABLE;
  MaxListenerDestinations                   = 100;
  MaxActiveSubscriptions                    = 100;
  SubscriptionsPersisted                    = TRUE;
};

instance of SFCB_RegisteredProfile
{
  InstanceID = "CIM:SFCB_IP";
  RegisteredOrganization = 2;
  RegisteredName = "Indications";
  RegisteredVersion = "1.1.0";
  AdvertiseTypes = 3;
};

class SFCB_ElementCapabilities : CIM_ElementCapabilities
{
};

--- 20_indication.mof DELETED ---

Index: interopServerProvider.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/interopServerProvider.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- interopServerProvider.c	14 May 2010 20:20:34 -0000	1.31
+++ interopServerProvider.c	29 Apr 2011 21:40:50 -0000	1.32
@@ -718,6 +718,29 @@
   
   if(!CMClassPathIsA(_broker, cop, "cim_indicationservice", NULL))
     return rc;
+
+  // Get the settable props
+  int settable=0;
+  CMPIObjectPath *iscop = CMNewObjectPath(_broker, "root/interop", "SFCB_IndicationServiceCapabilities",NULL);
+  CMPIEnumeration *iscenm = _broker->bft->enumerateInstances(_broker, ctx, iscop, NULL, NULL);
+  CMPIData iscinst = CMGetNext(iscenm, NULL);
+  CMPIData iscprop = CMGetProperty(iscinst.value.inst, "DeliveryRetryAttemptsIsSettable", NULL);
+  if (!iscprop.value.boolean) settable++;
+  iscprop = CMGetProperty(iscinst.value.inst, "DeliveryRetryIntervalIsSettable", NULL);
+  if (!iscprop.value.boolean) settable++;
+  iscprop = CMGetProperty(iscinst.value.inst, "SubscriptionRemovalActionIsSettable", NULL);
+  if (!iscprop.value.boolean) settable++;
+  iscprop = CMGetProperty(iscinst.value.inst, "SubscriptionRemovalTimeIntervalIsSettable", NULL);
+  if (!iscprop.value.boolean) settable++;
+
+  if (iscop) CMRelease(iscop);
+  if (iscenm) CMRelease(iscenm);
+
+  // If any of the settable props were false, no MI of indication service allowed
+  // We're assuming that this is the only reason for doing an MI
+  if (settable > 0) return rc;
+
+  // Ok, all is well to continue with the operation...
   ctxLocal = native_clone_CMPIContext(ctx);
   val.string = sfcb_native_new_CMPIString("$DefaultProvider$", NULL,0);
   ctxLocal->ft->addEntry(ctxLocal, "rerouteToProvider", &val, CMPI_string);
@@ -753,23 +776,44 @@
   CMPIInstance * ci = NULL;
   CMPIContext * ctxLocal;
   CMPIBoolean filterCreation=1;
-  CMPIUint16 retryAttempts=3; /* retry indications 3 times */
-  CMPIUint32 retryInterval=20;/* at a 20 second interval */
-  CMPIUint16 subRemoval=2; /* 2 == "Remove" */
-  CMPIUint32 subRemovalInterval=2592000; /* 30 days */
+  CMPIUint16      retryAttempts,subRemoval; 
+  CMPIUint32      tmp,retryInterval,subRemovalInterval; 
+   
+  // Get the retry parameters from the config file
+  getControlUNum("DeliveryRetryInterval", &retryInterval);
+  getControlUNum("DeliveryRetryAttempts", &tmp);
+  if (tmp > UINT16_MAX) {
+    // Exceeded max range, set to default
+    mlogf(M_ERROR, M_SHOW, "--- Value for DeliveryRetryAttempts exceeds range, using default.\n");
+    retryAttempts=3;
+  } else {
+    retryAttempts=(CMPIUint16) tmp;
+  }
+  getControlUNum("SubscriptionRemovalTimeInterval", &subRemovalInterval);
+  getControlUNum("SubscriptionRemovalAction",  &tmp);
+  if (tmp > UINT16_MAX) {
+    // Exceeded max range, set to default
+    mlogf(M_ERROR, M_SHOW, "--- Value for SubscriptionRemovalAction exceeds range, using default.\n");
+    subRemoval=2;
+  } else {
+    subRemoval= (CMPIUint16) tmp;
+  }
 
   ctxLocal = native_clone_CMPIContext(ctx);
   val.string = sfcb_native_new_CMPIString("$DefaultProvider$", NULL,0);
   ctxLocal->ft->addEntry(ctxLocal, "rerouteToProvider", &val, CMPI_string);
 
   op=CMNewObjectPath(_broker,"root/interop","CIM_IndicationService",&st);
-  ci=CMNewInstance(_broker,op,&st);
   CMAddKey(op,"CreationClassName","CIM_IndicationService",CMPI_chars);
   CMAddKey(op,"SystemCreationClassName","CIM_ComputerSystem",CMPI_chars);
   str[0]=str[511]=0;
   gethostname(str,511);
   CMAddKey(op,"SystemName",str,CMPI_chars);
   CMAddKey(op,"Name",getSfcbUuid(),CMPI_chars);
+  // Delete the instance so we can replace with proper values
+  CBDeleteInstance(_broker,ctxLocal,op);
+  ci = CMNewInstance(_broker, op, &st);
+
   CMSetProperty(ci,"CreationClassName","CIM_IndicationService",CMPI_chars);
   CMSetProperty(ci,"SystemCreationClassName","CIM_ComputerSystem",CMPI_chars);
   CMSetProperty(ci,"SystemName",str,CMPI_chars);

Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/sfcb/configure.ac,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- configure.ac	1 Apr 2011 01:57:59 -0000	1.116
+++ configure.ac	29 Apr 2011 21:40:50 -0000	1.117
@@ -109,6 +109,10 @@
 	[AC_HELP_STRING([--enable-tests(=TESTS)],
 		[Enable listed tests. If none are listed, all are enabled.])])
 
+AC_ARG_ENABLE(settableretry,
+	[AC_HELP_STRING([--enable-settableretry],
+		[Allow reliable indication params to be settable.])])
+
 AC_ARG_ENABLE(uds,
 	[AC_HELP_STRING([--enable-uds],
 		[Enable UDS authentication.])])
@@ -182,6 +186,7 @@
 
 # Check and configure requested tests.
 if test "$enable_tests" == "yes"; then
+    enable_settableretry="yes"
 if test "$enable_local_connect_only" == "yes"; then
     enable_tests="localtests,gcov"
 else
@@ -300,6 +305,10 @@
    AC_DEFINE(HAVE_UDS,,[UDS authentication enabled])
 fi
 
+if test "$enable_settableretry" == "yes"; then
+   AC_DEFINE(SETTABLERETRY,,[Settable indication parameters enabled])
+fi
+
 
 if test "$enable_qualifierrep" == "yes"; then
    LOAD_QUALIFIER_PROVIDER=
@@ -486,6 +495,7 @@
 fi
 
 AM_CONDITIONAL(INDICATIONS,[test "$enable_indications" == "yes"]) 
+AM_CONDITIONAL(SETTABLERETRY,[test "$enable_settableretry" == "yes"])
 AM_CONDITIONAL(JDBC,[test "$enable_jdbc" == "yes"]) 
 AM_CONDITIONAL(SSL,[test "$enable_ssl" == "yes"]) 
 AM_CONDITIONAL(SLP,[test "$enable_slp" == "yes"]) 
@@ -499,7 +509,7 @@
 AM_CONDITIONAL(LOCAL_CONNECT_ONLY,[test "$enable_local_connect_only" == "yes"])
 
 AC_CONFIG_FILES([Makefile sfcb.spec sfcbrepos.sh sfcbstage.sh sfcbunstage.sh 
-	         sfcbuuid.sh sfcb.cfg.pre getSchema.sh.pre 
+	         sfcbuuid.sh sfcb.cfg.pre getSchema.sh.pre 20_indication.mof.pre
 		 sfcb.init-redhat sfcb.init-suse sfcb.init-none default.reg
 		 man/genSslCert.1.pre  man/sfcbmof.1.pre 
                  man/sfcbunstage.1.pre man/sfcbuuid.1.pre man/getSchema.1.pre
@@ -524,6 +534,7 @@
 echo -e "uds"\\t\\t\\t\\t"${enable_uds:-no}"
 echo -e "tests"\\t\\t\\t\\t"${enable_tests:-no}"
 echo -e "debug"\\t\\t\\t\\t"${enable_debug:-no}"
+echo -e "Settable retry parameters"\\t"${enable_settableretry:-no}"
 echo =================================================================
 echo
 echo "sfcb configuration complete.  you may now run 'make'"

Index: sfcb.cfg.pre.in
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcb.cfg.pre.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- sfcb.cfg.pre.in	10 Nov 2010 20:30:32 -0000	1.24
+++ sfcb.cfg.pre.in	29 Apr 2011 21:40:50 -0000	1.25
@@ -236,3 +236,25 @@
 ## Can be overriden by setting environment variable SFCB_TRACE_LEVEL. 
 ## Default is 0. If trace mask is set (by any method) the default is 1.
 #traceLevel: 0
+
+##----------------------------Reliable Indications ----------------------------
+## Interval between indication retry attempts
+## Default is 20 seconds
+#DeliveryRetryInterval: 20
+
+## Number of retry attempts before giving up
+## Default is 3 attempts (not including initial attempt)
+## A value of 0 disables reliable indications
+#DeliveryRetryAttempts: 3
+
+## The length of time an destination can fail before the subscription
+## removal action below is taken
+## Default is 2592000 seconds (30 days)
+#SubscriptionRemovalTimeInterval: 2592000
+
+## The action taken when the time interval expires
+## Default is 2, remove the subscription
+## Other values: 3, disable the subscription
+##               4, ignore (do nothing)
+#SubscriptionRemovalAction: 2
+

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.581
retrieving revision 1.582
diff -u -d -r1.581 -r1.582
--- NEWS	28 Apr 2011 21:48:28 -0000	1.581
+++ NEWS	29 Apr 2011 21:40:50 -0000	1.582
@@ -1,6 +1,9 @@
 Changes in 1.3.12
 =================
 
+New features:
+- 3190623 Set *IsSettable properties to false for IndicationService
+
 Bugs fixed:
 
 - 3261868 Enum CQL filter on NULL cause incorrect rsp

Index: control.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/control.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- control.c	10 Nov 2010 20:30:32 -0000	1.34
+++ control.c	29 Apr 2011 21:40:50 -0000	1.35
@@ -57,6 +57,9 @@
 
 char * configfile = NULL;
 
+// Control initial values
+// { property, type, value}
+// Type: 0=string, 1=num, 2=bool, 3=unstripped string
 Control init[] = {
    {"httpPort",         1, "5988"},
    {"enableHttp",       2, "true"},
@@ -119,6 +122,11 @@
    {"httpMaxContentLength", 1, "100000000"},
    {"validateMethodParamTypes",	2,	"false"},
    {"maxMsgLen",	1,	"10000000"},
+   {"DeliveryRetryInterval",1,"20"},
+   {"DeliveryRetryAttempts",1,"3"},
+   {"SubscriptionRemovalTimeInterval",1,"2592000"},
+   {"SubscriptionRemovalAction",1,"2"},
+
 };
 
 void sunsetControl()

Index: Makefile.am
===================================================================
RCS file: /cvsroot/sblim/sfcb/Makefile.am,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- Makefile.am	20 Aug 2010 20:00:17 -0000	1.109
+++ Makefile.am	29 Apr 2011 21:40:50 -0000	1.110
@@ -505,6 +505,15 @@
 	sed -e s?$$\{prefix\}?$(prefix)?g \
 	-e s?$$\{exec_prefix\}?$(prefix)?g $< > $@
 
+if SETTABLERETRY
+20_indication.mof: 20_indication.mof.pre
+	sed -e s?SETTABLE?TRUE?g $< > $@
+else
+20_indication.mof: 20_indication.mof.pre
+	sed -e s?SETTABLE?FALSE?g $< > $@
+endif
+
+
 sfcb: sfcb.$(INIT_STYLE)
 	sed -e s?$$\{prefix\}?$(prefix)?g \
 	-e s?$$\{exec_prefix\}?$(prefix)?g $< > $@

[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-64-g4b32cde

From: Michael Chase-S. <mc...@us...> - 2011-04-29 20:49:48

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  4b32cde24cd555357d1137b8ababa20c7d46d4e8 (commit)
      from  6a399e90cf5647165b89436ed5e9f8c9b95027ee (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 4b32cde24cd555357d1137b8ababa20c7d46d4e8
Author: Michael Chase-Salerno <br...@li...>
Date:   Fri Apr 29 16:48:53 2011 -0400

    3190623 Set *IsSettable propperties to false for IndicationService
    Squashed commit of the following:
    
    commit 9fb69ac1c0bd6f21f0c75cf11bebe4f25c13b1b2
    Author: Michael Chase-Salerno <br...@li...>
    Date:   Thu Apr 28 19:26:00 2011 -0400
    
        Enable setting the properties if --enable-test
    
    commit f357eb6819e306b5c13d702929132a862ae5ab4c
    Author: Michael Chase-Salerno <br...@li...>
    Date:   Thu Apr 28 19:10:51 2011 -0400
    
        Get properties from config file, store in instance on start.
    
    commit 2664a953c87d931962a47bbdd7b224ef78e1ce6f
    Author: Michael Chase-Salerno <br...@li...>
    Date:   Wed Apr 27 16:59:24 2011 -0400
    
        Prevent MI if the isSettable's are false
    
    commit dccb09a038ffe603da2eeabf743cae87a3c5aade
    Author: Michael Chase-Salerno <br...@li...>
    Date:   Tue Apr 26 13:08:20 2011 -0400
    
        Configure option for settable retry, and setting of repo props.

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

Summary of changes:
diff --git a/20_indication.mof b/20_indication.mof.pre.in
similarity index 75%
rename from 20_indication.mof
rename to 20_indication.mof.pre.in
index 0a84b00..c199618 100644
--- a/20_indication.mof
+++ b/20_indication.mof.pre.in
@@ -11,10 +11,10 @@ instance of SFCB_IndicationServiceCapabilities
 {
   InstanceID = "CIM:SFCB_ISC";
   FilterCreationEnabledIsSettable           = FALSE;
-  DeliveryRetryAttemptsIsSettable           = TRUE;
-  DeliveryRetryIntervalIsSettable           = TRUE;
-  SubscriptionRemovalActionIsSettable       = TRUE;
-  SubscriptionRemovalTimeIntervalIsSettable = TRUE;
+  DeliveryRetryAttemptsIsSettable           = SETTABLE;
+  DeliveryRetryIntervalIsSettable           = SETTABLE;
+  SubscriptionRemovalActionIsSettable       = SETTABLE;
+  SubscriptionRemovalTimeIntervalIsSettable = SETTABLE;
   MaxListenerDestinations                   = 100;
   MaxActiveSubscriptions                    = 100;
   SubscriptionsPersisted                    = TRUE;
diff --git a/ChangeLog b/ChangeLog
index 4d84728..16e3b4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-29 Michael Chase-Salerno <br...@li...>
+
+	* 20_indication.mof.pre.in, Makefile.am, configure.ac
+	control.c, interopServerProvider.c, sfcb.cfg.pre.in:
+	[ 3190623 ] Set *IsSettable propperties to false for IndicationService
+
 2011-04-28  Chris Buccella  <buc...@li...>
 
 	* cimcClientSfcbLocal.c:
diff --git a/Makefile.am b/Makefile.am
index 828863c..11e6e2c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -481,6 +481,15 @@ getSchema.sh: getSchema.sh.pre
 	sed -e s?$$\{prefix\}?$(prefix)?g \
 	-e s?$$\{exec_prefix\}?$(prefix)?g $< > $@
 
+if SETTABLERETRY
+20_indication.mof: 20_indication.mof.pre
+	sed -e s?SETTABLE?TRUE?g $< > $@
+else
+20_indication.mof: 20_indication.mof.pre
+	sed -e s?SETTABLE?FALSE?g $< > $@
+endif
+
+
 sfcb: sfcb.$(INIT_STYLE)
 	sed -e s?$$\{prefix\}?$(prefix)?g \
 	-e s?$$\{exec_prefix\}?$(prefix)?g $< > $@
diff --git a/NEWS b/NEWS
index d2b9025..241a6c6 100644
--- a/NEWS
+++ b/NEWS
@@ -2,12 +2,12 @@ Changes in 1.4.2
 ================
 
 New features:
+- 3190623 Set *IsSettable propperties to false for IndicationService
 
 Bugs fixed: 
 
 Everything in 1.3.12, plus: 
 
-
 Changes in 1.4.1
 ================
 
diff --git a/configure.ac b/configure.ac
index 6349c2c..cceff62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,6 +103,10 @@ AC_ARG_ENABLE(tests,
 	[AC_HELP_STRING([--enable-tests(=TESTS)],
 		[Enable listed tests. If none are listed, all are enabled.])])
 
+AC_ARG_ENABLE(settableretry,
+	[AC_HELP_STRING([--enable-settableretry],
+		[Allow reliable indication params to be settable.])])
+
 AC_ARG_ENABLE(uds,
 	[AC_HELP_STRING([--enable-uds],
 		[Enable UDS authentication.])])
@@ -176,6 +180,7 @@ fi
 
 # Check and configure requested tests.
 if test "$enable_tests" == "yes"; then
+    enable_settableretry="yes"
 if test "$enable_local_connect_only" == "yes"; then
     enable_tests="localtests,gcov"
 else
@@ -336,6 +341,10 @@ if test "$enable_uds" == "yes"; then
    AC_DEFINE(HAVE_UDS,,[UDS authentication enabled])
 fi
 
+if test "$enable_settableretry" == "yes"; then
+   AC_DEFINE(SETTABLERETRY,,[Settable indication parameters enabled])
+fi
+
 
 if test "$enable_qualifierrep" == "yes"; then
    LOAD_QUALIFIER_PROVIDER=
@@ -525,6 +534,7 @@ if test -d $srcdir/cmpi-devel; then
 fi
 
 AM_CONDITIONAL(INDICATIONS,[test "$enable_indications" == "yes"]) 
+AM_CONDITIONAL(SETTABLERETRY,[test "$enable_settableretry" == "yes"]) 
 AM_CONDITIONAL(SSL,[test "$enable_ssl" == "yes"]) 
 AM_CONDITIONAL(SLP,[test "$enable_slp" == "yes"]) 
 AM_CONDITIONAL(SLP_HOSTNAME_LIB,[test "$enable_slp_hostname_lib" == "yes"])
@@ -537,7 +547,7 @@ AM_CONDITIONAL(LOCAL_CONNECT_NO_INDICATION,[test "$enable_local_connect_only" ==
 AM_CONDITIONAL(LOCAL_CONNECT_ONLY,[test "$enable_local_connect_only" == "yes"])
 
 AC_CONFIG_FILES([Makefile sfcb.spec sfcbrepos.sh sfcbstage.sh sfcbunstage.sh 
-	         sfcbuuid.sh sfcb.cfg.pre getSchema.sh.pre 
+	         sfcbuuid.sh sfcb.cfg.pre getSchema.sh.pre 20_indication.mof.pre
 		 sfcb.init-redhat sfcb.init-suse sfcb.init-none default.reg
 		 man/genSslCert.1.pre  man/sfcbmof.1.pre 
                  man/sfcbunstage.1.pre man/sfcbuuid.1.pre man/getSchema.1.pre
@@ -562,6 +572,7 @@ echo -e "uds"\\t\\t\\t\\t"${enable_uds:-no}"
 echo -e "tests"\\t\\t\\t\\t"${enable_tests:-no}"
 echo -e "debug"\\t\\t\\t\\t"${enable_debug:-no}"
 echo -e "Request types"\\t\\t\\t"${enable_request_types}"
+echo -e "Settable retry parameters"\\t"${enable_settableretry:-no}"
 echo =================================================================
 echo
 echo "sfcb configuration complete.  you may now run 'make'"
diff --git a/control.c b/control.c
index c632b8c..9d76bfd 100644
--- a/control.c
+++ b/control.c
@@ -55,6 +55,9 @@ static UtilHashTable *ct = NULL;
 
 char           *configfile = NULL;
 
+// Control initial values
+// { property, type, value}
+// Type: 0=string, 1=num, 2=bool, 3=unstripped string
 Control         init[] = {
   {"httpPort", 1, "5988"},
   {"enableHttp", 2, "true"},
@@ -112,6 +115,11 @@ Control         init[] = {
   {"validateMethodParamTypes", 2, "false"},
   {"maxMsgLen", 1, "10000000"},
   {"networkInterface", 3, NULL},
+  {"DeliveryRetryInterval",1,"20"},
+  {"DeliveryRetryAttempts",1,"3"},
+  {"SubscriptionRemovalTimeInterval",1,"2592000"},
+  {"SubscriptionRemovalAction",1,"2"},
+
 };
 
 void
diff --git a/interopServerProvider.c b/interopServerProvider.c
index 8e66ce5..c5158e8 100644
--- a/interopServerProvider.c
+++ b/interopServerProvider.c
@@ -798,6 +798,29 @@ ServerProviderModifyInstance(CMPIInstanceMI * mi,
 
   if (!CMClassPathIsA(_broker, cop, "cim_indicationservice", NULL))
     return rc;
+
+  // Get the settable props
+  int settable=0;
+  CMPIObjectPath *iscop = CMNewObjectPath(_broker, "root/interop", "SFCB_IndicationServiceCapabilities",NULL);
+  CMPIEnumeration *iscenm = _broker->bft->enumerateInstances(_broker, ctx, iscop, NULL, NULL);
+  CMPIData iscinst = CMGetNext(iscenm, NULL);
+  CMPIData iscprop = CMGetProperty(iscinst.value.inst, "DeliveryRetryAttemptsIsSettable", NULL);
+  if (!iscprop.value.boolean) settable++;
+  iscprop = CMGetProperty(iscinst.value.inst, "DeliveryRetryIntervalIsSettable", NULL);
+  if (!iscprop.value.boolean) settable++;
+  iscprop = CMGetProperty(iscinst.value.inst, "SubscriptionRemovalActionIsSettable", NULL);
+  if (!iscprop.value.boolean) settable++;
+  iscprop = CMGetProperty(iscinst.value.inst, "SubscriptionRemovalTimeIntervalIsSettable", NULL);
+  if (!iscprop.value.boolean) settable++;
+
+  if (iscop) CMRelease(iscop);
+  if (iscenm) CMRelease(iscenm);
+
+  // If any of the settable props were false, no MI of indication service allowed
+  // We're assuming that this is the only reason for doing an MI
+  if (settable > 0) return rc;
+
+  // Ok, all is well to continue with the operation...
   ctxLocal = native_clone_CMPIContext(ctx);
   val.string = sfcb_native_new_CMPIString("$DefaultProvider$", NULL, 0);
   ctxLocal->ft->addEntry(ctxLocal, "rerouteToProvider", &val, CMPI_string);
@@ -837,10 +860,29 @@ ServerProviderInitInstances(const CMPIContext *ctx)
   CMPIInstance   *ci = NULL;
   CMPIContext    *ctxLocal;
   CMPIBoolean     filterCreation = 1;
-  CMPIUint16      retryAttempts = 3;    /* retry indications 3 times */
-  CMPIUint32      retryInterval = 20;   /* at a 20 second interval */
-  CMPIUint16      subRemoval = 2;       /* 3 == "Disable" */
-  CMPIUint32      subRemovalInterval = 2592000; /* 30 days */
+
+  CMPIUint16      retryAttempts,subRemoval; 
+  CMPIUint32      tmp,retryInterval,subRemovalInterval; 
+  
+  // Get the retry parameters from the config file
+  getControlUNum("DeliveryRetryInterval", &retryInterval);
+  getControlUNum("DeliveryRetryAttempts", &tmp);
+  if (tmp > UINT16_MAX) {
+    // Exceeded max range, set to default
+    mlogf(M_ERROR, M_SHOW, "--- Value for DeliveryRetryAttempts exceeds range, using default.\n");
+    retryAttempts=3;
+  } else {
+    retryAttempts=(CMPIUint16) tmp;
+  }
+  getControlUNum("SubscriptionRemovalTimeInterval", &subRemovalInterval);
+  getControlUNum("SubscriptionRemovalAction",  &tmp);
+  if (tmp > UINT16_MAX) {
+    // Exceeded max range, set to default
+    mlogf(M_ERROR, M_SHOW, "--- Value for SubscriptionRemovalAction exceeds range, using default.\n");
+    subRemoval=2;
+  } else {
+    subRemoval= (CMPIUint16) tmp;
+  }
 
   ctxLocal = native_clone_CMPIContext(ctx);
   val.string = sfcb_native_new_CMPIString("$DefaultProvider$", NULL, 0);
@@ -848,7 +890,6 @@ ServerProviderInitInstances(const CMPIContext *ctx)
 
   op = CMNewObjectPath(_broker, "root/interop", "CIM_IndicationService",
                        &st);
-  ci = CMNewInstance(_broker, op, &st);
   CMAddKey(op, "CreationClassName", "CIM_IndicationService", CMPI_chars);
   CMAddKey(op, "SystemCreationClassName", "CIM_ComputerSystem",
            CMPI_chars);
@@ -856,6 +897,10 @@ ServerProviderInitInstances(const CMPIContext *ctx)
   gethostname(str, 511);
   CMAddKey(op, "SystemName", str, CMPI_chars);
   CMAddKey(op, "Name", getSfcbUuid(), CMPI_chars);
+  // Delete the instance so we can replace with proper values
+  CBDeleteInstance(_broker,ctxLocal,op);
+  ci = CMNewInstance(_broker, op, &st);
+
   CMSetProperty(ci, "CreationClassName", "CIM_IndicationService",
                 CMPI_chars);
   CMSetProperty(ci, "SystemCreationClassName", "CIM_ComputerSystem",
diff --git a/sfcb.cfg.pre.in b/sfcb.cfg.pre.in
index e1d7424..acc28ba 100644
--- a/sfcb.cfg.pre.in
+++ b/sfcb.cfg.pre.in
@@ -230,3 +230,25 @@ certificateAuthLib:   sfcCertificateAuthentication
 ## Can be overriden by setting environment variable SFCB_TRACE_LEVEL. 
 ## Default is 0. If trace mask is set (by any method) the default is 1.
 #traceLevel: 0
+
+##----------------------------Reliable Indications ----------------------------
+## Interval between indication retry attempts
+## Default is 20 seconds
+#DeliveryRetryInterval: 20
+
+## Number of retry attempts before giving up
+## Default is 3 attempts (not including initial attempt)
+## A value of 0 disables reliable indications
+#DeliveryRetryAttempts: 3
+
+## The length of time an destination can fail before the subscription
+## removal action below is taken
+## Default is 2592000 seconds (30 days)
+#SubscriptionRemovalTimeInterval: 2592000
+
+## The action taken when the time interval expires
+## Default is 2, remove the subscription
+## Other values: 3, disable the subscription
+##               4, ignore (do nothing)
+#SubscriptionRemovalAction: 2
+


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

[Sblim-commit] cmpi-remote ticket.h,1.8,1.9

From: Narasimha S. <nsh...@us...> - 2011-04-29 20:40:45

Update of /cvsroot/sblim/cmpi-remote
In directory vz-cvs-3.sog:/tmp/cvs-serv28640

Modified Files:
	ticket.h 
Log Message:
[3277729] cmpi-remote issue on ppc, 32bit-64bit


Index: ticket.h
===================================================================
RCS file: /cvsroot/sblim/cmpi-remote/ticket.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ticket.h	23 Feb 2011 22:45:18 -0000	1.8
+++ ticket.h	29 Apr 2011 20:40:42 -0000	1.9
@@ -33,7 +33,7 @@
 	uint64_t id;	/*!< ticket id */
 	uint64_t broker_long;	/*!< originating broker */ 
 	struct comm_ticket * next; /*! next element pointer */
-#if SIZEOF_INT == SIZEOF_VOIDP  /* are we 32-bit? (could do this better...) */
+#if (__WORDSIZE == 32)
         char padding[4];
 #endif
 };

[Sblim-commit] cmpi-remote NEWS,1.8,1.9

From: Narasimha S. <nsh...@us...> - 2011-04-29 20:40:06

Update of /cvsroot/sblim/cmpi-remote
In directory vz-cvs-3.sog:/tmp/cvs-serv28527

Modified Files:
	NEWS 
Log Message:
[3277729] cmpi-remote issue on ppc, 32bit-64bit


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-remote/NEWS,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- NEWS	23 Feb 2011 22:45:18 -0000	1.8
+++ NEWS	29 Apr 2011 20:40:04 -0000	1.9
@@ -8,3 +8,4 @@
 - [ 3082567 ] cmpi-remote: proxy provider crashes deserializing status
 - [ 3190539 ] cmpi-remote: proxy provider crashes serializing status
 - [ 3190569 ] cmpi-remote: Mixed-bitness support for provider tickets
+- [ 3277729 ] cmpi-remote: issue on ppc, 32bit-64bit

[Sblim-commit] cmpi-remote ChangeLog,1.8,1.9

From: Narasimha S. <nsh...@us...> - 2011-04-29 20:38:44

Update of /cvsroot/sblim/cmpi-remote
In directory vz-cvs-3.sog:/tmp/cvs-serv28384

Modified Files:
	ChangeLog 
Log Message:
[3277729] cmpi-remote issues on ppc, 32bit-64bit


Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/cmpi-remote/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ChangeLog	23 Feb 2011 22:45:18 -0000	1.8
+++ ChangeLog	29 Apr 2011 20:38:42 -0000	1.9
@@ -1,3 +1,8 @@
+2011-04-29  Narasimha Sharoff  <nsh...@us...>
+
+	* ticket.h
+	Determine the bitness using __WORDSIZE
+
 2011-02-23  Chris Buccella  <buc...@li...>
 
 	* ticket.h, ticket.c:

[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-63-g6a399e9

From: Chris B. <buc...@us...> - 2011-04-28 21:53:00

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  6a399e90cf5647165b89436ed5e9f8c9b95027ee (commit)
      from  62a8430f27f3557979127f1d0c2b7e618bb2c85a (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 6a399e90cf5647165b89436ed5e9f8c9b95027ee
Author: buccella <buc...@li...>
Date:   Thu Apr 28 17:53:07 2011 -0400

    [ 3202466 ] Single item on method param of array type rejected via Local

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 696b6c4..4d84728 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-04-28  Chris Buccella  <buc...@li...>
 
+	* cimcClientSfcbLocal.c:
+	[ 3202466 ] Single item on method param of array type rejected via Local
+	(patch by Chris Poblete)
+
 	* queryOperation.c:
 	[ 3291646 ] Unused var in __NullEvaluate
 
diff --git a/NEWS b/NEWS
index 0a5da37..d2b9025 100644
--- a/NEWS
+++ b/NEWS
@@ -4,9 +4,9 @@ Changes in 1.4.2
 New features:
 
 Bugs fixed: 
-- 3261868 Enum CQL filter on NULL cause incorrect rsp
-- 3213591 Local intf client abort abnormally on enum filter syntax err
-- 3291646 Unused var in __NullEvaluate
+
+Everything in 1.3.12, plus: 
+
 
 Changes in 1.4.1
 ================
@@ -64,6 +64,16 @@ Everything in 1.3.10, plus:
 - 3104761 cimRsRequest.h missing from make-dist tarball
 - 3107553 Remove Large Volume Support
 
+Changes in 1.3.12
+=================
+
+Bugs Fixed: 
+
+- 3261868 Enum CQL filter on NULL cause incorrect rsp
+- 3213591 Local intf client abort abnormally on enum filter syntax err
+- 3291646 Unused var in __NullEvaluate
+- 3202466 Single item on method param of array type rejected via Local
+
 Changes in 1.3.11
 =================
 
diff --git a/cimcClientSfcbLocal.c b/cimcClientSfcbLocal.c
index 4862f46..a3bedaf 100644
--- a/cimcClientSfcbLocal.c
+++ b/cimcClientSfcbLocal.c
@@ -1214,7 +1214,7 @@ static CMPIValue convertFromStringValue(CMPIValue strcval,
   
   // expected incoming type is either string or string array
   // incoming array type must match expected array type 
-  if ((xtype & CMPI_ARRAY) ^ (strctype & CMPI_ARRAY)) {
+  if (!(xtype & CMPI_ARRAY) && (strctype & CMPI_ARRAY)) {
     if (prc) CMSetStatus(prc, CMPI_RC_ERR_INVALID_PARAMETER);
     return newcval;     
   }
diff --git a/contributions.txt b/contributions.txt
index 7ac411a..a06e318 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -181,7 +181,8 @@ Chris Poblete, Dell
 11/08/2010 [ 3101155 ] Failed to load provider libraries due to symbol conflicts
 11/09/2010 [ 3101148 ] SfcbLocal method parameter type conversion and validation
 11/10/2010 [ 3101154 ] Daemon clients failed SfcbLocal connect due to permission
-03/09/2010 [ 3202420 ] CDATA value in a string property is improperly XML escaped
+03/09/2011 [ 3202420 ] CDATA value in a string property is improperly XML escaped
+04/28/2011 [ 3202466 ] Single item on method param of array type rejected via Local
 
 Josef Moellers
 --------------


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

[Sblim-commit] sfcb cimcClientSfcbLocal.c, 1.39, 1.40 ChangeLog, 1.653, 1.654 NEWS, 1.580, 1.581 contributions.txt, 1.61, 1.62

From: Chris B. <buc...@us...> - 2011-04-28 21:48:31

Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv15367

Modified Files:
	cimcClientSfcbLocal.c ChangeLog NEWS contributions.txt 
Log Message:
[ 3202466 ] Single item on method param of array type rejected via Local

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -d -r1.580 -r1.581
--- NEWS	28 Apr 2011 19:54:15 -0000	1.580
+++ NEWS	28 Apr 2011 21:48:28 -0000	1.581
@@ -6,6 +6,7 @@
 - 3261868 Enum CQL filter on NULL cause incorrect rsp
 - 3213591 Local intf client abort abnormally on enum filter syntax err
 - 3291646 Unused var in __NullEvaluate
+- 3202466 Single item on method param of array type rejected via Local
 
 Changes in 1.3.11
 =================

Index: cimcClientSfcbLocal.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/cimcClientSfcbLocal.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- cimcClientSfcbLocal.c	5 Apr 2011 21:02:53 -0000	1.39
+++ cimcClientSfcbLocal.c	28 Apr 2011 21:48:28 -0000	1.40
@@ -1186,7 +1186,7 @@
 
    // expected incoming type is either string or string array
    // incoming array type must match expected array type 
-   if ((xtype & CMPI_ARRAY) ^ (strctype & CMPI_ARRAY)) {
+   if (!(xtype & CMPI_ARRAY) && (strctype & CMPI_ARRAY)) {
       if (prc) CMSetStatus(prc, CMPI_RC_ERR_INVALID_PARAMETER);
       return newcval; 	
    }

Index: contributions.txt
===================================================================
RCS file: /cvsroot/sblim/sfcb/contributions.txt,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- contributions.txt	9 Mar 2011 00:40:20 -0000	1.61
+++ contributions.txt	28 Apr 2011 21:48:28 -0000	1.62
@@ -179,6 +179,7 @@
 11/08/2010 [ 3101148 ] SfcbLocal method parameter type conversion and validation
 11/10/2010 [ 3101154 ] Daemon clients failed SfcbLocal connect due to permission
 03/08/2011 [ 3202420 ] CDATA value in a string property is improperly XML escaped
+04/28/2011 [ 3202466 ] Single item on method param of array type rejected via Local
 
 Josef Moellers
 --------------

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.653
retrieving revision 1.654
diff -u -d -r1.653 -r1.654
--- ChangeLog	28 Apr 2011 19:54:15 -0000	1.653
+++ ChangeLog	28 Apr 2011 21:48:28 -0000	1.654
@@ -1,5 +1,9 @@
 2011-04-28  Chris Buccella  <buc...@li...>
 
+	* cimcClientSfcbLocal.c:
+	[ 3202466 ] Single item on method param of array type rejected via Local
+	(patch by Chris Poblete)
+
 	* queryOperation.c: 
 	[ 3291646 ] Unused var in __NullEvaluate

[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-62-g62a8430

From: Chris B. <buc...@us...> - 2011-04-28 19:56:02

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  62a8430f27f3557979127f1d0c2b7e618bb2c85a (commit)
      from  09c6b272f416177dcebdc36fa7306f4c191e3442 (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 62a8430f27f3557979127f1d0c2b7e618bb2c85a
Author: buccella <buc...@li...>
Date:   Thu Apr 28 15:56:09 2011 -0400

    removed "experimental" from descritpion of --enable-slp

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

Summary of changes:
diff --git a/configure.ac b/configure.ac
index 70ba510..6349c2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,7 @@ AC_ARG_ENABLE(ssl,
 
 AC_ARG_ENABLE(slp,
 	[AC_HELP_STRING([--enable-slp],
-		[include slp agent for SFCB - EXPERIMENTAL.])])
+		[include slp agent for SFCB.])])
 		
 AC_ARG_ENABLE(slp-hostname-lib,
    [AC_HELP_STRING([--enable-slp-hostname-lib],


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

[Sblim-commit] sfcb queryOperation.c, 1.17, 1.18 ChangeLog, 1.652, 1.653 NEWS, 1.579, 1.580

From: Chris B. <buc...@us...> - 2011-04-28 19:54:17

Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv21603

Modified Files:
	queryOperation.c ChangeLog NEWS 
Log Message:
[ 3291646 ] Unused var in __NullEvaluate

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.579
retrieving revision 1.580
diff -u -d -r1.579 -r1.580
--- NEWS	5 Apr 2011 21:02:53 -0000	1.579
+++ NEWS	28 Apr 2011 19:54:15 -0000	1.580
@@ -5,6 +5,7 @@
 
 - 3261868 Enum CQL filter on NULL cause incorrect rsp
 - 3213591 Local intf client abort abnormally on enum filter syntax err
+- 3291646 Unused var in __NullEvaluate
 
 Changes in 1.3.11
 =================

Index: queryOperation.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/queryOperation.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- queryOperation.c	4 Apr 2011 22:37:18 -0000	1.17
+++ queryOperation.c	28 Apr 2011 19:54:15 -0000	1.18
@@ -759,7 +759,7 @@
 static int __NullEvaluate(QLOperation *op, QLPropertySource* source, int invert)
 {
    QLOpd type;
-   CMPIValue v = getPropValue(op->lhod, source, &type);
+   getPropValue(op->lhod, source, &type);
 
    if (invert)
       return ((type != QL_Null));

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.652
retrieving revision 1.653
diff -u -d -r1.652 -r1.653
--- ChangeLog	5 Apr 2011 21:02:53 -0000	1.652
+++ ChangeLog	28 Apr 2011 19:54:15 -0000	1.653
@@ -1,3 +1,8 @@
+2011-04-28  Chris Buccella  <buc...@li...>
+
+	* queryOperation.c: 
+	[ 3291646 ] Unused var in __NullEvaluate
+
 2011-04-05 Michael Chase-Salerno <br...@li...>
 
 	* cimcClientSfcbLocal.c:

[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-61-g09c6b27

From: Chris B. <buc...@us...> - 2011-04-28 19:41:21

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  09c6b272f416177dcebdc36fa7306f4c191e3442 (commit)
      from  214ed409befbe35aaaefe59cf5d2e3cdb3ed062c (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 09c6b272f416177dcebdc36fa7306f4c191e3442
Author: buccella <buc...@li...>
Date:   Thu Apr 28 15:41:30 2011 -0400

    [ 3291646 ] Unused var in __NullEvaluate

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 67da799..696b6c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-28  Chris Buccella  <buc...@li...>
+
+	* queryOperation.c:
+	[ 3291646 ] Unused var in __NullEvaluate
+
 2011-04-05  Chris Buccella  <buc...@li...>
 
 	* httpAdapter.c:
diff --git a/NEWS b/NEWS
index be459da..0a5da37 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ New features:
 Bugs fixed: 
 - 3261868 Enum CQL filter on NULL cause incorrect rsp
 - 3213591 Local intf client abort abnormally on enum filter syntax err
+- 3291646 Unused var in __NullEvaluate
 
 Changes in 1.4.1
 ================
diff --git a/queryOperation.c b/queryOperation.c
index aa51700..8d12aa8 100644
--- a/queryOperation.c
+++ b/queryOperation.c
@@ -860,7 +860,7 @@ _isNullEvaluate(QLOperation * op, QLPropertySource * source)
 static int __NullEvaluate(QLOperation *op, QLPropertySource* source, int invert)
 {
    QLOpd type;
-   CMPIValue v = getPropValue(op->lhod, source, &type);
+   getPropValue(op->lhod, source, &type);
 
    if (invert) 
       return ((type != QL_Null));


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

[Sblim-commit] Git: SFCC - Small Footprint CIM Client branch, master, updated. 45fde32053f8903900d7ea5242e27fad84663a78

From: Narasimha S. <nsh...@us...> - 2011-04-25 17:09:51

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  45fde32053f8903900d7ea5242e27fad84663a78 (commit)
      from  c4521bda714ff1760ec7e5fbc1743c9ab3daccef (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 45fde32053f8903900d7ea5242e27fad84663a78
Author: Narasimha Sharoff <nsh...@us...>
Date:   Mon Apr 25 10:08:50 2011 -0700

    [ 2967265 ] code cleanup in sfcclient

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 9e7a748..e8450ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-25  Narasimha Sharoff  <nsh...@us...>
+
+	* frontend/sfcc/sfcclient.c:
+	[ 2967265 ] code cleanup in sfcclient
+	(patch by Klaus Kaempf)
+
 2011-04-07  Chris Buccella  <buc...@li...>
 
 	* backend/cimxml/grammar.c:
diff --git a/NEWS b/NEWS
index cf0a070..2e3e90d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
 Small Footprint CIM Client Library NEWS
 
+Changes in 2.2.3
+================
+Bugs:
+- 2967265: Code cleanup in frontend/sfcc/sfcclient.c
+
 Changes in 2.2.2
 ================
 
diff --git a/frontend/sfcc/sfcclient.c b/frontend/sfcc/sfcclient.c
index 89736ad..2eed047 100644
--- a/frontend/sfcc/sfcclient.c
+++ b/frontend/sfcc/sfcclient.c
@@ -215,12 +215,14 @@ void * newStringBuffer (int s)
 
 char * value2Chars (CMPIType type, CMPIValue *value)
 {
-   char str[2048], *p;
+#define SBUFLEN 32
+   char str[SBUFLEN], *p;
    unsigned int size;
    CMPIString *cStr;
 
    str[0]=0;
    if (type & CMPI_ARRAY) {
+	fprintf(stderr, "*** value2Chars not implemented for Array *** ");
    }
    else if (type & CMPI_ENC) {
 
@@ -283,29 +285,29 @@ char * value2Chars (CMPIType type, CMPIValue *value)
 
       switch (type) {
       case CMPI_uint8:
-         sprintf(str, "%u", value->uint8);
-         return strdup(str);
+         snprintf(str, SBUFLEN, "%u", value->uint8);
+         break;
       case CMPI_sint8:
-         sprintf(str, "%d", value->sint8);
-         return strdup(str);
+         snprintf(str, SBUFLEN, "%d", value->sint8);
+         break;
       case CMPI_uint16:
-         sprintf(str, "%u", value->uint16);
-         return strdup(str);
+         snprintf(str, SBUFLEN, "%u", value->uint16);
+         break;
       case CMPI_sint16:
-         sprintf(str, "%d", value->sint16);
-         return strdup(str);
+         snprintf(str, SBUFLEN, "%d", value->sint16);
+         break;
       case CMPI_uint32:
-         sprintf(str, "%lu", value->uint32);
-         return strdup(str);
+         snprintf(str, SBUFLEN, "%lu", value->uint32);
+         break;
       case CMPI_sint32:
-         sprintf(str, "%ld", value->sint32);
-         return strdup(str);
+         snprintf(str, SBUFLEN, "%ld", value->sint32);
+         break;
       case CMPI_uint64:
-         sprintf(str, "%llu", value->uint64);
-         return strdup(str);
+         snprintf(str, SBUFLEN, "%llu", value->uint64);
+         break;
       case CMPI_sint64:
-         sprintf(str, "%lld", value->sint64);
-         return strdup(str);
+         snprintf(str, SBUFLEN, "%lld", value->sint64);
+         break;
       }
 
    }
@@ -313,13 +315,14 @@ char * value2Chars (CMPIType type, CMPIValue *value)
 
       switch (type) {
       case CMPI_real32:
-         sprintf(str, "%g", value->real32);
-         return strdup(str);
+         snprintf(str, SBUFLEN, "%g", value->real32);
+         break;
       case CMPI_real64:
-         sprintf(str, "%g", value->real64);
-         return strdup(str);
+         snprintf(str, SBUFLEN, "%g", value->real64);
+         break;
       }
 
    }
+#undef SBUFLEN
    return strdup(str);
 }


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

[Sblim-commit] gather/plugin metricIPProtocolEndpoint.readme, 1.3, 1.4

From: Tyrel D. <ty...@us...> - 2011-04-19 23:37:41

Update of /cvsroot/sblim/gather/plugin
In directory vz-cvs-3.sog:/tmp/cvs-serv11427

Modified Files:
	metricIPProtocolEndpoint.readme 
Log Message:
Updated metricIPProtocolEndpoint.readme to include ByteReceiveRate and
ByteTransmitRate


Index: metricIPProtocolEndpoint.readme
===================================================================
RCS file: /cvsroot/sblim/gather/plugin/metricIPProtocolEndpoint.readme,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- metricIPProtocolEndpoint.readme	24 Jun 2009 21:24:22 -0000	1.3
+++ metricIPProtocolEndpoint.readme	19 Apr 2011 23:37:38 -0000	1.4
@@ -31,6 +31,8 @@
 - PacketsReceived
 - PacketTransmitRate
 - PacketReceiveRate
+- ByteTransmitRate
+- ByteReceiveRate
 
 
 /* ---------------------------------------------------------------------------*/
@@ -120,7 +122,7 @@
 
 
 PacketReceiveRate
-------------------
+-----------------
 
 Metric Type		: Rate
 Based on Metric	: BytesSubmitted
@@ -129,4 +131,26 @@
 
 Value Source	: last entry of BytesSubmitted / sample time
 
+
+ByteTransmitRate
+----------------
+
+Metric Type     : Rate
+Based on Metric : BytesSubmitted
+CIM Data Type   : uint32
+Units           : Bytes per second
+
+Value Source    : second entry of BytesSubmitted / sample time
+
+
+ByteReceiveRate
+---------------
+
+Metric Type     : Rate
+Based on Metric : BytesSubmitted
+CIM Data Type   : uint32
+Units           : Bytes per second
+
+Value Source    : first entry of BytesSubmitted / sample time
+
 /* ---------------------------------------------------------------------------*/

[Sblim-commit] gather NEWS,1.96,1.97

From: Tyrel D. <ty...@us...> - 2011-04-19 23:09:46

Update of /cvsroot/sblim/gather
In directory vz-cvs-3.sog:/tmp/cvs-serv3909

Modified Files:
	NEWS 
Log Message:
Fixed 3289931: long vm names cause buffer overflow


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/gather/NEWS,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- NEWS	14 Apr 2011 21:57:38 -0000	1.96
+++ NEWS	19 Apr 2011 23:09:43 -0000	1.97
@@ -1,5 +1,6 @@
 Bugs fixed:
 - 3275169 bash error reported in provider bootstrap scripts
+- 3289931 long vm names cause buffer overflow
 
 Changes in Version 2.2.2
 ========================

[Sblim-commit] Git: SFCC - Small Footprint CIM Client branch, master, updated. c4521bda714ff1760ec7e5fbc1743c9ab3daccef

From: Narasimha S. <nsh...@us...> - 2011-04-14 23:50:38

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  c4521bda714ff1760ec7e5fbc1743c9ab3daccef (commit)
      from  d5c6797643f975587a586ce4f6d9f8d3bf342682 (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 c4521bda714ff1760ec7e5fbc1743c9ab3daccef
Author: Narasimha Sharoff <nsh...@us...>
Date:   Thu Apr 14 16:48:21 2011 -0700

    [3101151] sfcc failed to connect due to hardcoded path - using stat call

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index fbb635d..9e7a748 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,7 @@
 
 	* cimc/cimcclient.c
 	[ 3101151 ] SfcbLocal failed to connect due to hardcoded library path
+	(based on the patch by: Chris Poblete <Chr...@De...>)
 
 2011-02-22  Narasimha Sharoff  <nsh...@us...>
 
diff --git a/cimc/cimcclient.c b/cimc/cimcclient.c
index d520fc4..7ed10a3 100644
--- a/cimc/cimcclient.c
+++ b/cimc/cimcclient.c
@@ -25,6 +25,8 @@
 #include <stdlib.h>
 #include <dlfcn.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 /*
  * Canonical CIM C API entry points
@@ -42,6 +44,7 @@ CIMCEnv* NewCIMCEnv(const char *id, unsigned int options, int *rc, char **msg)
    void        *library; 
    InitCimcEnv  init=NULL;
    CIMCEnv     *rv=NULL;
+   struct      stat sbuf;
    
     libName[LIBLEN]=0;
     entry[ENTLEN]=0;
@@ -52,7 +55,7 @@ CIMCEnv* NewCIMCEnv(const char *id, unsigned int options, int *rc, char **msg)
         snprintf(*msg,ERRLEN,"Invalid connection type '%s'. Must be 'XML' or 'SfcbLocal'.",id);
     } else {
         if ((strcmp(id, "SfcbLocal") == 0) && 
-	    ((SFCB_LIBDIR != NULL) && (strlen(SFCB_LIBDIR) > 0))) {
+	    (stat(SFCB_LIBDIR, &sbuf) == 0)) {
             snprintf(libName, LIBLEN, "%s/libcimcClient%s.so",SFCB_LIBDIR,id);
         } else {
             snprintf(libName, LIBLEN, "libcimcClient%s.so",id);


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

[Sblim-commit] gather NEWS,1.95,1.96

From: Tyrel D. <ty...@us...> - 2011-04-14 21:57:40

Update of /cvsroot/sblim/gather
In directory vz-cvs-3.sog:/tmp/cvs-serv28244

Modified Files:
	NEWS 
Log Message:
Fixed 3275169: bash error reported in provider bootstrap scripts


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/gather/NEWS,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- NEWS	4 Jan 2011 22:52:32 -0000	1.95
+++ NEWS	14 Apr 2011 21:57:38 -0000	1.96
@@ -1,3 +1,6 @@
+Bugs fixed:
+- 3275169 bash error reported in provider bootstrap scripts
+
 Changes in Version 2.2.2
 ========================

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax EmbObjHandler.java, 1.1.2.14, 1.1.2.15

From: Dave B. <bla...@us...> - 2011-04-11 18:13:15

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

Modified Files:
      Tag: Experimental
	EmbObjHandler.java 
Log Message:
 3281781 - fail to parse Embedded Instance parameter

Index: EmbObjHandler.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/EmbObjHandler.java,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -d -r1.1.2.14 -r1.1.2.15
--- EmbObjHandler.java	29 Jul 2010 18:44:22 -0000	1.1.2.14
+++ EmbObjHandler.java	11 Apr 2011 18:13:13 -0000	1.1.2.15
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2010
+ * (C) Copyright IBM Corp. 2006, 2011
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -22,6 +22,7 @@
  * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
  * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
  * 2957387    2010-03-03  blaschke-oss EmbededObject XML attribute must not be all uppercases
+ * 3281781    2011-04-11  blaschke-oss fail to parse Embedded Instance parameter
  */
 
 package org.sblim.cimclient.internal.cimxml.sax;
@@ -278,9 +279,10 @@
 		if (isEmbeddedInstance() && this.iType.getType() != CIMDataType.OBJECT) throw new SAXException(
 				this.iNodeName + " element is an EmbeddedInstance with non INSTANCE value. "
 						+ "It's not valid!");
-		if (this.iSession.strictEmbObjParsing() && isEmbeddedClass()
-				&& this.iType.getType() != CIMDataType.CLASS) throw new SAXException(this.iNodeName
-				+ " element is an EmbeddedObject with non CLASS value. It's not valid!");
+		if (isEmbeddedClass() && this.iType.getType() != CIMDataType.CLASS
+				&& this.iType.getType() != CIMDataType.OBJECT) throw new SAXException(
+				this.iNodeName
+						+ " element is an EmbeddedObject with non CLASS/INSTANCE value. It's not valid!");
 	}
 
 	private void transformNormObj() throws SAXException {

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

From: Dave B. <bla...@us...> - 2011-04-11 18:12:28

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

Modified Files:
	HttpClient.java 
Log Message:
3235440 - NullPointerException when socket factory returns null

Index: HttpClient.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/http/HttpClient.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- HttpClient.java	14 Mar 2011 12:52:52 -0000	1.34
+++ HttpClient.java	11 Apr 2011 18:12:23 -0000	1.35
@@ -57,6 +57,7 @@
  * 3022554    2010-06-30  blaschke-oss Flushing socket ignores skip() return code
  * 3046073    2010-09-07  blaschke-oss Performance hit due to socket conn. creation with timeout
  * 3195069    2011-02-28  blaschke-oss Need support to disable SSL Handshake
+ * 3235440    2011-03-22  blaschke-oss NullPointerException when socket factory returns null
  */
 package org.sblim.cimclient.internal.http;
 
@@ -989,11 +990,16 @@
 			logger.trace(Level.FINER, "Creating new http for url " + this.iUrl.toString());
 			if (socketConnectWithTimeout) {
 				this.iSocket = factory.createSocket();
-				this.iSocket.connect(
-						new InetSocketAddress(this.iUrl.getHost(), this.iUrl.getPort()), timeout);
+				if (this.iSocket != null) this.iSocket.connect(new InetSocketAddress(this.iUrl
+						.getHost(), this.iUrl.getPort()), timeout);
 			} else {
 				this.iSocket = factory.createSocket(this.iUrl.getHost(), this.iUrl.getPort());
 			}
+			if (this.iSocket == null) {
+				logger.trace(Level.WARNING, "Socket factory " + factory.getClass().getName()
+						+ " returned null socket");
+				throw new IOException("Socket factory did not create socket");
+			}
 
 			this.iSocket.setTcpNoDelay(true);
 			this.iSocket.setKeepAlive(true);

[Sblim-commit] jsr48-client NEWS,1.216,1.217

From: Dave B. <bla...@us...> - 2011-04-11 18:12:27

Update of /cvsroot/sblim/jsr48-client
In directory vz-cvs-3.sog:/tmp/cvs-serv31749

Modified Files:
	NEWS 
Log Message:
3235440 - NullPointerException when socket factory returns null

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/NEWS,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -d -r1.216 -r1.217
--- NEWS	15 Mar 2011 10:00:38 -0000	1.216
+++ NEWS	11 Apr 2011 18:12:24 -0000	1.217
@@ -1,3 +1,7 @@
+Changes in HEAD
+================
+3235440 NullPointerException when socket factory returns null
+
 Version 2.1.8
 ================
 3197423 Server authentication with PegasusLocalAuthInfo failing

[Sblim-commit] Git: SFCC - Small Footprint CIM Client branch, master, updated. d5c6797643f975587a586ce4f6d9f8d3bf342682

From: Chris B. <buc...@us...> - 2011-04-07 21:39:31

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  d5c6797643f975587a586ce4f6d9f8d3bf342682 (commit)
       via  16d4b5d4ecdc34700503f42313322e54a2026f5e (commit)
      from  8b03b1cfa434f5edaa89061be539616bedb86213 (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 d5c6797643f975587a586ce4f6d9f8d3bf342682
Merge: 16d4b5d4ecdc34700503f42313322e54a2026f5e 8b03b1cfa434f5edaa89061be539616bedb86213
Author: buccella <buc...@li...>
Date:   Thu Apr 7 17:39:13 2011 -0400

    Merge branch 'master' of ssh://sblim.git.sourceforge.net/gitroot/sblim/sfcc
    
    Conflicts:
    	ChangeLog

commit 16d4b5d4ecdc34700503f42313322e54a2026f5e
Author: buccella <buc...@li...>
Date:   Thu Apr 7 17:38:11 2011 -0400

    [ 3196128 ] enumInstances does not set NameSpace in ObjectPath in XML mode
    (for real this time)

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index b706e4b..fbb635d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-07  Chris Buccella  <buc...@li...>
+
+	* backend/cimxml/grammar.c:
+	[ 3196128 ] enumInstances does not set NameSpace in ObjectPath in XML mode
+	(patch by Josef Moellers)
+
 2011-04-05  Michael Chase-Salerno <br...@li...>
 
 	* TEST/v2test_xq_synerr.c:
@@ -26,10 +32,6 @@
 	[ 1956407 ] CIM-XML/HTTP connection to unix socket
 	(patch by Bart Whiteley)
 
-	* backend/cimxml/grammar.c:
-	[ 3196128 ] enumInstances does not set NameSpace in ObjectPath in XML mode
-	(patch by Josef Moellers)
-
 2011-03-23  Narasimha Sharoff  <nsh...@us...>
 
 	* frontend/sfcc/sfcclient.c
diff --git a/backend/cimxml/grammar.c b/backend/cimxml/grammar.c
index 660c1a1..871c58a 100644
--- a/backend/cimxml/grammar.c
+++ b/backend/cimxml/grammar.c
@@ -477,6 +477,7 @@ static void iReturnValueContent(ParserControl *parm, parseUnion *stateUnion)
 			dontLex = 1;
 			valueNamedInstance(parm, (parseUnion*)&lvalp.xtokNamedInstance);
 			createPath(&op,&(lvalp.xtokNamedInstance.path));
+			CMSetNameSpace(op, parm->da_nameSpace);
 			inst = native_new_CMPIInstance(op,NULL);
 			//setInstQualifiers(inst, &lvalp.xtokNamedInstance.instance.qualifiers);
 			setInstProperties(inst, &lvalp.xtokNamedInstance.instance.properties);


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

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

From: Dave B. <bla...@us...> - 2011-04-06 23:04:38

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

Modified Files:
      Tag: Experimental
	WBEMClientCIMXML.java 
Log Message:
3277928 - CIM-XML tracing cannot be enabled in the field (correct date)

Index: WBEMClientCIMXML.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java,v
retrieving revision 1.21.2.52
retrieving revision 1.21.2.53
diff -u -d -r1.21.2.52 -r1.21.2.53
--- WBEMClientCIMXML.java	6 Apr 2011 22:44:27 -0000	1.21.2.52
+++ WBEMClientCIMXML.java	6 Apr 2011 23:04:36 -0000	1.21.2.53
@@ -54,7 +54,7 @@
  * 3028518    2010-07-14  blaschke-oss Additional StringBuilder use
  * 3185833    2011-02-18  blaschke-oss missing newline when logging request/response
  * 3197423    2011-03-02  blaschke-oss Server authentication with PegasusLocalAuthInfo failing
- * 3277928    2011-04-07  blaschke-oss CIM-XML tracing cannot be enabled in the field
+ * 3277928    2011-04-06  blaschke-oss CIM-XML tracing cannot be enabled in the field
  */
 package org.sblim.cimclient.internal.wbem;

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

From: Dave B. <bla...@us...> - 2011-04-06 22:44:30

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

Modified Files:
      Tag: Experimental
	WBEMClientCIMXML.java 
Log Message:
3277928 - CIM-XML tracing cannot be enabled in the field

Index: WBEMClientCIMXML.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java,v
retrieving revision 1.21.2.51
retrieving revision 1.21.2.52
diff -u -d -r1.21.2.51 -r1.21.2.52
--- WBEMClientCIMXML.java	7 Mar 2011 12:36:22 -0000	1.21.2.51
+++ WBEMClientCIMXML.java	6 Apr 2011 22:44:27 -0000	1.21.2.52
@@ -54,10 +54,12 @@
  * 3028518    2010-07-14  blaschke-oss Additional StringBuilder use
  * 3185833    2011-02-18  blaschke-oss missing newline when logging request/response
  * 3197423    2011-03-02  blaschke-oss Server authentication with PegasusLocalAuthInfo failing
+ * 3277928    2011-04-07  blaschke-oss CIM-XML tracing cannot be enabled in the field
  */
 package org.sblim.cimclient.internal.wbem;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -142,6 +144,8 @@
 
 	private final WBEMConfiguration iConfiguration = new WBEMConfiguration(new Properties());
 
+	private FileOutputStream iCimXmlTraceFile = null;
+
 	private Locale[] iLocales; // final
 
 	private HttpClientPool iHttpClientPool; // final
@@ -230,6 +234,27 @@
 				throw new RuntimeException(e);
 			}
 
+			if (this.iConfiguration.isCimXmlTracingEnabled()
+					&& LogAndTraceBroker.getBroker().getXmlTraceStream() == null) {
+				String filename = this.iConfiguration.getCimXmlTraceStream();
+				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 {
+							this.iCimXmlTraceFile = new FileOutputStream(filename);
+							LogAndTraceBroker.getBroker().setXmlTraceStream(this.iCimXmlTraceFile);
+						} catch (IOException e) {
+							logger.trace(Level.FINE, "Unable to open "
+									+ WBEMConfigurationProperties.CIMXML_TRACE_STREAM + "="
+									+ filename, e);
+						}
+					}
+				}
+			}
+
 			this.iInitialized = true;
 
 		} finally {
@@ -622,6 +647,11 @@
 			if (this.iHttpClientPool != null) {
 				this.iHttpClientPool.closePool();
 			}
+			if (this.iCimXmlTraceFile != null) {
+				this.iCimXmlTraceFile.close();
+			}
+		} catch (IOException e) {
+			// Ignore CIM-XML trace file exception
 		} finally {
 			this.iClosed = true;
 			logger.exit();

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

From: Dave B. <bla...@us...> - 2011-04-06 22:44:29

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

Modified Files:
      Tag: Experimental
	WBEMConfiguration.java 
Log Message:
3277928 - CIM-XML tracing cannot be enabled in the field

Index: WBEMConfiguration.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util/WBEMConfiguration.java,v
retrieving revision 1.17.2.21
retrieving revision 1.17.2.22
diff -u -d -r1.17.2.21 -r1.17.2.22
--- WBEMConfiguration.java	28 Feb 2011 17:01:08 -0000	1.17.2.21
+++ WBEMConfiguration.java	6 Apr 2011 22:44:27 -0000	1.17.2.22
@@ -33,6 +33,7 @@
  * 3111718    2010-11-18  blaschke-oss org.sblim.cimclient SSL Code is using the wrong SSL Property
  * 3185763    2011-02-25  blaschke-oss Reliable indication support - Phase 1
  * 3195069    2011-02-28  blaschke-oss Need support to disable SSL Handshake
+ * 3277928    2011-04-07  blaschke-oss CIM-XML tracing cannot be enabled in the field
  */
 
 package org.sblim.cimclient.internal.util;
@@ -823,6 +824,16 @@
 	}
 
 	/**
+	 * Returns the CIM-XML trace stream to be used if application does not set
+	 * one of its own
+	 * 
+	 * @return The trace stream
+	 */
+	public String getCimXmlTraceStream() {
+		return getProperty(WBEMConfigurationProperties.CIMXML_TRACE_STREAM, null);
+	}
+
+	/**
 	 * Returns the backlog that is tolerated before the thread pool creates an
 	 * additional handler
 	 *

Flat | Threaded

<< < 1 .. 54 55 56 57 58 .. 596 > >> (Page 56 of 596)