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

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 .. 40 41 42 43 44 .. 596 > >> (Page 42 of 596)

[Sblim-commit] sfcb providerMgr.h,1.15,1.16

From: Narasimha S. <nsh...@us...> - 2012-03-05 18:14:06

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

Modified Files:
	providerMgr.h 
Log Message:
[3416060] sigsegv in tool_mm_flush()


Index: providerMgr.h
===================================================================
RCS file: /cvsroot/sblim/sfcb/providerMgr.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- providerMgr.h	14 Dec 2009 23:07:54 -0000	1.15
+++ providerMgr.h	5 Mar 2012 18:14:03 -0000	1.16
@@ -347,5 +347,6 @@
                                  int *count);
 BinResponseHdr *invokeProvider(BinRequestContext * ctx);
 void freeResponseHeaders(BinResponseHdr ** resp, BinRequestContext * ctx);
+sigset_t mask, old_mask;
 
 #endif

[Sblim-commit] sfcb providerMgr.c,1.76,1.77

From: Narasimha S. <nsh...@us...> - 2012-03-05 18:13:45

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

Modified Files:
	providerMgr.c 
Log Message:
[3416060] sigsegv in tool_mm_flush()


Index: providerMgr.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/providerMgr.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- providerMgr.c	29 Feb 2012 23:28:19 -0000	1.76
+++ providerMgr.c	5 Mar 2012 18:13:43 -0000	1.77
@@ -931,6 +931,9 @@
  
    _SFCB_ENTER(TRACE_PROVIDERMGR, "processProviderMgrRequests");
 
+   /* SF:3416060 disable signals during startup */
+   sigfillset(&mask);
+   sigprocmask(SIG_SETMASK, &mask, &old_mask);
    startUpProvider("root/interop","$ClassProvider$");
 
 #ifdef SFCB_INCL_INDICATION_SUPPORT
@@ -943,6 +946,7 @@
 #ifdef HAVE_SLP
    startUpProvider("root/interop","$ProfileProvider$");
 #endif
+   sigprocmask(SIG_SETMASK, &old_mask, NULL);
 
    for (;;) {
       MgrHandler hdlr; 
@@ -962,8 +966,10 @@
            _SFCB_TRACE(1,("--- Mgr request for %s-%s (%d) from %d", req->nameSpace.data,
                 req->className.data,req->type,requestor));
 
+           sigprocmask(SIG_SETMASK, &mask, &old_mask);
            hdlr = mHandlers[req->type];
            hdlr.handler(&requestor, req);
+           sigprocmask(SIG_SETMASK, &old_mask, NULL);
            
            _SFCB_TRACE(1,("--- Mgr request for %s-%s DONE", req->nameSpace.data,
               req->className.data));

[Sblim-commit] sfcb providerDrv.c,1.105,1.106

From: Narasimha S. <nsh...@us...> - 2012-03-05 18:13:30

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

Modified Files:
	providerDrv.c 
Log Message:
[3416060] sigsegv in tool_mm_flush()


Index: providerDrv.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/providerDrv.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- providerDrv.c	25 Jan 2012 16:15:07 -0000	1.105
+++ providerDrv.c	5 Mar 2012 18:13:27 -0000	1.106
@@ -243,7 +243,8 @@
          stopped=1;
          (pp+i)->pid=0;
          info=(pp+i)->firstProv;
-         pReg->ft->resetProvider(pReg,pid);
+         if (pReg)
+            pReg->ft->resetProvider(pReg,pid);
       }   
       if ((pp+i)->pid!=0) (*left)++;
    }
