sblim-commit — CVS Commit Info for SBLIM

[Sblim-commit] Git: SFCC - Small Footprint CIM Client tag, SFCC_2_2_4, created. 5c0593e3bcf8b2845cc56a261074f598fa6a369b

[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 tag, SFCC_2_2_4 has been created
        at  5c0593e3bcf8b2845cc56a261074f598fa6a369b (commit)

- Log -----------------------------------------------------------------
commit 5c0593e3bcf8b2845cc56a261074f598fa6a369b
Author: buccella <buc...@li...>
Date:   Tue Jun 12 16:55:25 2012 -0400

    bump version number to 2.2.4
-----------------------------------------------------------------------


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

[Sblim-commit] sfcb cimcClientSfcbLocal.c, 1.46, 1.47 cimcClientSfcbLocal.h, 1.4, 1.5 ChangeLog, 1.776, 1.777 NEWS, 1.694, 1.695

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

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

Modified Files:
	cimcClientSfcbLocal.c cimcClientSfcbLocal.h ChangeLog NEWS 
Log Message:
[ 3534659 ] Match SfcbLocal to sfcc update

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.694
retrieving revision 1.695
diff -u -d -r1.694 -r1.695
--- NEWS	7 Jun 2012 20:27:13 -0000	1.694
+++ NEWS	12 Jun 2012 19:12:57 -0000	1.695
@@ -9,6 +9,7 @@
 - 3513390 Enforce LD and subscription limits
 - 3527920 RI and http responsecodes
 - 3531210 Allow indication delivery timeout tuning
+- 3534659 Match SfcbLocal to sfcc update
 
 Bugs fixed:
 

Index: cimcClientSfcbLocal.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/cimcClientSfcbLocal.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- cimcClientSfcbLocal.c	29 Mar 2012 14:39:53 -0000	1.46
+++ cimcClientSfcbLocal.c	12 Jun 2012 19:12:56 -0000	1.47
@@ -2019,7 +2019,7 @@
    return NewCMPIDateTimeFromChars(utcTime,rc); 
 }
 
