sblim-commit — CVS Commit Info for SBLIM

[Sblim-commit] sfcb interopProvider.c,1.6,1.7

[Gareth S B. <bes...@us...>]

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

Modified Files:
	interopProvider.c 
Log Message:
http://sourceforge.net/tracker/index.php?func=detail&aid=1206664&group_id=128809&atid=712784


Index: interopProvider.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/interopProvider.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- interopProvider.c	26 Apr 2005 14:11:20 -0000	1.6
+++ interopProvider.c	22 May 2005 20:13:40 -0000	1.7
@@ -468,7 +468,9 @@
       principal=(char*)principalP.value.string->hdl;
 
    for ( ; *fClasses; fClasses++) {
-      if (isa(fi->sns,*fClasses,"cim_processindication")) {
+      _SFCB_TRACE(1,("--- namespace=\"%s\" indication class=\"%s\"", fi->sns, *fClasses));
+
+      if (isa(fi->sns,*fClasses,"CIM_ProcessIndication")) {
          *st=activateSubscription(principal, *fClasses, *fClasses, fi, &irc);
       }
       else if (isa("root/interop",*fClasses,"CIM_InstCreation")) {
@@ -481,7 +483,7 @@
          *st=activateLifeCycleSubscription(principal, *fClasses, fi,MODIFY_INST);
       }
       else {
-         setStatus(st,CMPI_RC_ERR_NOT_SUPPORTED,"Lifecycle indications not supported");
+         setStatus(st,CMPI_RC_ERR_NOT_SUPPORTED,"Unsupported indication class specified in filter query");
         _SFCB_RETURN(-1);
      }
    }

[Sblim-commit] sfcb classProvider.c,1.12,1.13 default.reg,1.4,1.5 providerMgr.c,1.8,1.9

[Gareth S B. <bes...@us...>]

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

Modified Files:
	classProvider.c default.reg providerMgr.c 
Log Message:
misc fixes for http://sourceforge.net/tracker/index.php?func=detail&aid=1203985&group_id=128809&atid=712784


Index: default.reg
===================================================================
RCS file: /cvsroot/sblim/sfcb/default.reg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- default.reg	18 May 2005 05:57:57 -0000	1.4
+++ default.reg	22 May 2005 18:45:03 -0000	1.5
@@ -30,4 +30,5 @@
    provider: IndCIMXMLHandler
    location: sfcIndCIMXMLHandler
    type: instance method
+   namespace: root/interop
 #

Index: classProvider.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/classProvider.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- classProvider.c	29 Apr 2005 11:35:31 -0000	1.12
+++ classProvider.c	22 May 2005 18:45:03 -0000	1.13
@@ -741,7 +741,7 @@
    int rc;
 
    _SFCB_ENTER(TRACE_PROVIDERS, "ClassProviderGetClass");
-   _SFCB_TRACE(1,("--- ClassName %s",(char *) cn->hdl));
+   _SFCB_TRACE(1,("--- ClassName=\"%s\"",(char *) cn->hdl));
    
    cReg=getNsReg(ref, &rc);
    if (cReg==NULL) {
@@ -752,8 +752,11 @@
    cReg->ft->rLock(cReg);
    
    cl = getClass(cReg, (char *) cn->hdl);
-   if (cl) CMReturnInstance(rslt, (CMPIInstance *) cl);
-   else {
+   if (cl) {
+      _SFCB_TRACE(1,("--- Class found"));
+      CMReturnInstance(rslt, (CMPIInstance *) cl);
+   } else {
+      _SFCB_TRACE(1,("--- Class not found"));
       st.rc = CMPI_RC_ERR_NOT_FOUND;
    }
    

Index: providerMgr.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/providerMgr.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- providerMgr.c	26 Apr 2005 21:58:47 -0000	1.8
+++ providerMgr.c	22 May 2005 18:45:03 -0000	1.9
@@ -160,7 +160,8 @@
 
    if (strcasecmp(nameSpace,"root/pg_interop")==0) 
       return nameSpaceOk(info,"root/interop");
-   
+
+   _SFCB_TRACE(1,("--- failed"));
    _SFCB_RETURN(0);
 }
 

[Sblim-commit] sfcb trace.c,1.3,1.4

[Gareth S B. <bes...@us...>]

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

Modified Files:
	trace.c 
Log Message:
fix for http://sourceforge.net/tracker/index.php?func=detail&aid=1206310&group_id=128809&atid=712784


Index: trace.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/trace.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- trace.c	26 Apr 2005 21:58:47 -0000	1.3
+++ trace.c	21 May 2005 22:02:41 -0000	1.4
@@ -53,8 +53,8 @@
   {"providerDrv",       TRACE_PROVIDERDRV},
   {"cimxmlProc",        TRACE_CIMXMLPROC},
   {"httpDaemon",        TRACE_HTTPDAEMON},
-  {"encCalls",          TRACE_ENCCALLS},
   {"upCalls",           TRACE_UPCALLS},
+  {"encCalls",          TRACE_ENCCALLS},
   {"ProviderInstMgr",   TRACE_PROVIDERINSTMGR},
   {"providerAssocMgr",  TRACE_PROVIDERASSOCMGR},
   {"providers",         TRACE_PROVIDERS},
@@ -64,7 +64,6 @@
   {"sockets",           TRACE_SOCKETS},
   {"memoryMgr",         TRACE_MEMORYMGR},
   {"msgQueue",          TRACE_MSGQUEUE},
-  {"msgQueue",          TRACE_MSGQUEUE},
   {"xmlParsing",        TRACE_XMLPARSING},
   {NULL,0}
 };   

[Sblim-commit] sfcb cimXmlOps.y,1.5,1.6

[Gareth S B. <bes...@us...>]

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

Modified Files:
	cimXmlOps.y 
Log Message:
fix for http://sourceforge.net/tracker/index.php?func=detail&aid=1203985&group_id=128809&atid=712784


Index: cimXmlOps.y
===================================================================
RCS file: /cvsroot/sblim/sfcb/cimXmlOps.y,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cimXmlOps.y	26 Apr 2005 21:58:46 -0000	1.5
+++ cimXmlOps.y	21 May 2005 21:39:21 -0000	1.6
@@ -1907,7 +1907,11 @@
     : XTOK_PROPERTY propertyData ZTOK_PROPERTY
     {
        $$.val=$2;
-    }   
+    }  
+    | XTOK_PROPERTYREFERENCE propertyData ZTOK_PROPERTYREFERENCE
+    {
+       $$.val=$2;
+    }
 ;
 
 propertyData 

[Sblim-commit] sfcb installsfcb.sh,1.3,1.4

[Gareth S B. <bes...@us...>]

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

Modified Files:
	installsfcb.sh 