@@ -730,6 +731,7 @@
          if (info->pid == 0) {
 
             currentProc=getpid();
+            sigprocmask(SIG_SETMASK, &old_mask, NULL);
             setSignal(SIGCHLD, SIG_DFL,0);
             setSignal(SIGTERM, SIG_IGN,0);
             setSignal(SIGHUP, SIG_IGN,0);

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

From: Chris B. <buc...@us...> - 2012-03-03 04:14:15

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  9c1c5431b1d58f1a29c184565b6557e0b00c4000 (commit)
      from  167b36f1b44dab4a4c717ac26eea27546af12414 (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 9c1c5431b1d58f1a29c184565b6557e0b00c4000
Author: buccella <buc...@li...>
Date:   Fri Mar 2 23:14:45 2012 -0500

    [ 3496383 ] Faster Return from CBDeliverIndication

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

Summary of changes:
diff --git a/interopProvider.c b/interopProvider.c
index a40e1b1..fb68a61 100644
--- a/interopProvider.c
+++ b/interopProvider.c
@@ -1376,13 +1376,13 @@ InteropProviderInvokeMethod(CMPIMethodMI * mi,
                        (char *) str->hdl));
           CMAddArg(hin, "subscription", &su->sci, CMPI_instance);
 
-	  pthread_attr_init(&it_attr);
-	  pthread_attr_setdetachstate(&it_attr, PTHREAD_CREATE_DETACHED);
-	  
-	  DeliveryInfo* di = malloc(sizeof(DeliveryInfo));
-	  di->ctx = native_clone_CMPIContext(ctx);
-	  di->hop = CMClone(su->ha->hop, NULL);
-	  di->hin = CMClone(hin, NULL);
+          pthread_attr_init(&it_attr);
+          pthread_attr_setdetachstate(&it_attr, PTHREAD_CREATE_DETACHED);
+          
+          DeliveryInfo* di = malloc(sizeof(DeliveryInfo));
+          di->ctx = native_clone_CMPIContext(ctx);
+          di->hop = CMClone(su->ha->hop, NULL);
+          di->hin = CMClone(hin, NULL);
 
 	  pthread_create(&ind_thread, &it_attr,&sendIndForDelivery,(void *) di);
 


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

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

From: Chris B. <buc...@us...> - 2012-03-03 04:11:43

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  167b36f1b44dab4a4c717ac26eea27546af12414 (commit)
      from  56a17186335902e028aa58bae311d0b8410c94cf (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 167b36f1b44dab4a4c717ac26eea27546af12414
Author: buccella <buc...@li...>
Date:   Fri Mar 2 23:12:09 2012 -0500

    [ 3496383 ] Faster Return from CBDeliverIndication

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 4015dda..40a8adc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-02  Chris Buccella  <buc...@li...>
+
+	* interopProvider.c:
+	[ 3496383 ] Faster Return from CBDeliverIndication
+
 2012-03-01 Michael Chase-Salerno <br...@li...>
 
 	* indCIMXMLHandler.c, indRetryTest.sh
diff --git a/NEWS b/NEWS
index db66482..8b5fb28 100644
--- a/NEWS
+++ b/NEWS
@@ -104,6 +104,7 @@ Bugs Fixed:
 - 3495343 Bad pointer references in trace statements
 - 3495801 Correction to 3495343
 - 3496061 IndicationSubscription May Be Undeletable
+- 3496383 Faster Return from CBDeliverIndication
 
 Changes in 1.3.13
 =================
diff --git a/interopProvider.c b/interopProvider.c
index 096933f..a40e1b1 100644
--- a/interopProvider.c
+++ b/interopProvider.c
@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <pthread.h>
 #include "fileRepository.h"
 #include <sfcCommon/utilft.h>
 #include "trace.h"
@@ -1284,6 +1285,28 @@ InteropProviderMethodCleanup(CMPIMethodMI * mi,
  * ------------------------------------------------------------------------- 
  */
 
+typedef struct delivery_info {
+  const CMPIContext* ctx;
+  CMPIObjectPath *hop;  
+  CMPIArgs* hin;
+} DeliveryInfo;
+
+void * sendIndForDelivery(void *di) {
+
+  _SFCB_ENTER(TRACE_INDPROVIDER, "sendIndForDelivery");
+
+  DeliveryInfo* delInfo;
+  delInfo = (DeliveryInfo*)di;
+  CBInvokeMethod(_broker,delInfo->ctx,delInfo->hop,"_deliver",delInfo->hin,NULL,NULL);
+
+  CMRelease((CMPIContext*)delInfo->ctx);
+  CMRelease(delInfo->hop);
+  CMRelease(delInfo->hin);
+  free(di);
+  pthread_exit(NULL);
+}
+
+
 CMPIStatus
 InteropProviderInvokeMethod(CMPIMethodMI * mi,
                             const CMPIContext *ctx,
@@ -1320,6 +1343,9 @@ InteropProviderInvokeMethod(CMPIMethodMI * mi,
     char           *ns =
         (char *) CMGetArg(in, "namespace", NULL).value.string->hdl;
 
+    pthread_t ind_thread;
+    pthread_attr_t it_attr;
+
     // Add indicationFilterName to the indication
     Filter *filter = filterId;
     CMPIData cd_name = CMGetProperty(filter->fci, "name", &fn_st);
@@ -1349,8 +1375,17 @@ InteropProviderInvokeMethod(CMPIMethodMI * mi,
                       ("--- invoke handler %s %s", (char *) ns->hdl,
                        (char *) str->hdl));
           CMAddArg(hin, "subscription", &su->sci, CMPI_instance);
-          CBInvokeMethod(_broker, ctx, su->ha->hop, "_deliver", hin, NULL,
-                         &st);
+
+	  pthread_attr_init(&it_attr);
+	  pthread_attr_setdetachstate(&it_attr, PTHREAD_CREATE_DETACHED);
+	  
+	  DeliveryInfo* di = malloc(sizeof(DeliveryInfo));
+	  di->ctx = native_clone_CMPIContext(ctx);
+	  di->hop = CMClone(su->ha->hop, NULL);
+	  di->hin = CMClone(hin, NULL);
+
+	  pthread_create(&ind_thread, &it_attr,&sendIndForDelivery,(void *) di);
+
           _SFCB_TRACE(1, ("--- invoke handler status: %d", st.rc));
         }
       }


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

[Sblim-commit] sfcb interopProvider.c, 1.53, 1.54 ChangeLog, 1.726, 1.727 NEWS, 1.649, 1.650

From: Chris B. <buc...@us...> - 2012-03-02 21:38:02

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

Modified Files:
	interopProvider.c ChangeLog NEWS 
Log Message:
[ 3496383 ] Faster Return from CBDeliverIndication

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.649
retrieving revision 1.650
diff -u -d -r1.649 -r1.650
--- NEWS	1 Mar 2012 23:56:43 -0000	1.649
+++ NEWS	2 Mar 2012 21:37:59 -0000	1.650
@@ -40,6 +40,7 @@
 - 3483200 duplicate indication deliveries
 - 3496061 IndicationSubscription May Be Undeletable
 - 3484083 Exclude SFCBIndicationID
+- 3496383 Faster Return from CBDeliverIndication
 
 Changes in 1.3.13
 =================

Index: interopProvider.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/interopProvider.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- interopProvider.c	1 Mar 2012 20:28:22 -0000	1.53
+++ interopProvider.c	2 Mar 2012 21:37:59 -0000	1.54
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+#include <pthread.h>
 #include "fileRepository.h"
 #include "utilft.h"
 #include "trace.h"
@@ -1161,6 +1162,27 @@
    _SFCB_RETURN(st);
 }
 
+typedef struct delivery_info {
+  const CMPIContext* ctx;
+  CMPIObjectPath *hop;  
+  CMPIArgs* hin;
+} DeliveryInfo;
+
+void * sendIndForDelivery(void *di) {
+
+  _SFCB_ENTER(TRACE_INDPROVIDER, "sendIndForDelivery");
+
+  DeliveryInfo* delInfo;
+  delInfo = (DeliveryInfo*)di;
+  CBInvokeMethod(_broker,delInfo->ctx,delInfo->hop,"_deliver",delInfo->hin,NULL,NULL);
+
+  CMRelease((CMPIContext*)delInfo->ctx);
+  CMRelease(delInfo->hop);
+  CMRelease(delInfo->hin);
+  free(di);
+  pthread_exit(NULL);
+}
+
 /* ------------------------------------------------------------------------- */
 
 CMPIStatus InteropProviderInvokeMethod(
@@ -1196,6 +1218,8 @@
         uint64;
 #endif
       char *ns=(char*)CMGetArg(in,"namespace",NULL).value.string->hdl;
+      pthread_t ind_thread;
+      pthread_attr_t it_attr;
       
       // Add indicationFilterName to the indication
       Filter *filter = filterId;
@@ -1222,7 +1246,17 @@
             CMPIString *ns=CMGetNameSpace(su->ha->hop,NULL);
             _SFCB_TRACE(1,("--- invoke handler %s %s",(char*)ns->hdl,(char*)str->hdl));
             CMAddArg(hin,"subscription",&su->sci,CMPI_instance);
-            CBInvokeMethod(_broker,ctx,su->ha->hop,"_deliver",hin,NULL,&st);
+
+            pthread_attr_init(&it_attr);
+            pthread_attr_setdetachstate(&it_attr, PTHREAD_CREATE_DETACHED);
+
+            DeliveryInfo* di = malloc(sizeof(DeliveryInfo));
+            di->ctx = native_clone_CMPIContext(ctx);
+            di->hop = CMClone(su->ha->hop, NULL);
+            di->hin = CMClone(hin, NULL);
+
+            pthread_create(&ind_thread, &it_attr,&sendIndForDelivery,(void *) di);
+
             _SFCB_TRACE(1,("--- invoke handler status: %d",st.rc));
          }     
       }   

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.726
retrieving revision 1.727
diff -u -d -r1.726 -r1.727
--- ChangeLog	1 Mar 2012 23:56:43 -0000	1.726
+++ ChangeLog	2 Mar 2012 21:37:59 -0000	1.727
@@ -1,3 +1,8 @@
+2012-03-02  Chris Buccella  <buc...@li...>
+
+	* interopProvider.c:
+	[ 3496383 ] Faster Return from CBDeliverIndication
+
 2012-03-01 Michael Chase-Salerno <br...@li...>
 
 	* indCIMXMLHandler.c, indRetryTest.sh

[Sblim-commit] jsr48-client/src/javax/wbem/client WBEMClientConstants.java, 1.1.2.5, 1.1.2.6

From: Dave B. <bla...@us...> - 2012-03-02 21:22:17

Update of /cvsroot/sblim/jsr48-client/src/javax/wbem/client
In directory vz-cvs-3.sog:/tmp/cvs-serv16103/src/javax/wbem/client

Modified Files:
      Tag: Experimental
	WBEMClientConstants.java 
Log Message:
3496355 - JSR48 1.0.0: add new WBEMClientConstants

Index: WBEMClientConstants.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/javax/wbem/client/WBEMClientConstants.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- WBEMClientConstants.java	2 Mar 2012 17:58:10 -0000	1.1.2.5
+++ WBEMClientConstants.java	2 Mar 2012 21:22:14 -0000	1.1.2.6
@@ -18,6 +18,7 @@
  * 2930341    2010-01-12  blaschke-oss Sync up WBEMClientConstants with JSR48 1.0.0
  * 2959264    2010-02-25  blaschke-oss Sync up javax.client.* javadoc with JSR48 1.0.0
  * 3496301    2012-03-02  blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final
+ * 3496355    2012-03-02  blaschke-oss JSR48 1.0.0: add new WBEMClientConstants
  */
 package javax.wbem.client;
 
@@ -32,6 +33,36 @@
 public class WBEMClientConstants {
 
 	/**
+	 * Use this property to set the list of ciphers the client will support.
+	 * Setting this value to null will use the default set of ciphers provided
+	 * by the version of Java being used. Optional.
+	 */
+	public static final String PROP_CLIENT_CIPHERS = "javax.wbem.client.ciphers";
+
+	/**
+	 * This property along with the PROP_CLIENT_KEYSTORE_PASSWORD and
+	 * PROP_CLIENT_TRUSTSTORE are used to configure mutual authentication. This
+	 * property is used to provide the filename of the keystore. The path can be
+	 * relative or full. Optional.
+	 */
+	public static final String PROP_CLIENT_KEYSTORE = "javax.wbem.client.keyStore";
+
+	/**
+	 * This property along with the PROP_CLIENT_KEYSTORE and
+	 * PROP_CLIENT_TRUSTSTORE are used to configure mutual authentication. This
+	 * property is used to provide the password of the keystore. Optional.
+	 */
+	public static final String PROP_CLIENT_KEYSTORE_PASSWORD = "javax.wbem.client.keyStorePassword";
+
+	/**
+	 * This property along with the PROP_CLIENT_KEYSTORE and
+	 * PROP_CLIENT_KEYSTORE_PASSWORD are used to configure mutual
+	 * authentication. This property is used to provide the filename of the
+	 * truststore. The path can be relative or full. Optional.
+	 */
+	public static final String PROP_CLIENT_TRUSTSTORE = "javax.wbem.client.trustStore";
+
+	/**
 	 * Set this property to "1" to enable logging to the console. Set to "0" to
 	 * disable. The default is 0.
 	 */

[Sblim-commit] jsr48-client/utst/org/sblim/cimclient/unittest/util WBEMConfigurationTest.java, 1.3.2.10, 1.3.2.11

From: Dave B. <bla...@us...> - 2012-03-02 21:22:16

Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/util
In directory vz-cvs-3.sog:/tmp/cvs-serv16103/utst/org/sblim/cimclient/unittest/util

Modified Files:
      Tag: Experimental
	WBEMConfigurationTest.java 
Log Message:
3496355 - JSR48 1.0.0: add new WBEMClientConstants

Index: WBEMConfigurationTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/util/WBEMConfigurationTest.java,v
retrieving revision 1.3.2.10
retrieving revision 1.3.2.11
diff -u -d -r1.3.2.10 -r1.3.2.11
--- WBEMConfigurationTest.java	13 Jan 2010 02:04:06 -0000	1.3.2.10
+++ WBEMConfigurationTest.java	2 Mar 2012 21:22:13 -0000	1.3.2.11
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2010
+ * (C) Copyright IBM Corp. 2006, 2012
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -21,6 +21,7 @@
  * 2882448    2009-10-21  blaschke-oss Add WBEMClientConstants from JSR48
  * 2884718    2009-10-23  blaschke-oss Merge JSR48 and SBLIM client properties
  * 2930341    2010-01-12  blaschke-oss Sync up WBEMClientConstants with JSR48 1.0.0
+ * 3496355    2012-03-02  blaschke-oss JSR48 1.0.0: add new WBEMClientConstants
  */
 
 package org.sblim.cimclient.unittest.util;
@@ -262,6 +263,12 @@
 		verify("Uninit timeout", EQUAL, client.getProperty(WBEMClientConstants.PROP_TIMEOUT), null);
 		verify("Uninit chunking", EQUAL, client
 				.getProperty(WBEMClientConstants.PROPERTY_WBEM_CHUNKING), null);
+		verify("Uninit keystore", EQUAL, client
+				.getProperty(WBEMClientConstants.PROP_CLIENT_KEYSTORE), null);
+		verify("Uninit keystore passwd", EQUAL, client
+				.getProperty(WBEMClientConstants.PROP_CLIENT_KEYSTORE_PASSWORD), null);
+		verify("Uninit truststore", EQUAL, client
+				.getProperty(WBEMClientConstants.PROP_CLIENT_TRUSTSTORE), null);
 
 		// Setting corresponding SBLIM properties affect JSR48 properties
 		client.setProperty(WBEMConfigurationProperties.LOG_FILE_LEVEL, "ALL");
@@ -272,6 +279,9 @@
 		client.setProperty(WBEMConfigurationProperties.LOG_FILE_COUNT, "50");
 		client.setProperty(WBEMConfigurationProperties.HTTP_TIMEOUT, "60000");
 		client.setProperty(WBEMConfigurationProperties.HTTP_USE_CHUNKING, "false");
+		client.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH, pathAbsoluteLong1);
+		client.setProperty(WBEMConfigurationProperties.KEYSTORE_PASSWORD, "passw0rd");
+		client.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, pathAbsoluteLong2);
 
 		verify("SBLIM init enab con", EQUAL, client
 				.getProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING), "0");