-ClientEnv* _Create_SfcbLocal_Env(char *id)
+ClientEnv* _Create_SfcbLocal_Env(char *id, unsigned int options, int *rc, char **msg)
 {
  
    static ClientEnvFT localFT = {
@@ -2043,6 +2043,7 @@
     ClientEnv *env = (ClientEnv*)malloc(sizeof(ClientEnv));
     env->hdl=NULL;
     env->ft=&localFT;
+    env->options = options;
 
     // enable trace logging
     _SFCB_TRACE_INIT();

Index: cimcClientSfcbLocal.h
===================================================================
RCS file: /cvsroot/sblim/sfcb/cimcClientSfcbLocal.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cimcClientSfcbLocal.h	27 Sep 2007 15:39:42 -0000	1.4
+++ cimcClientSfcbLocal.h	12 Jun 2012 19:12:57 -0000	1.5
@@ -180,6 +180,7 @@
 struct _ClientEnv {
    void *hdl;
    ClientEnvFT *ft;
+   unsigned int options;
 };
 
 int sameCMPIObjectPath ( const CMPIObjectPath *cop1, const CMPIObjectPath *cop2);

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.776
retrieving revision 1.777
diff -u -d -r1.776 -r1.777
--- ChangeLog	7 Jun 2012 20:27:13 -0000	1.776
+++ ChangeLog	12 Jun 2012 19:12:57 -0000	1.777
@@ -1,3 +1,8 @@
+2012-06-12  Chris Buccella  <buc...@li...>
+
+	* cimcClientSfcbLocal.h, cimcClientSfcbLocal.c:
+	[ 3534659 ] Match SfcbLocal to sfcc update
+
 2012-06-07 Michael Chase-Salerno <br...@li...>
 
 	* interopProvider.c:

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

[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  f76860014073e64611f5201e43d0214fd4b8c0cf (commit)
      from  b1a3a4960c918b64b7aca341218b7091170c1a6f (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 f76860014073e64611f5201e43d0214fd4b8c0cf
Author: buccella <buc...@li...>
Date:   Tue Jun 12 15:10:26 2012 -0400

    3495060 was missing

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

Summary of changes:
diff --git a/NEWS b/NEWS
index 47bf5f9..2f2be6f 100644
--- a/NEWS
+++ b/NEWS
@@ -134,7 +134,7 @@ New Features:
 - 3484025 Disable indication sequencing
 - 3462309 Do not allow multiple instances of sfcb
 - 3488688 Don't spawn logger for clients
-
+- 3495060 Verify filter and handler information during subscription
 
 Bugs Fixed: 
 


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

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

[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  b1a3a4960c918b64b7aca341218b7091170c1a6f (commit)
      from  f193aa21b9a123b67d79d262789db2d06b83a45a (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 b1a3a4960c918b64b7aca341218b7091170c1a6f
Author: buccella <buc...@li...>
Date:   Tue Jun 12 14:34:48 2012 -0400

    [ 3534659 ] Match SfcbLocal to sfcc update

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 3d6e131..a55966a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-12  Chris Buccella  <buc...@li...>
+
+	* cimcClientSfcbLocal.c, cimcClientSfcbLocal.h:
+	[ 3534659 ] Match SfcbLocal to sfcc update
+
 2012-06-07 Michael Chase-Salerno <br...@li...>
 
 	* interopProvider.c:
diff --git a/NEWS b/NEWS
index ddc0864..47bf5f9 100644
--- a/NEWS
+++ b/NEWS
@@ -100,6 +100,7 @@ New Features:
 - 3517530 Implement mark, release routines in CMPIBrokerMemFT
 - 3513390 Enforce LD and subscription limits
 - 3527920 RI and http responsecodes
+- 3534659 Match SfcbLocal to sfcc update
 
 Bugs Fixed:
 - 3514627 unsupported sfcb.cfg param - use exit call
diff --git a/cimcClientSfcbLocal.c b/cimcClientSfcbLocal.c
index 7a8a7b0..78e3732 100644
--- a/cimcClientSfcbLocal.c
+++ b/cimcClientSfcbLocal.c
@@ -2077,7 +2077,7 @@ newDateTimeFromChars(ClientEnv *ce, const char *utcTime, CMPIStatus *rc)
 }
 
 ClientEnv      *
-_Create_SfcbLocal_Env(char *id)
+_Create_SfcbLocal_Env(char *id, unsigned int options, int *rc, char **msg)
 {
 
   static ClientEnvFT localFT = {
@@ -2101,6 +2101,7 @@ _Create_SfcbLocal_Env(char *id)
   ClientEnv      *env = (ClientEnv *) malloc(sizeof(ClientEnv));
   env->hdl = NULL;
   env->ft = &localFT;
+  env->options = options;
 
   // enable trace logging
   _SFCB_TRACE_INIT();
diff --git a/cimcClientSfcbLocal.h b/cimcClientSfcbLocal.h
index af796a2..0547b91 100644
--- a/cimcClientSfcbLocal.h
+++ b/cimcClientSfcbLocal.h
@@ -500,6 +500,7 @@ extern          "C" {
   struct _ClientEnv {
     void           *hdl;
     ClientEnvFT    *ft;
+    unsigned int    options;
   };
 
   int             sameCMPIObjectPath(const CMPIObjectPath * cop1,


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

[Sblim-commit] cmpi-devel CmpiImpl.cpp,1.16,1.17 NEWS,1.24,1.25

[Tyrel D. <ty...@us...>]

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

Modified Files:
	CmpiImpl.cpp NEWS 
Log Message:
Fixed 3531603: no way to determine internal type of CmpiData 


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/NEWS,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- NEWS	5 Jun 2012 22:47:55 -0000	1.24
+++ NEWS	10 Jun 2012 01:30:07 -0000	1.25
@@ -6,6 +6,7 @@
 - 3531599 replace CMGetCharPtr with CMGetCharsPtr
 - 3531597 returnData with char type fails
 - 3531596 CmpiData uses wrong union for unsigned data
+- 3531603 no way to determine internal type of CmpiData 
 
 New Features:
 - 3531601 add CmpiString constructor for char data

Index: CmpiImpl.cpp
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/CmpiImpl.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- CmpiImpl.cpp	5 Jun 2012 22:47:55 -0000	1.16
+++ CmpiImpl.cpp	10 Jun 2012 01:30:07 -0000	1.17
@@ -1042,6 +1042,10 @@
   return (_data.state & CMPI_notFound);
 }
 
+CMPIType CmpiData::getType() const {
+    return _data.type;
+}
+
 
 //---------------------------------------------------
 //--

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

[Michael Chase-S. <mc...@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  f193aa21b9a123b67d79d262789db2d06b83a45a (commit)
      from  75653ff204b7b886f2c255f6f99c93318432f40c (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 f193aa21b9a123b67d79d262789db2d06b83a45a
Author: Michael Chase-Salerno <br...@li...>
Date:   Thu Jun 7 17:50:22 2012 -0400

    [ 3532951 ] Filter creation fails with disable default properties

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index afb4290..3d6e131 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-07 Michael Chase-Salerno <br...@li...>
+
+	* interopProvider.c:
+	[ 3532951 ] Filter creation fails with disable default properties
+
 2012-06-06 Michael Chase-Salerno <br...@li...>
 
 	* indCIMXMLExport.c:
diff --git a/NEWS b/NEWS
index 7c9d907..ddc0864 100644
--- a/NEWS
+++ b/NEWS
@@ -112,6 +112,7 @@ Bugs Fixed:
 - 3528096 Error status codes sometimes not propigated for instances
 - 3529856 httpProcs limit can be broken
 - 3527620 EnumerateClasses does not include qualifiers by default
+- 3532951 Filter creation fails with disable default properties
 
 Changes in 1.3.14
 =================
diff --git a/interopProvider.c b/interopProvider.c
index f45b5ab..a60f714 100644
--- a/interopProvider.c
+++ b/interopProvider.c
@@ -1179,6 +1179,7 @@ InteropProviderCreateInstance(CMPIInstanceMI * mi,
       gethostname(hostName,511); /* should be the same as SystemName of IndicationService */
       CMAddKey(copLocal, "SystemName", hostName, CMPI_chars);
       CMSetProperty(ciLocal,"SystemName",hostName,CMPI_chars);
+      CMSetStatus(&st, CMPI_RC_OK);
     }
 
     for (ql = (char *) lang->hdl, i = 0, n = 0, m = strlen(ql); i < m; i++) {


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

[Sblim-commit] sfcb ChangeLog, 1.775, 1.776 NEWS, 1.693, 1.694 interopProvider.c, 1.61, 1.62

[Michael Chase-S. <mc...@us...>]

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

Modified Files:
	ChangeLog NEWS interopProvider.c 
Log Message:
[ 3532951 ] Filter creation fails with disable default properties


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.693
retrieving revision 1.694
diff -u -d -r1.693 -r1.694
--- NEWS	7 Jun 2012 02:56:09 -0000	1.693
+++ NEWS	7 Jun 2012 20:27:13 -0000	1.694
@@ -23,6 +23,7 @@
 - 3528096 Error status codes sometimes not propigated for instances
 - 3529856 httpProcs limit can be broken
 - 3527620 EnumerateClasses does not include qualifiers by default
+- 3532951 Filter creation fails with disable default properties
 
 Changes in 1.3.14
 =================

Index: interopProvider.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/interopProvider.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- interopProvider.c	23 May 2012 21:58:55 -0000	1.61
+++ interopProvider.c	7 Jun 2012 20:27:13 -0000	1.62
@@ -1047,14 +1047,14 @@
          provide this if the client does not */
       CMPIString *sysname=ciLocal->ft->getProperty(ciLocal,"SystemName",&st).value.string;
       if (sysname == NULL || sysname->hdl == NULL) {
- 	char hostName[512];
- 	hostName[0]=0;
-	gethostname(hostName,511); /* should be the same as SystemName of IndicationService */
-	CMAddKey(copLocal, "SystemName", hostName, CMPI_chars);
-	CMSetProperty(ciLocal,"SystemName",hostName,CMPI_chars);
+        char hostName[512];
+        hostName[0]=0;
+        gethostname(hostName,511); /* should be the same as SystemName of IndicationService */
+        CMAddKey(copLocal, "SystemName", hostName, CMPI_chars);
+        CMSetProperty(ciLocal,"SystemName",hostName,CMPI_chars);
+        CMSetStatus(&st, CMPI_RC_OK);
       }
 
-
       for (ql=(char*)lang->hdl,i=0,n=0,m=strlen(ql); i<m; i++) {
          if (ql[i]>' ') lng[n++]=ql[i];
          if (n>=15) break;

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.775
retrieving revision 1.776
diff -u -d -r1.775 -r1.776
--- ChangeLog	7 Jun 2012 02:56:09 -0000	1.775
+++ ChangeLog	7 Jun 2012 20:27:13 -0000	1.776
@@ -1,3 +1,8 @@
+2012-06-07 Michael Chase-Salerno <br...@li...>
+
+	* interopProvider.c:
+	[ 3532951 ] Filter creation fails with disable default properties
+
 2012-06-06 Michael Chase-Salerno <br...@li...>
 
 	* control.h, indCIMXMLExport.c, sfcb.cfg.pre.in:

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

[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  7bad81a2525585d6c1f67f3183b5371a3f30e72a (commit)
      from  167dcc80e145e486139266560b284aed7aa20f36 (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 7bad81a2525585d6c1f67f3183b5371a3f30e72a
Author: buccella <buc...@li...>
Date:   Thu Jun 7 13:55:58 2012 -0400

    [ 3435363 ] Wrong call of curl_global_cleanup()

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 86bf9af..8de2ebc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-07  Chris Buccella  <buc...@li...>
+
+	* backend/cimxml/client.c, cimc/cimc.h, cimc/cimcclient.c:
+	[ 3435363 ] Wrong call of curl_global_cleanup()
+
 2012-05-29  Chris Buccella  <buc...@li...>
 
 	* TEST/v2test_ecn.c, backend/cimxml/cimXmlParser.c,
diff --git a/NEWS b/NEWS
index 2bd79aa..86b4140 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Bugs:
 - 3344917: Beam, file leak
 - 3528819: Crash in getInstance when instance has NULL properties
 - 3530609: Various BEAM Errors
+- 3435363: Wrong call of curl_global_cleanup()
 
 Changes in 2.2.3
 ================
diff --git a/backend/cimxml/client.c b/backend/cimxml/client.c
index 69b2848..16b788d 100644
--- a/backend/cimxml/client.c
+++ b/backend/cimxml/client.c
@@ -2961,8 +2961,12 @@ static void *releaseEnv(CIMCEnv *env)
 {
   CMPIStatus rc = {CMPI_RC_OK,NULL};
   
+  if (!(env->options & CIMC_NO_CURL_INIT)) {
+    curl_global_cleanup();
+  }
+
   free(env);
-  curl_global_cleanup();
+
   return NULL;
 }
 
@@ -3036,13 +3040,18 @@ static CIMCEnvFT localFT = {
 
 /* Factory function for CIMXML Client */
 
-CIMCEnv* _Create_XML_Env(char *id)
+CIMCEnv* _Create_XML_Env(const char *id, unsigned int options, int *rc, char **msg)
 {
  
     CIMCEnv *env = (CIMCEnv*)malloc(sizeof(CIMCEnv));
     env->hdl=NULL;
     env->ft=&localFT;
-    
+    env->options = options;
+
+    if (!(options & CIMC_NO_CURL_INIT)) {
+      curl_global_init(CURL_GLOBAL_SSL);
+    }
+
     return env;
  }
 /* *********************************************************** */ 
diff --git a/cimc/cimc.h b/cimc/cimc.h
index a238994..1199eeb 100644
--- a/cimc/cimc.h
+++ b/cimc/cimc.h
@@ -30,6 +30,9 @@
 extern "C" {
 #endif
 
+/* NewCIMCEnv options */
+
+#define CIMC_NO_CURL_INIT 1  /* don't call curl_global_init() or _cleanup() */
 
   
   /*
@@ -404,6 +407,7 @@ extern "C" {
   struct _CIMCEnv {
     void *hdl;
     CIMCEnvFT *ft;
+    unsigned int options;
   };
 
 
diff --git a/cimc/cimcclient.c b/cimc/cimcclient.c
index 4a7f943..73865dc 100644
--- a/cimc/cimcclient.c
+++ b/cimc/cimcclient.c
@@ -36,7 +36,12 @@
 #define ENTLEN 256
 #define ERRLEN 1024
 
+/* Create new CIMCEnv
 
+   id - the interface to use, either XML or SfcbLocal
+   options - options passed to the given backend (ops in cimc.h)
+
+ */
 CIMCEnv* NewCIMCEnv(const char *id, unsigned int options, int *rc, char **msg)
 {
    char         libName[LIBLEN+1];


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

[Sblim-commit] sfcb ChangeLog, 1.774, 1.775 NEWS, 1.692, 1.693 control.c, 1.46, 1.47 indCIMXMLExport.c, 1.18, 1.19 sfcb.cfg.pre.in, 1.34, 1.35

[Michael Chase-S. <mc...@us...>]

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

Modified Files:
	ChangeLog NEWS control.c indCIMXMLExport.c sfcb.cfg.pre.in 
Log Message:
[ 3531210 ] Allow indication delivery timeout tuning



Index: indCIMXMLExport.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/indCIMXMLExport.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- indCIMXMLExport.c	7 Jun 2012 01:02:14 -0000	1.18
+++ indCIMXMLExport.c	7 Jun 2012 02:56:09 -0000	1.19
@@ -25,6 +25,7 @@
 #include "utilft.h"
 #include "trace.h"
 #include <string.h>
+#include "control.h"
 
 extern UtilStringBuffer *newStringBuffer(int);
 extern int getControlChars(char *id, char **val);
@@ -185,8 +186,11 @@
         return 3;
     }
 
-    /* Set transfer timeout to 10 sec */
-    rv = curl_easy_setopt(cd->mHandle, CURLOPT_TIMEOUT, 10);
+    /* Set transfer timeout to config option or 10 sec */
+    long indicationCurlTimeout=10;
+    if (getControlNum("indicationCurlTimeout", &indicationCurlTimeout))
+          indicationCurlTimeout = 10;
+    rv = curl_easy_setopt(cd->mHandle, CURLOPT_TIMEOUT, indicationCurlTimeout);
 
     /* Set username and password * /
     if (url.user.length() > 0 && url.password.length() > 0) {

Index: control.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/control.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- control.c	19 Apr 2012 17:39:55 -0000	1.46
+++ control.c	7 Jun 2012 02:56:09 -0000	1.47
@@ -135,6 +135,7 @@
    {"indicationDeliveryThreadTimeout",1,"0"},
    {"MaxListenerDestinations",1,"100"},
    {"MaxActiveSubscriptions",1,"100"},
+   {"indicationCurlTimeout",1,"10"},
 };
 
 void sunsetControl()

Index: sfcb.cfg.pre.in
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcb.cfg.pre.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- sfcb.cfg.pre.in	19 Apr 2012 17:39:55 -0000	1.34
+++ sfcb.cfg.pre.in	7 Jun 2012 02:56:09 -0000	1.35
@@ -278,6 +278,11 @@
 ## Default is 0 (no timeout)
 #indicationDeliveryThreadTimeout: 0
 
+## Timeout passed to curl for thread delivery. After this time has elapsed
+## the indication delivery is considered a failure.
+## Default is 10 seconds
+#indicationCurlTimeout: 10
+
 ##----------------------------Reliable Indications ----------------------------
 ## Interval between indication retry attempts
 ## Default is 20 seconds

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.774
retrieving revision 1.775
diff -u -d -r1.774 -r1.775
--- ChangeLog	7 Jun 2012 01:02:14 -0000	1.774
+++ ChangeLog	7 Jun 2012 02:56:09 -0000	1.775
@@ -1,5 +1,10 @@
 2012-06-06 Michael Chase-Salerno <br...@li...>
 
+	* control.h, indCIMXMLExport.c, sfcb.cfg.pre.in:
+	[ 3531210 ] Allow indication delivery timeout tuning
+
+2012-06-06 Michael Chase-Salerno <br...@li...>
+
 	* indCIMXMLExport.c:
 	[ 3527920 ] RI and http response codes
 	Fix for curl errors not being caught

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.692
retrieving revision 1.693
diff -u -d -r1.692 -r1.693
--- NEWS	30 May 2012 21:26:33 -0000	1.692
+++ NEWS	7 Jun 2012 02:56:09 -0000	1.693
@@ -8,6 +8,7 @@
 - 3517530 Implement mark, release routines in CMPIBrokerMemFT
 - 3513390 Enforce LD and subscription limits
 - 3527920 RI and http responsecodes
+- 3531210 Allow indication delivery timeout tuning
 
 Bugs fixed:
 

[Sblim-commit] sfcb ChangeLog, 1.773, 1.774 indCIMXMLExport.c, 1.17, 1.18

[Michael Chase-S. <mc...@us...>]

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

Modified Files:
	ChangeLog indCIMXMLExport.c 
Log Message:
[ 3527920 ] RI and http response codes
Fix for curl errors not being caught


Index: indCIMXMLExport.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/indCIMXMLExport.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- indCIMXMLExport.c	21 May 2012 18:58:30 -0000	1.17
+++ indCIMXMLExport.c	7 Jun 2012 01:02:14 -0000	1.18
@@ -290,8 +290,14 @@
              rc = 501;
              break;
           default:
+             if (responseCode != 0) {
+               // If we got an unrecognized response code, return it
+               rc = (int)responseCode;
+             } else {
+               // Otherwise there was some other curl error, return that
+               rc = (int)rv;
+             }
              *msg = getErrorMessage(rv);
-             rc = (int)responseCode;
              break;
         }
         return rc;

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.773
retrieving revision 1.774
diff -u -d -r1.773 -r1.774
--- ChangeLog	30 May 2012 21:26:33 -0000	1.773
+++ ChangeLog	7 Jun 2012 01:02:14 -0000	1.774
@@ -1,3 +1,9 @@
+2012-06-06 Michael Chase-Salerno <br...@li...>
+
+	* indCIMXMLExport.c:
+	[ 3527920 ] RI and http response codes
+	Fix for curl errors not being caught
+
 2012-05-30  Chris Buccella  <buc...@li...>
 
 	* cimXmlOps.y:

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

[Michael Chase-S. <mc...@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  75653ff204b7b886f2c255f6f99c93318432f40c (commit)
      from  ab71d6d8e7904a5f42fa3bba2204a55cac91dd8b (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 75653ff204b7b886f2c255f6f99c93318432f40c
Author: Michael Chase-Salerno <br...@li...>
Date:   Wed Jun 6 20:54:12 2012 -0400

    [ 3527920 ] RI and http response codes
    Fix for curl errors not being caught

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 8468e6b..afb4290 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-06 Michael Chase-Salerno <br...@li...>
+
+	* indCIMXMLExport.c:
+	[ 3527920 ] RI and http response codes
+	Fix for curl errors not being caught
+
 2012-06-01 Michael Chase-Salerno <br...@li...>
 
 	* control.h, indCIMXMLExport.c, sfcb.cfg.pre.in:
diff --git a/indCIMXMLExport.c b/indCIMXMLExport.c
index 636091b..159a77c 100644
--- a/indCIMXMLExport.c
+++ b/indCIMXMLExport.c
@@ -346,8 +346,14 @@ getResponse(CurlData * cd, char **msg)
          rc = 501;
          break;
       default:
+         if (responseCode != 0) {
+           // If we got an unrecognized response code, return it
+           rc = (int)responseCode;
+         } else {
+           // Otherwise there was some other curl error, return that
+           rc = (int)rv;
+         }
          *msg = getErrorMessage(rv);
-         rc = (int)responseCode;
          break;
     } 
     return rc;


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

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

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

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

Modified Files:
      Tag: Experimental
	WBEMConfiguration.java 
Log Message:
3524050 - Improve WWW-Authenticate in HTTPClient.java

Index: WBEMConfiguration.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util/WBEMConfiguration.java,v
retrieving revision 1.17.2.30
retrieving revision 1.17.2.31
diff -u -d -r1.17.2.30 -r1.17.2.31
--- WBEMConfiguration.java	10 May 2012 23:23:42 -0000	1.17.2.30
+++ WBEMConfiguration.java	6 Jun 2012 14:43:13 -0000	1.17.2.31
@@ -40,6 +40,7 @@
  * 3492214    2012-02-23  blaschke-oss Add a SenderIPAddress property indications
  * 3492224    2012-02-23  blaschke-oss Need two different timeouts for Socket connections
  * 3521157    2012-05-10  blaschke-oss JSR48 1.0.0: PROP_ENABLE_*_LOGGING is Level, not 0/1
+ * 3524050    2012-06-06  blaschke-oss Improve WWW-Authenticate in HTTPClient.java
  */
 
 package org.sblim.cimclient.internal.util;
@@ -523,6 +524,15 @@
 	}
 
 	/**
+	 * Returns the WWW-Authenticate info to use on first request
+	 * 
+	 * @return The WWW-Authenticate info
+	 */
+	public String getHttpWwwAuthenticateInfo() {
+		return getProperty(WBEMConfigurationProperties.HTTP_WWW_AUTHENTICATE_INFO, null);
+	}
+
+	/**
 	 * Returns the state of MPOST enablement
 	 * 
 	 * @return <code>true</code> if MPOST is enabled, <code>false</code>

[Sblim-commit] cmpi-devel CmpiImpl.cpp,1.15,1.16 NEWS,1.23,1.24

[Tyrel D. <ty...@us...>]

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

Modified Files:
	CmpiImpl.cpp NEWS 
Log Message:
Fixed 3531596: CmpiData uses wrong union for unsigned data


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/NEWS,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- NEWS	5 Jun 2012 22:36:12 -0000	1.23
+++ NEWS	5 Jun 2012 22:47:55 -0000	1.24
@@ -5,6 +5,7 @@
 - 3531598 several CmpiObjectPath methods leak memory
 - 3531599 replace CMGetCharPtr with CMGetCharsPtr
 - 3531597 returnData with char type fails
+- 3531596 CmpiData uses wrong union for unsigned data
 
 New Features:
 - 3531601 add CmpiString constructor for char data

Index: CmpiImpl.cpp
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/CmpiImpl.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- CmpiImpl.cpp	5 Jun 2012 22:36:11 -0000	1.15
+++ CmpiImpl.cpp	5 Jun 2012 22:47:55 -0000	1.16
@@ -858,25 +858,25 @@
 
 CmpiData::CmpiData(CMPIUint8 d) {
    _data.state=CMPI_goodValue;
-   _data.value.sint8=d;
+   _data.value.uint8=d;
    _data.type=CMPI_uint8;
 }
 
 CmpiData::CmpiData(CMPIUint16 d) {
    _data.state=CMPI_goodValue;
-   _data.value.sint16=d;
+   _data.value.uint16=d;
    _data.type=CMPI_uint16;
 }
 
 CmpiData::CmpiData(CMPIUint32 d) {
    _data.state=CMPI_goodValue;
-   _data.value.sint32=d;
+   _data.value.uint32=d;
    _data.type=CMPI_uint32;
 }
 
 CmpiData::CmpiData(CMPIUint64 d) {
    _data.state=CMPI_goodValue;
-   _data.value.sint64=d;
+   _data.value.uint64=d;
    _data.type=CMPI_uint64;
 }
 

[Sblim-commit] cmpi-devel CmpiImpl.cpp,1.14,1.15 NEWS,1.22,1.23

[Tyrel D. <ty...@us...>]

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

Modified Files:
	CmpiImpl.cpp NEWS 
Log Message:
Fixed 3531597: returnData with char type fails


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/NEWS,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- NEWS	3 Jun 2012 05:35:38 -0000	1.22
+++ NEWS	5 Jun 2012 22:36:12 -0000	1.23
@@ -4,6 +4,7 @@
 Bugs Fixed:
 - 3531598 several CmpiObjectPath methods leak memory
 - 3531599 replace CMGetCharPtr with CMGetCharsPtr
+- 3531597 returnData with char type fails
 
 New Features:
 - 3531601 add CmpiString constructor for char data

Index: CmpiImpl.cpp
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/CmpiImpl.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- CmpiImpl.cpp	3 Jun 2012 05:35:38 -0000	1.14
+++ CmpiImpl.cpp	5 Jun 2012 22:36:11 -0000	1.15
@@ -1353,7 +1353,8 @@
 }
 
 void CmpiResult::returnData(const CmpiData& d) {
-   CMPIStatus rc=getEnc()->ft->returnData(getEnc(),&d._data.value,d._data.type);
+   CMPIStatus rc=getEnc()->ft->returnData(getEnc(),
+           (d._data.type!=CMPI_chars) ? &d._data.value : (CMPIValue *)d._data.value.chars, d._data.type);
    if (rc.rc!=CMPI_RC_OK) throw CmpiStatus(rc);
 }
 

[Sblim-commit] cmpi-devel CmpiImpl.cpp,1.13,1.14 NEWS,1.21,1.22

[Tyrel D. <ty...@us...>]

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

Modified Files:
	CmpiImpl.cpp NEWS 
Log Message:
Fixed 3531599: replace CMGetCharPtr with CMGetCharsPtr


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/NEWS,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- NEWS	3 Jun 2012 05:29:32 -0000	1.21
+++ NEWS	3 Jun 2012 05:35:38 -0000	1.22
@@ -3,6 +3,7 @@
 
 Bugs Fixed:
 - 3531598 several CmpiObjectPath methods leak memory
+- 3531599 replace CMGetCharPtr with CMGetCharsPtr
 
 New Features:
 - 3531601 add CmpiString constructor for char data

Index: CmpiImpl.cpp
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/CmpiImpl.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- CmpiImpl.cpp	3 Jun 2012 05:29:32 -0000	1.13
+++ CmpiImpl.cpp	3 Jun 2012 05:35:38 -0000	1.14
@@ -1188,7 +1188,7 @@
 }
 
 const char*  CmpiStatus::msg() {
-   return st.msg ? CMGetCharPtr(st.msg) : 0;
+   return st.msg ? CMGetCharsPtr(st.msg,NULL) : 0;
 }
 
 CmpiStatus::CmpiStatus() {
@@ -1252,7 +1252,7 @@
 
 void *CmpiObjectPath::makeObjectPath(CMPIBroker *mb, const CmpiString& ns, const char *cls) {
    CMPIStatus rc={CMPI_RC_OK,NULL};
-   void *op=mb->eft->newObjectPath(mb,CMGetCharPtr(ns.getEnc()),cls,&rc);
+   void *op=mb->eft->newObjectPath(mb,CMGetCharsPtr(ns.getEnc(),NULL),cls,&rc);
    if (rc.rc!=CMPI_RC_OK) throw CmpiStatus(rc);
    return op;
 }

[Sblim-commit] cmpi-devel CmpiImpl.cpp,1.12,1.13 NEWS,1.20,1.21

[Tyrel D. <ty...@us...>]

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

Modified Files:
	CmpiImpl.cpp NEWS 
Log Message:
Fixed 3531598: several CmpiObjectPath methods leak memory


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/NEWS,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- NEWS	3 Jun 2012 04:51:09 -0000	1.20
+++ NEWS	3 Jun 2012 05:29:32 -0000	1.21
@@ -2,6 +2,7 @@
 ================
 
 Bugs Fixed:
+- 3531598 several CmpiObjectPath methods leak memory
 
 New Features:
 - 3531601 add CmpiString constructor for char data

Index: CmpiImpl.cpp
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/CmpiImpl.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- CmpiImpl.cpp	3 Jun 2012 04:51:09 -0000	1.12
+++ CmpiImpl.cpp	3 Jun 2012 05:29:32 -0000	1.13
@@ -1133,7 +1133,7 @@
      else
        throw CmpiStatus(rc.rc,name->charPtr());
    }
-   if (name) *name=*(new CmpiString(s));
+   if (name) *name=CmpiString(s);
    return d;
 };
 
@@ -1268,7 +1268,7 @@
    CMPIStatus rc={CMPI_RC_OK,NULL};
    CMPIString *s=getEnc()->ft->getNameSpace(getEnc(),&rc);
    if (rc.rc!=CMPI_RC_OK) throw CmpiStatus(rc);
-   return *new CmpiString(s);
+   return CmpiString(s);
 }
 
 void CmpiObjectPath::setNameSpace(const char* ns) {
@@ -1280,7 +1280,7 @@
    CMPIStatus rc={CMPI_RC_OK,NULL};
    CMPIString *s=getEnc()->ft->getHostname(getEnc(),&rc);
    if (rc.rc!=CMPI_RC_OK) throw CmpiStatus(rc);
-   return *new CmpiString(s);
+   return CmpiString(s);
 }
 
 void CmpiObjectPath::setHostname(const char* hn) {
@@ -1292,7 +1292,7 @@
    CMPIStatus rc={CMPI_RC_OK,NULL};
    CMPIString *s=getEnc()->ft->getClassName(getEnc(),&rc);
    if (rc.rc!=CMPI_RC_OK) throw CmpiStatus(rc);
-   return *new CmpiString(s);
+   return CmpiString(s);
 }
 
 void CmpiObjectPath::setClassName(const char* cn) {
@@ -1321,7 +1321,7 @@
    CMPIString *s;
    d._data=getEnc()->ft->getKeyAt(getEnc(),(int)pos,&s,&rc);
    if (rc.rc!=CMPI_RC_OK) throw CmpiStatus(rc);
-   if (name) *name=*(new CmpiString(s));
+   if (name) *name=CmpiString(s);
    return d;
 }
 
@@ -1643,7 +1643,7 @@
      else
        throw CmpiStatus(rc.rc,name->charPtr());
    }
-   if (name) *name=*(new CmpiString(s));
+   if (name) *name=CmpiString(s);
    return d;
 }
 

[Sblim-commit] cmpi-devel/cmpi CmpiString.h,1.3,1.4

[Tyrel D. <ty...@us...>]

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

Modified Files:
	CmpiString.h 
Log Message:
Fixed 3531601: add CmpiString constructor for char data


Index: CmpiString.h
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/cmpi/CmpiString.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CmpiString.h	9 Jul 2008 19:36:59 -0000	1.3
+++ CmpiString.h	3 Jun 2012 04:51:10 -0000	1.4
@@ -71,6 +71,10 @@
    */
    CmpiString();
 
+   /** Constructor - char *
+    */
+   CmpiString(const char * s);
+
    /** Constructor - Copy constructor
    */
    CmpiString(const CmpiString& s);

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

[Michael Chase-S. <mc...@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  ab71d6d8e7904a5f42fa3bba2204a55cac91dd8b (commit)
      from  d42b30ac4e38801e4da2bd0d344160492f5f9990 (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 ab71d6d8e7904a5f42fa3bba2204a55cac91dd8b
Author: Michael Chase-Salerno <br...@li...>
Date:   Fri Jun 1 14:49:54 2012 -0400

    [ 3531210 ] Allow indication delivery timeout tuning

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 815912a..8468e6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-01 Michael Chase-Salerno <br...@li...>
+
+	* control.h, indCIMXMLExport.c, sfcb.cfg.pre.in:
+	[ 3531210 ] Allow indication delivery timeout tuning
+
 2012-05-30  Chris Buccella  <buc...@li...>
 
 	* cimXmlOps.y:
diff --git a/NEWS b/NEWS
index 00095db..7c9d907 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ New features:
 - 3441679 Add a feature to validate CMPI types
 - 3497831 Updates to sfcb-ps test script
 - 3506453 Support peer cert verification for SSL indications
+- 3531210 Allow indication delivery timeout tuning
 
 Bugs fixed: 
 - 3495804 Cleanup: httpProcId still defined, wrong define in cimXmlGen
diff --git a/control.c b/control.c
index d394a3c..d89f4c3 100644
--- a/control.c
+++ b/control.c
@@ -129,7 +129,7 @@ Control         init[] = {
   {"indicationDeliveryThreadTimeout",1,"0"},
   {"MaxListenerDestinations",1,"100"},
   {"MaxActiveSubscriptions",1,"100"},
-
+  {"indicationCurlTimeout",1,"10"},
 };
 
 void
diff --git a/indCIMXMLExport.c b/indCIMXMLExport.c
index dbaa4b3..636091b 100644
--- a/indCIMXMLExport.c
+++ b/indCIMXMLExport.c
@@ -23,6 +23,7 @@
 #include <sfcCommon/utilft.h>
 #include "trace.h"
 #include <string.h>
+#include "control.h"
 
 extern UtilStringBuffer *newStringBuffer(int);
 extern int      getControlChars(char *id, char **val);
@@ -229,10 +230,11 @@ genRequest(CurlData * cd, char *url, char **msg)
     return 3;
   }
 
-  /*
-   * Set transfer timeout to 10 sec 
-   */
-  rv = curl_easy_setopt(cd->mHandle, CURLOPT_TIMEOUT, 10);
+  /* Set transfer timeout to config option or 10 sec */
+  long indicationCurlTimeout=10;
+  if (getControlNum("indicationCurlTimeout", &indicationCurlTimeout))
+        indicationCurlTimeout = 10;
+  rv = curl_easy_setopt(cd->mHandle, CURLOPT_TIMEOUT, indicationCurlTimeout);
 
   /*
    * Set username and password * / if (url.user.length() > 0 &&
diff --git a/sfcb.cfg.pre.in b/sfcb.cfg.pre.in
index f7d9cf4..e3c55a1 100644
--- a/sfcb.cfg.pre.in
+++ b/sfcb.cfg.pre.in
@@ -298,6 +298,11 @@ sslCiphers: ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH
 ## Default is 0 (no timeout)
 #indicationDeliveryThreadTimeout: 0
 
+## Timeout passed to curl for thread delivery. After this time has elapsed
+## the indication delivery is considered a failure.
+## Default is 10 seconds
+#indicationCurlTimeout: 10
+
 ##----------------------------Reliable Indications ----------------------------
 ## Interval between indication retry attempts
 ## Default is 20 seconds


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

[Sblim-commit] jsr48-client/src/org/sblim/cimclient WBEMListenerSBLIM.java, 1.5.2.13, 1.5.2.14

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

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

Modified Files:
      Tag: Experimental
	WBEMListenerSBLIM.java 
Log Message:
3529065 - Enable WBEMListener get/setProperty

Index: WBEMListenerSBLIM.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/WBEMListenerSBLIM.java,v
retrieving revision 1.5.2.13
retrieving revision 1.5.2.14
diff -u -d -r1.5.2.13 -r1.5.2.14
--- WBEMListenerSBLIM.java	23 May 2012 16:59:22 -0000	1.5.2.13
+++ WBEMListenerSBLIM.java	1 Jun 2012 17:49:37 -0000	1.5.2.14
@@ -26,12 +26,15 @@
  * 3496385    2012-03-02  blaschke-oss JSR48 1.0.0: add WBEMListener get/setProperty
  * 3513228    2012-04-23  blaschke-oss Reliable Indications support can create lots of threads
  * 3529062    2012-05-23  blaschke-oss WBEMListenerFactory should return new instance
+ * 3529065    2012-05-31  hellerda     Enable WBEMListener get/setProperty
  */
 
 package org.sblim.cimclient;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.BindException;
+import java.util.Enumeration;
 import java.util.EventListener;
 import java.util.HashMap;
 import java.util.Map;
@@ -39,6 +42,7 @@
 
 import javax.wbem.listener.IndicationListener;
 import javax.wbem.listener.WBEMListener;
+import javax.wbem.listener.WBEMListenerConstants;
 
 import org.sblim.cimclient.internal.http.HttpConnectionHandler;
 import org.sblim.cimclient.internal.http.HttpServerConnection;
@@ -59,7 +63,7 @@
 	 * processes incoming indications
 	 * 
 	 */
-	public static class WBEMListenerImpl {
+	public class WBEMListenerImpl {
 
 		private EventListener iIndicationListener;
 
@@ -89,8 +93,16 @@
 		 */
 		public WBEMListenerImpl(String pLocalAddress, int pPort, boolean pSSL,
 				EventListener pIndicationListener, Properties pProperties) throws IOException {
-			WBEMConfiguration config = (pProperties != null ? new WBEMConfiguration(pProperties)
-					: WBEMConfiguration.getGlobalConfiguration());
+
+			// Merge any properties passed via addListener
+			if (pProperties != null) {
+				for (Enumeration<Object> e = pProperties.keys(); e.hasMoreElements();) {
+					String key = (String) e.nextElement();
+					String value = pProperties.getProperty(key);
+					setProperty(key, value);
+					}
+			}
+			WBEMConfiguration config = iConfiguration;
 			if (!(pIndicationListener instanceof IndicationListener)
 					&& !(pIndicationListener instanceof IndicationListenerSBLIM)) throw new IllegalArgumentException(
 					"Listener must be instance of IndicationListener or IndicationListenerSBLIM");
@@ -157,8 +169,8 @@
 
 	}
 
-	// private final WBEMConfiguration iConfiguration = new
-	// WBEMConfiguration(new Properties());
+	private final WBEMConfiguration iConfiguration = new
+	WBEMConfiguration(new Properties());
 
 	private Map<Integer, WBEMListenerImpl> iPortMap = new HashMap<Integer, WBEMListenerImpl>();
 
@@ -334,9 +346,17 @@
 	public String getProperty(String pName) {
 		if (pName.startsWith("javax.wbem.")) {
 			// Process JSR48 properties
-			return null;
+			if (pName.equals(WBEMListenerConstants.PROP_LISTENER_KEYSTORE)) {
+				return this.iConfiguration.getSslKeyStorePath();
+			} else if (pName.equals(WBEMListenerConstants.PROP_LISTENER_KEYSTORE_PASSWORD)) {
+				return this.iConfiguration.getSslKeyStorePassword();
+			} else if (pName.equals(WBEMListenerConstants.PROP_LISTENER_TRUSTSTORE)) {
+				return this.iConfiguration.getSslTrustStorePath();
+			} else {
+				return null;
+			}
 		}
-		return null;
+		return this.iConfiguration.getDomainProperty(pName);
 	}
 
 	public synchronized void removeListener(int pPort) {
@@ -347,7 +367,22 @@
 	}
 
 	public void setProperty(String pName, String pValue) {
-		throw new IllegalArgumentException("Property " + pName + " with value " + pValue
-				+ " not supported!");
+		if (pName.startsWith("javax.wbem.")) {
+			// Process JSR48 properties
+			if (pName.equals(WBEMListenerConstants.PROP_LISTENER_KEYSTORE)) {
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.KEYSTORE_PATH,
+						pValue);
+			} else if (pName.equals(WBEMListenerConstants.PROP_LISTENER_KEYSTORE_PASSWORD)) {
+				this.iConfiguration.setDomainProperty(
+						WBEMConfigurationProperties.KEYSTORE_PASSWORD, pValue);
+			} else if (pName.equals(WBEMListenerConstants.PROP_LISTENER_TRUSTSTORE)) {
+				this.iConfiguration.setDomainProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH,
+						pValue);
+			} else {
+				throw new IllegalArgumentException(pName);
+			}
+		} else {
+			this.iConfiguration.setDomainProperty(pName, pValue);
+		}
 	}
 }

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/cimxml CIMClientXML_HelperImpl.java, 1.42, 1.43

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

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

Modified Files:
	CIMClientXML_HelperImpl.java 
Log Message:
3527580 - WBEMClient should not throw IllegalArgumentException

Index: CIMClientXML_HelperImpl.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMClientXML_HelperImpl.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- CIMClientXML_HelperImpl.java	9 May 2012 14:18:44 -0000	1.42
+++ CIMClientXML_HelperImpl.java	1 Jun 2012 12:48:37 -0000	1.43
@@ -47,6 +47,7 @@
  * 3062747    2010-09-21  blaschke-oss SblimCIMClient does not log all CIM-XML responces.
  * 3514537    2012-04-03  blaschke-oss TCK: execQueryInstances requires boolean, not Boolean
  * 3521119    2012-04-24  blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
+ * 3527580    2012-05-17  blaschke-oss WBEMClient should not throw IllegalArgumentException
  */
 
 package org.sblim.cimclient.internal.cimxml;
@@ -388,7 +389,7 @@
 		CIMProperty<?>[] keysA = pObjectName.getKeys();
 
 		// Make sure keys are populated
-		if (keysA.length == 0) throw new IllegalArgumentException(
+		if (keysA.length == 0) throw new WBEMException(WBEMException.CIM_ERR_INVALID_PARAMETER,
 				"associatorInstances requires keys for the instance to be populated");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
@@ -463,7 +464,8 @@
 				"null class name");
 
 		// Make sure keys are not populated
-		if (pObjectName.getKeys().length != 0) throw new IllegalArgumentException(
+		if (pObjectName.getKeys().length != 0) throw new WBEMException(
+				WBEMException.CIM_ERR_INVALID_PARAMETER,
 				"Keys should not be populated for associatorClasses");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
@@ -1305,7 +1307,8 @@
 				"null class name");
 
 		// Make sure keys are not populated
-		if (pPath.getKeys().length != 0) throw new IllegalArgumentException(
+		if (pPath.getKeys().length != 0) throw new WBEMException(
+				WBEMException.CIM_ERR_INVALID_PARAMETER,
 				"Keys should not be populated for referenceClasses");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);
@@ -1365,7 +1368,8 @@
 				"null class name");
 
 		// keys are required for CIMInstance
-		if (pPath.getKeys().length == 0) throw new IllegalArgumentException(
+		if (pPath.getKeys().length == 0) throw new WBEMException(
+				WBEMException.CIM_ERR_INVALID_PARAMETER,
 				"refrenceInstances requires keys for the instance to be populated");
 
 		Element simplereqE = CIMXMLBuilderImpl.createSIMPLEREQ(pDoc);

[Sblim-commit] jsr48-client NEWS,1.306,1.307

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

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

Modified Files:
	NEWS 
Log Message:
3527580 - WBEMClient should not throw IllegalArgumentException

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/NEWS,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -d -r1.306 -r1.307
--- NEWS	31 May 2012 15:13:32 -0000	1.306
+++ NEWS	1 Jun 2012 12:48:36 -0000	1.307
@@ -1,5 +1,6 @@
 Changes in HEAD
 ================
+3527580 WBEMClient should not throw IllegalArgumentException
 3526681 CIMError valid status codes out-of-date
 3526679 DOM parser ignores ERROR node CODE
 3526675 Unit test fails on Java 7

[Sblim-commit] jsr48-client NEWS,1.305,1.306

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

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

Modified Files:
	NEWS 
Log Message:
3526681 - CIMError valid status codes out-of-date

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/NEWS,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -d -r1.305 -r1.306
--- NEWS	31 May 2012 15:06:21 -0000	1.305
+++ NEWS	31 May 2012 15:13:32 -0000	1.306
@@ -1,5 +1,6 @@
 Changes in HEAD
 ================
+3526681 CIMError valid status codes out-of-date
 3526679 DOM parser ignores ERROR node CODE
 3526675 Unit test fails on Java 7
 3525914 TCK: SetPropertyTest.testSetProperty failing

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

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

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

Modified Files:
	CIMXMLParserImpl.java 
Log Message:
3526679 - DOM parser ignores ERROR node CODE

Index: CIMXMLParserImpl.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- CIMXMLParserImpl.java	9 May 2012 14:18:44 -0000	1.47
+++ CIMXMLParserImpl.java	31 May 2012 15:06:21 -0000	1.48
@@ -54,6 +54,7 @@
  * 3513349    2012-03-31  blaschke-oss TCK: CIMDataType must not accept null string
  * 3466280    2012-04-23  blaschke-oss get instance failure for CIM_IndicationSubscription
  * 3521119    2012-04-24  blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
+ * 3526679    2012-05-14  blaschke-oss DOM parser ignores ERROR node CODE
  */
 
 package org.sblim.cimclient.internal.cimxml;
@@ -2644,6 +2645,7 @@
 		} catch (Exception e) {
 			LogAndTraceBroker.getBroker().trace(Level.WARNING,
 					"exception while parsing error code from XML", e);
+			errorCode = WBEMException.CIM_ERR_FAILED;
 		}
 		Attr error_descriptionA = (Attr) searchAttribute(pErrorE, "DESCRIPTION");
 		String description = "";
@@ -2665,9 +2667,10 @@
 
 		// throw new CIMException(CIMException.getErrorName(errorCode),
 		// description.substring(description.indexOf(':')+1));
-		if (!rtnV.isEmpty()) return new WBEMException(WBEMException.CIM_ERR_FAILED, "ErrorCode:"
-				+ errorCode + " description:" + description, rtnV.toArray(new CIMInstance[0]));
-		return new WBEMException("ErrorCode:" + errorCode + " description:" + description);
+		if (!rtnV.isEmpty()) return new WBEMException(errorCode, "ErrorCode:" + errorCode
+				+ " description:" + description, rtnV.toArray(new CIMInstance[0]));
+		return new WBEMException(errorCode, "ErrorCode:" + errorCode + " description:"
+				+ description);
 	}
 
 	/**

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/cim DTStringReader.java, 1.7, 1.8

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

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

Modified Files:
	DTStringReader.java 
Log Message:
3526675 - Unit test fails on Java 7

Index: DTStringReader.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cim/DTStringReader.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- DTStringReader.java	28 Apr 2009 19:42:45 -0000	1.7
+++ DTStringReader.java	31 May 2012 14:58:14 -0000	1.8
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -17,6 +17,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)
  * 2763216    2009-04-14  blaschke-oss Code cleanup: visible spelling/grammar errors
+ * 3526675    2012-05-14  blaschke-oss Unit test fails on Java 7
  */
 
 package org.sblim.cimclient.internal.cim;
@@ -98,6 +99,9 @@
 		}
 		if (res < 0) throw new IllegalArgumentException("Negative value is not allowed for "
 				+ pFieldName + " in " + this.iDateTimeStr + "!");
+		// Java 7 parseInt began allowing plus sign
+		if (field.indexOf('+') != -1) throw new IllegalArgumentException(
+				"Plus sign is not allowed for " + pFieldName + " in " + this.iDateTimeStr + "!");
 		return res;
 	}
 

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

[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  d42b30ac4e38801e4da2bd0d344160492f5f9990 (commit)
       via  57f4d276df135de1f5f1a722c41daac61c315d45 (commit)
      from  e8a80e2cf2318dde85c75be2e6e0669eee0f9849 (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 d42b30ac4e38801e4da2bd0d344160492f5f9990
Merge: 57f4d27 e8a80e2
Author: buccella <buc...@li...>
Date:   Wed May 30 17:28:47 2012 -0400

    merge fix

commit 57f4d276df135de1f5f1a722c41daac61c315d45
Author: buccella <buc...@li...>
Date:   Wed May 30 17:27:19 2012 -0400

    [ 3527620 ] EnumerateClasses does not include qualifiers by default

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 0d8af75..815912a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-30  Chris Buccella  <buc...@li...>
+
+	* cimXmlOps.y:
+	[ 3527620 ] EnumerateClasses does not include qualifiers by default
+
 2012-05-25  Dave Heller <hel...@us...>
 
 	* extra/sfcb-ps:
diff --git a/NEWS b/NEWS
index 6af9eee..00095db 100644
--- a/NEWS
+++ b/NEWS
@@ -110,6 +110,7 @@ Bugs Fixed:
 - 3528074 Improve CMPIInstance Error Codes
 - 3528096 Error status codes sometimes not propigated for instances
 - 3529856 httpProcs limit can be broken
+- 3527620 EnumerateClasses does not include qualifiers by default
 
 Changes in 1.3.14
 =================
diff --git a/cimXmlOps.y b/cimXmlOps.y
index 5cf8e6c..6503bd1 100644
--- a/cimXmlOps.y
+++ b/cimXmlOps.y
@@ -2653,7 +2653,7 @@ enumClasses
        $$.op.type = OPS_EnumerateClasses;
        $$.op.nameSpace=setCharsMsgSegment($1);
        $$.op.className=setCharsMsgSegment(NULL);
-       $$.flags = FL_localOnly;
+       $$.flags = FL_localOnly|FL_includeQualifiers;
 
        setRequest(parm,&$$,sizeof(XtokEnumClasses),OPS_EnumerateClasses);
        buildEnumClassesRequest(parm);
@@ -2664,7 +2664,7 @@ enumClasses
        $$.op.type = OPS_EnumerateClasses;
        $$.op.nameSpace=setCharsMsgSegment($1);
        $$.op.className=setCharsMsgSegment($2.className);
-       $$.flags = ($2.flags & $2.flagsSet) | ((~$2.flagsSet) & FL_localOnly);
+       $$.flags = ($2.flags & $2.flagsSet) | ((~$2.flagsSet) & (FL_localOnly|FL_includeQualifiers));
 
        setRequest(parm,&$$,sizeof(XtokEnumClasses),OPS_EnumerateClasses);
        buildEnumClassesRequest(parm);


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