Log Message:
misc updates


Index: installsfcb.sh
===================================================================
RCS file: /cvsroot/sblim/sfcb/installsfcb.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- installsfcb.sh	18 May 2005 05:03:43 -0000	1.3
+++ installsfcb.sh	19 May 2005 23:20:52 -0000	1.4
@@ -32,7 +32,7 @@
 if [[ $_ANSWER = "N" || $_ANSWER = "n" ]]; then exit 1; fi
 
 # Check if there is an existing install script anywhere that will break autoconf
-for _FILE in ./install-sh ./install.sh ../install-sh ../install.sh; do
+for _FILE in ../install-sh ../install.sh; do
    if [[ -e $_FILE ]]; then
       echo "Existing $_FILE will break autoconf! Please remove/rename it and re-run $0"
       exit 1 
@@ -189,7 +189,12 @@
 
 # Start up the sfcbd, albeit without any namespaces or registered classes
 echo -n "Starting sfcb. Enter Root "
-su --preserve-environment --command "killall -q -9 sfcbd; sleep 1; $_PREFIX/etc/init.d/sfcb start"
+su --preserve-environment --command '
+	for _LIB in $( find $_PREFIX/lib -name "libsfc*.0.0.0" ); do
+	  _NEWLIB=${_LIB%.0.0}
+	  if [[ ! -e $_NEWLIB ]]; then ln -s $_LIB $_NEWLIB; fi
+	done;
+	killall -q -9 sfcbd; sleep 1; $_PREFIX/etc/init.d/sfcb start'
 echo
 sleep 1
 if ! ps -C sfcbd > /dev/null; then
@@ -339,17 +344,4 @@
    eval $_CMD
 fi
 