@@ -291,6 +301,12 @@
 				"60000");
 		verify("SBLIM init chunking", EQUAL, client
 				.getProperty(WBEMClientConstants.PROPERTY_WBEM_CHUNKING), "0");
+		verify("SBLIM init keystore", EQUAL, client
+				.getProperty(WBEMClientConstants.PROP_CLIENT_KEYSTORE), pathAbsoluteLong1);
+		verify("SBLIM init keystore passwd", EQUAL, client
+				.getProperty(WBEMClientConstants.PROP_CLIENT_KEYSTORE_PASSWORD), "passw0rd");
+		verify("SBLIM init truststore", EQUAL, client
+				.getProperty(WBEMClientConstants.PROP_CLIENT_TRUSTSTORE), pathAbsoluteLong2);
 
 		// Set JSR48 properties directly
 		client.setProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING, "1");
@@ -302,6 +318,9 @@
 		client.setProperty(WBEMClientConstants.PROP_LOG_NUM_FILES, "4");
 		client.setProperty(WBEMClientConstants.PROP_TIMEOUT, "5000");
 		client.setProperty(WBEMClientConstants.PROPERTY_WBEM_CHUNKING, "1");
+		client.setProperty(WBEMConfigurationProperties.KEYSTORE_PATH, pathRelativeLong1);
+		client.setProperty(WBEMConfigurationProperties.KEYSTORE_PASSWORD, "pa$$word");
+		client.setProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH, pathRelativeLong2);
 
 		verify("JSR48 init enab con", EQUAL, client
 				.getProperty(WBEMClientConstants.PROP_ENABLE_CONSOLE_LOGGING), "1");
@@ -321,6 +340,12 @@
 				"5000");
 		verify("JSR48 init chunking", EQUAL, client
 				.getProperty(WBEMClientConstants.PROPERTY_WBEM_CHUNKING), "1");
+		verify("JSR48 init keystore", EQUAL, client
+				.getProperty(WBEMClientConstants.PROP_CLIENT_KEYSTORE), pathRelativeLong1);
+		verify("JSR48 init keystore passwd", EQUAL, client
+				.getProperty(WBEMClientConstants.PROP_CLIENT_KEYSTORE_PASSWORD), "pa$$word");
+		verify("JSR48 init truststore", EQUAL, client
+				.getProperty(WBEMClientConstants.PROP_CLIENT_TRUSTSTORE), pathRelativeLong2);
 
 		// Setting corresponding JSR48 properties affect SBLIM properties
 		verify("JSR48 init enab file from SBLIM", EQUAL, client
@@ -339,6 +364,12 @@
 				.getProperty(WBEMConfigurationProperties.HTTP_TIMEOUT), "5000");
 		verify("JSR48 init chunking from SBLIM", EQUAL, client
 				.getProperty(WBEMConfigurationProperties.HTTP_USE_CHUNKING), "true");
+		verify("JSR48 init keystore from SBLIM", EQUAL, client
+				.getProperty(WBEMConfigurationProperties.KEYSTORE_PATH), pathRelativeLong1);
+		verify("JSR48 init keystore passwd from SBLIM", EQUAL, client
+				.getProperty(WBEMConfigurationProperties.KEYSTORE_PASSWORD), "pa$$word");
+		verify("JSR48 init truststore from SBLIM", EQUAL, client
+				.getProperty(WBEMConfigurationProperties.TRUSTSTORE_PATH), pathRelativeLong2);
 
 		// Try various combinations of log dir and file
 		client.setProperty(WBEMClientConstants.PROP_LOG_DIR, null);

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

From: Dave B. <bla...@us...> - 2012-03-02 21:18:25

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

Modified Files:
      Tag: Experimental
	WBEMListenerSBLIM.java 
Log Message:
3496385 - JSR48 1.0.0: add WBEMListener get/setProperty

Index: WBEMListenerSBLIM.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/WBEMListenerSBLIM.java,v
retrieving revision 1.5.2.10
retrieving revision 1.5.2.11
diff -u -d -r1.5.2.10 -r1.5.2.11
--- WBEMListenerSBLIM.java	6 Feb 2012 22:07:56 -0000	1.5.2.10
+++ WBEMListenerSBLIM.java	2 Mar 2012 21:18:22 -0000	1.5.2.11
@@ -23,6 +23,7 @@
  * 3400209    2011-08-31  blaschke-oss Highlighted Static Analysis (PMD) issues
  * 3469018    2012-01-03  blaschke-oss Properties not passed to CIMIndicationHandler
  * 3477087    2012-01-23  blaschke-oss Need Access to an Indication Sender's IP Address
+ * 3496385    2012-03-02  blaschke-oss JSR48 1.0.0: add WBEMListener get/setProperty
  */
 
 package org.sblim.cimclient;
@@ -331,10 +332,23 @@
 		return listener.getListenerPort();
 	}
 
+	public String getProperty(String pName) {
+		if (pName.startsWith("javax.wbem.")) {
+			// Process JSR48 properties
+			return null;
+		}
+		return null;
+	}
+
 	public synchronized void removeListener(int pPort) {
 		WBEMListenerImpl listener = this.iPortMap.remove(Integer.valueOf(pPort));
 		if (listener != null) {
 			listener.stop();
 		}
 	}
