sblim-commit — CVS Commit Info for SBLIM

[Sblim-commit] indication_helper/test Test_regProperties.c,1.1.1.1,1.2

[Konrad R. <kon...@us...>]

Update of /cvsroot/sblim/indication_helper/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19813

Modified Files:
	Test_regProperties.c 
Log Message:
BUG: 1168609
TITLE:compiler barfs about strict-aliasing for indication_helper



Index: Test_regProperties.c
===================================================================
RCS file: /cvsroot/sblim/indication_helper/test/Test_regProperties.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Test_regProperties.c	2 Feb 2005 19:06:51 -0000	1.1.1.1
+++ Test_regProperties.c	22 Mar 2005 20:07:04 -0000	1.2
@@ -37,7 +37,8 @@
   int i;
   char temp[MAX];
   char *pn[NR];
-  void *data[NR];
+
+  IndErrorT (*data[NR]) (CMPIData *);
 
   if (getenv("DEBUG"))
       debug = 1;
@@ -59,13 +60,13 @@
   assert ( IND_INVALID_ARGS == ind_set_properties_f("",
 						    CLASS, 
 						    pn, 
-						    (IndErrorT (**) (CMPIData *))&data, 
+							data,
 						    NR));
   
   assert ( IND_OK == ind_set_properties_f(NAMESPACE,
 					  CLASS, 
 					  pn, 
-					  (IndErrorT (**) (CMPIData *))&data, 
+					  data,
 					  NR));
 
   /* Try to unregister class in a wrong namespace */

[Sblim-commit] sfcb cmpiftx.h,NONE,1.1 cimXmlGen.c,1.2,1.3 cimXmlRequest.c,1.2,1.3 constClass.c,1.1.1.1,1.2 constClass.h,1.1.1.1,1.2 httpAdapter.c,1.3,1.4 native.h,1.1.1.1,1.2 objectpath.c,1.1.1.1,1.2 providerDrv.c,1.2,1.3 support.c,1.2,1.3 support.h,1.1.1.1,1.2

[Adrian S. <a3s...@us...>]

Update of /cvsroot/sblim/sfcb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6093

Modified Files:
	cimXmlGen.c cimXmlRequest.c constClass.c constClass.h 
	httpAdapter.c native.h objectpath.c providerDrv.c support.c 
	support.h 
Added Files:
	cmpiftx.h 
Log Message:
Added cmpiftx.h for sfcb MI extensions
Added loadClassMI support in support.c
Renamed __tool_loadxx variablenames to loadxx
Corrected #include statements for constClass.h at various places 


Index: cimXmlRequest.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/cimXmlRequest.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cimXmlRequest.c	12 Mar 2005 00:43:00 -0000	1.2
+++ cimXmlRequest.c	21 Mar 2005 14:22:38 -0000	1.3
@@ -27,7 +27,9 @@
 #include "cimXmlRequest.h"
 #include "cimXmlParser.h"
 #include "msgqueue.h"
+#include "cmpidt.h"
 #include "constClass.h"
+#include "objectImpl.h"
 
 #include "native.h"
 #include "trace.h"

Index: cimXmlGen.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/cimXmlGen.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cimXmlGen.c	15 Mar 2005 23:23:02 -0000	1.2
+++ cimXmlGen.c	21 Mar 2005 14:22:38 -0000	1.3
@@ -26,7 +26,9 @@
 #include "cimXmlRequest.h"
 #include "cimXmlParser.h"
 #include "msgqueue.h"
+#include "cmpidt.h"
 #include "constClass.h"
+#include "objectImpl.h"
 
 #include "native.h"
 #include "trace.h"

Index: native.h
===================================================================
RCS file: /cvsroot/sblim/sfcb/native.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- native.h	9 Mar 2005 12:25:12 -0000	1.1.1.1
+++ native.h	21 Mar 2005 14:22:38 -0000	1.2
@@ -33,6 +33,7 @@
 
 #include "cmpidt.h"
 #include "cmpift.h"
+#include "constClass.h"
 #include "cmpimacs.h"
 #include "msgqueue.h"
 

Index: support.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/support.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- support.c	12 Mar 2005 00:43:00 -0000	1.2
+++ support.c	21 Mar 2005 14:22:38 -0000	1.3
@@ -34,7 +34,7 @@
 int collectStat=0;
 unsigned long exFlags = 0;
 
-void *tool_load_lib(const char *libname)
+void *loadLibib(const char *libname)
 {
    char filename[255];
    sprintf(filename, "lib%s.so", libname);
@@ -42,7 +42,7 @@
 }
 
 
-static void *__get_generic_entry_point(void *library, const char *ptype)
+static void *getGenericEntryPoint(void *library, const char *ptype)
 {
    char entry_point[255];
    void *sym;
@@ -52,7 +52,7 @@
 }
 
 