-
-exit 0
-
-sfcbrepos -f
-
-mkdir -p $_PREFIX/var/lib/sfcb/registration/repository/root/interop
-rm -rf $_PREFIX/var/lib/sfcb/registration/repository/root/interop/*
-
-sfcbmof -I $_PREFIX/share/sfcb/CIM -i CIM_Schema.mof -o $_PREFIX/var/lib/sfcb/registration/repository/root/interop/classSchemas ./interop.mof
-
-sfcbd -tm ?
-
 exit 0
-

[Sblim-commit] cmpi-tests/cmpi-reef configure.ac,1.1.1.1,1.2

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/cmpi-tests/cmpi-reef
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11883

Modified Files:
	configure.ac 
Log Message:
added CMPI_VERSION=90 flag


Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/cmpi-tests/cmpi-reef/configure.ac,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- configure.ac	10 May 2005 00:01:34 -0000	1.1.1.1
+++ configure.ac	19 May 2005 23:05:32 -0000	1.2
@@ -44,6 +44,7 @@
 # ADD CHECKS FOR ANY REQUIRED NON_CMPI LIBRARY FUNCTIONS HERE
 AC_CHECK_FUNCS([strcpy memset sizeof])
 
+CPPFLAGS="$CPPFLAGS -DCMPI_VERSION=90"
 
 ################### NO CHANGES SHOULD BE NECESSARY BELOW ######################
 

[Sblim-commit] cmpi-tests/cmpi-methodtest configure.ac,1.1.1.1,1.2

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/cmpi-tests/cmpi-methodtest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11657

Modified Files:
	configure.ac 
Log Message:
added CMPI_VERSION=90 flag


Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/cmpi-tests/cmpi-methodtest/configure.ac,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- configure.ac	12 May 2005 20:49:43 -0000	1.1.1.1
+++ configure.ac	19 May 2005 23:04:28 -0000	1.2
@@ -45,6 +45,7 @@
 # ADD CHECKS FOR ANY REQUIRED NON_CMPI LIBRARY FUNCTIONS HERE
 AC_CHECK_FUNCS([malloc realloc free vfprintf fprintf fflush sprintf snprintf strncpy strcmp strdup])
 
+CPPFLAGS="$CPPFLAGS -DCMPI_VERSION=90"
 
 ################### NO CHANGES SHOULD BE NECESSARY BELOW ######################
 

[Sblim-commit] cmpi-samples/cmpi-fad configure.ac,1.4,1.5

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/cmpi-samples/cmpi-fad
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11147

Modified Files:
	configure.ac 
Log Message:
added CMPI_VERSION=90 flag


Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/cmpi-samples/cmpi-fad/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- configure.ac	27 Apr 2005 12:02:56 -0000	1.4
+++ configure.ac	19 May 2005 23:02:05 -0000	1.5
@@ -30,6 +30,7 @@
 AC_FUNC_STAT
 AC_CHECK_FUNCS([gethostname mkdir])
 
+CPPFLAGS="$CPPFLAGS -DCMPI_VERSION=90"
 
 ### NO CHANGES SHOULD BE NECESSARY BELOW
 

[Sblim-commit] cmpi-samples/cmpi-processes configure.ac,1.1.1.1,1.2

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/cmpi-samples/cmpi-processes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10557

Modified Files:
	configure.ac 
Log Message:
add CMPI_VERSION=90 flag


Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/cmpi-samples/cmpi-processes/configure.ac,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- configure.ac	28 Apr 2005 21:05:10 -0000	1.1.1.1
+++ configure.ac	19 May 2005 22:59:15 -0000	1.2
@@ -45,6 +45,8 @@
 # ADD CHECKS FOR ANY REQUIRED NON_CMPI LIBRARY FUNCTIONS HERE
 AC_CHECK_FUNCS([popen pclose fgets kill vfprintf fprintf sprintf sscanf])
 
+CPPFLAGS="$CPPFLAGS -DCMPI_VERSION=90"
+
 
 ################### NO CHANGES SHOULD BE NECESSARY BELOW ######################
 

[Sblim-commit] cmpi-samples/cmpi-instancelist configure.ac,1.1.1.1,1.2

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/cmpi-samples/cmpi-instancelist
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10339

Modified Files:
	configure.ac 
Log Message:
add CMPI_VERSION=90 flag


Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/cmpi-samples/cmpi-instancelist/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 May 2005 22:15:27 -0000	1.1.1.1
+++ configure.ac	19 May 2005 22:57:33 -0000	1.2
@@ -44,6 +44,7 @@
 # ADD CHECKS FOR ANY REQUIRED NON_CMPI LIBRARY FUNCTIONS HERE
 AC_CHECK_FUNCS([malloc realloc free vfprintf fprintf fflush sprintf snprintf strncpy strcmp strdup])
 
+CPPFLAGS="$CPPFLAGS -DCMPI_VERSION=90"
 
 ################### NO CHANGES SHOULD BE NECESSARY BELOW ######################
 

[Sblim-commit] cmpi-samples/cmpi-authorization configure.ac,1.1.1.1,1.2

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/cmpi-samples/cmpi-authorization
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9915

Modified Files:
	configure.ac 
Log Message:
added CMPI_VERSION=90 flag


Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/cmpi-samples/cmpi-authorization/configure.ac,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- configure.ac	2 May 2005 00:15:22 -0000	1.1.1.1
+++ configure.ac	19 May 2005 22:55:31 -0000	1.2
@@ -45,6 +45,7 @@
 # ADD CHECKS FOR ANY REQUIRED NON_CMPI LIBRARY FUNCTIONS HERE
 AC_CHECK_FUNCS([fopen fclose])
 
+CPPFLAGS="$CPPFLAGS -DCMPI_VERSION=90"
 
 ################### NO CHANGES SHOULD BE NECESSARY BELOW ######################
 

[Sblim-commit] cmpi-tests/cmpi-instancetest configure.ac,1.1.1.1,1.2

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/cmpi-tests/cmpi-instancetest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4898

Modified Files:
	configure.ac 
Log Message:
added CMPI_VERSION 90 flag


Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/configure.ac,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- configure.ac	4 May 2005 03:25:09 -0000	1.1.1.1
+++ configure.ac	19 May 2005 22:29:30 -0000	1.2
@@ -45,6 +45,7 @@
 # ADD CHECKS FOR ANY REQUIRED NON_CMPI LIBRARY FUNCTIONS HERE
 AC_CHECK_FUNCS([malloc realloc free vfprintf fprintf fflush sprintf snprintf strncpy strcmp strdup])
 
+CPPFLAGS="$CPPFLAGS -DCMPI_VERSION=90"
 
 ################### NO CHANGES SHOULD BE NECESSARY BELOW ######################
 

[Sblim-commit] ecute ToDo.txt,1.10,1.11 .project,1.2,1.3 TODOsForEcuteRSA.txt,1.6,NONE

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

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

Modified Files:
	ToDo.txt .project 
Removed Files:
	TODOsForEcuteRSA.txt 
Log Message:
Updated ToDo list

Index: .project
===================================================================
RCS file: /cvsroot/sblim/ecute/.project,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- .project	7 Oct 2004 15:23:55 -0000	1.2
+++ .project	19 May 2005 14:53:26 -0000	1.3
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.ibm.ecute</name>
+	<name>ecute</name>
 	<comment></comment>
 	<projects>
 	</projects>

Index: ToDo.txt
===================================================================
RCS file: /cvsroot/sblim/ecute/ToDo.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ToDo.txt	1 Apr 2005 17:41:04 -0000	1.10
+++ ToDo.txt	19 May 2005 14:53:26 -0000	1.11
@@ -1,7 +1,7 @@
 ToDo List for ECUTE
 -------------------
 
-Last updated: 01-Apr-2005 AM
+Last updated: 19-May-2005 BB
 
 
 1.  Problem:  In Rose, there are two places where the Description qualifier for
@@ -91,7 +91,6 @@
     hierarchy top base classes, but cannot navigate back to the derived class
     or classes.
 
-
     Solution:
     - Add a combo list with derived classes to the "Edit Qualifiers" dialog.
 
@@ -225,7 +224,7 @@
     - new screen shots
 
 22. Add support to the UMLBuffer for qualifier definitions. Currently both
-    MOF plugins support qualifier definitions. This would also requiere to
+    MOF plugins support qualifier definitions. This would also require to
     update the Rose plugins to store this information in the package.
 
     Question: how could the user add/edit qualifier definitions in Rose?
@@ -430,7 +429,7 @@
 
 34. Add a check&repair option for role names in associations.
 
-    The check would detect missing override qualifiers betwen equally named reference
+    The check would detect missing override qualifiers between equally named reference
     properties in a inheritance sequence as well as any change of role names along a
     chain of reference properties connected with override qualifiers.
 
@@ -468,6 +467,59 @@
     at com.ibm.ecute.EntryPoint.<init>(EntryPoint.java:216)
     at com.ibm.ecute.EntryPoint.main(EntryPoint.java:108)
 
-38. (was 36.) The entry in the list of installed software (Win XP:  Control
-    Panel / Add or Remove Programs) should state the version being installed.
 
+ToDo's for Ecute integration into RSA
+----------------------------------------
+
+1.	Edit Qualifiers Dialog:
+	1.  Implementation of the inheritance of the Qualifiers (using the "defined in" column).
+	2.  Implementation of "Remove Value" in the values tab.
+	3.  Replace the flavor column(s) in the edit and definition tab with one column called "Inheritance Behavior" which can
+	    contain three values "Restricted", "ToSubclass EnableOverride", "ToSubclass DisableOverride"
+	4.  Remove the scope column from the values tab
+	5.  Implementation of apply and undo in the values tab as it is implemented in the definition tab
+	6.  Implementation of context menus for the tables in the Qualifiers Property Tab and the Edit Qualifiers Dialog
+	7.  Implementation of Back und Forward buttons in the values tab for a betteer navigation
+	8.  Implementation of a "Create overwritten property" function which automates the process of overwriting a class
+	    property and setting the override qualifier
+	9. Implementation of Clear, Load and Save buttons in the defintition tab
+	
+2.  Qualifers Property Tab
+	1. Implementation of the qualifiers property tab for the model which should show the qualifier definitions for the
+       model only
+       
+3. MOF Import
+	1. Import of a XXX_Qualifiers.mof file should now update the qualifiers definitions in the model constraint instead
+	   of the QualifiersList.txt
+	
+4.	Diagrams
+	1. Implementation of a new CIM-Style for the CIM-Diagrams. Like it is done for Rose-Diagrams (see Window-Preferences-Modeling-Appearance-Apperance Style). (Maybe this can be done in the CIM-Profile)
+	2. Auto applaying of the new CIM-Style for new Diagrams.
+	3. Fixing the problem that the associations are not shown in the diagram. (see Point 2 of knownRSAProblems.txt).
+	3. Implementation of the Associations-Diagrams (depends on the Point 4 of knownRSAProblems.txt).
+	
+5. Wizards and Processing
+	1. Implementation of F1-Help in the wizards.
+	2. Improvement of the threading. Today while processing the wizard and the log dialog freezes in.
+	3. Check the implementation of the CANCEL-Button.
+	4. Make improvement of the ProgressBar. Today the progress bar will be initialized two times. Once for the Input-Plugin and once for the Output-Plugin. If your are parsing one big mof file, i. e. CIM_Schema.mof you see no proceeding progress. Better is a implementation of one initializing and a constant proceeding.
+	5. To find out why the first processing(import/export) is much slower than the following processes (imports/exports).
+	6. Implemenation of check and repair plug-in / check the Model Analysis which is provided by RSA maybe it is good enough. (See menuitem Modeling - Model Analysis) Check also the possiblilty to extend the Model Analysis to avoid multiple inheritance, associations without a association class and that a association class inherits form a normal class in the model.
+	7. Implemenation of a Wizard to import CIM-Rose-Models
+	
+6.	CIM-UML-Mapping
+	1. Implementation of 3-way-Associations (appears in CIM v. 2.9). 3-way-Associations are not possible in Rose, but are possible in RSA. Therefore the MOF-Parser must be changed.
+	2. If qualifier ArrayType is of value "Ordered" or "Indexed" the derived Property attribute "isOrderd" should be set to "true".
+	
+7.	MOFParser
+	1. Make error messages clearer. In example:
+		The (incorrect) Line : "string ClassName;  /7 was an override of Name" results in the following error message: "Error: ws-cim-example3.mof(160): Token 256.0 not expected." Make these error messages clearer. 
+
+8. RSAModelCreator
+   1. Implementation of the Qualifier-Inheritance. Already done is inheritance of Min, Max and Aggregate. Inheritance of all other Qualfiers are left.
+   
+9. RSAParser
+	1. Problem: The direkt mapped qualifiers of type boolean will always set in case of true default, respectively will never set in case of false default. Because of their direct mapping you can not differ if they were state explicitly or by default.
+		The concerned qualifers are: Octetstring, Out, Static, Write
+		The In qualifier is not concerned because he should be always stated.
+	2. Problem: The Min, Max, Key and Aggregate qualifiers should only be set if they are not stated in the superclass.

--- TODOsForEcuteRSA.txt DELETED ---

[Sblim-commit] ecute/InstallShield55/ecute/File Groups Jacob.fgl,1.2,1.3 Default.fdf,1.3,1.4

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

Update of /cvsroot/sblim/ecute/InstallShield55/ecute/File Groups
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25388/InstallShield55/ecute/File Groups

Modified Files:
	Jacob.fgl Default.fdf 
Log Message:
New InstallShield routine for ECUTE version 2.1 beta 1 (2nd trial)

Index: Jacob.fgl
===================================================================
RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/File Groups/Jacob.fgl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Jacob.fgl	8 Apr 2005 08:34:27 -0000	1.2
+++ Jacob.fgl	19 May 2005 13:52:09 -0000	1.3
@@ -1,5 +1,5 @@
 [TopDir]
-file0=D:\ecute\distribution\Download jacobBin_18.zip.url
+file0=D:\ecute\distribution\Download jacob_18.zip.url
 SubDir0=jacob
 
 [jacob]

Index: Default.fdf
===================================================================
RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/File Groups/Default.fdf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Default.fdf	8 Apr 2005 08:34:27 -0000	1.3
+++ Default.fdf	19 May 2005 13:52:09 -0000	1.4
@@ -1,4 +1,4 @@
-[eCute4RSA]
+[qualifiersDefinition]
 SELFREGISTERING=No
 HTTPLOCATION=
 LANGUAGE=
@@ -29,17 +29,17 @@
 MISC=
 
 [FileGroups]
-group0=qualifiersDefinition
+group0=eCute4RSA
 group1=java classes
-group2=eCute4RSA
-group3=eclipse link
-group4=Schema
+group2=qualifiersDefinition
+group3=Schema
+group4=eclipse link
 group5=Docs
 group6=eCute4Rose
 group7=Jacob
 group8=CMPITemplates
 
-[qualifiersDefinition]
+[eCute4RSA]
 SELFREGISTERING=No
 HTTPLOCATION=
 LANGUAGE=
@@ -54,7 +54,7 @@
 POTENTIALLY=No
 MISC=
 
-[Schema]
+[eclipse link]
 SELFREGISTERING=No
 HTTPLOCATION=
 LANGUAGE=
@@ -65,11 +65,11 @@
 COMMENT=
 COMPRESS=Yes
 COMPRESSDLL=
-LINKTYPE=Dynamic Link
+LINKTYPE=Static Link
 POTENTIALLY=No
 MISC=
 
-[eclipse link]
+[Schema]
 SELFREGISTERING=No
 HTTPLOCATION=
 LANGUAGE=
@@ -80,7 +80,7 @@
 COMMENT=
 COMPRESS=Yes
 COMPRESSDLL=
-LINKTYPE=Static Link
+LINKTYPE=Dynamic Link
 POTENTIALLY=No
 MISC=
 

[Sblim-commit] ecute/InstallShield55/ecute Ecute.pfw,1.1,1.2

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

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

Modified Files:
	Ecute.pfw 
Log Message:
New InstallShield routine for ECUTE version 2.1 beta 1 (2nd trial)

Index: Ecute.pfw
===================================================================
RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Ecute.pfw,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Ecute.pfw	8 Apr 2005 08:34:30 -0000	1.1
+++ Ecute.pfw	19 May 2005 13:52:09 -0000	1.2
@@ -5,17 +5,17 @@
 Title=Ecute
 Company=IBM
 CompanyEMail=
-BasePath=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images
+BasePath=D:\workspace\ecute\InstallShield55\ecute\Media\Default\Disk Images
 ImportPath=D:\workspace\ecute\InstallShield55\ecute\Media\Default
 UseRTF=0
 SaveFiles=0
 SubFolders=1
-ApplicationName=Ecute
-Description=eCute for Rational Rose and Rational Software Architect
+ApplicationName=ECUTE
+Description=ECUTE for Rational Rose and Rational Software Architect
 Comments=
 Notice=Copyright IBM Corporation 2005
-Version=2.1-alpha6
-OutputSpec=D:\ecute\Ecute4RSA-alpha6.exe
+Version=2.1 beta 1
+OutputSpec=D:\ecute\ECUTE21-beta1-win.exe
 GUIDs=0
 Type=2
 Compress=1
@@ -61,102 +61,102 @@
 
 [File 1]
 Name=DATA.TAG
-Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
+Path=D:\workspace\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
 Flags=1
 Disk=0
 
 [File 2]
 Name=data1.cab
-Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
+Path=D:\workspace\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
 Flags=2097153
 Disk=0
 
 [File 3]
 Name=data1.hdr
-Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
+Path=D:\workspace\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
 Flags=2097153
 Disk=0
 
 [File 4]
 Name=lang.dat
-Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
+Path=D:\workspace\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
 Flags=1
 Disk=0
 
 [File 5]
 Name=layout.bin
-Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
+Path=D:\workspace\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
 Flags=1
 Disk=0
 
 [File 6]
 Name=os.dat
-Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
+Path=D:\workspace\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
 Flags=1
 Disk=0
 
 [File 7]
 Name=Setup.exe
-Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
+Path=D:\workspace\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
 Flags=589825
 Disk=0
 
 [File 8]
 Name=SETUP.INI
-Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
+Path=D:\workspace\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
 Flags=1
 Disk=0
 
 [File 9]
 Name=setup.ins
-Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
+Path=D:\workspace\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
 Flags=1
 Disk=0
 
 [File 10]
 Name=setup.lid
-Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
+Path=D:\workspace\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
 Flags=1
 Disk=0
 
 [File 11]
 Name=_INST32I.EX_
-Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
+Path=D:\workspace\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
 Flags=524289
 Disk=0
 
 [File 12]
 Name=_ISDel.exe
-Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
+Path=D:\workspace\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
 Flags=589825
 Disk=0
 
 [File 13]
 Name=_Setup.dll
-Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
+Path=D:\workspace\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
 Flags=655377
 Disk=0
 
 [File 14]
 Name=_sys1.cab
-Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
+Path=D:\workspace\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
 Flags=2097153
 Disk=0
 
 [File 15]
 Name=_sys1.hdr
-Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
+Path=D:\workspace\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
 Flags=2097153
 Disk=0
 
 [File 16]
 Name=_user1.cab
-Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
+Path=D:\workspace\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
 Flags=2097153
 Disk=0
 
 [File 17]
 Name=_user1.hdr
-Path=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
+Path=D:\workspace\ecute\InstallShield55\ecute\Media\Default\Disk Images\Disk1\
 Flags=2097153
 Disk=0

[Sblim-commit] ecute/InstallShield55/ecute/Script Files Setup.ins,1.3,1.4 Setup.ino,1.3,1.4 Setup.obs,1.3,1.4 setup.rul,1.3,1.4

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

Update of /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25388/InstallShield55/ecute/Script Files

Modified Files:
	Setup.ins Setup.ino Setup.obs setup.rul 
Log Message:
New InstallShield routine for ECUTE version 2.1 beta 1 (2nd trial)

Index: Setup.ins
===================================================================
RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files/Setup.ins,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvs8ZbVOp and /tmp/cvsrWqmah differ

Index: setup.rul
===================================================================
RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files/setup.rul,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- setup.rul	8 Apr 2005 08:34:28 -0000	1.3
+++ setup.rul	19 May 2005 13:52:08 -0000	1.4
@@ -819,11 +819,11 @@
     STRING szLicenseFile,svString,element,svResult;
 	LIST listID;	
 begin
-	if (FindFile ( svDir , "jacobBin_18.zip" , svResult )=0) then
+	if (FindFile ( svDir , "jacob_18.zip" , svResult )=0) then
 		return OK;
 	endif;
 	
-	szLicenseFile = SUPPORTDIR ^ "license.txt";
+	szLicenseFile = SUPPORTDIR ^ "jacob.txt";
 	svString="";
     listID = ListCreate (STRINGLIST);
     ListReadFromFile (listID, szLicenseFile);	
@@ -837,7 +837,7 @@
 	nResult    = AskYesNo ( svString , YES );
 	
 	if (nResult=YES) then
-		LaunchAppAndWait ("cmd","/c \""+SUPPORTDIR+"\\Download jacobBin_18.zip.url\"", WAIT);
+		LaunchAppAndWait ("cmd","/c \""+SUPPORTDIR+"\\Download jacob_18.zip.url\"", WAIT);
    	endif;
 
     return OK;
@@ -915,3 +915,4 @@
 
 
 
+

Index: Setup.obs
===================================================================
RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files/Setup.obs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsKgotLz and /tmp/cvs58OSbr differ

Index: Setup.ino
===================================================================
RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files/Setup.ino,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsAeQzrB and /tmp/cvskKQHUs differ

[Sblim-commit] ecute/InstallShield55/ecute/String Tables/0009-English value.shl,1.3,1.4

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

Update of /cvsroot/sblim/ecute/InstallShield55/ecute/String Tables/0009-English
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25388/InstallShield55/ecute/String Tables/0009-English

Modified Files:
	value.shl 
Log Message:
New InstallShield routine for ECUTE version 2.1 beta 1 (2nd trial)

Index: value.shl
===================================================================
RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/String Tables/0009-English/value.shl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- value.shl	8 Apr 2005 08:34:30 -0000	1.3
+++ value.shl	19 May 2005 13:52:09 -0000	1.4
@@ -1,20 +1,20 @@
 [Data]
-TITLE_MAIN=Ecute for Rational Rose and Rational Software Architect
+TITLE_MAIN=ECUTE for Rational Rose and Rational Software Architect
 ERROR_COMPONENT=Component:
 COMPANY_NAME=IBM
 COMPANY_NAME16=Company
 ERROR_FILEGROUP=File Group:
 ERROR_MOVEDATA=An error occurred during the move data process: %d
-PRODUCT_VERSION=2.1-alpha3
-UNINST_KEY=Ecute
-TITLE_CAPTIONBAR=Ecute Setup
+PRODUCT_VERSION=2.1 beta 1
+UNINST_KEY=ECUTE
+TITLE_CAPTIONBAR=ECUTE Setup
 PRODUCT_NAME16=Product
 ERROR_FILE=File:
 ERROR_VGARESOLUTION=This program requires VGA or better resolution.
 PRODUCT_KEY=yourapp.Exe
-UNINST_DISPLAY_NAME=Ecute
+UNINST_DISPLAY_NAME=ECUTE 2.1 beta 1
 ERROR_UNINSTSETUP=unInstaller setup failed to initialize.  You may not be able to uninstall this product.
-PRODUCT_NAME=Ecute
+PRODUCT_NAME=ECUTE
 
 [General]
 Language=0009

[Sblim-commit] ecute/Plugin/com/ibm/ecute/rsa/core/internal/dialogs EditQualifiersDialog.java,1.1,1.2

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

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/dialogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2326/Plugin/com/ibm/ecute/rsa/core/internal/dialogs

Modified Files:
	EditQualifiersDialog.java 
Log Message:
Qualifiers tab is refreshed after edit qualifiers dialog is left.
Qualifiers of association properties which are not ownedEnds 
of the associationcan now be show and edited

Index: EditQualifiersDialog.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/dialogs/EditQualifiersDialog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- EditQualifiersDialog.java	10 May 2005 09:11:54 -0000	1.1
+++ EditQualifiersDialog.java	19 May 2005 09:17:49 -0000	1.2
@@ -1015,8 +1015,9 @@
 		if(element instanceof Property){
 			Property prop = (Property)element;
 			Property oppositeProp = null;
+			boolean isOwnedEnd = propertyIsOwnedEnd(prop);
 			// get the property of the other association end
-			if (prop.getOwner() instanceof AssociationClass){
+			if (isOwnedEnd /*&& prop.getOwner() instanceof AssociationClass*/){
 				AssociationClass parentClass = (AssociationClass)prop.getOwner();
 				List ends = parentClass.getOwnedEnds();
 				if ((Property)ends.get(0) == prop){
@@ -1061,7 +1062,7 @@
 				allAvailableQualifers.remove(qualifierObject);
 			}
 			//Qualifier: Max, Min
-			if(prop.getOwner() instanceof AssociationClass){
+			if(isOwnedEnd /*&& prop.getOwner() instanceof AssociationClass*/){
 				if(((AssociationClass)prop.getOwner()).getOwnedEnds().contains(prop)){
 					if(prop.getUpper() != MultiplicityElement.UNLIMITED_UPPER_BOUND){
 						qualifierName = "Max";
@@ -1174,6 +1175,24 @@
 		}
 	}
 	
+    private boolean propertyIsOwnedEnd(Property prop){
+    	
+    	boolean isOwnedEnd = false;
+    	if (prop.getOwner() instanceof AssociationClass){
+    		AssociationClass parentClass = (AssociationClass)prop.getOwner();
+    		List ends = parentClass.getOwnedEnds();
+    		if ((Property)ends.get(0) == prop){
+    			isOwnedEnd = true;
+    		}
+    		if ((Property)ends.get(1) == prop){
+    			isOwnedEnd = true;
+    		}
+    		return isOwnedEnd;
+    	} else {
+    		return false;
+    	}
+    }
+	
 	private int addQualiferToValueTable(String qualifierName, String qualifierValue, String definedIn, Qualifier qualifier, int index, boolean isDefaultQualifier)
 	{
 		String name = "";

[Sblim-commit] ecute/Plugin/com/ibm/ecute/rsa/core/internal/properties QualifiersPropertySection.java,1.12,1.13

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

Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/properties
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2326/Plugin/com/ibm/ecute/rsa/core/internal/properties

Modified Files:
	QualifiersPropertySection.java 
Log Message:
Qualifiers tab is refreshed after edit qualifiers dialog is left.
Qualifiers of association properties which are not ownedEnds 
of the associationcan now be show and edited

Index: QualifiersPropertySection.java
===================================================================
RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/properties/QualifiersPropertySection.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- QualifiersPropertySection.java	10 May 2005 09:11:54 -0000	1.12
+++ QualifiersPropertySection.java	19 May 2005 09:17:49 -0000	1.13
@@ -119,6 +119,7 @@
             {
                 int ai = qualifiersTable.getSelectionIndex();
                 editValue(ai, false);
+                refresh();
             }
 
         });
@@ -446,16 +447,21 @@
                     
                     //Qualifiers with Property Scope
                     if(element instanceof Property){
-                        Property prop = (Property)element;
+                    	Property prop = (Property)element;
                         Property oppositeProp = null;
+                        
+                        boolean isOwnedEnd = propertyIsOwnedEnd(prop);
+                        
                         // get the property of the other association end
-                        if (prop.getOwner() instanceof AssociationClass){
+                        if (isOwnedEnd /*&& prop.getOwner() instanceof AssociationClass*/){
                         	AssociationClass parentClass = (AssociationClass)prop.getOwner();
                         	List ends = parentClass.getOwnedEnds();
                         	if ((Property)ends.get(0) == prop){
+                        		isOwnedEnd = true;
                         		oppositeProp = (Property)ends.get(1);
                         	}
                         	if ((Property)ends.get(1) == prop){
+                        		isOwnedEnd = true;
                         		oppositeProp = (Property)ends.get(0);
                         	}
                         
@@ -494,7 +500,7 @@
                             allAvailableQualifers.remove(qualifierObject);
                         }
                         //Qualifier: Max, Min
-                        if(prop.getOwner() instanceof AssociationClass){
+                        if(isOwnedEnd /*&& prop.getOwner() instanceof AssociationClass*/){
                             if(((AssociationClass)prop.getOwner()).getOwnedEnds().contains(prop)){
 	                            if(prop.getUpper() != MultiplicityElement.UNLIMITED_UPPER_BOUND){
 	                                qualifierName = "Max";
@@ -639,6 +645,23 @@
         refresh();
     }
     
+    private boolean propertyIsOwnedEnd(Property prop){
+    	
+    	boolean isOwnedEnd = false;
+    	if (prop.getOwner() instanceof AssociationClass){
+    		AssociationClass parentClass = (AssociationClass)prop.getOwner();
+    		List ends = parentClass.getOwnedEnds();
+    		if ((Property)ends.get(0) == prop){
+    			isOwnedEnd = true;
+    		}
+    		if ((Property)ends.get(1) == prop){
+    			isOwnedEnd = true;
+    		}
+    		return isOwnedEnd;
+    	} else {
+    		return false;
+    	}
+    }
 
     protected void removeQualifier(int ai)
     {

[Sblim-commit] sfcb/regressionTests build.sh,1.8,1.9 setEnv,1.2,1.3

[Gareth S B. <bes...@us...>]

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

Modified Files:
	build.sh setEnv 
Log Message:
update regression test scripts


Index: build.sh
===================================================================
RCS file: /cvsroot/sblim/sfcb/regressionTests/build.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- build.sh	6 May 2005 02:11:58 -0000	1.8
+++ build.sh	18 May 2005 21:30:02 -0000	1.9
@@ -19,7 +19,7 @@
 # */
 
 
-dirs='FilesAndDirectories BigOutput ProcessIndications LifeCycleIndications'
+dirs='ProcessIndications LifeCycleIndications'
 
 sfcbdir=/usr/local/share/sfcb
 if [ -x /usr/bin/curl ] && [ ! -f $sfcbdir/CIM/CIM_Schema.mof ]
@@ -46,10 +46,10 @@
 
 for x in $dirs
 do 
-#   echo make -C $x install
-#   make -C $x install
-   echo sh $x/build.sh $x
-   sh $x/build.sh $x
+   echo make -C $x install
+   make -C $x install
+#   echo sh $x/build.sh $x
+#   sh $x/build.sh $x
 done   
 
 echo sfcbmof -I $CIMDIR -i CIM_Schema.mof -o repository/root/interop/classSchemas schema/interop.mof

Index: setEnv
===================================================================
RCS file: /cvsroot/sblim/sfcb/regressionTests/setEnv,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- setEnv	15 Mar 2005 02:36:22 -0000	1.2
+++ setEnv	18 May 2005 21:30:02 -0000	1.3
@@ -1,5 +1,5 @@
 export PATH=`pwd`/bin:/usr/local/bin:$PATH
-export LD_LIBRARY_PATH=lib:/usr/local/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=lib:/usr/local/lib:/usr/local/lib/cmpi:$LD_LIBRARY_PATH
 export SFCB_HOME=`pwd`
 export SFCB_TRACE=1
 ulimit -c unlimited

[Sblim-commit] cmpi-tests/cmpi-instancetest/src TST_InstanceTest.c,1.3,1.4 cmpiutil.c,1.2,1.3

[Gareth S B. <bes...@us...>]

Update of /cvsroot/sblim/cmpi-tests/cmpi-instancetest/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19713/src

Modified Files:
	TST_InstanceTest.c cmpiutil.c 
Log Message:
fix for http://sourceforge.net/tracker/index.php?func=detail&aid=1197062&group_id=128809&atid=712784


Index: TST_InstanceTest.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/src/TST_InstanceTest.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TST_InstanceTest.c	13 May 2005 22:55:50 -0000	1.3
+++ TST_InstanceTest.c	18 May 2005 15:47:56 -0000	1.4
@@ -404,13 +404,13 @@
    }
 
    else if (strcmp(namestring, "Property_uint32") == 0) {
-      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%u, data value=%u", _PROVIDERNAME,
+      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%lu, data value=%lu", _PROVIDERNAME,
 		value.uint32, instancedata->Property_uint32));
       if (value.uint32 != instancedata->Property_uint32) goto error;
    }
 
    else if (strcmp(namestring, "Property_uint64") == 0) {
-      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%u, data value=%u", _PROVIDERNAME,
+      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%llu, data value=%llu", _PROVIDERNAME,
 		value.uint64, instancedata->Property_uint64));
       if (value.uint64 != instancedata->Property_uint64) goto error;
    }
@@ -428,13 +428,13 @@
    }
 
    else if (strcmp(namestring, "Property_sint32") == 0) {
-      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%d, data value=%d", _PROVIDERNAME,
+      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%ld, data value=%ld", _PROVIDERNAME,
 		value.sint32, instancedata->Property_sint32));
       if (value.sint32 != instancedata->Property_sint32) goto error;
    }
 
    else if (strcmp(namestring, "Property_sint64") == 0) {
-      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%d, data value=%d", _PROVIDERNAME,
+      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%lld, data value=%lld", _PROVIDERNAME,
 		value.sint64, instancedata->Property_sint64));
       if (value.sint64 != instancedata->Property_sint64) goto error;
    }