+
+	public void setProperty(String pName, String pValue) {
+		throw new IllegalArgumentException("Property " + pName + " with value " + pValue
+				+ " not supported!");
+	}
 }

[Sblim-commit] jsr48-client/src/javax/wbem/listener WBEMListenerConstants.java, NONE, 1.1.2.1

From: Dave B. <bla...@us...> - 2012-03-02 20:08:38

Update of /cvsroot/sblim/jsr48-client/src/javax/wbem/listener
In directory vz-cvs-3.sog:/tmp/cvs-serv7817/src/javax/wbem/listener

Added Files:
      Tag: Experimental
	WBEMListenerConstants.java 
Log Message:
3496380 - JSR48 1.0.0: add new WBEMListenerConstants

--- NEW FILE: WBEMListenerConstants.java ---
/**
 * (C) Copyright IBM Corp. 2012
 *
 * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
 * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
 * CONSTITUTES RECIPIENTS ACCEPTANCE OF THE AGREEMENT.
 *
 * You can obtain a current copy of the Eclipse Public License from
 * http://www.opensource.org/licenses/eclipse-1.0.php
 *
 * @author : Dave Blaschke, bla...@us...
 * 
 * Change History
 * Flag       Date        Prog         Description
 * -------------------------------------------------------------------------------
 * 3496380    2012-03-02  blaschke-oss JSR48 1.0.0: add new WBEMListenerConstants
 */
package javax.wbem.listener;

//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012y
/**
 * This class defines the constants used for <code>WBEMListener</code>
 * configuration. If a property is tagged as optional an implementation may or
 * may not support the property. If the implementation does not support the
 * property, it must throw an <code>IllegalArgumentException</code> if the
 * property value is attempted to be set.
 */
public class WBEMListenerConstants {

	/**
	 * Use this property to set the list of ciphers the listener will support.
	 * Setting this value to null will use the default set of ciphers provided
	 * by the version of Java being used. Optional.
	 */
	public static final String PROP_LISTENER_CIPHERS = "javax.wbem.listener.ciphers";

	/**
	 * This property along with the PROP_LISTENER_KEYSTORE_PASSWORD and
	 * PROP_LISTENER_TRUSTSTORE are used to configure mutual authentication.
	 * This property is used to provide the filename of the keystore. The path
	 * can be relative or full. Optional.
	 */
	public static final String PROP_LISTENER_KEYSTORE = "javax.wbem.listener.keyStore";

	/**
	 * This property along with the PROP_LISTENER_KEYSTORE and
	 * PROP_LISTENER_TRUSTSTORE are used to configure mutual authentication.
	 * This property is used to provide the password of the keystore. Optional.
	 */
	public static final String PROP_LISTENER_KEYSTORE_PASSWORD = "javax.wbem.listener.keyStorePassword";

	/**
	 * This property along with the PROP_LISTENER_KEYSTORE and
	 * PROP_LISTENER_KEYSTORE_PASSWORD are used to configure mutual
	 * authentication. This property is used to provide the filename of the
	 * truststore. The path can be relative or full. Optional.
	 */
	public static final String PROP_LISTENER_TRUSTSTORE = "javax.wbem.listener.trustStore";
}

[Sblim-commit] jsr48-client/utst/org/sblim/cimclient/unittest/cim CIMObjectPathTest.java, 1.1.2.14, 1.1.2.15

From: Dave B. <bla...@us...> - 2012-03-02 19:01:56

Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/cim
In directory vz-cvs-3.sog:/tmp/cvs-serv30483/utst/org/sblim/cimclient/unittest/cim

Modified Files:
      Tag: Experimental
	CIMObjectPathTest.java 
Log Message:
3496349 - JSR48 1.0.0: add CIMObjectPath getKeyValue

Index: CIMObjectPathTest.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/cim/CIMObjectPathTest.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
--- CIMObjectPathTest.java	24 Jul 2011 20:41:52 -0000	1.1.2.14
+++ CIMObjectPathTest.java	2 Mar 2012 19:01:54 -0000	1.1.2.15
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2007, 2011
+ * (C) Copyright IBM Corp. 2007, 2012
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -24,6 +24,7 @@
  * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
  * 2944824    2010-02-08  blaschke-oss Missing getXmlSchemaName() in CIMObjectPath
  * 3374012    2011-07-24  blaschke-oss Sblim client CIMObjectPath class defect for LLA format URL
+ * 3496349    2012-03-02  blaschke-oss JSR48 1.0.0: add CIMObjectPath getKeyValue
  */
 
 package org.sblim.cimclient.unittest.cim;
@@ -302,17 +303,23 @@
 		}
 
 		@SuppressWarnings("null")
-		private void equals(StringBuffer pBuf, String pOPName, CIMProperty<?>[] pKeys) {
+		private void equals(StringBuffer pBuf, String pOPName, CIMObjectPath pOP) {
+			CIMProperty<?>[] keys = pOP.getKeys();
 			int refLen = this.iKeys == null ? 0 : this.iKeys.length;
-			int len = pKeys == null ? 0 : pKeys.length;
+			int len = keys == null ? 0 : keys.length;
 			if (refLen != len) {
 				pBuf.append(pOPName + ".getKeys().length = " + len + " != " + refLen + " !!!\n");
 				return;
 			}
 			for (int i = 0; i < len; i++) {
-				CIMProperty<?> refKey = this.iKeys[i], key = pKeys[i];
+				CIMProperty<?> refKey = this.iKeys[i], key = keys[i];
 				if (!refKey.equals(key)) pBuf.append(pOPName + ": idx:" + i + " refKey!=key !!!\n"
 						+ "refKey:" + refKey + "\n   key:" + key + "\n");
+				if (!pOP.getKeyValue(refKey.getName()).equals(pOP.getKeyValue(key.getName()))) pBuf
+						.append(pOPName + ": idx:" + i
+								+ " getKeyValue(refKey)!=getKeyValue(key) !!!\n"
+								+ "getKeyValue(refKey):" + pOP.getKeyValue(refKey.getName())
+								+ "\n   getKeyValue(key):" + pOP.getKeyValue(key.getName()) + "\n");
 			}
 		}
 
@@ -324,7 +331,7 @@
 			equals(strBuf, pName, "getNamespace", this.iNameSpace, pOP.getNamespace());
 			equals(strBuf, pName, "getObjectName", this.iObjName, pOP.getObjectName());
 			equals(strBuf, pName, "getXmlSchemaName", null, pOP.getXmlSchemaName());
-			equals(strBuf, pName, pOP.getKeys());
+			equals(strBuf, pName, pOP);
 			return strBuf.length() == 0 ? null : strBuf.toString();
 		}

[Sblim-commit] jsr48-client/src/javax/wbem/client WBEMClient.java, 1.2.2.15, 1.2.2.16

From: Dave B. <bla...@us...> - 2012-03-02 18:13:38

Update of /cvsroot/sblim/jsr48-client/src/javax/wbem/client
In directory vz-cvs-3.sog:/tmp/cvs-serv27664/src/javax/wbem/client

Modified Files:
      Tag: Experimental
	WBEMClient.java 
Log Message:
3496343 - JSR48 1.0.0: deprecate WBEMClient associators and references

Index: WBEMClient.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/javax/wbem/client/WBEMClient.java,v
retrieving revision 1.2.2.15
retrieving revision 1.2.2.16
diff -u -d -r1.2.2.15 -r1.2.2.16
--- WBEMClient.java	2 Mar 2012 17:58:10 -0000	1.2.2.15
+++ WBEMClient.java	2 Mar 2012 18:13:36 -0000	1.2.2.16
@@ -26,6 +26,7 @@
  * 2959586    2010-03-01  blaschke-oss Sync up WBEMClient javadoc with JSR48 1.0.0
  * 2961592    2010-03-01  blaschke-oss Remove WBEMClient.setLocales() UnsupportedOperationException
  * 3496301    2012-03-02  blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final
+ * 3496343    2012-03-02  blaschke-oss JSR48 1.0.0: deprecate WBEMClient associators and references
  */
 
 package javax.wbem.client;
@@ -420,9 +421,6 @@
 	 * <code>CIMInstance</code> objects is returned containing the instances
 	 * associated to the source Object.<br>
 	 * <br>
-	 * NOTE: This will be deprecated soon, use <code>associatorClasses</code> to
-	 * enumerate CIM Classes and <code>associatorInstances</code> to enumerate
-	 * CIM Instances.
 	 * 
 	 * @param pObjectName
 	 *            <code>CIMObjectPath</code> defining the source CIM Object