-static void *__get_fixed_entry_point(const char *provider,
+static void *getFixedEntryPoint(const char *provider,
                                      void *library, const char *ptype)
 {
    char entry_point[255];
@@ -70,17 +70,17 @@
                                              CMPIContext * ctx);
 
 
-CMPIInstanceMI *tool_load_InstanceMI(const char *provider, void *library,
+CMPIInstanceMI *loadInstanceMI(const char *provider, void *library,
                                      CMPIBroker * broker, CMPIContext * ctx)
 {
    CMPIInstanceMI *mi; 
-   _SFCB_ENTER(TRACE_PROVIDERDRV, "tool_load_InstanceMI");
+   _SFCB_ENTER(TRACE_PROVIDERDRV, "loadInstanceMI");
    
    GENERIC_InstanceMI g = (GENERIC_InstanceMI) 
-      __get_generic_entry_point(library,"Instance");
+      getGenericEntryPoint(library,"Instance");
    if (g == NULL) {
       FIXED_InstanceMI f = (FIXED_InstanceMI) 
-         __get_fixed_entry_point(provider, library, "Instance");
+         getFixedEntryPoint(provider, library, "Instance");
       if (f == NULL) _SFCB_RETURN(NULL);
       if (broker) {
          mi=(f) (broker, ctx);
@@ -103,20 +103,20 @@
                                                    CMPIContext * ctx);
 
 
-CMPIAssociationMI *tool_load_AssociationMI(const char *provider,
+CMPIAssociationMI *loadAssociationMI(const char *provider,
                                            void *library,
                                            CMPIBroker * broker,
                                            CMPIContext * ctx)
 {
    CMPIAssociationMI *mi; 
-   _SFCB_ENTER(TRACE_PROVIDERDRV, "tool_load_AssociationMI");
+   _SFCB_ENTER(TRACE_PROVIDERDRV, "loadAssociationMI");
    
    GENERIC_AssociationMI g = (GENERIC_AssociationMI) 
-      __get_generic_entry_point(library, "Association");
+      getGenericEntryPoint(library, "Association");
       
    if (g == NULL) {
       FIXED_AssociationMI f = (FIXED_AssociationMI) 
-         __get_fixed_entry_point(provider, library, "Association");
+         getFixedEntryPoint(provider, library, "Association");
       if (f == NULL) _SFCB_RETURN(NULL);
       if (broker) {
          mi=(f) (broker, ctx);
@@ -139,17 +139,17 @@
                                          CMPIContext * ctx);
 
 
-CMPIMethodMI *tool_load_MethodMI(const char *provider, void *library,
+CMPIMethodMI *loadMethodMI(const char *provider, void *library,
                                  CMPIBroker * broker, CMPIContext * ctx)
 {
    CMPIMethodMI *mi; 
-   _SFCB_ENTER(TRACE_PROVIDERDRV, "tool_load_MethodMI");
+   _SFCB_ENTER(TRACE_PROVIDERDRV, "loadMethodMI");
    
    GENERIC_MethodMI g =
-       (GENERIC_MethodMI) __get_generic_entry_point(library, "Method");
+       (GENERIC_MethodMI) getGenericEntryPoint(library, "Method");
    if (g == NULL) {
       FIXED_MethodMI f =
-          (FIXED_MethodMI) __get_fixed_entry_point(provider, library,"Method");
+          (FIXED_MethodMI) getFixedEntryPoint(provider, library,"Method");
       if (f == NULL) _SFCB_RETURN(NULL);
       if (broker) {
          mi=(f)(broker, ctx);
@@ -171,18 +171,18 @@
 typedef CMPIPropertyMI *(*FIXED_PropertyMI) (CMPIBroker * broker,
                                              CMPIContext * ctx);
 
-CMPIPropertyMI *tool_load_PropertyMI(const char *provider, void *library,
+CMPIPropertyMI *loadPropertyMI(const char *provider, void *library,
                                      CMPIBroker * broker, CMPIContext * ctx)
 {
+   _SFCB_ENTER(TRACE_PROVIDERDRV, "loadPropertyMI");
    GENERIC_PropertyMI g =
-       (GENERIC_PropertyMI) __get_generic_entry_point(library,
+       (GENERIC_PropertyMI) getGenericEntryPoint(library,
                                                       "Property");
    if (g == NULL) {
       FIXED_PropertyMI f =
-          (FIXED_PropertyMI) __get_fixed_entry_point(provider, library,
+          (FIXED_PropertyMI) getFixedEntryPoint(provider, library,
                                                      "Property");
-      if (f == NULL)
-         return NULL;
+      if (f == NULL) _SFCB_RETURN(NULL);
       return (f) (broker, ctx);
    }
    return (g) (broker, ctx, provider);
@@ -196,25 +196,39 @@
                                                  CMPIContext * ctx);
 
 
-CMPIIndicationMI *tool_load_IndicationMI(const char *provider,
+CMPIIndicationMI *loadIndicationMI(const char *provider,
                                          void *library,
                                          CMPIBroker * broker, CMPIContext * ctx)
 {
    GENERIC_IndicationMI g =
-       (GENERIC_IndicationMI) __get_generic_entry_point(library,
+       (GENERIC_IndicationMI) getGenericEntryPoint(library,
                                                         "Indication");
    if (g == NULL) {
       FIXED_IndicationMI f =
-          (FIXED_IndicationMI) __get_fixed_entry_point(provider, library,
+          (FIXED_IndicationMI) getFixedEntryPoint(provider, library,
                                                        "Indication");
-      if (f == NULL)
-         return NULL;
+      if (f == NULL) return NULL;
       return (f) (broker, ctx);
    }
    return (g) (broker, ctx, provider);
 };
 
 
+
+typedef CMPIClassMI *(*FIXED_ClassMI) (CMPIBroker * broker,
+                                                 CMPIContext * ctx);
+
+CMPIClassMI *loadClassMI(const char *provider,
+                                         void *library,
+                                         CMPIBroker * broker, CMPIContext * ctx)
+{
+   FIXED_ClassMI f =
+          (FIXED_ClassMI) getFixedEntryPoint(provider, library,
+                                                       "Class");
+   if (f == NULL) return NULL;
+   return (f) (broker, ctx);
+};
+
 /****************************************************************************/
 
 

Index: httpAdapter.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/httpAdapter.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- httpAdapter.c	11 Mar 2005 12:22:35 -0000	1.3
+++ httpAdapter.c	21 Mar 2005 14:22:38 -0000	1.4
@@ -74,9 +74,9 @@
 
 extern char *decode64(char *data);
 extern void libraryName(const char *location, char *fullName);
-extern void *tool_load_lib(const char *libname);
+extern void *loadLibib(const char *libname);
 extern int getControlChars(char *id, char **val);
-extern void *tool_load_lib(const char *libname);
+extern void *loadLibib(const char *libname);
 
 extern RespSegments genFirstChunkResponses(BinRequestContext*,BinResponseHdr**,int,int);
 extern RespSegments genLastChunkResponses(BinRequestContext*, BinResponseHdr**, int);

Index: support.h
===================================================================
RCS file: /cvsroot/sblim/sfcb/support.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- support.h	9 Mar 2005 12:25:14 -0000	1.1.1.1
+++ support.h	21 Mar 2005 14:22:38 -0000	1.2
@@ -28,27 +28,32 @@
 
 #include "cmpidt.h"
 #include "cmpift.h"
+#include "cmpiftx.h"
 #include "cmpimacs.h"
 
 
-CMPIInstanceMI *tool_load_InstanceMI(const char *provider,
+CMPIInstanceMI *loadInstanceMI(const char *provider,
                                      void *library,
                                      CMPIBroker * broker, CMPIContext * ctx);
-CMPIAssociationMI *tool_load_AssociationMI(const char *provider,
+CMPIAssociationMI *loadAssociationMI(const char *provider,
                                            void *library,
                                            CMPIBroker * broker,
                                            CMPIContext * ctx);
-CMPIMethodMI *tool_load_MethodMI(const char *provider,
+CMPIMethodMI *loadMethodMI(const char *provider,
                                  void *library,
                                  CMPIBroker * broker, CMPIContext * ctx);
-CMPIPropertyMI *tool_load_PropertyMI(const char *provider,
+CMPIPropertyMI *loadPropertyMI(const char *provider,
                                      void *library,
                                      CMPIBroker * broker, CMPIContext * ctx);
-CMPIIndicationMI *tool_load_IndicationMI(const char *provider,
+CMPIIndicationMI *loadIndicationMI(const char *provider,
                                          void *library,
                                          CMPIBroker * broker,
                                          CMPIContext * ctx);
 
+CMPIClassMI *loadClassMI(const char *provider,
+                                         void *library,
+                                         CMPIBroker * broker,
+                                         CMPIContext * ctx);
 
 
 /*!

Index: providerDrv.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/providerDrv.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- providerDrv.c	12 Mar 2005 00:43:00 -0000	1.2
+++ providerDrv.c	21 Mar 2005 14:22:38 -0000	1.3
@@ -249,7 +249,7 @@
    _SFCB_ENTER(TRACE_PROVIDERDRV, "getInstanceMI");
    
    if (info->instanceMI == NULL) info->instanceMI =
-          tool_load_InstanceMI(info->providerName, info->library, Broker, ctx);
+          loadInstanceMI(info->providerName, info->library, Broker, ctx);
    *mi = info->instanceMI;
    rc = info->instanceMI ? 1 : 0;
    _SFCB_RETURN(rc);
@@ -261,7 +261,7 @@
    _SFCB_ENTER(TRACE_PROVIDERDRV, "getAssociationMI");
     
    if (info->associationMI == NULL) info->associationMI =
-          tool_load_AssociationMI(info->providerName, info->library, Broker, ctx);
+          loadAssociationMI(info->providerName, info->library, Broker, ctx);
    *mi = info->associationMI;
    rc = info->associationMI ? 1 : 0;
    _SFCB_RETURN(rc);
@@ -273,7 +273,7 @@
     _SFCB_ENTER(TRACE_PROVIDERDRV, "getIndicationMI");
     
    if (info->indicationMI == NULL) info->indicationMI =
-          tool_load_IndicationMI(info->providerName, info->library, Broker, ctx);
+          loadIndicationMI(info->providerName, info->library, Broker, ctx);
    *mi = info->indicationMI;
    rc = info->indicationMI ? 1 : 0;
    _SFCB_RETURN(rc);
@@ -285,7 +285,7 @@
     _SFCB_ENTER(TRACE_PROVIDERDRV, "getMethodMI");
     
    if (info->methodMI == NULL) info->methodMI =
-          tool_load_MethodMI(info->providerName, info->library, Broker, ctx);
+          loadMethodMI(info->providerName, info->library, Broker, ctx);
    *mi = info->methodMI;
    rc = info->methodMI ? 1 : 0;
    _SFCB_RETURN(rc);

Index: constClass.h
===================================================================
RCS file: /cvsroot/sblim/sfcb/constClass.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- constClass.h	9 Mar 2005 12:25:11 -0000	1.1.1.1
+++ constClass.h	21 Mar 2005 14:22:38 -0000	1.2
@@ -23,7 +23,7 @@
 #ifndef CMPI_constClass_h
 #define CMPI_constClass_h
 
-#include "objectImpl.h"
+#include "cmpidt.h"
 
 #define MALLOCED(a) (((a) & 0xff000000)!=0xff000000)
 

--- NEW FILE: cmpiftx.h ---

/*
 * cmpiftx.h
 *
 * (C) Copyright IBM Corp. 2005
 *
 * THIS FILE IS PROVIDED UNDER THE TERMS OF THE COMMON 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 Common Public License from
 * http://oss.software.ibm.com/developerworks/opensource/license-cpl.html
 *
 * Author:        Adrian Schuur <sc...@de...>
 *
 * Description:
 *
 * CMPI extdended function tables.
 *
*/

#ifndef _CMPIFTX_H_
#define _CMPIFTX_H_

#include "constClass.h"
#include "cmpidt.h"

#ifdef __cplusplus
extern "C" {
#endif

   //---------------------------------------------------
   //--
   //	_CMPIClassMI Class Provider object
   //--
   //---------------------------------------------------


   /** This structure represents a Class provider.
   */
   typedef struct _CMPIClassMIFT CMPIClassMIFT;
   typedef struct _CMPIClassMI {

       /** Opaque pointer to Provider specific implementation data.
       */
      void *hdl;

       /** Pointer to the Class Provider Function Table.
       */
      CMPIClassMIFT *ft;
   } CMPIClassMI;



   //---------------------------------------------------
   //--
   //	_CMPIClassMIFT Function Table
   //--
   //---------------------------------------------------


   /** This structure is a table of pointers providing access to Class
       provider functions. This table must be returend during initialization
       by the provider.
   */
   struct _CMPIClassMIFT {

       /** Function table version
       */
     int ftVersion;

       /** Provider version
       */
     int miVersion;

       /** Provider name
       */
     char *miName;

       /** Cleanup is called prior to unloading of the provider.
	 @param mi Provider this pointer.
	 @param ctx Invocation Context
	 @return Function return status.
      */
     CMPIStatus (*cleanup)
            (CMPIClassMI* mi, CMPIContext* ctx);

       /** Enumerate ObjectPaths of Classes serviced by this provider.
	 @param mi Provider this pointer.
	 @param ctx Invocation Context.
	 @param rslt Result data container.
	 @param op ObjectPath containing namespace and classname components.
	 @return Function return status.
      */
     CMPIStatus (*enumClassNames)
             (CMPIClassMI* mi, CMPIContext* ctx, CMPIResult* rslt,
              CMPIObjectPath* op);

       /** Enumerate the Classes serviced by this provider.
	 @param mi Provider this pointer.
	 @param ctx Invocation Context.
	 @param rslt Result data container.
	 @param op ObjectPath containing namespace and classname components.
	 @return Function return status.
      */
     CMPIStatus (*enumClasses)
             (CMPIClassMI* mi, CMPIContext* ctx, CMPIResult* rslt,
              CMPIObjectPath* op);

       /** Get the Class defined by &lt;op&gt;.
	 @param mi Provider this pointer.
	 @param ctx Invocation Context.
	 @param rslt Result data container.
	 @param op ObjectPath containing namespace, classname and key components.
	 @param properties If not NULL, the members of the array define one or
	     more Property names. Each returned Object MUST NOT include elements
	     for any Properties missing from this list.
	 @return Function return status.
      */
     CMPIStatus (*getClass)
             (CMPIClassMI* mi, CMPIContext* ctx, CMPIResult* rslt,
              CMPIObjectPath* op, char** properties);

       /** Create Class from &lt;cls&gt; using &lt;op&gt; as reference.
	 @param mi Provider this pointer.
	 @param ctx Invocation Context.
	 @param rslt Result data container.
	 @param op ObjectPath containing namespace and classname components.
	 @param cls The Class.
	 @return Function return status.
      */
     CMPIStatus (*createClass)
             (CMPIClassMI* mi, CMPIContext* ctx, CMPIResult* rslt,
              CMPIObjectPath* op, CMPIConstClass* cls);

       /** Replace an existing Class from &lt;cls&gt; using &lt;op&gt; as reference.
	 @param mi Provider this pointer.
	 @param ctx Invocation Context.
	 @param rslt Result data container.
	 @param op ObjectPath containing namespace and classname components.
	 @param cls The Class.
	 @return Function return status.
      */
     CMPIStatus (*setClass)
             (CMPIClassMI* mi, CMPIContext* ctx, CMPIResult* rslt,
              CMPIObjectPath* op, CMPIConstClass* cls);

       /** Delete an existing Class defined by &lt;op&gt;.
	 @param mi Provider this pointer.
	 @param ctx Invocation Context.
	 @param rslt Result data container.
	 @param op ObjectPath containing namespace and classname components.
	 @return Function return status.
      */
     CMPIStatus (*deleteClass)
             (CMPIClassMI* mi, CMPIContext* ctx, CMPIResult* rslt,
              CMPIObjectPath* op);
  };



#ifdef __cplusplus
 };
#endif

#endif // _CMPIFTX_H_


Index: constClass.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/constClass.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- constClass.c	9 Mar 2005 12:25:11 -0000	1.1.1.1
+++ constClass.c	21 Mar 2005 14:22:38 -0000	1.2
@@ -27,6 +27,7 @@
 #include <string.h>
 
 #include "constClass.h"
+#include "objectImpl.h"
 #include "msgqueue.h"
 
 //#define DEB(x) x

Index: objectpath.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/objectpath.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- objectpath.c	9 Mar 2005 12:25:13 -0000	1.1.1.1
+++ objectpath.c	21 Mar 2005 14:22:38 -0000	1.2
@@ -25,7 +25,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <constClass.h>
+#include "constClass.h"
+#include "objectImpl.h"
 
 #include "native.h"
 #include "msgqueue.h"

[Sblim-commit] cmpi-devel .cvsignore,NONE,1.1 sblim-cmpi-devel.spec.in,NONE,1.1 Makefile.am,1.1.1.1,1.2 configure.ac,1.1.1.1,1.2

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-devel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22210

Modified Files:
	Makefile.am configure.ac 
Added Files:
	.cvsignore sblim-cmpi-devel.spec.in 
Log Message:
Feature 1165993: Add RPM Support to sblim-cmpi-devel.


--- NEW FILE: .cvsignore ---
.deps
Makefile
Makefile.in
aclocal.m4
autom4te.cache
config.h
config.h.in
config.log
config.status
configure
stamp-h1


--- NEW FILE: sblim-cmpi-devel.spec.in ---
#
# sblim-cmpi-devel.spec
#
# Package spec for cmpi-devel
#

BuildRoot: /var/tmp/buildroot

Summary: SBLIM CMPI Provider Development Support
Name: @PACKAGE_TARNAME@
Version: @PACKAGE_VERSION@
Release: 0
Group: Systems Management/Base
License: Common Public License 1.0

Provides: cmpi-devel

Source0: http://dl.sourceforge.net/sourceforge/sblim/%{name}-%{version}.tar.bz2

%Description
This packages provides the CMPI header files needed by provider developers
and can be used standalone.

%prep

%setup -T -b 0 -n %{name}-%{version}

export PATCH_GET=0
#%patch0 -p1

%build

%configure --disable-debug
make

%install

if [ `id -ur` != 0 ]
then
# paranoia check 
	rm -rf $RPM_BUILD_ROOT 
fi

make DESTDIR=$RPM_BUILD_ROOT install

# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a

%clean
if [ `id -ur` != 0 ]
then
# paranoia check 
	rm -rf $RPM_BUILD_ROOT 
fi


%files
%defattr(-,root,root)
%doc %{_datadir}/doc
%{_includedir}
%{_libdir}/*.so*

Index: Makefile.am
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile.am	18 Mar 2005 13:45:38 -0000	1.1.1.1
+++ Makefile.am	18 Mar 2005 15:13:31 -0000	1.2
@@ -1,5 +1,7 @@
 # $Id$
 
+docdir=$(datadir)/doc/$(PACKAGE)-$(VERSION)
+
 lib_LTLIBRARIES=libcmpiCppImpl.la
 
 nobase_include_HEADERS=cmpi/CmpiArgs.h cmpi/CmpiBroker.h cmpi/cmpidt.h \
@@ -15,3 +17,13 @@
 
 libcmpiCppImpl_la_SOURCES=CmpiImpl.cpp
 libcmpiCppImpl_la_CPPFLAGS=-Wall -I$(srcdir)/cmpi
+
+EXTRA_DIST=$(PACKAGE).spec
+
+install-data-local: 
+	test -d $(DESTDIR)$(docdir) || $(mkdir_p) $(DESTDIR)$(docdir)
+	$(INSTALL_DATA) $(srcdir)/README $(srcdir)/AUTHORS $(srcdir)/COPYING $(DESTDIR)$(docdir)
+
+
+uninstall-local:
+	rm -rf $(DESTDIR)$(docdir)

Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/cmpi-devel/configure.ac,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- configure.ac	18 Mar 2005 13:45:38 -0000	1.1.1.1
+++ configure.ac	18 Mar 2005 15:13:31 -0000	1.2
@@ -30,5 +30,5 @@
 # Checks for library functions.
 AC_CHECK_FUNCS([strcasecmp])
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile sblim-cmpi-devel.spec])
 AC_OUTPUT

[Sblim-commit] ecute/Plugin/com/ibm/ecute EditQualifiers.java,1.2,1.3 Check.java,1.2,1.3

[Benjamin B. <bg...@us...>]

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8426/Plugin/com/ibm/ecute

Modified Files:
	EditQualifiers.java Check.java 
Log Message:


Index: Check.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/Check.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Check.java	8 Jul 2004 16:44:19 -0000	1.2
+++ Check.java	18 Mar 2005 08:02:36 -0000	1.3
@@ -26,6 +26,9 @@
 import java.util.ArrayList;
 import java.util.Hashtable;
 
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+
 import com.ibm.ecute.Dialogs.CheckDialog;
 import com.ibm.ecute.plugins.ProgressFrame;
 import com.ibm.ecute.plugins.Dialogs.DefaultProgressFrame;
@@ -78,8 +81,22 @@
 		
 		//Add latest operations to the runtime machine
 		String threadName = Thread.currentThread().getName();
-		Runtime.getRuntime().addShutdownHook(new theCheck(threadName));
-
+		try {
+			Runtime.getRuntime().addShutdownHook(new theCheck(threadName));
+		} catch (Error e){
+			System.out.println("unsupported JACOB version");
+			JFrame f = new JFrame();
+			JOptionPane.showMessageDialog(f,
+				    "You are using an unsupported version of JACOB.\n" +
+				    "Please install one of the supported JACOB versions listed below.\n\n" +
+				    "Supported versions:\n" +
+				    "- JACOB 1.8\n" +
+				    "- JACOB 1.7",
+				    "ECUTE error",
+				    JOptionPane.ERROR_MESSAGE);
+			System.exit(1);
+		}
+		
 		if (CheckDialog.showDialog()) {
 			selectedOnly = CheckDialog.selectedOnly;
 			duplicatedClasses = CheckDialog.duplicatedClasses;
@@ -96,7 +113,7 @@
 			} catch (Exception e) {
 				theDialog.addLine2Log("" + e);
 				e.printStackTrace();
-			}
+			} 
 			theDialog.endTasks(true);
 
 		} else

Index: EditQualifiers.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/EditQualifiers.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- EditQualifiers.java	13 Aug 2004 07:29:29 -0000	1.2
+++ EditQualifiers.java	18 Mar 2005 08:02:36 -0000	1.3
@@ -260,7 +260,9 @@
 	}
 
     
-	public void windowDeactivated(WindowEvent e){}
+	public void windowDeactivated(WindowEvent e){
+		valuesTab.skipNextEvent = true;
+	}
 	public void windowDeiconified(WindowEvent e){
 		windowActivated(e);
 	}
@@ -269,7 +271,7 @@
 	public void windowClosed(WindowEvent e){}
 	
 	public void windowClosing(WindowEvent e) {
-		boolean result=valuesTab.aceptAction(true);
+		boolean result=valuesTab.acceptAction(true);
 		ComThread.Release();
 			
 		if (result)
@@ -284,7 +286,7 @@
 	public void actionPerformed( ActionEvent e ) {
 		if ( e.getSource() == cancelButton ) {
 			
-			boolean result=valuesTab.aceptAction(true);
+			boolean result=valuesTab.acceptAction(true);
 			ComThread.Release();
 			
 			if (result)
@@ -292,17 +294,17 @@
 		}
 		
 		if ( e.getSource() == OKButton ) {
-			valuesTab.aceptAction(false);
+			valuesTab.acceptAction(false);
 			ComThread.Release();
-			definitionsTab.aceptAction();
+			definitionsTab.acceptAction();
             
 			lock.interrupt();         
 		}
 		
 		if ( e.getSource() == applyButton ) {
-			valuesTab.aceptAction(false);
+			valuesTab.acceptAction(false);
 			ComThread.Release();
-			definitionsTab.aceptAction();
+			definitionsTab.acceptAction();
 		}
 		
 		if ( e.getSource() == undoButton ) {

[Sblim-commit] ecute/Plugin/com/ibm/ecute/plugins/output/funcionality RoseREI.java,1.5,1.6

[Benjamin B. <bg...@us...>]

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/plugins/output/funcionality
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8426/Plugin/com/ibm/ecute/plugins/output/funcionality

Modified Files:
	RoseREI.java 
Log Message:


Index: RoseREI.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/plugins/output/funcionality/RoseREI.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- RoseREI.java	9 Dec 2004 15:03:33 -0000	1.5
+++ RoseREI.java	18 Mar 2005 08:02:49 -0000	1.6
@@ -298,15 +298,26 @@
 
 		if (lastRootClass == null)
 			return;
+		
 		AddClass2Diagram(lastRootClass, diagram);
+		
+		// set color of inheritance relationships "inherited" from other MOF files
+		Dispatch inheritRelations = Dispatch.call(lastRootClass, "GetInheritRelations").toDispatch();
+		int size = Dispatch.get(inheritRelations, "Count").toInt();
+
+		for (int i = size; i > 0; i--) {
+			Dispatch relation =
+				Dispatch.call(inheritRelations, "GetAt", new Variant(i)).toDispatch();
+			ChangeLineColor(diagram, relation, derived);
+			relation.release();
+		}
+		inheritRelations.release();		
 
 		//create inheritance and change colors
 		String theRoot = Dispatch.get(lastRootClass, "Name").toString();
 		Dispatch InheritRel =
 			Dispatch.call(lastClass, "AddInheritRel", "", theRoot).toDispatch();
-
 		Dispatch.call(diagram, "AddRelationView", InheritRel);
-		//*******************
 
 		ChangeLineColor(diagram, InheritRel, derived);
 
@@ -398,9 +409,10 @@
 
 	void AddClass2Diagram(Object theClass, Object theDiagram) {
 		Dispatch.call(theDiagram, "AddClass", theClass);
+		
 		Dispatch theView =
 			Dispatch.call(theDiagram, "GetClassView", theClass).toDispatch();
-
+		
 		Dispatch.put(theView, "AutomaticResize", new Variant(false));
 		theView.release();
 
@@ -878,7 +890,11 @@
 		if (type == TCATEGORY)
 			thisTab = catTab;
 
-		if (name.equalsIgnoreCase("Description")) {
+		if (name.equalsIgnoreCase("Abstract")) {
+			Dispatch.put(theElement, "Abstract", value);
+			Dispatch.call(lastObject,"OverrideProperty",thisTab,name,value);
+		
+		} else if (name.equalsIgnoreCase("Description")) {
 			Dispatch.put(theElement, "Documentation", value);
 
 			if (type == TCATEGORY) {

[Sblim-commit] ecute/Plugin/com/ibm/ecute/Dialogs DefinitionsTab.java,1.2,1.3 ValuesTab.java,1.3,1.4 EditValue.java,1.2,1.3

[Benjamin B. <bg...@us...>]

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/Dialogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8426/Plugin/com/ibm/ecute/Dialogs

Modified Files:
	DefinitionsTab.java ValuesTab.java EditValue.java 
Log Message:


Index: DefinitionsTab.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/Dialogs/DefinitionsTab.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DefinitionsTab.java	27 Dec 2004 12:49:49 -0000	1.2
+++ DefinitionsTab.java	18 Mar 2005 08:02:49 -0000	1.3
@@ -220,7 +220,7 @@
 			  JOptionPane.ERROR_MESSAGE);
 	}
 	
-	public void aceptAction(){
+	public void acceptAction(){
 		qualifiersTable.save(qualifiersFileName);
 	}    
 

Index: ValuesTab.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/Dialogs/ValuesTab.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ValuesTab.java	27 Dec 2004 12:49:49 -0000	1.3
+++ ValuesTab.java	18 Mar 2005 08:02:49 -0000	1.4
@@ -91,7 +91,9 @@
 	JButton roleB = new JButton("Role B");
 	JButton parentMethod = new JButton("Parent method");
 	public static boolean showAll = true;
-	public static boolean skipNext = false;
+	// skipNextEvent is used to ignore the next event that occurs
+	// among others used ignored events when returning from EditValue dialog
+	public /*static*/ boolean skipNextEvent = false;
 	boolean eventsAccepted = false;
 	boolean changes = false;
 	boolean isModifiable = true;
@@ -311,14 +313,14 @@
 	//it will check if there are changes to save in the current
 	//selection before loading the new selection qualifiers
 	public void updateWindow() {
-		if (skipNext) {
-			skipNext = false;
+		if (skipNextEvent) {
+			skipNextEvent = false;
 			return;
 		}
 		if (!disableEvents())
 			return;
 		if (eventsAccepted) {
-			skipNext = false;
+			skipNextEvent = false;
 			System.out.println("Canceled");
 			return;
 		} else
@@ -330,9 +332,22 @@
 				qualifiersTable.updateData(result);
 		} catch (Exception e) {
 			e.printStackTrace();
+		} catch (Error e){
+			//e.printStackTrace();
+			System.out.println("unsupported JACOB version");
+			JOptionPane.showMessageDialog(this,
+				    "You are using an unsupported version of JACOB.\n" +
+				    "Please install one of the supported JACOB versions listed below.\n\n" +
+				    "Supported versions:\n" +
+				    "- JACOB 1.8\n" +
+				    "- JACOB 1.7",
+				    "ECUTE error",
+				    JOptionPane.ERROR_MESSAGE);
+			System.exit(1);
+		} finally {
+			ComThread.Release();
+			enableEvents();
 		}
-		ComThread.Release();
-		enableEvents();
 	}
 	public void reloadQualifiers() {
 		try {
@@ -366,7 +381,7 @@
 		return item;
 	}
 	//shows the dialog asking the user if he wants to save the changes
-	public boolean aceptAction(boolean ask) {
+	public boolean acceptAction(boolean ask) {
 		System.out.println("acceptAction?" + changes);
 		if (!changes)
 			return true;
@@ -475,6 +490,8 @@
 			}
 			//EDIT
 			if (e.getSource() == editButton) {
+				System.out.println("EditButton");
+				skipNextEvent = true;
 				if (!isModifiable) {
 					JOptionPane
 							.showMessageDialog(
@@ -531,6 +548,8 @@
 					currentValueWithNull = currentValue;
 				//if (!currentValueWithNull.equalsIgnoreCase(valueWithNull))
 				changes = true;
+				//System.out.println("currentValue = "+currentValue+ " value = "+value
+				//  				+ " changes =" + changes);
 				qualifiersTable.setValueAt(rowN, 1, value);
 				String previousRow[] = previousRowValue(name);
 				if (previousRow == null) {
@@ -872,7 +891,7 @@
 			if (ID.equalsIgnoreCase(previousID)) {
 				return null;
 			}
-			if (!aceptAction(true))
+			if (!acceptAction(true))
 				return null;
 		}
 		//The real update begins :-)
@@ -897,7 +916,7 @@
 		String selectedElement = "";
 		Dispatch parentClass = null;
 		switch (type) {
-			case 0 :
+			case 0 : // class
 				parentClass = item;
 				selectedElement = "Class: ";
 				if (Dispatch.call(item, "IsALinkClass").toBoolean()
@@ -907,7 +926,7 @@
 					selectedElement = "Association: ";
 				}
 				break;
-			case 1 :
+			case 1 : // Association
 				if (Dispatch.get(item, "LinkClass").isNull()) {
 					System.out.println("hola");
 					parentClasses.removeAllItems();
@@ -920,7 +939,7 @@
 					selectedElement = "Association: ";
 				}
 				break;
-			case 2 :
+			case 2 : // role
 				String itemID = Dispatch.call(item, "GetUniqueId").toString();
 				//we have to find if its RoleA or RoleB
 				item = Dispatch.get(item, "Association").toDispatch();
@@ -940,32 +959,31 @@
 					parentClass = Dispatch.get(item, "LinkClass").toDispatch();
 				}
 				break;
-			case 3 :
+			case 3 : // attribute
 				selectedElement = "Property " + itemName + ": ";
 				parentClass = Dispatch.get(item, "ParentClass").toDispatch();
 				break;
-			case 4 :
+			case 4 : // operation
 				selectedElement = "Method " + itemName + ": ";
 				methodName = itemName;
 				parentClass = Dispatch.get(item, "ParentClass").toDispatch();
 				break;
-			case 5 :
+			case 5 : // parameter
 				selectedElement = "Parameter " + itemName + " from "
 						+ methodName + ": ";
 				parentClass = Dispatch
 						.call(myModel, "FindClassWithID", classID).toDispatch();
 				break;
-			case 6 :
+			case 6 : // category
 				return getCategoryData(item, itemName);
 			default :
 				parentClasses.removeAllItems();
 				selected.setText("");
 				return new String[0][4];
 		}
-		previousTab = theTab;
-		System.out.println(typeS + type);
+		previousTab   = theTab;
 		previousTypeS = typeS;
-		previousType = type;
+		previousType  = type;
 		Dispatch category = null;
 		if (parentClass != null)
 			category = Dispatch.get(parentClass, "ParentCategory").toDispatch();
@@ -1855,7 +1873,7 @@
 			toolBarPane.add(empty);
 		}
 		parentFrame.show();
-		skipNext = true;
+		skipNextEvent = true;
 	}
 	private String[] getHashtableKeys(Hashtable table) {
 		Enumeration enum = table.keys();

Index: EditValue.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/Dialogs/EditValue.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- EditValue.java	29 Nov 2004 12:46:19 -0000	1.2
+++ EditValue.java	18 Mar 2005 08:02:49 -0000	1.3
@@ -75,6 +75,7 @@
 	JTextArea valueText;
 	JRadioButton trueButton;
 	JRadioButton falseButton;
+	JScrollPane textPane;	
 	JCheckBox nullBox;
 	JButton OKButton;
 	JButton CancelButton;
@@ -102,7 +103,7 @@
 			}
 		}else
 			previousValue=theValue;
-
+			
 		JLabel empty4=new JLabel();
 		mainPanelC.gridx = 0;
 		mainPanelC.gridy = 0;
@@ -116,25 +117,23 @@
 		mainPanelL.setConstraints( empty4, mainPanelC );
 		panel.add( empty4 );
 
-		if(qualifierDef.type!=Qualifier.BOOLEAN)
-		{	valueText = new JTextArea(theValue);
-		valueText.setLineWrap(true);
-		valueText.setWrapStyleWord(true);
-		JScrollPane textPane=new JScrollPane(valueText);
-		mainPanelC.gridx = 0;
-		mainPanelC.gridy = 1;
-		mainPanelC.gridwidth = 7;
-		mainPanelC.gridheight = 1;
-		mainPanelC.fill = GridBagConstraints.BOTH;
-		mainPanelC.insets=new Insets(5,5,5,5);
-		mainPanelC.weightx = 1;
-		mainPanelC.weighty = 1;
-		mainPanelC.anchor = GridBagConstraints.CENTER;
-		mainPanelL.setConstraints( textPane, mainPanelC );
-		panel.add( textPane );
-
-		if (nullValue)
-            textPane.setEnabled(false);
+		if(qualifierDef.type!=Qualifier.BOOLEAN){
+			valueText = new JTextArea(theValue);
+			valueText.setLineWrap(true);
+			valueText.setWrapStyleWord(true);
+			//JScrollPane textPane=new JScrollPane(valueText);
+			textPane = new JScrollPane(valueText);
+			mainPanelC.gridx = 0;
+			mainPanelC.gridy = 2;
+			mainPanelC.gridwidth = 7;
+			mainPanelC.gridheight = 1;
+			mainPanelC.fill = GridBagConstraints.BOTH;
+			mainPanelC.insets=new Insets(5,5,5,5);
+			mainPanelC.weightx = 1;
+			mainPanelC.weighty = 1;
+			mainPanelC.anchor = GridBagConstraints.CENTER;
+			mainPanelL.setConstraints( textPane, mainPanelC );
+			panel.add( textPane );
 		}
 		else // is of BOOLEAN TYPE
 		{
@@ -173,17 +172,13 @@
 
 		}
 
-
-
-
-
 		nullBox=new JCheckBox("Null value",nullValue);
 		if ((qualifierDef.type>=0)&&
 		  (qualifierDef.type!=Qualifier.BOOLEAN))
 		{
 			nullBox.addItemListener(this);
 			mainPanelC.gridx = 0;
-			mainPanelC.gridy = 2;
+			mainPanelC.gridy = 1;
 			mainPanelC.gridwidth = 7;
 			mainPanelC.gridheight = 1;
 			mainPanelC.fill = GridBagConstraints.HORIZONTAL;
@@ -298,6 +293,9 @@
 		  -getHeight()/2);
 		setLocation(thePoint);
 
+		if (nullValue)
+			valueText.setEnabled(false);
+		
 		if (display)
 			show();
 
@@ -306,6 +304,7 @@
 
 		if (nullBox.isSelected())
 			return null;
+
 		else
 			return previousValue;
 	}
@@ -317,7 +316,7 @@
 
 		if(e.getActionCommand().equalsIgnoreCase("false"))
 			valueText = new JTextArea("false");
-
+		
 		if ( e.getSource() == CancelButton ) {
 			isCancel=true;
 			this.dispose();
@@ -353,7 +352,6 @@
 				falseButton.setSelected(true);
 
 		}
-
 	}
 
 	public void itemStateChanged(ItemEvent e) {

[Sblim-commit] ecute/Plugin/com/ibm/ecute/plugins/Dialogs DefaultProgressFrame.java,1.4,1.5

[Benjamin B. <bg...@us...>]

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/plugins/Dialogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8426/Plugin/com/ibm/ecute/plugins/Dialogs

Modified Files:
	DefaultProgressFrame.java 
Log Message:


Index: DefaultProgressFrame.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/plugins/Dialogs/DefaultProgressFrame.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- DefaultProgressFrame.java	15 Aug 2004 16:23:48 -0000	1.4
+++ DefaultProgressFrame.java	18 Mar 2005 08:02:49 -0000	1.5
@@ -305,6 +305,9 @@
 			public void actionPerformed(ActionEvent e) {
 				if (done) {
 					lock.interrupt();
+					// close window when "Done!" button is pressed
+					//dispose();
+					System.exit(1);
 				} else
 					abortTasks();
 			}

[Sblim-commit] ecute/Plugin/com/ibm/ecute/utils Constants.java,1.4,1.5

[Benjamin B. <bg...@us...>]

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/utils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8426/Plugin/com/ibm/ecute/utils

Modified Files:
	Constants.java 
Log Message:


Index: Constants.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/utils/Constants.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Constants.java	6 Dec 2004 17:17:40 -0000	1.4
+++ Constants.java	18 Mar 2005 08:02:36 -0000	1.5
@@ -22,7 +22,7 @@
 
 public class Constants {
 	
-    public static final String pluginVersion="2.0 Beta-1";
+    public static final String pluginVersion="2.0";
 	public static final String toolName="ECUTE";
 	public static final String qualifiersFileName="QualifiersList.txt";
 	

[Sblim-commit] ecute/Docs User guide.pdf,1.4,1.5 development guide.doc,1.2,1.3

[Benjamin B. <bg...@us...>]

Update of /cvsroot/sblim/ecute/Docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7587/Docs

Modified Files:
	User guide.pdf development guide.doc 
Log Message:


Index: development guide.doc
===================================================================
RCS file: /cvsroot/sblim/ecute/Docs/development guide.doc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvs3U77zd and /tmp/cvslHTU38 differ

Index: User guide.pdf
===================================================================
RCS file: /cvsroot/sblim/ecute/Docs/User guide.pdf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
Binary files /tmp/cvsL6TIHk and /tmp/cvs4lWyLr differ

[Sblim-commit] ecute/Docs User guide.doc,1.4,1.5

[Benjamin B. <bg...@us...>]

Update of /cvsroot/sblim/ecute/Docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7281/Docs

Modified Files:
	User guide.doc 
Log Message:


Index: User guide.doc
===================================================================
RCS file: /cvsroot/sblim/ecute/Docs/User guide.doc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
Binary files /tmp/cvsuRiUMZ and /tmp/cvsY9EdhF differ

[Sblim-commit] ecute ToDo.txt,1.7,1.8

[Robert K. <kie...@us...>]

Update of /cvsroot/sblim/ecute
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16579

Modified Files:
	ToDo.txt 
Log Message:
Added new todo

Index: ToDo.txt
===================================================================
RCS file: /cvsroot/sblim/ecute/ToDo.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ToDo.txt	27 Dec 2004 09:20:58 -0000	1.7
+++ ToDo.txt	17 Mar 2005 13:21:56 -0000	1.8
@@ -388,5 +388,17 @@
       >> Error: ws-cim-example3.mof(160): Token 256.0 not expected.
       
     This error message needs some improvement
+    
+30. When the selected Rose package does not contain a main diagram during export
+    a Nullpointer exception occurs in RoseParser::CreateCategories:
+    ERROR: the following unknown error was detected:
+    java.lang.NullPointerException
+	at com.ibm.ecute.plugins.input.funcionality.RoseParser.fillCategory(RoseParser.java:211)
+	at com.ibm.ecute.plugins.input.funcionality.RoseParser.CreateCategories(RoseParser.java:190)
+	at com.ibm.ecute.plugins.input.funcionality.RoseParser.Import(RoseParser.java:151)
+	at com.ibm.ecute.plugins.input.RoseInputPlugin.execute(RoseInputPlugin.java:150)
+	at com.ibm.ecute.EntryPoint.executeInputPlugins(EntryPoint.java:636)
+	at com.ibm.ecute.EntryPoint.<init>(EntryPoint.java:216)
+	at com.ibm.ecute.EntryPoint.main(EntryPoint.java:108)
 
 

[Sblim-commit] indication_helper ind_helper.c,1.3,1.4

[Heidi N. <hei...@us...>]

Update of /cvsroot/sblim/indication_helper
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32265

Modified Files:
	ind_helper.c 
Log Message:
added _releaseDataValue() function; necessary to reset values for checking
mechanism in _worker


Index: ind_helper.c
===================================================================
RCS file: /cvsroot/sblim/indication_helper/ind_helper.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ind_helper.c	3 Feb 2005 22:45:50 -0000	1.3
+++ ind_helper.c	17 Mar 2005 08:52:03 -0000	1.4
@@ -160,6 +160,7 @@
 static IndErrorT _cloneData(CMPIData *dst, const CMPIData *sc);
 
 static IndErrorT _releaseData(CMPIData *data);
+static IndErrorT _releaseDataValue(CMPIData *data);
 
 static int _compareProperty (void * ,  void * );
 static int _compareCIMValue(CMPIData , CMPIData );
@@ -898,8 +899,8 @@
 	     the filter on it */
 
 #ifdef DEBUG	 
-	  fprintf(stderr,"Trying filter: %p from %s:%s\n",
-		  p->filter, p->namespace, p->cn);
+	  fprintf(stderr,"Trying filter: %p from %s:%s on instance %s\n",
+		  p->filter, p->namespace, p->cn, CMGetCharPtr(CDToString(broker,instance,&status)) );
 #endif
 	  if (p->filter != NULL)
 	    {
@@ -1144,6 +1145,7 @@
 		      /* Call the routine */
 		      data.type = CMPI_null;
 		      data.state = CMPI_nullValue;
+		      _releaseDataValue(&p->data);
 		      IND_HLP_DEBUG("Calling the monitor function");
 
 		      if (p->check(&data) != IND_OK) {
@@ -1155,11 +1157,11 @@
 			_releaseData(&data);
 			break;
 		      }
-		      		      
-		      if (_compareCIMValue(data, 
-					   p->data) != 0)
+		      
+		      if (_compareCIMValue(data,p->data) != 0)
 			{ /* Yeey, data changed! */
 			  /* Copy the data */ 
+
 			  _releaseData(&p->data);
 			  _cloneData(&p->data, &data);
 
@@ -1742,7 +1744,7 @@
 	  value1.state, value2.state);
   */
    /* Check that the type of the two CIM values is the same */
-   if (value1.type != value2.type) return 0;
+  if (value1.type != value2.type) return 0;
    
    /* Check that the value of the two CIM values is the same */
    switch (value1.type) {
@@ -2090,3 +2092,84 @@
   return IND_OK;
 }
 
+
+static IndErrorT _releaseDataValue(CMPIData *data)
+{
+  IND_HLP_DEBUG("_releaseDataValue called.");
+  if (data == NULL)
+    return IND_INVALID_ARGS;
+
+  switch (data->type) 
+    {
+    case CMPI_uint16:
+      data->value.uint16=0;
+      break;
+
+    case CMPI_instance:
+      CMRelease(data->value.inst);
+      break;
+
+    case CMPI_ref:
+      CMRelease(data->value.ref);
+      break;
+
+    case CMPI_args:
+      CMRelease(data->value.args);
+      break;
+
+    case CMPI_filter:
+      CMRelease(data->value.filter);
+      break;
+
+    case CMPI_enumeration:
+      CMRelease(data->value.Enum);
+      break;
+
+    case CMPI_chars:
+      free(data->value.chars);
+      break;
+
+    case CMPI_dateTime:
+      CMRelease(data->value.dateTime);
+      break;
+
+    case CMPI_ptr:
+      
+      data->value.dataPtr.length = 0;
+      free(data->value.dataPtr.ptr);
+      break;
+
+    }
+
+ if ((data->type & CMPI_ARRAY) == CMPI_ARRAY)
+    {
+      IND_HLP_DEBUG("Array released.");
+      /* Should we  go through each element on the list? */
+      /*
+      count = CMGetArrayCount(data->value.array, &status);
+      for (i = 0; i < count; i++)
+	{
+	  temp=CMGetArrayElementAt(data->value.array,
+				   i, &status);
+	  _releaseData(&temp);
+	}
+      */
+      if (data->value.array)
+	CMRelease(data->value.array);
+
+    }
+
+  if (((data->type & CMPI_string) == CMPI_string) && 
+      (data->type != CMPI_chars) &&
+      ((data->type & CMPI_ARRAY) != CMPI_ARRAY))
+	
+    {
+      IND_HLP_DEBUG("String released.");
+      if (data->value.string)
+	CMRelease(data->value.string);
+    }
+ 
+  IND_HLP_DEBUG("_releaseDataValue exited.");
+  return IND_OK;
+}
+

[Sblim-commit] cmpi-base/test/indication PegasusCreateFilter.localhost.xml,NONE,1.1 PegasusCreateHandler.localhost.xml,NONE,1.1 PegasusCreateSubscription.localhost.xml,NONE,1.1 PegasusDeleteFilter.localhost.xml,NONE,1.1 PegasusDeleteHandler.localhost.xml,NONE,1.1 PegasusDeleteSubscription.localhost.xml,NONE,1.1

[Heidi N. <hei...@us...>]

Update of /cvsroot/sblim/cmpi-base/test/indication
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29738/test/indication

Added Files:
	PegasusCreateFilter.localhost.xml 
	PegasusCreateHandler.localhost.xml 
	PegasusCreateSubscription.localhost.xml 
	PegasusDeleteFilter.localhost.xml 
	PegasusDeleteHandler.localhost.xml 
	PegasusDeleteSubscription.localhost.xml 
Log Message:
added sample subscripion to test/indication directory (for openPegasus);
updated README.INDICATION with better description and sample


--- NEW FILE: PegasusCreateSubscription.localhost.xml ---
<?xml version="1.0" encoding="utf-8"?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
  <MESSAGE ID="4711" PROTOCOLVERSION="1.0">
    <SIMPLEREQ>
      <IMETHODCALL NAME="CreateInstance">
        <LOCALNAMESPACEPATH>
          <NAMESPACE NAME="root"/>
          <NAMESPACE NAME="PG_InterOp"/>
        </LOCALNAMESPACEPATH>
        <IPARAMVALUE NAME="NewInstance">
          <INSTANCE CLASSNAME="CIM_IndicationSubscription">
            <PROPERTY.REFERENCE NAME="Filter" 
                                REFERENCECLASS="CIM_IndicationFilter"> 
              <VALUE.REFERENCE> 
                <INSTANCENAME CLASSNAME="CIM_IndicationFilter">
                  <KEYBINDING NAME="SystemCreationClassName">
                    <KEYVALUE VALUETYPE="string">
                    CIM_ComputerSystem
                    </KEYVALUE>
                  </KEYBINDING>
                  <KEYBINDING NAME="SystemName">
                    <KEYVALUE VALUETYPE="string">
                    localhost.localdomain
                    </KEYVALUE>
                  </KEYBINDING>
                  <KEYBINDING NAME="CreationClassName">
                    <KEYVALUE VALUETYPE="string">
                    CIM_IndicationFilter
                    </KEYVALUE>
                  </KEYBINDING>
                  <KEYBINDING NAME="Name">
                    <KEYVALUE VALUETYPE="string">
                    OperatingSystemFilter0
                    </KEYVALUE>
                  </KEYBINDING>
                </INSTANCENAME>
              </VALUE.REFERENCE>
            </PROPERTY.REFERENCE>
            <PROPERTY.REFERENCE NAME="Handler" 
                                REFERENCECLASS="CIM_IndicationHandler"> 
              <VALUE.REFERENCE> 
                <INSTANCENAME CLASSNAME="CIM_IndicationHandlerCIMXML">
                  <KEYBINDING NAME="SystemCreationClassName">
                    <KEYVALUE VALUETYPE="string">
                    CIM_ComputerSystem
                    </KEYVALUE>
                  </KEYBINDING>
                  <KEYBINDING NAME="SystemName">
                    <KEYVALUE VALUETYPE="string">
                    localhost.localdomain
                    </KEYVALUE>
                  </KEYBINDING>
                  <KEYBINDING NAME="CreationClassName">
                    <KEYVALUE VALUETYPE="string">
                    CIM_IndicationHandlerCIMXML
                    </KEYVALUE>
                  </KEYBINDING>
                  <KEYBINDING NAME="Name">
                    <KEYVALUE VALUETYPE="string">
                    OperatingSystemHandler0
                    </KEYVALUE>
                  </KEYBINDING>
                </INSTANCENAME>
              </VALUE.REFERENCE>
            </PROPERTY.REFERENCE>
            <PROPERTY NAME="SubscriptionState" TYPE="uint16"> 
              <VALUE> 2 </VALUE>
            </PROPERTY>
          </INSTANCE>
        </IPARAMVALUE>
      </IMETHODCALL>
    </SIMPLEREQ>
  </MESSAGE>
</CIM>

--- NEW FILE: PegasusDeleteHandler.localhost.xml ---
<?xml version="1.0" encoding="utf-8"?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
  <MESSAGE ID="4711" PROTOCOLVERSION="1.0">
    <SIMPLEREQ>
      <IMETHODCALL NAME="DeleteInstance">
        <LOCALNAMESPACEPATH>
          <NAMESPACE NAME="root"/>
          <NAMESPACE NAME="PG_InterOp"/>
        </LOCALNAMESPACEPATH>
        <IPARAMVALUE NAME="InstanceName">
          <INSTANCENAME CLASSNAME="CIM_IndicationHandlerCIMXML">
            <KEYBINDING NAME="SystemCreationClassName">
              <KEYVALUE>CIM_ComputerSystem</KEYVALUE>
            </KEYBINDING>
            <KEYBINDING NAME="SystemName">
              <KEYVALUE>localhost.localdomain</KEYVALUE>
            </KEYBINDING>
            <KEYBINDING NAME="CreationClassName"> 
              <KEYVALUE>CIM_IndicationHandlerCIMXML</KEYVALUE>
            </KEYBINDING>
            <KEYBINDING NAME="Name" TYPE="string"> 
              <KEYVALUE>OperatingSystemHandler0</KEYVALUE>
            </KEYBINDING>
          </INSTANCENAME>
        </IPARAMVALUE>
      </IMETHODCALL>
    </SIMPLEREQ>
  </MESSAGE>
</CIM>

--- NEW FILE: PegasusDeleteFilter.localhost.xml ---
<?xml version="1.0" encoding="utf-8"?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
  <MESSAGE ID="4711" PROTOCOLVERSION="1.0">
    <SIMPLEREQ>
      <IMETHODCALL NAME="DeleteInstance">
        <LOCALNAMESPACEPATH>
          <NAMESPACE NAME="root"/>
          <NAMESPACE NAME="PG_InterOp"/>
        </LOCALNAMESPACEPATH>
        <IPARAMVALUE NAME="InstanceName">
          <INSTANCENAME CLASSNAME="CIM_IndicationFilter">
            <KEYBINDING NAME="SystemCreationClassName">
              <KEYVALUE>CIM_ComputerSystem</KEYVALUE>
            </KEYBINDING>
            <KEYBINDING NAME="SystemName">
              <KEYVALUE>localhost.localdomain</KEYVALUE>
            </KEYBINDING>
            <KEYBINDING NAME="CreationClassName"> 
              <KEYVALUE>CIM_IndicationFilter</KEYVALUE>
            </KEYBINDING>
            <KEYBINDING NAME="Name" TYPE="string"> 
              <KEYVALUE>OperatingSystemFilter0</KEYVALUE>
            </KEYBINDING>
          </INSTANCENAME>
        </IPARAMVALUE>
      </IMETHODCALL>
    </SIMPLEREQ>
  </MESSAGE>
</CIM>

--- NEW FILE: PegasusCreateHandler.localhost.xml ---
<?xml version="1.0" encoding="utf-8"?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
  <MESSAGE ID="4711" PROTOCOLVERSION="1.0">
    <SIMPLEREQ>
      <IMETHODCALL NAME="CreateInstance">
        <LOCALNAMESPACEPATH>
          <NAMESPACE NAME="root"/>
          <NAMESPACE NAME="PG_InterOp"/>
        </LOCALNAMESPACEPATH>
        <IPARAMVALUE NAME="NewInstance">
          <INSTANCE CLASSNAME="CIM_IndicationHandlerCIMXML">
            <PROPERTY NAME="SystemCreationClassName" TYPE="string">
              <VALUE>CIM_ComputerSystem</VALUE>
            </PROPERTY>
            <PROPERTY NAME="SystemName" TYPE="string">
              <VALUE>localhost.localdomain</VALUE>
            </PROPERTY>
            <PROPERTY NAME="CreationClassName" TYPE="string"> 
              <VALUE>CIM_IndicationHandlerCIMXML</VALUE>
            </PROPERTY>
            <PROPERTY NAME="Name" TYPE="string"> 
              <VALUE>OperatingSystemHandler0</VALUE>
            </PROPERTY>
            <PROPERTY NAME="Destination" TYPE="string"> 
              <VALUE>localhost/CIMListener/Pegasus_SimpleDisplayConsumer</VALUE>
            </PROPERTY>
          </INSTANCE>
        </IPARAMVALUE>
      </IMETHODCALL>
    </SIMPLEREQ>
  </MESSAGE>
</CIM>

--- NEW FILE: PegasusCreateFilter.localhost.xml ---
<?xml version="1.0" encoding="utf-8"?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
  <MESSAGE ID="4711" PROTOCOLVERSION="1.0">
    <SIMPLEREQ>
      <IMETHODCALL NAME="CreateInstance">
        <LOCALNAMESPACEPATH>
          <NAMESPACE NAME="root"/>
          <NAMESPACE NAME="PG_InterOp"/>
        </LOCALNAMESPACEPATH>
        <IPARAMVALUE NAME="NewInstance">
          <INSTANCE CLASSNAME="CIM_IndicationFilter">
            <PROPERTY NAME="SystemCreationClassName" TYPE="string">
              <VALUE>CIM_ComputerSystem</VALUE>
            </PROPERTY>
            <PROPERTY NAME="SystemName" TYPE="string">
              <VALUE>localhost.localdomain</VALUE>
            </PROPERTY>
            <PROPERTY NAME="CreationClassName" TYPE="string"> 
              <VALUE>CIM_IndicationFilter</VALUE>
            </PROPERTY>
            <PROPERTY NAME="Name" TYPE="string"> 
              <VALUE>OperatingSystemFilter0</VALUE>
            </PROPERTY>
            <PROPERTY NAME="Query" TYPE="string"> 
              <VALUE> SELECT * FROM Linux_OperatingSystemIndication
              </VALUE>
            </PROPERTY>
            <PROPERTY NAME="QueryLanguage" TYPE="string"> 
              <VALUE>WQL</VALUE>
            </PROPERTY>
            <PROPERTY NAME="SourceNamespace" TYPE="string"> 
              <VALUE>root/cimv2</VALUE>
            </PROPERTY>
          </INSTANCE>
        </IPARAMVALUE>
      </IMETHODCALL>
    </SIMPLEREQ>
  </MESSAGE>
</CIM>


--- NEW FILE: PegasusDeleteSubscription.localhost.xml ---
<?xml version="1.0" encoding="utf-8"?>
<CIM CIMVERSION="2.0" DTDVERSION="2.0">
  <MESSAGE ID="4711" PROTOCOLVERSION="1.0">
    <SIMPLEREQ>
      <IMETHODCALL NAME="DeleteInstance">
        <LOCALNAMESPACEPATH>
          <NAMESPACE NAME="root"/>
          <NAMESPACE NAME="PG_InterOp"/>
        </LOCALNAMESPACEPATH>
        <IPARAMVALUE NAME="InstanceName">
          <INSTANCENAME CLASSNAME="CIM_IndicationSubscription">
            <KEYBINDING NAME="Filter">
              <VALUE.REFERENCE>
                <INSTANCENAME CLASSNAME="CIM_IndicationFilter">
                  <KEYBINDING NAME="SystemCreationClassName">
                    <KEYVALUE VALUETYPE="string">
                    CIM_ComputerSystem
                    </KEYVALUE>
                  </KEYBINDING>
                  <KEYBINDING NAME="SystemName">
                    <KEYVALUE VALUETYPE="string">
                    localhost.localdomain
                    </KEYVALUE>
                  </KEYBINDING>
                  <KEYBINDING NAME="CreationClassName">
                    <KEYVALUE VALUETYPE="string">
                    CIM_IndicationFilter
                    </KEYVALUE>
                  </KEYBINDING>
                  <KEYBINDING NAME="Name">
                    <KEYVALUE VALUETYPE="string">
                    OperatingSystemFilter0
                    </KEYVALUE>
                  </KEYBINDING>
                </INSTANCENAME>
              </VALUE.REFERENCE>
            </KEYBINDING>
            <KEYBINDING NAME="Handler">
              <VALUE.REFERENCE> 
                <INSTANCENAME CLASSNAME="CIM_IndicationHandlerCIMXML">
                  <KEYBINDING NAME="SystemCreationClassName">
                    <KEYVALUE VALUETYPE="string">
                    CIM_ComputerSystem
                    </KEYVALUE>
                  </KEYBINDING>
                  <KEYBINDING NAME="SystemName">
                    <KEYVALUE VALUETYPE="string">
                    localhost.localdomain
                    </KEYVALUE>
                  </KEYBINDING>
                  <KEYBINDING NAME="CreationClassName">
                    <KEYVALUE VALUETYPE="string">
                    CIM_IndicationHandlerCIMXML
                    </KEYVALUE>
                  </KEYBINDING>
                  <KEYBINDING NAME="Name">
                    <KEYVALUE VALUETYPE="string">
                    OperatingSystemHandler0
                    </KEYVALUE>
                  </KEYBINDING>
                </INSTANCENAME>
              </VALUE.REFERENCE>
            </KEYBINDING>
          </INSTANCENAME>
        </IPARAMVALUE>
      </IMETHODCALL>
    </SIMPLEREQ>
  </MESSAGE>
</CIM>

[Sblim-commit] cmpi-base/mof Linux_BaseIndication.mof,NONE,1.1 Linux_BaseIndicationReg.mof,NONE,1.1 Linux_Base.mof,1.10,1.11 Linux_BaseRegistration.mof,1.8,1.9 makefile.pegasus,1.1.1.1,1.2

[Heidi N. <hei...@us...>]

Update of /cvsroot/sblim/cmpi-base/mof
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29738/mof

Modified Files:
	Linux_Base.mof Linux_BaseRegistration.mof makefile.pegasus 
Added Files:
	Linux_BaseIndication.mof Linux_BaseIndicationReg.mof 
Log Message:
added sample subscripion to test/indication directory (for openPegasus);
updated README.INDICATION with better description and sample


--- NEW FILE: Linux_BaseIndication.mof ---
//
// Linux_BaseIndication.mof
//
// (C) Copyright IBM Corp. 2005
//
// THIS FILE IS PROVIDED UNDER THE TERMS OF THE COMMON 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 Common Public License from
// http://oss.software.ibm.com/developerworks/opensource/license-cpl.html
//
// Author:       Heidi Neumann <hei...@de...>
// Contributors:
//
// Description:
// CIM Indication classes for Linux Base System Instrumentation
//

#pragma locale ("en_US")

// -------------------------------------------------------------------
// *******************************************************************
// 	Classes
// *******************************************************************
// -------------------------------------------------------------------



// ===================================================================
// 	Linux_OperatingSystemIndication
// ===================================================================

[ Indication,
  Description ("Metric Process Indication"),
  Provider("cmpi:OSBase_OperatingSystemProvider")
]
class Linux_OperatingSystemIndication : CIM_ProcessIndication
{
  [Description("OS Name for Indication")]
  string Name;
  [Description("OperationalStatus for Indication")]
  string OperationalStatus;
};

--- NEW FILE: Linux_BaseIndicationReg.mof ---
//
// Linux_BaseIndicationReg.mof
//
// (C) Copyright IBM Corp. 2005
//
// THIS FILE IS PROVIDED UNDER THE TERMS OF THE COMMON 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 Common Public License from
// http://oss.software.ibm.com/developerworks/opensource/license-cpl.html
//
// Author:       Heidi Neumann <hei...@de...>
// Contributors:
//
// Description:
// instances to register CIM Indication classes for Linux Base System 
// Instrumentation to openPegasus' root/PG_InterOp namespace
//


#pragma locale ("en_US")
#pragma namespace ("root/PG_InterOp")

// ===================================================================
// 	Linux_OperatingSystemIndication
// ===================================================================


instance of PG_ProviderCapabilities
{
   //The provider module as defined in PG_ProviderModule
   ProviderModuleName = "OSBase_OperatingSystemProviderModule";
   //The provider name as defined in PG_Provider
   ProviderName = "OSBase_OperatingSystemProvider";
   CapabilityID = "2";
   //Name of the CIM class as defined in the mof
   ClassName = "Linux_OperatingSystemIndication";
   Namespaces = {"root/cimv2"};
   ProviderType = { 4 }; // Indication
   SupportedProperties = NULL; // All properties
   SupportedMethods = NULL; // All methods
};

Index: Linux_Base.mof
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/mof/Linux_Base.mof,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Linux_Base.mof	3 Feb 2005 18:19:34 -0000	1.10
+++ Linux_Base.mof	17 Mar 2005 08:39:54 -0000	1.11
@@ -105,19 +105,6 @@
 };
 
 
-//[ Indication,
-//  Description ("Metric Process Indication"),
-//  Provider("cmpi:OSBase_OperatingSystemProvider")
-//]
-//class Linux_OperatingSystemIndication : CIM_ProcessIndication
-//{
-//  [Description("OS Name for Indication")]
-//  string Name;
-//  [Description("OperationalStatus for Indication")]
-//  string OperationalStatus;
-//};
-
-
 // ===================================================================
 // 	Linux_UnixProcess
 // ===================================================================

Index: Linux_BaseRegistration.mof
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/mof/Linux_BaseRegistration.mof,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Linux_BaseRegistration.mof	3 Feb 2005 18:19:34 -0000	1.8
+++ Linux_BaseRegistration.mof	17 Mar 2005 08:39:54 -0000	1.9
@@ -138,21 +138,6 @@
    SupportedMethods = NULL; // All methods
 };
 
-//instance of PG_ProviderCapabilities
-//{
-//   //The provider module as defined in PG_ProviderModule
-//   ProviderModuleName = "OSBase_OperatingSystemProviderModule";
-//   //The provider name as defined in PG_Provider
-//   ProviderName = "OSBase_OperatingSystemProvider";
-//   CapabilityID = "2";
-//   //Name of the CIM class as defined in the mof
-//   ClassName = "Linux_OperatingSystemIndication";
-//   Namespaces = {"root/cimv2"};
-//   ProviderType = { 4 }; // Indication
-//   SupportedProperties = NULL; // All properties
-//   SupportedMethods = NULL; // All methods
-//};
-
 
 // ===================================================================
 // 	Linux_UnixProcess

Index: makefile.pegasus
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/mof/makefile.pegasus,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- makefile.pegasus	18 Mar 2003 09:16:58 -0000	1.1.1.1
+++ makefile.pegasus	17 Mar 2005 08:39:54 -0000	1.2
@@ -5,6 +5,9 @@
 install:
 	cimmofl -I. -nroot/cimv2 Linux_Base.mof
 	cimmofl -I. -nroot/PG_InterOp Linux_BaseRegistration.mof
+#	cimmofl -nroot/PG_InterOp $(PEGASUS_ROOT)/src/Providers/sample/Load/SimpleDisplayConsumerR.mof
+#	cimmofl -I. -nroot/cimv2 Linux_BaseIndication.mof
+#	cimmofl -I. -nroot/PG_InterOp Linux_BaseIndicationReg.mof
 
 
 

[Sblim-commit] cmpi-base CHANGE.LOG,1.11,1.12 README.INDICATION,1.1,1.2

[Heidi N. <hei...@us...>]

Update of /cvsroot/sblim/cmpi-base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29738

Modified Files:
	CHANGE.LOG README.INDICATION 
Log Message:
added sample subscripion to test/indication directory (for openPegasus);
updated README.INDICATION with better description and sample


Index: CHANGE.LOG
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/CHANGE.LOG,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- CHANGE.LOG	7 Mar 2005 09:53:37 -0000	1.11
+++ CHANGE.LOG	17 Mar 2005 08:39:53 -0000	1.12
@@ -57,5 +57,8 @@
   FreePhysicalMemory, SizeStoredInPagingFiles and 
   FreeSpaceInPagingFiles for kernel 2.6
 * bug# 1155834: fixed OperatingSystem's InstallDate for Fedora
+* added sample subscriptions to test/indication directory
+* updated README.INDICATION with better description and sample for
+  openPegasus
 
 // ===================================================================

Index: README.INDICATION
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/README.INDICATION,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README.INDICATION	3 Feb 2005 18:19:34 -0000	1.1
+++ README.INDICATION	17 Mar 2005 08:39:53 -0000	1.2
@@ -11,6 +11,11 @@
 Author:       Heidi Neumann <hei...@de...>
 Date  :	      01/03/2005
 
+Changes:      03/07/2005: added description to register Pegasus Simple Display
+                          consumer
+	      03/09/2005: added sample indication subscription for Pegasus to 
+			  test/indication directory
+
 /* ---------------------------------------------------------------------------*/
 
 
@@ -26,6 +31,36 @@
 - enable the class definition of Linux_OperatingSystemIndication in the
   mof/Linux_Base.mof file
 - for PEGASUS:
-  enable the registration of the Indication Interface for the provider
-  cmpiOSBase_OperatingSystemProvider
+  - edit mof/makefile.pegasus to enable the registration of the Indication 
+    class and provider
 - now build the cmpi-base package as described in the README
+
+
+
+Indication Sample (openPegasus)
+-------------------------------
+
+A sample indication subscription can be found under test/indication. You 
+need to register the Pegasus Simple Display consumer. The registration 
+command and mof is:
+
+> cimmofl -nroot/PG_InterOp $(PEGASUS_ROOT)/src/Providers/sample/Load/SimpleDisplayConsumerR.mof
+
+The openPegasus SimpleDisplayConsumer writes received indications into the
+indicationLog file. You only need to set the PEGASUS_DISPLAYCONSUMER_DIR 
+environment variable by:
+
+> export PEGASUS_DISPLAYCONSUMER_DIR=<path>
+
+Then load the sample filter, handler and subscription by:
+
+> wbemexec PegasusCreateFilter.localhost.xml
+> wbemexec PegasusCreateHandler.localhost.xml
+> wbemexec PegasusCreateSubscription.localhost.xml
+
+Unload via the following order:
+
+> wbemexec PegasusDeleteSubscription.localhost.xml
+> wbemexec PegasusDeleteHandler.localhost.xml
+> wbemexec PegasusDeleteFilter.localhost.xml
+

[Sblim-commit] cmpi-base/test/indication - New directory

[Heidi N. <hei...@us...>]

Update of /cvsroot/sblim/cmpi-base/test/indication
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28334/indication

Log Message:
Directory /cvsroot/sblim/cmpi-base/test/indication added to the repository

[Sblim-commit] cmpi-base CHANGE.LOG,1.10,1.11

[Heidi N. <hei...@us...>]

Update of /cvsroot/sblim/cmpi-base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10154

Modified Files:
	CHANGE.LOG 
Log Message:
fixed bug# 1155823 and bug# 1155834


Index: CHANGE.LOG
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/CHANGE.LOG,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- CHANGE.LOG	2 Mar 2005 08:49:50 -0000	1.10
+++ CHANGE.LOG	7 Mar 2005 09:53:37 -0000	1.11
@@ -50,3 +50,12 @@
 * fixed retrieval of LPARID on Power
 
 // ===================================================================
+// new in version 1.4.3 :
+
+* bug# 1155823: fixed retrieval of OperatingSystem's 
+  TotalVirtualMemorySize, FreeVirtualMemory, TotalVisibleMemorySize,
+  FreePhysicalMemory, SizeStoredInPagingFiles and 
+  FreeSpaceInPagingFiles for kernel 2.6
+* bug# 1155834: fixed OperatingSystem's InstallDate for Fedora
+
+// ===================================================================

[Sblim-commit] cmpi-network CHANGE.LOG,1.5,1.6 OSBase_CommonNetwork.c,1.6,1.7 OSBase_IPProtocolEndpoint.c,1.6,1.7

[Heidi N. <hei...@us...>]

Update of /cvsroot/sblim/cmpi-network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8530

Modified Files:
	CHANGE.LOG OSBase_CommonNetwork.c OSBase_IPProtocolEndpoint.c 
Log Message:
bug# 1158159: fixed parsing of /proc/net/dev for systems with high
amount of network traffic


Index: OSBase_CommonNetwork.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-network/OSBase_CommonNetwork.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- OSBase_CommonNetwork.c	4 Dec 2003 14:38:44 -0000	1.6
+++ OSBase_CommonNetwork.c	7 Mar 2005 09:46:00 -0000	1.7
@@ -102,10 +102,8 @@
   char               ** hdout = NULL;
   char               ** hdchk = NULL;
   char               ** hderr = NULL;
-  char               *  str   = NULL;
-  char               *  ptr   = NULL;
-  char               *  id    = NULL;
   char               *  cmd   = NULL;
+  char                  port[64];
   unsigned short        type  = 0;
   int                   i     = 2;      /* start at third line */
   int                   rc    = 0;
@@ -117,19 +115,12 @@
   if( rc == 0 ) {
     while( hdout[i] != NULL) {	
       
-      str = strchr(hdout[i] , ':');
-      id = calloc(1, (strlen(hdout[i])-strlen(str)+1));
-      strncpy( id, hdout[i], strlen(hdout[i])-strlen(str));
-      
-      ptr = id+strlen(id);
-      *(ptr) = '\0';
-      str = strrchr(id, ' ');
-      
-      cmd = calloc(1, (strlen(id)+16) );
+      memset(port,0,sizeof(port));
+      sscanf(hdout[i]," %[^:]:",port);
+
+      cmd = calloc(1,100);
       strcpy(cmd, "/sbin/ifconfig ");
-      if( str == NULL ) { ptr = id; }
-      else { ptr = id+(strlen(id)-strlen(str)+1); }
-      strcat(cmd, ptr );
+      strcat(cmd, port);
       
       rc = runcommand( cmd, NULL , &hdchk , &hderr );
       if(cmd) { free(cmd); cmd = NULL; }
@@ -140,9 +131,9 @@
 	if( strstr(hdchk[0], "Local Loopback") != NULL ) { type = 3; }
       }
       else {
-	if( strstr(id, "eth") != NULL ) { type = 1; }
-	if( strstr(id, "tr")  != NULL ) { type = 2; }
-	if( strstr(id, "lo")  != NULL ) { type = 3; }
+	if( strstr(port,"eth") != NULL ) { type = 1; }
+	if( strstr(port,"tr")  != NULL ) { type = 2; }
+	if( strstr(port,"lo")  != NULL ) { type = 3; }
       }
       freeresultbuf(hdchk);
       freeresultbuf(hderr);
@@ -157,15 +148,10 @@
 	  hlp->next = calloc (1,sizeof(struct netPortList));
 	  hlp = hlp->next;
 	}
-	if( str == NULL ) {
-	  rc = _netPort_data( id, type, &(hlp->sptr));
-	}
-	else {
-	  rc = _netPort_data( id+(strlen(id)-strlen(str)+1), type, &(hlp->sptr));
-	}
+
+	rc = _netPort_data( port, type, &(hlp->sptr));
       }
       type = 0;
-      if(id) free(id);
       i++;
       rc = 0;
     }

Index: OSBase_IPProtocolEndpoint.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-network/OSBase_IPProtocolEndpoint.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- OSBase_IPProtocolEndpoint.c	4 Dec 2003 14:38:44 -0000	1.6
+++ OSBase_IPProtocolEndpoint.c	7 Mar 2005 09:46:00 -0000	1.7
@@ -51,10 +51,8 @@
 int enum_all_ipProtocolEndpoints( struct ipPEndpointList ** lptr ) {
   struct ipPEndpointList *  hlp   = NULL;
   char                   ** hdout = NULL;
-  char                   *  str   = NULL;
-  char                   *  ptr   = NULL;
-  char                   *  id    = NULL;
   char                   *  name  = NULL;
+  char                      port[64];
   int                       i     = 2;      /* start at third line */
   int                       rc    = 0;
 
@@ -75,20 +73,10 @@
 	hlp = hlp->next;
       }
       
-      str = strchr(hdout[i] , ':');
-      id = calloc(1, (strlen(hdout[i])-strlen(str)+1));
-      strncpy( id, hdout[i], strlen(hdout[i])-strlen(str));
-      ptr = id+strlen(id);
-      *(ptr) = '\0';
-      str = strrchr(id, ' ');
+      memset(port,0,sizeof(port));
+      sscanf(hdout[i]," %[^:]:",port);
+      name = _get_ipProtocolEndpoint_name( &port );
 
-      if( str == NULL ) {
-	name = _get_ipProtocolEndpoint_name( id );
-      }
-      else {
-	name = _get_ipProtocolEndpoint_name( id+(strlen(id)-strlen(str)+1) );
-      }
-      if(id) free(id);
       rc = _ipProtocolEndpoint_data( name, &(hlp->sptr));
       if(name) free(name);
       

Index: CHANGE.LOG
===================================================================
RCS file: /cvsroot/sblim/cmpi-network/CHANGE.LOG,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CHANGE.LOG	20 Sep 2004 12:16:06 -0000	1.5
+++ CHANGE.LOG	7 Mar 2005 09:45:59 -0000	1.6
@@ -21,4 +21,11 @@
 
 * support for property list filter on EnumInstances and GetInstance
 
+
+// ===================================================================
+// new in version 1.3.1 :
+
+* bug# 1158159: fixed parsing of /proc/net/dev for systems with high
+  amount of network traffic
+
 // ===================================================================

[Sblim-commit] cmpi-base OSBase_OperatingSystem.c,1.16,1.17

[Heidi N. <hei...@us...>]

Update of /cvsroot/sblim/cmpi-base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16691

Modified Files:
	OSBase_OperatingSystem.c 
Log Message:
fixed bug# 1155834: InstallDate on Fedora was not set


Index: OSBase_OperatingSystem.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/OSBase_OperatingSystem.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- OSBase_OperatingSystem.c	3 Mar 2005 13:38:41 -0000	1.16
+++ OSBase_OperatingSystem.c	3 Mar 2005 13:52:35 -0000	1.17
@@ -200,7 +200,12 @@
   get_os_distro();
 
   if( strstr( CIM_OS_DISTRO, "Red Hat" ) != NULL ) {
+    /* we guess it is Red Hat */
     rc = runcommand( "rpm -qi redhat-release | grep Install" , NULL , &hdout , NULL );
+    if(rc!=0) { 
+    /* we guess it is Fedora */
+      rc = runcommand( "rpm -qi fedora-release | grep Install" , NULL , &hdout , NULL );
+    }
     if( rc == 0 ) {
       str = strstr( hdout[0], ": ");
       str+=2;

[Sblim-commit] cmpi-base OSBase_OperatingSystem.c,1.15,1.16

[Heidi N. <hei...@us...>]

Update of /cvsroot/sblim/cmpi-base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12711

Modified Files:
	OSBase_OperatingSystem.c 
Log Message:
fixed bug# 1155823: wrong values for TotalVirtualMemorySize, FreeVirtualMemory,
TotalVisibleMemorySize, FreePhysicalMemory, SizeStoredInPagingFiles and
FreeSpaceInPagingFiles for kernel 2.6 reported


Index: OSBase_OperatingSystem.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/OSBase_OperatingSystem.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- OSBase_OperatingSystem.c	16 Sep 2004 09:07:46 -0000	1.15
+++ OSBase_OperatingSystem.c	3 Mar 2005 13:38:41 -0000	1.16
@@ -55,7 +55,10 @@
  */
 int get_operatingsystem_data( struct cim_operatingsystem ** sptr ){
 
-  FILE * fmeminfo = NULL ;
+  FILE   *fhd = NULL;
+  char   *ptr = NULL;
+  char    buf[30000];
+  size_t  bytes_read = 0;
 
   _OSBASE_TRACE(3,("--- get_operatingsystem_data() called"));
 
@@ -73,17 +76,19 @@
    * TotalVisibleMemorySize, FreePhysicalMemory, SizeStoredInPagingFiles,
    * FreeSpaceInPagingFiles
    */
-  if ( (fmeminfo=fopen("/proc/meminfo","r")) != NULL ) {
-    fscanf(fmeminfo,
-	   "%*s %*s %*s %*s %*s %*s %*s %lld %*s %lld %*s %*s %*s %*s %lld %*s %lld",
-	   &((*sptr)->totalPhysMem),&((*sptr)->freePhysMem),
-	   &((*sptr)->totalSwapMem),&((*sptr)->freeSwapMem) );
-    fclose(fmeminfo);
+  if ( (fhd=fopen("/proc/meminfo","r")) != NULL ) {
+    bytes_read = fread(buf, 1, sizeof(buf)-1, fhd);
+    buf[bytes_read] = 0; /* safeguard end of buffer */
+    ptr = strstr(buf,"MemTotal");
+    sscanf(ptr, "%*s %lld", &((*sptr)->totalPhysMem));
+    ptr = strstr(buf,"MemFree");
+    sscanf(ptr, "%*s %lld", &((*sptr)->freePhysMem));
+    ptr = strstr(buf,"SwapTotal");
+    sscanf(ptr, "%*s %lld", &((*sptr)->totalSwapMem));
+    ptr = strstr(buf,"SwapFree");
+    sscanf(ptr, "%*s %lld", &((*sptr)->freeSwapMem));
+    fclose(fhd);
   }
-  (*sptr)->totalPhysMem = (*sptr)->totalPhysMem/1024;
-  (*sptr)->freePhysMem = (*sptr)->freePhysMem/1024;
-  (*sptr)->totalSwapMem = (*sptr)->totalSwapMem/1024;
-  (*sptr)->freeSwapMem = (*sptr)->freeSwapMem/1024;
   /* TotalVirtualMemorySize */
   (*sptr)->totalVirtMem = (*sptr)->totalPhysMem + (*sptr)->totalSwapMem;
   /* FreeVirtualMemory */

[Sblim-commit] mofc configure.ac,1.1.1.1,1.2

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/mofc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16147

Modified Files:
	configure.ac 
Log Message:
Fixed incorrect --with-sfcb handling.


Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/mofc/configure.ac,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- configure.ac	3 Mar 2005 09:08:47 -0000	1.1.1.1
+++ configure.ac	3 Mar 2005 09:26:37 -0000	1.2
@@ -1,6 +1,6 @@
 # $Id$
 
-AC_INIT(MOF Compiler, 0.6.5a, mih...@de...,mofc)
+AC_INIT(MOF Compiler, 0.6.5b, mih...@de...,mofc)
 AC_CONFIG_SRCDIR([hash.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -33,7 +33,7 @@
 		              [use sfcb backend. In that case this package must
 			       be in a sub-directory of the sfcb package.])])
 
-if test "$with_sfcb" != no; then
+if test "$with_sfcb" == yes; then
    if test x"$SFCB_DIR" = x; then
       SFCB_DIR=..
    fi

[Sblim-commit] cmpi-adapter README.cmpi,1.8,1.9

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-adapter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2108

Modified Files:
	README.cmpi 
Log Message:
Undoing bogus checkin.


Index: README.cmpi
===================================================================
RCS file: /cvsroot/sblim/cmpi-adapter/README.cmpi,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- README.cmpi	2 Mar 2005 17:02:06 -0000	1.8
+++ README.cmpi	2 Mar 2005 17:34:51 -0000	1.9
@@ -21,7 +21,6 @@
 09/24/2003	Updated for Pegasus 2.2.1 Instructions
 12/01/2003	Updated instructions for OpenCIMOM and Pegasus
 01/20/2005	Removed Pegasus Implementation
-03/02/2005      Available from SF.net
 
 Introduction
 ------------

[Sblim-commit] cmpi-adapter README.cmpi,1.7,1.8

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-adapter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23089

Modified Files:
	README.cmpi 
Log Message:
Bogus Update.


Index: README.cmpi
===================================================================
RCS file: /cvsroot/sblim/cmpi-adapter/README.cmpi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- README.cmpi	20 Jan 2005 18:13:55 -0000	1.7
+++ README.cmpi	2 Mar 2005 17:02:06 -0000	1.8
@@ -21,6 +21,7 @@
 09/24/2003	Updated for Pegasus 2.2.1 Instructions
 12/01/2003	Updated instructions for OpenCIMOM and Pegasus
 01/20/2005	Removed Pegasus Implementation
+03/02/2005      Available from SF.net
 
 Introduction
 ------------

[Sblim-commit] cmpi-base CHANGE.LOG,1.9,1.10 OSBase_ComputerSystem.c,1.8,1.9

[Heidi N. <hei...@us...>]

Update of /cvsroot/sblim/cmpi-base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18035

Modified Files:
	CHANGE.LOG OSBase_ComputerSystem.c 
Log Message:
fixed retrieval of LPARID on Power


Index: CHANGE.LOG
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/CHANGE.LOG,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- CHANGE.LOG	1 Mar 2005 09:41:58 -0000	1.9
+++ CHANGE.LOG	2 Mar 2005 08:49:50 -0000	1.10
@@ -45,3 +45,8 @@
   -> see README.IDICATION for more information
 
 // ===================================================================
+// new in version 1.4.2 :
+
+* fixed retrieval of LPARID on Power
+
+// ===================================================================

Index: OSBase_ComputerSystem.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/OSBase_ComputerSystem.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- OSBase_ComputerSystem.c	24 Jan 2005 11:29:05 -0000	1.8
+++ OSBase_ComputerSystem.c	2 Mar 2005 08:49:59 -0000	1.9
@@ -29,7 +29,13 @@
 /* ---------------------------------------------------------------------------*/
 // private declarations
 
+#if defined (S390)
 #define LPARNAME   "grep 'LPAR Name' /proc/sysinfo"
+#endif
+
+#if defined (PPC)
+#define LPARNAME   "grep 'partition_id' /proc/ppc64/lparcfg"
+#endif
 
 /* ---------------------------------------------------------------------------*/
 
@@ -75,16 +81,24 @@
 
   memset(lparid,0,size);
 
-#if defined (S390)
+#if defined (S390) || defined (PPC)
 
   char **hdout = NULL;
+  char *ptr    = NULL;
   char id[255];
 
   if( runcommand(LPARNAME,NULL,&hdout,NULL)) { return -1; }
   if(hdout[0]) {
+#if defined (S390)
     sscanf(hdout[0],"%*s %*s %s",id);
+#endif
+#if defined (PPC)
+    ptr=strchr(hdout[0],'=');
+    ptr+=1;
+    sscanf(ptr,"%s",id);
+#endif
     if(strlen(id)>size) { return -1; }
-    strcpy(lparid,id)
+    strcpy(lparid,id);
   }
   return 0;
 #endif

[Sblim-commit] cmpi-adapter/common autoconfiscate.sh,1.1,1.2 makefile,1.6,NONE

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-adapter/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1265

Modified Files:
	autoconfiscate.sh 
Removed Files:
	makefile 
Log Message:
Removed old makefile and added libtoolize to autoconfiscate script.


Index: autoconfiscate.sh
===================================================================
RCS file: /cvsroot/sblim/cmpi-adapter/common/autoconfiscate.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- autoconfiscate.sh	3 Feb 2005 15:48:18 -0000	1.1
+++ autoconfiscate.sh	1 Mar 2005 14:24:23 -0000	1.2
@@ -1,5 +1,6 @@
 #!/bin/sh
 aclocal &&
 autoheader &&
+libtoolize &&
 automake -af &&
 autoconf

--- makefile DELETED ---