@@ -452,7 +452,7 @@
    }
 
    else if (strcmp(namestring, "Property_real64") == 0) {
-      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%.32e, data value=%.32e", _PROVIDERNAME,
+      _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%.32le, data value=%.32le", _PROVIDERNAME,
 		value.real64, instancedata->Property_real64));
       if (value.real64 != instancedata->Property_real64) goto error;
    }
@@ -496,9 +496,9 @@
       }
 
       /* Compare dateTime's using their binary format */
-     _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%d, data value=%d", _PROVIDERNAME,
+     _OSBASE_TRACE(2,("%s:_testpropertyvalue() property value=%lld, data value=%lld", _PROVIDERNAME,
 		datetime1, datetime2));
-//      if (datetime1 != datetime2) goto error;
+      if (datetime1 != datetime2) goto error;
    }
 
    else if (strcmp(namestring, "Property_char16") == 0) {

Index: cmpiutil.c
===================================================================
RCS file: /cvsroot/sblim/cmpi-tests/cmpi-instancetest/src/cmpiutil.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cmpiutil.c	12 May 2005 00:53:19 -0000	1.2
+++ cmpiutil.c	18 May 2005 15:47:56 -0000	1.3
@@ -307,19 +307,19 @@
          return valuestring;
       case CMPI_sint32:
          valuestring = malloc(100*sizeof(char));
-         sprintf(valuestring, "%d", data.value.sint32);
+         sprintf(valuestring, "%ld", data.value.sint32);
          return valuestring;
       case CMPI_uint32:
          valuestring = malloc(100*sizeof(char));
-         sprintf(valuestring, "%u", data.value.uint32);
+         sprintf(valuestring, "%lu", data.value.uint32);
          return valuestring;
       case CMPI_sint64:
          valuestring = malloc(100*sizeof(char));
-         sprintf(valuestring, "%d", data.value.sint64);
+         sprintf(valuestring, "%lld", data.value.sint64);
          return valuestring;
       case CMPI_uint64:
          valuestring = malloc(100*sizeof(char));
-         sprintf(valuestring, "%u", data.value.uint64);
+         sprintf(valuestring, "%llu", data.value.uint64);
          return valuestring;
       case CMPI_string: {
          if (CMIsNullObject(data.value.string)) return NULL;
@@ -338,7 +338,7 @@
          return valuestring;
       case CMPI_real64:
          valuestring = malloc(100*sizeof(char));
-         sprintf(valuestring, "%.32e", data.value.real64);
+         sprintf(valuestring, "%.32le", data.value.real64);
          return valuestring;
       case CMPI_dateTime: {
          CMPIStatus status = {CMPI_RC_OK, NULL};

[Sblim-commit] sfcb interop.mof,NONE,1.1 Makefile.am,1.19,1.20 sfcbrepos.sh.in,1.8,1.9

[Gareth S B. <bes...@us...>]

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

Modified Files:
	Makefile.am sfcbrepos.sh.in 
Added Files:
	interop.mof 
Log Message:
added suport to autocreate root/interop repository for indication support


Index: Makefile.am
===================================================================
RCS file: /cvsroot/sblim/sfcb/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile.am	2 May 2005 01:35:06 -0000	1.19
+++ Makefile.am	18 May 2005 15:02:16 -0000	1.20
@@ -194,6 +194,7 @@
 	test -d $(DESTDIR)$(sfcbstatedir)/stage/mofs || $(mkdir_p) $(DESTDIR)$(sfcbstatedir)/stage/mofs
 	test -d $(DESTDIR)$(sfcbstatedir)/stage/regs || $(mkdir_p) $(DESTDIR)$(sfcbstatedir)/stage/regs
 	$(INSTALL_DATA) $(srcdir)/default.reg $(DESTDIR)$(sfcbstatedir)/stage
+	$(INSTALL_DATA) $(srcdir)/interop.mof $(DESTDIR)$(sfcbstatedir)/stage
 	test -d $(DESTDIR)$(sfcbdocdir) || $(mkdir_p) $(DESTDIR)$(sfcbdocdir)
 	$(INSTALL_DATA) $(srcdir)/README $(srcdir)/AUTHORS $(srcdir)/COPYING $(DESTDIR)$(sfcbdocdir)
 	$(INSTALL_DATA) $(srcdir)/doc/sfcb.html $(DESTDIR)$(sfcbdocdir)
@@ -201,6 +202,7 @@
 uninstall-local:
 	rm -f $(DESTDIR)$(sysconfdir)/sfcb/sfcb.cfg
 	rm -f $(DESTDIR)$(sfcbstatedir)/stage/default.reg
+	rm -f $(DESTDIR)$(sfcbstatedir)/stage/interop.mof
 	rm -f $(DESTDIR)$(sfcbdocdir)/*
 	-rmdir $(sysconfdir)/sfcb
 	-rmdir $(sfcbdocdir)

--- NEW FILE: interop.mof ---
//
// interop base classes for mofc/
//
//

// ===================================================================
// 	dummy classes to get event classes loaded by mofc
// ===================================================================

class DMY_IndicationSubscription : CIM_IndicationSubscription
{
};

class DMY_IndicationFilter : CIM_IndicationFilter
{
};

class DMY_ProcessIndication : CIM_ProcessIndication
{
};

class DMY_InstCreation : CIM_InstCreation
{
};

class DMY_ListenerDestinationCIMXML : CIM_ListenerDestinationCIMXML
{
};

Index: sfcbrepos.sh.in
===================================================================
RCS file: /cvsroot/sblim/sfcb/sfcbrepos.sh.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sfcbrepos.sh.in	27 Apr 2005 17:48:29 -0000	1.8
+++ sfcbrepos.sh.in	18 May 2005 15:02:16 -0000	1.9
@@ -91,6 +91,7 @@
 	    exit 1
 	fi
     fi
+
     if [ -f $registrationdir/providerRegister ]
     then
 	mv -f $registrationdir/providerRegister $registrationdir/providerRegister.previous 
@@ -100,13 +101,16 @@
 	    exit 1
 	fi
     fi
+
     mkdir -p $registrationdir/repository/root/cimv2 &&
+    mkdir -p $registrationdir/repository/root/interop &&
     cp $stagingdir/default.reg $registrationdir/providerRegister
     if [ $? != 0 ]
     then
-	echo "Failed to create default repository and registry" >&2
+	echo "Failed to create default repositories and registry" >&2
 	exit 1
     fi
+
     if ls $stagingdir/regs/*.reg > /dev/null 2>&1
     then
 	if ! cat $stagingdir/regs/*.reg >> $registrationdir/providerRegister
@@ -115,6 +119,7 @@
 	    exit 1
 	fi
     fi
+
     if ls $stagingdir/mofs/*.mof > /dev/null 2>&1
     then
 	if ! sfcbmof -o $registrationdir/repository/root/cimv2/classSchemas -I $cimschemadir -i CIM_Schema.mof $stagingdir/mofs/*.mof
@@ -123,6 +128,14 @@
 	    exit 1
 	fi
     fi
+
+    # Setup interop class support
+    if ! sfcbmof -o $registrationdir/repository/root/interop/classSchemas -I $cimschemadir -i CIM_Schema.mof $stagingdir/interop.mof
+    then 
+        echo Failed compiling interop MOF file. >&2
+        exit 1
+    fi
+
 else
     echo Could not find required staging files. Please check your setup. >&2
     exit 1

[Sblim-commit] sfcb default.reg,1.3,1.4

[Gareth S B. <bes...@us...>]

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

Modified Files:
	default.reg 
Log Message:


Index: default.reg
===================================================================
RCS file: /cvsroot/sblim/sfcb/default.reg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- default.reg	18 May 2005 05:53:47 -0000	1.3
+++ default.reg	18 May 2005 05:57:57 -0000	1.4
@@ -7,7 +7,14 @@
 [$DefaultProvider$]
    provider: InternalProvider
    location: sfcInternalProvider
-   type: instance association
+   type: instance association method
+   unload: never
+#
+[$InterOpProvider$]
+   provider: InteropProvider
+   location: sfcInteropProvider
+   type: instance association method
+   unload: never
 #
 [CIM_IndicationFilter]
    provider: InteropProvider
@@ -20,7 +27,7 @@
    type: instance association method
 #
 [CIM_ListenerDestinationCIMXML]
-   provider: IndCIMXMHandler
-   location: sfcIndCIMXMHandler
+   provider: IndCIMXMLHandler
+   location: sfcIndCIMXMLHandler
    type: instance method
 #

[Sblim-commit] sfcb default.reg,1.2,1.3

[Gareth S B. <bes...@us...>]

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

Modified Files:
	default.reg 
Log Message:
removed deprecated SFC_Authorization entry from default reg file


Index: default.reg
===================================================================
RCS file: /cvsroot/sblim/sfcb/default.reg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- default.reg	1 Apr 2005 11:55:28 -0000	1.2
+++ default.reg	18 May 2005 05:53:47 -0000	1.3
@@ -24,8 +24,3 @@
    location: sfcIndCIMXMHandler
    type: instance method
 #
-[SFC_Authorization]
-   provider: SFC_Authorization
-   location: sfcAuthorizationProvider
-   type: instance method
-#

[Sblim-commit] sfcb installsfcb.sh,1.2,1.3

[Gareth S B. <bes...@us...>]

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

Modified Files:
	installsfcb.sh 
Log Message:
updated instance script to reflect addition of test xml files


Index: installsfcb.sh
===================================================================
RCS file: /cvsroot/sblim/sfcb/installsfcb.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- installsfcb.sh	18 May 2005 04:19:51 -0000	1.2
+++ installsfcb.sh	18 May 2005 05:03:43 -0000	1.3
@@ -171,6 +171,12 @@
 _installpkg "sfcb" $_PREFIX
 if [[ $? -ne 0 ]]; then exit 1; fi
 
+if [[ -e $_SRCROOT/sfcBroker.c ]]; then
+   export SFCB_HOME=$_SRCROOT
+else
+   export SFCB_HOME=$_SRCROOT/sfcb
+fi
+
 # Add sfcb locations to the search paths
 export PATH=$_PREFIX/bin:$PATH
 export LD_LIBRARY_PATH=$_PREFIX/lib:$LD_LIBRARY_PATH
@@ -192,8 +198,7 @@
 fi
 
 # Run a quick test to make sure the sfcb is running and responding to client requests
-cd $_SRCROOT
-#cd $_SRCROOT/sfcb/test
+cd $SFCB_HOME/test
 _TEST=enumerateclasses.FIRSTTIME
 echo "Running test $_TEST ..."
 $_PREFIX/bin/wbemcat $_TEST.xml > $_TEST.result
@@ -286,9 +291,10 @@
    exit 1
 fi
 
-cd tests
 # Run some simple tests using wbemcat
 if which wbemcat > /dev/null; then
+   cd $SFCB_HOME/test
+
    echo "****************************************"
    _CMD="wbemcat $PWD/enumerateclasses.ALL.xml"
    echo -e "wbemcat test: EnumerateClasses on root/cimv2 namespace ...\n\t$_CMD"