@@ -498,7 +496,11 @@
 	 *            or otherwise incorrect parameters)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
 	 * </pre>
+	 * @deprecated Use <code>associatorClasses</code> to enumerate CIM Classes
+	 *             and <code>associatorInstances</code> to enumerate CIM
+	 *             Instances.
 	 */
+	@Deprecated
 	public CloseableIterator associators(CIMObjectPath pObjectName, String pAssociationClass,
 			String pResultClass, String pRole, String pResultRole, boolean pIncludeQualifiers,
 			boolean pIncludeClassOrigin, String[] pPropertyList) throws WBEMException;
@@ -2101,9 +2103,6 @@
 	 * returned containing the Association class instances that refer to the
 	 * source Object.<br>
 	 * <br>
-	 * NOTE: This will be deprecated, use <code>refrenceClasses</code> to
-	 * enumerate CIM Classes and <code>refrenceInstances</code> to enumerate CIM
-	 * Instances.
 	 * 
 	 * @param pObjectName
 	 *            <code>CIMObjectPath</code> defining the source CIM Object
@@ -2158,7 +2157,10 @@
 	 *            or otherwise incorrect parameters)
 	 *      CIM_ERR_FAILED (some other unspecified error occurred)
 	 * </pre>
+	 * @deprecated Use <code>refrenceClasses</code> to enumerate CIM Classes and
+	 *             <code>refrenceInstances</code> to enumerate CIM Instances.
 	 */
+	@Deprecated
 	public CloseableIterator references(CIMObjectPath pObjectName, String pResultClass,
 			String pRole, boolean pIncludeQualifiers, boolean pIncludeClassOrigin,
 			String[] pPropertyList) throws WBEMException;

[Sblim-commit] jsr48-client/src/javax/cim CIMClass.java, 1.9.2.16, 1.9.2.17 CIMDateTime.java, 1.4.2.8, 1.4.2.9 CIMProperty.java, 1.7.2.10, 1.7.2.11

From: Dave B. <bla...@us...> - 2012-03-02 17:58:12

Update of /cvsroot/sblim/jsr48-client/src/javax/cim
In directory vz-cvs-3.sog:/tmp/cvs-serv24553/src/javax/cim

Modified Files:
      Tag: Experimental
	CIMClass.java CIMDateTime.java CIMProperty.java 
Log Message:
3496301 - Sync up javax.* javadoc with JSR48 1.0.0 Final

Index: CIMProperty.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMProperty.java,v
retrieving revision 1.7.2.10
retrieving revision 1.7.2.11
diff -u -d -r1.7.2.10 -r1.7.2.11
--- CIMProperty.java	8 Sep 2011 12:26:09 -0000	1.7.2.10
+++ CIMProperty.java	2 Mar 2012 17:58:10 -0000	1.7.2.11
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2011
+ * (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 
@@ -21,13 +21,14 @@
  * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
  * 2935258    2010-01-22  blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0
  * 3400209    2011-08-31  blaschke-oss Highlighted Static Analysis (PMD) issues
+ * 3496301    2012-03-02  blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final
  */
 
 package javax.cim;
 
 import org.sblim.cimclient.internal.util.MOF;
 
-//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:59 EST 2010
+//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012
 /**
  * This class represents a CIM Property as defined by the Distributed Management
  * Task Force (<a href=http://www.dmtf.org>DMTF</a>) CIM Infrastructure
@@ -52,7 +53,7 @@
 
 	/**
 	 * Constructs a <code>CIMProperty</code> to be used in instances. For a
-	 * <code>CIMClass</code>, <code>CIMClassProperty</code> should be used. This
+	 * <code>CIMClass</code>, <code>CIMClassProperty</code> shall be used. This
 	 * can only be used for non-Key properties, non-propagated properties and
 	 * when the the origin class is not needed.
 	 * 
@@ -69,7 +70,7 @@
 
 	/**
 	 * Constructs a <code>CIMProperty</code> to be used in instances. For a
-	 * <code>CIMClass</code>, <code>CIMClassProperty</code> should be used.
+	 * <code>CIMClass</code>, <code>CIMClassProperty</code> shall be used.
 	 * 
 	 * @param pName
 	 *            The name of the property.

Index: CIMClass.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMClass.java,v
retrieving revision 1.9.2.16
retrieving revision 1.9.2.17
diff -u -d -r1.9.2.16 -r1.9.2.17
--- CIMClass.java	8 Sep 2011 12:26:10 -0000	1.9.2.16
+++ CIMClass.java	2 Mar 2012 17:58:10 -0000	1.9.2.17
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2011
+ * (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 
@@ -27,6 +27,7 @@
  * 2944842    2010-02-08  blaschke-oss Missing thrown ArrayIndexOutOfBoundsException
  * 2975917    2010-03-24  blaschke-oss TCK: CIMClass.getProperty() does not handle null property
  * 3400209    2011-08-31  blaschke-oss Highlighted Static Analysis (PMD) issues
+ * 3496301    2012-03-02  blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final
  */
 
 package javax.cim;
@@ -39,7 +40,7 @@
 import org.sblim.cimclient.internal.cim.CIMQualifiedElementInterfaceImpl;
 import org.sblim.cimclient.internal.util.MOF;
 
-//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:58 EST 2010
+//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012
 /**
  * This class represents a CIM class as defined by the Distributed Management
  * Task Force (<a href=http://www.dmtf.org>DMTF</a>) CIM Infrastructure
@@ -74,7 +75,11 @@
 	private boolean iIsAssoc;
 
 	/**
-	 * Creates and instantiates a Java object representing a CIM Class.
+	 * Creates and instantiates a Java object representing a CIM Class. This
+	 * method may or may not validate the <code>isAssociation</code> and
+	 * <code>isKeyed</code>. If an invalid value is supplied (i.e. the class is
+	 * an association, but the <code>isAssociation</code> was set to
+	 * <code>false</code>), it may or may not be corrected.
 	 * 
 	 * @param pPath
 	 *            Object Name of the CIM class.
@@ -82,7 +87,7 @@
 	 *            Name of the superclass.
 	 * @param pQualifiers
 	 *            List of qualifiers of the CIM class.
-	 * @param pProps
+	 * @param pProperties
 	 *            List of properties of the CIM class.
 	 * @param pMethods
 	 *            List of methods of the CIM class.
@@ -94,22 +99,24 @@
 	 *            <code>false</code> otherwise.
 	 */
 	public CIMClass(CIMObjectPath pPath, String pSuperClass, CIMQualifier<?>[] pQualifiers,
-			CIMClassProperty<?>[] pProps, CIMMethod<?>[] pMethods, boolean pIsAssociation,
+			CIMClassProperty<?>[] pProperties, CIMMethod<?>[] pMethods, boolean pIsAssociation,
 			boolean pIsKeyed) {
 		super(pPath.getObjectName());
 		this.iObjPath = pPath;
 		this.iSuperClass = pSuperClass;
 		this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(pQualifiers, false, false,
 				pIsAssociation);
-		this.iProps = (CIMClassProperty[]) CIMElementSorter.sort(pProps);
+		this.iProps = (CIMClassProperty[]) CIMElementSorter.sort(pProperties);
 		this.iMethods = (CIMMethod[]) CIMElementSorter.sort(pMethods);
 		this.iIsAssoc = pIsAssociation;
 		// ignoring pIsKeyed
-		this.iIsKeyed = hasKey(pProps);
+		this.iIsKeyed = hasKey(pProperties);
 	}
 
 	/**
-	 * Creates and instantiates a Java object representing a CIM Class.
+	 * Creates and instantiates a Java object representing a CIM Class. This
+	 * constructor will inspect the class to determine if it is an association
+	 * or has keys.
 	 * 
 	 * @param pName
 	 *            Name of the CIM class.
@@ -117,21 +124,21 @@
 	 *            Name of the superclass.
 	 * @param pQualifiers
 	 *            List of qualifiers of the CIM class.
-	 * @param pProps
+	 * @param pProperties
 	 *            List of properties of the CIM class.
 	 * @param pMethods
 	 *            List of methods of the CIM class.
 	 */
 	public CIMClass(String pName, String pSuperClass, CIMQualifier<?>[] pQualifiers,
-			CIMClassProperty<?>[] pProps, CIMMethod<?>[] pMethods) {
+			CIMClassProperty<?>[] pProperties, CIMMethod<?>[] pMethods) {
 		super(pName);
 		this.iObjPath = new CIMObjectPath(pName, null);
 		this.iSuperClass = pSuperClass;
 		this.iQualiImpl = new CIMQualifiedElementInterfaceImpl(pQualifiers);
-		this.iProps = (CIMClassProperty[]) CIMElementSorter.sort(pProps);
+		this.iProps = (CIMClassProperty[]) CIMElementSorter.sort(pProperties);
 		this.iMethods = (CIMMethod[]) CIMElementSorter.sort(pMethods);
 		this.iIsAssoc = this.iQualiImpl.hasQualifierValue("Association", Boolean.TRUE);
-		this.iIsKeyed = hasKey(pProps);
+		this.iIsKeyed = hasKey(pProperties);
 	}
 
 	/**

Index: CIMDateTime.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/javax/cim/CIMDateTime.java,v
retrieving revision 1.4.2.8
retrieving revision 1.4.2.9
diff -u -d -r1.4.2.8 -r1.4.2.9
--- CIMDateTime.java	22 Jan 2010 18:39:48 -0000	1.4.2.8
+++ CIMDateTime.java	2 Mar 2012 17:58:10 -0000	1.4.2.9
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2010
+ * (C) Copyright IBM Corp. 2006, 2012
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -17,18 +17,19 @@
  * 2204488 	  2008-10-28  raman_arora  Fix code to remove compiler warnings
  * 2227442 	  2008-11-05  blaschke-oss Add missing serialVersionUID
  * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2531371    2009-02-10  raman_arora  Upgrade client to JDK 1.5 (Phase 2) 
+ * 2531371    2009-02-10  raman_arora  Upgrade client to JDK 1.5 (Phase 2)
  * 2795671    2009-05-22  raman_arora  Add Type to Comparable <T>
  * 2935258    2010-01-22  blaschke-oss Sync up javax.cim.* javadoc with JSR48 1.0.0
+ * 3496301    2012-03-02  blaschke-oss Sync up javax.* javadoc with JSR48 1.0.0 Final
  */
 
 package javax.cim;
 
 import java.io.Serializable;
 
-//Sync'd against JSR48 1.0.0 javadoc (build 1.5.0_10) on Wed Jan 20 02:20:58 EST 2010
+//Sync'd against JSR48 1.0.0 javadoc (build 1.6.0_18) on Thu Mar 01 12:21:26 EST 2012
 /**
- * This abstract class represents a CIM datetime data type as defined by the
+ * This abstract class represents a CIM Datetime data type as defined by the
  * Distributed Management Task Force (<a href=http://www.dmtf.org>DMTF</a>) CIM
  * Infrastructure Specification (<a
  * href=http://www.dmtf.org/standards/published_documents/DSP0004V2.3_final.pdf
@@ -54,7 +55,7 @@
  * zero-padded so that the entire string is always the same 25-character length.
  * Fields which are not significant must be replaced with asterisk characters.
  * Similarly, intervals use the same format, except that the interpretation of
- * the field is based on elapsed time. <br>
+ * the fields is based on elapsed time. <br>
  * For example, the interval datetime for an elapsed time of 1 day, 13 hours, 23
  * minutes, 12 seconds would be: 00000001132312.000000:000. A UTC offset of zero
  * is always used for interval properties.

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

From: Michael Chase-S. <mc...@us...> - 2012-03-01 23:57:46

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  56a17186335902e028aa58bae311d0b8410c94cf (commit)
      from  c771406bc307ec5f668d6f811ead221394a6c796 (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 56a17186335902e028aa58bae311d0b8410c94cf
Author: Michael Chase-Salerno <br...@li...>
Date:   Thu Mar 1 18:57:16 2012 -0500

    3484083 Exclude SFCBIndicationID
    Print output spacing fix

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

Summary of changes:
diff --git a/test/TestProviders/tests/IndRetryTest.sh b/test/TestProviders/tests/IndRetryTest.sh
index 62ecc29..aed9f3e 100755
--- a/test/TestProviders/tests/IndRetryTest.sh
+++ b/test/TestProviders/tests/IndRetryTest.sh
@@ -314,7 +314,7 @@ fi
 count=$(grep SFCB_IndicationID $ODIR/SFCB_Listener.txt  | wc -l)
 if [ $count -ne 0 ] 
 then
-    echo " SFCB_IndicationID property found: FAILED"
+    echo "  SFCB_IndicationID property found: FAILED"
     RC=1
 fi
 


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

[Sblim-commit] sfcb ChangeLog, 1.725, 1.726 NEWS, 1.648, 1.649 indCIMXMLHandler.c, 1.44, 1.45

From: Michael Chase-S. <mc...@us...> - 2012-03-01 23:56:45

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

Modified Files:
	ChangeLog NEWS indCIMXMLHandler.c 
Log Message:
[ 3484083] Exclude SFCBIndicationID 


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.648
retrieving revision 1.649
diff -u -d -r1.648 -r1.649
--- NEWS	1 Mar 2012 20:28:22 -0000	1.648
+++ NEWS	1 Mar 2012 23:56:43 -0000	1.649
@@ -39,6 +39,7 @@
 - 3495806 isChild() can cause a provider mismatch
 - 3483200 duplicate indication deliveries
 - 3496061 IndicationSubscription May Be Undeletable
+- 3484083 Exclude SFCBIndicationID
 
 Changes in 1.3.13
 =================

Index: indCIMXMLHandler.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/indCIMXMLHandler.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- indCIMXMLHandler.c	29 Feb 2012 22:45:36 -0000	1.44
+++ indCIMXMLHandler.c	1 Mar 2012 23:56:43 -0000	1.45
@@ -874,6 +874,8 @@
         iop=CMGetObjectPath(ind,NULL);
         CMAddKey(iop,"SFCB_IndicationID",&indID,CMPI_uint32);
         CMSetProperty(ind,"SFCB_IndicationID",&indID,CMPI_uint32);
+        // Prevent this property from showing up in the indication
+        filterFlagProperty(ind, "SFCB_IndicationID");
         sub=CMGetArg(in,"subscription",NULL).value.inst;
         CMPIData handler=CMGetProperty(sub, "Handler", &st);
         CMPIObjectPath *hop=handler.value.ref;

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.725
retrieving revision 1.726
diff -u -d -r1.725 -r1.726
--- ChangeLog	1 Mar 2012 20:28:22 -0000	1.725
+++ ChangeLog	1 Mar 2012 23:56:43 -0000	1.726
@@ -1,3 +1,8 @@
+2012-03-01 Michael Chase-Salerno <br...@li...>
+
+	* indCIMXMLHandler.c, indRetryTest.sh
+	[ 3484083] Exclude SFCBIndicationID 
+
 2012-03-01  Chris Buccella  <buc...@li...>
 
 	* interopProvider.c:

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

From: Michael Chase-S. <mc...@us...> - 2012-03-01 21:51:43

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  c771406bc307ec5f668d6f811ead221394a6c796 (commit)
       via  38b8a9633ee3d0100db5eab31b1c69a192314851 (commit)
       via  e41f750dc7af783a8110d312a4aee5c2773bce4a (commit)
      from  b6ad6f083b0aaa8a3885275107a657959405ce5e (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 c771406bc307ec5f668d6f811ead221394a6c796
Author: Michael Chase-Salerno <br...@li...>
Date:   Thu Mar 1 16:51:24 2012 -0500

    [ 3484083] Exclude SFCBIndicationID

commit 38b8a9633ee3d0100db5eab31b1c69a192314851
Merge: e41f750 b6ad6f0
Author: Michael Chase-Salerno <br...@li...>
Date:   Thu Mar 1 16:37:41 2012 -0500

    Merge branch 'master' of ssh://sblim.git.sourceforge.net/gitroot/sblim/sfcb

commit e41f750dc7af783a8110d312a4aee5c2773bce4a
Author: Michael Chase-Salerno <br...@li...>
Date:   Thu Mar 1 16:36:38 2012 -0500

    3484083 Exclude SFCBIndicationID

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index a8a5eaa..4015dda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-01 Michael Chase-Salerno <br...@li...>
+
+	* indCIMXMLHandler.c, indRetryTest.sh
+	[ 3484083] Exclude SFCBIndicationID 
+
 2012-03-01  Chris Buccella  <buc...@li...>
 
 	* interopProvider.c:
diff --git a/indCIMXMLHandler.c b/indCIMXMLHandler.c
index 3a827fe..5dfeb0b 100644
--- a/indCIMXMLHandler.c
+++ b/indCIMXMLHandler.c
@@ -978,6 +978,8 @@ IndCIMXMLHandlerInvokeMethod(CMPIMethodMI * mi,
       iop=CMGetObjectPath(ind,NULL);
       CMAddKey(iop,"SFCB_IndicationID",&indID,CMPI_uint32);
       CMSetProperty(ind,"SFCB_IndicationID",&indID,CMPI_uint32);
+      // Prevent this property from showing up in the indication
+      filterFlagProperty(ind, "SFCB_IndicationID");
       sub=CMGetArg(in,"subscription",NULL).value.inst;
       CMPIData handler=CMGetProperty(sub, "Handler", &st);
       CMPIObjectPath *hop=handler.value.ref;
diff --git a/test/TestProviders/tests/IndRetryTest.sh b/test/TestProviders/tests/IndRetryTest.sh
index bc21ca5..62ecc29 100755
--- a/test/TestProviders/tests/IndRetryTest.sh
+++ b/test/TestProviders/tests/IndRetryTest.sh
@@ -311,6 +311,12 @@ else
     echo " received $count of $lim: FAILED"
     RC=1
 fi
+count=$(grep SFCB_IndicationID $ODIR/SFCB_Listener.txt  | wc -l)
+if [ $count -ne 0 ] 
+then
+    echo " SFCB_IndicationID property found: FAILED"
+    RC=1
+fi
 
 # Check sequence numbers
 echo -n  "  Indication flood sequence numbers: "


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

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

From: Chris B. <buc...@us...> - 2012-03-01 21:20:43

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  b6ad6f083b0aaa8a3885275107a657959405ce5e (commit)
      from  74cc8e1c1a06715cc771969683cbfb98276c0539 (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 b6ad6f083b0aaa8a3885275107a657959405ce5e
Author: buccella <buc...@li...>
Date:   Thu Mar 1 16:21:12 2012 -0500

    [ 3496061 ] IndicationSubscription May Be Undeletable

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index e047138..a8a5eaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-01  Chris Buccella  <buc...@li...>
+
+	* interopProvider.c:
+	[ 3496061 ] IndicationSubscription May Be Undeletable
+
 2012-02-29  Chris Buccella  <buc...@li...>
 
 	* providerMgr.c:
diff --git a/NEWS b/NEWS
index 724f91a..db66482 100644
--- a/NEWS
+++ b/NEWS
@@ -103,6 +103,7 @@ Bugs Fixed:
 - 3495806 isChild() can cause a provider mismatch
 - 3495343 Bad pointer references in trace statements
 - 3495801 Correction to 3495343
+- 3496061 IndicationSubscription May Be Undeletable
 
 Changes in 1.3.13
 =================
diff --git a/interopProvider.c b/interopProvider.c
index cf6b94c..096933f 100644
--- a/interopProvider.c
+++ b/interopProvider.c
@@ -764,12 +764,19 @@ initInterOp(const CMPIBroker * broker, const CMPIContext *ctx)
   enm = _broker->bft->enumerateInstances(_broker, ctxLocal, op, NULL, &st);
 
   if (enm) {
+    CMPIStatus st;
     while (enm->ft->hasNext(enm, &st)
            && (ci = (enm->ft->getNext(enm, &st)).value.inst)) {
       CMPIObjectPath *hop;
       cop = CMGetObjectPath(ci, &st);
       hop = CMGetKey(cop, "handler", NULL).value.ref;
-      processSubscription(broker, ctx, ci, cop);
+      st = processSubscription(broker,ctx,ci,cop);
+      /* if the on-disk repo is modified between startups, it is
+         possible for a subscription instance to exist w/o a filter or
+         handler. Clean out the useless sub if this is the case */
+      if (st.rc == CMPI_RC_ERR_NOT_FOUND) {
+        CBDeleteInstance(_broker, ctxLocal, cop);
+      }
     }
     CMRelease(enm);
   }


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

[Sblim-commit] sfcb interopProvider.c, 1.52, 1.53 ChangeLog, 1.724, 1.725 NEWS, 1.647, 1.648

From: Chris B. <buc...@us...> - 2012-03-01 20:28:26

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

Modified Files:
	interopProvider.c ChangeLog NEWS 
Log Message:
[ 3496061 ] IndicationSubscription May Be Undeletable

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.647
retrieving revision 1.648
diff -u -d -r1.647 -r1.648
--- NEWS	1 Mar 2012 17:47:19 -0000	1.647
+++ NEWS	1 Mar 2012 20:28:22 -0000	1.648
@@ -38,6 +38,7 @@
 - 3495789 Makefile improvements for test suite
 - 3495806 isChild() can cause a provider mismatch
 - 3483200 duplicate indication deliveries
+- 3496061 IndicationSubscription May Be Undeletable
 
 Changes in 1.3.13
 =================

Index: interopProvider.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/interopProvider.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- interopProvider.c	29 Feb 2012 22:46:06 -0000	1.52
+++ interopProvider.c	1 Mar 2012 20:28:22 -0000	1.53
@@ -687,11 +687,18 @@
    enm = _broker->bft->enumerateInstances(_broker, ctxLocal, op, NULL, &st);
    
    if(enm) {
+     CMPIStatus st;
       while(enm->ft->hasNext(enm, &st) && (ci=(enm->ft->getNext(enm, &st)).value.inst)) {      
          CMPIObjectPath *hop;    
          cop=CMGetObjectPath(ci,&st);
          hop=CMGetKey(cop,"handler",NULL).value.ref;
-         processSubscription(broker,ctx,ci,cop);
+         st = processSubscription(broker,ctx,ci,cop);
+	 /* if the on-disk repo is modified between startups, it is
+            possible for a subscription instance to exist w/o a filter or
+            handler. Clean out the useless sub if this is the case */
+	 if (st.rc == CMPI_RC_ERR_NOT_FOUND) {
+	   CBDeleteInstance(_broker, ctxLocal, cop);
+	 }
       }
       CMRelease(enm);   
    }

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.724
retrieving revision 1.725
diff -u -d -r1.724 -r1.725
--- ChangeLog	1 Mar 2012 17:47:02 -0000	1.724
+++ ChangeLog	1 Mar 2012 20:28:22 -0000	1.725
@@ -1,3 +1,8 @@
+2012-03-01  Chris Buccella  <buc...@li...>
+
+	* interopProvider.c:
+	[ 3496061 ] IndicationSubscription May Be Undeletable
+
 2012-02-29 Narasimha Sharoff <nsh...@us...>
 
 	* brokerUpc.c

[Sblim-commit] sfcb NEWS,1.646,1.647

From: Narasimha S. <nsh...@us...> - 2012-03-01 17:47:22

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

Modified Files:
	NEWS 
Log Message:
[3483200] duplicate indication deliveries


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.646
retrieving revision 1.647
diff -u -d -r1.646 -r1.647
--- NEWS	29 Feb 2012 23:28:19 -0000	1.646
+++ NEWS	1 Mar 2012 17:47:19 -0000	1.647
@@ -37,6 +37,7 @@
 - 3495801 Correction to 3495343
 - 3495789 Makefile improvements for test suite
 - 3495806 isChild() can cause a provider mismatch
+- 3483200 duplicate indication deliveries
 
 Changes in 1.3.13
 =================

[Sblim-commit] sfcb ChangeLog,1.723,1.724

From: Narasimha S. <nsh...@us...> - 2012-03-01 17:47:04

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

Modified Files:
	ChangeLog 
Log Message:
[3483200] duplicate indication deliveries


Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.723
retrieving revision 1.724
diff -u -d -r1.723 -r1.724
--- ChangeLog	29 Feb 2012 23:28:19 -0000	1.723
+++ ChangeLog	1 Mar 2012 17:47:02 -0000	1.724
@@ -1,3 +1,8 @@
+2012-02-29 Narasimha Sharoff <nsh...@us...>
+
+	* brokerUpc.c
+	[ 3483200 ] duplicate indication deliveries
+
 2012-02-29  Chris Buccella  <buc...@li...>
 
 	* providerMgr.c:

[Sblim-commit] sfcb brokerUpc.c,1.35,1.36

From: Narasimha S. <nsh...@us...> - 2012-03-01 17:46:42

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

Modified Files:
	brokerUpc.c 
Log Message:
[3483200] duplicate indication deliveries


Index: brokerUpc.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/brokerUpc.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- brokerUpc.c	30 Sep 2011 16:11:36 -0000	1.35
+++ brokerUpc.c	1 Mar 2012 17:46:40 -0000	1.36
@@ -146,6 +146,7 @@
 		 );
          CBInvokeMethod(mb,ctx,op,"_deliver",in,NULL,&st);
       }
+      classMatch = 0; /* 3483200 */
       se=se->next;
    }

[Sblim-commit] sfcb providerMgr.c, 1.75, 1.76 ChangeLog, 1.722, 1.723 NEWS, 1.645, 1.646

From: Chris B. <buc...@us...> - 2012-02-29 23:28:22

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

Modified Files:
	providerMgr.c ChangeLog NEWS 
Log Message:
[ 3495806 ] isChild() can cause a provider mismatch

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.645
retrieving revision 1.646
diff -u -d -r1.645 -r1.646
--- NEWS	29 Feb 2012 23:12:44 -0000	1.645
+++ NEWS	29 Feb 2012 23:28:19 -0000	1.646
@@ -36,6 +36,7 @@
 - 3416164 Don't write CIM_IndicationService to disk
 - 3495801 Correction to 3495343
 - 3495789 Makefile improvements for test suite
+- 3495806 isChild() can cause a provider mismatch
 
 Changes in 1.3.13
 =================

Index: providerMgr.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/providerMgr.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- providerMgr.c	3 Feb 2012 16:45:57 -0000	1.75
+++ providerMgr.c	29 Feb 2012 23:28:19 -0000	1.76
@@ -1530,31 +1530,60 @@
 
 int isChild(const char *ns, const char *parent, const char* child)
 {
-   _SFCB_ENTER(TRACE_PROVIDERMGR, "isChild");
-
-   CMPIObjectPath *path;
+   CMPIObjectPath   *path;
+   CMPIStatus        rc;
+   InvokeMethodReq   sreq = BINREQ(OPS_InvokeMethod,5);
+   BinResponseHdr   *resp=NULL;
    BinRequestContext binCtx;
-   OperationHdr req = { OPS_InvokeMethod, 1 };
-   CMPIArgs *in = NewCMPIArgs(NULL);
-   CMPIStatus rc;
-   int irc;
-
-   memset(&binCtx,0,sizeof(BinRequestContext));
+   OperationHdr      req = { OPS_InvokeMethod, 2 };
+   CMPIArgs         *in;
+   int               irc;
+   
+   _SFCB_ENTER(TRACE_PROVIDERMGR, "isChild");
+  
+   path = TrackedCMPIObjectPath(ns, parent, &rc);
+   sreq.principal = setCharsMsgSegment("$$");
+   sreq.objectPath = setObjectPathMsgSegment(path);
+   
+   in = TrackedCMPIArgs(&rc);
    CMAddArg(in, "child", child, CMPI_chars);
-   path = NewCMPIObjectPath(ns, parent, &rc);
+   sreq.in = setArgsMsgSegment(in);
+   sreq.out = setArgsMsgSegment(NULL);
+   sreq.method = setCharsMsgSegment("isChild");
+
    req.nameSpace = setCharsMsgSegment((char *) ns);
-   req.className = setCharsMsgSegment("$ClassProvider$");
+   req.className = setCharsMsgSegment((char *) "$ClassProvider$");
 
-   irc = _methProvider(&binCtx, &req);
+   memset(&binCtx,0,sizeof(BinRequestContext));
+   binCtx.oHdr = &req;
+   binCtx.bHdr = &sreq.hdr;
+   binCtx.bHdrSize = sizeof(sreq);
+   binCtx.chunkedMode=binCtx.xmlAs=binCtx.noResp=0;
 
+   lockUpCall(Broker);
+   
+   irc = getProviderContext(&binCtx, &req);
+   
    if (irc == MSG_X_PROVIDER) {
-      localInvokeMethod(&binCtx, path, "ischild", in, NULL, &rc,0);
-      irc=(rc.rc==CMPI_RC_OK);
+      _SFCB_TRACE(1, ("--- Invoking Provider"));
+      resp = invokeProvider(&binCtx);
+      resp->rc--;
+      irc = (resp->rc == CMPI_RC_OK);
+   }
+   else {
+     mlogf(M_ERROR,M_SHOW,"-- no provider context isChild(%s:%s:%s)\n", 
+	   ns, parent, child);
+     irc = 0;
    }
-   else irc=0;
-   CMRelease(path);
-   CMRelease(in);
    
+   unlockUpCall(Broker);
+
+   if(resp) free(resp);
+   if(!localMode){
+  	close(binCtx.provA.socket);
+   }
+   closeProviderContext(&binCtx);
+
    _SFCB_RETURN(irc);
 }
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.722
retrieving revision 1.723
diff -u -d -r1.722 -r1.723
--- ChangeLog	29 Feb 2012 23:12:44 -0000	1.722
+++ ChangeLog	29 Feb 2012 23:28:19 -0000	1.723
@@ -1,5 +1,9 @@
 2012-02-29  Chris Buccella  <buc...@li...>
 
+	* providerMgr.c:
+	[ 3495806 ] isChild() can cause a provider mismatch
+	(patch by Viktor Mihajlovski)
+
 	* Makefile.am, test/Makefile.am, test/TestProviders/tests/IndRetryTest.sh,
 	  test/TestProviders/tests/Makefile.am, test/TestProviders/tests/xmltest.sh,
 	  test/commands/Makefile.am, test/commands/sfcbdump.sh,

[Sblim-commit] sfcb/test/commands Makefile.am, 1.2, 1.3 sfcbdump.sh, 1.1, 1.2

From: Chris B. <buc...@us...> - 2012-02-29 23:12:47

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

Modified Files:
	Makefile.am sfcbdump.sh 
Log Message:
[ 3495789 ] Makefile improvements for test suite

Index: sfcbdump.sh
===================================================================
RCS file: /cvsroot/sblim/sfcb/test/commands/sfcbdump.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sfcbdump.sh	7 Oct 2008 21:42:55 -0000	1.1
+++ sfcbdump.sh	29 Feb 2012 23:12:45 -0000	1.2
@@ -1,6 +1,6 @@
 #!/bin/sh
 RC=0
-if ! sfcbdump classSchemas | grep Linux_CSProcessor > /dev/null
+if ! sfcbdump $SRCDIR/classSchemas | grep Linux_CSProcessor > /dev/null
 then
     RC=1 
 fi

Index: Makefile.am
===================================================================
RCS file: /cvsroot/sblim/sfcb/test/commands/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	4 Mar 2010 22:19:56 -0000	1.2
+++ Makefile.am	29 Feb 2012 23:12:45 -0000	1.3
@@ -23,4 +23,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 #Some wbemcat tests
+export SRCDIR=$(srcdir)
 TESTS = cmdusage.sh sfcbdump.sh

[Sblim-commit] sfcb NEWS,1.643,1.644

From: Narasimha S. <nsh...@us...> - 2012-02-29 22:46:54

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

Modified Files:
	NEWS 
Log Message:
[ 3495060 ] verify filter and handler information during subscription


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.643
retrieving revision 1.644
diff -u -d -r1.643 -r1.644
--- NEWS	29 Feb 2012 21:20:51 -0000	1.643
+++ NEWS	29 Feb 2012 22:46:51 -0000	1.644
@@ -12,6 +12,7 @@
 - 3462309 Do not allow multiple instances of sfcb
 - 3488688 Don't spawn logger for clients
 - 3493493 Add sfcbsem
+- 3495060 Verify filter and handler information during subscription
 
 Bugs fixed:

[Sblim-commit] sfcb ChangeLog,1.720,1.721

From: Narasimha S. <nsh...@us...> - 2012-02-29 22:46:31

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

Modified Files:
	ChangeLog 
Log Message:
[ 3495060 ] verify filter and handler information during subscription


Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.720
retrieving revision 1.721
diff -u -d -r1.720 -r1.721
--- ChangeLog	29 Feb 2012 21:20:51 -0000	1.720
+++ ChangeLog	29 Feb 2012 22:46:29 -0000	1.721
@@ -1,3 +1,8 @@
+2012-02-29 Narasimha Sharoff <nsh...@us...>
+
+	* indCIMXMLHandler.c, interopProvider.c
+	[ 3495060 ] verify filter and handler information during subscription
+
 2012-02-29 Dave Heller <hel...@us...>
 
 	* cimslpSLP.c:

Flat | Threaded

<< < 1 .. 40 41 42 43 44 .. 596 > >> (Page 42 of 596)