Menu
▾
▴
sblim-commit — CVS Commit Info for SBLIM
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(1) |
Mar
(45) |
Apr
(150) |
May
(145) |
Jun
(150) |
Jul
(79) |
Aug
(313) |
Sep
(160) |
Oct
(309) |
Nov
(115) |
Dec
(60) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(160) |
Feb
(144) |
Mar
(127) |
Apr
(48) |
May
(102) |
Jun
(54) |
Jul
(245) |
Aug
(94) |
Sep
(152) |
Oct
(162) |
Nov
(166) |
Dec
(740) |
| 2007 |
Jan
(752) |
Feb
(437) |
Mar
(328) |
Apr
(373) |
May
(569) |
Jun
(399) |
Jul
(369) |
Aug
(627) |
Sep
(100) |
Oct
(306) |
Nov
(166) |
Dec
(282) |
| 2008 |
Jan
(68) |
Feb
(145) |
Mar
(180) |
Apr
(160) |
May
(277) |
Jun
(229) |
Jul
(1188) |
Aug
(51) |
Sep
(97) |
Oct
(99) |
Nov
(95) |
Dec
(170) |
| 2009 |
Jan
(39) |
Feb
(73) |
Mar
(120) |
Apr
(121) |
May
(104) |
Jun
(262) |
Jul
(57) |
Aug
(171) |
Sep
(131) |
Oct
(88) |
Nov
(64) |
Dec
(83) |
| 2010 |
Jan
(55) |
Feb
(67) |
Mar
(124) |
Apr
(64) |
May
(130) |
Jun
(75) |
Jul
(164) |
Aug
(64) |
Sep
(44) |
Oct
(17) |
Nov
(43) |
Dec
(31) |
| 2011 |
Jan
(21) |
Feb
(10) |
Mar
(43) |
Apr
(46) |
May
(52) |
Jun
(71) |
Jul
(7) |
Aug
(16) |
Sep
(51) |
Oct
(14) |
Nov
(33) |
Dec
(15) |
| 2012 |
Jan
(12) |
Feb
(61) |
Mar
(129) |
Apr
(76) |
May
(70) |
Jun
(52) |
Jul
(29) |
Aug
(41) |
Sep
(32) |
Oct
(23) |
Nov
(38) |
Dec
(26) |
| 2013 |
Jan
(35) |
Feb
(37) |
Mar
(51) |
Apr
(15) |
May
(52) |
Jun
(15) |
Jul
(23) |
Aug
(21) |
Sep
(46) |
Oct
(69) |
Nov
(57) |
Dec
(26) |
| 2014 |
Jan
(5) |
Feb
(13) |
Mar
(17) |
Apr
(1) |
May
(5) |
Jun
|
Jul
(2) |
Aug
(2) |
Sep
(1) |
Oct
(16) |
Nov
(8) |
Dec
(4) |
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(1) |
Jun
(4) |
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
|
From: Adrian S. <a3s...@us...> - 2005-07-08 16:38:56
|
Update of /cvsroot/sblim/sfcc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14072 Modified Files: cimXmlResp.c cimXmlResp.y Log Message: fixed [ 1234867 ] segfault in test.c when doing enumeClasses cimXmlResp now dynamically updating valueArray. Index: cimXmlResp.y =================================================================== RCS file: /cvsroot/sblim/sfcc/cimXmlResp.y,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- cimXmlResp.y 26 Jun 2005 21:46:02 -0000 1.6 +++ cimXmlResp.y 8 Jul 2005 16:38:42 -0000 1.7 @@ -815,6 +815,10 @@ } | valueArray value { + if ($$.next>$$.max) { + $$.max*=2; + $$.values=(char**)realloc($$.values,$$.max); + } $$.values[$$.next]=$2.value; $$.next++; } Index: cimXmlResp.c =================================================================== RCS file: /cvsroot/sblim/sfcc/cimXmlResp.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- cimXmlResp.c 26 Jun 2005 21:46:02 -0000 1.6 +++ cimXmlResp.c 8 Jul 2005 16:38:41 -0000 1.7 @@ -698,8 +698,8 @@ 581, 589, 604, 617, 631, 646, 647, 652, 656, 663, 678, 679, 686, 700, 701, 716, 728, 729, 734, 747, 751, 755, 762, 763, 767, 773, 778, 802, 809, 816, - 824, 829, 844, 846, 851, 859, 870, 874, 888, 895, - 899, 912, 920, 926, 970, 977, 986, 996, 1007, 1013 + 828, 833, 848, 850, 855, 863, 874, 878, 892, 899, + 903, 916, 924, 930, 974, 981, 990, 1000, 1011, 1017 }; #endif @@ -1928,13 +1928,17 @@ case 59: #line 817 "cimXmlResp.y" { + if (yyval.xtokValueArray.next>yyval.xtokValueArray.max) { + yyval.xtokValueArray.max*=2; + yyval.xtokValueArray.values=(char**)realloc(yyval.xtokValueArray.values,yyval.xtokValueArray.max); + } yyval.xtokValueArray.values[yyval.xtokValueArray.next]=yyvsp[0].xtokValue.value; yyval.xtokValueArray.next++; } break; case 60: -#line 825 "cimXmlResp.y" +#line 829 "cimXmlResp.y" { yyval.xtokValueReference.instancePath=yyvsp[-1].xtokInstancePath; yyval.xtokValueReference.type=typeValRef_InstancePath; @@ -1942,7 +1946,7 @@ break; case 61: -#line 830 "cimXmlResp.y" +#line 834 "cimXmlResp.y" { yyval.xtokValueReference.instanceName=yyvsp[-1].xtokInstanceName; yyval.xtokValueReference.type=typeValRef_InstanceName; @@ -1950,7 +1954,7 @@ break; case 63: -#line 847 "cimXmlResp.y" +#line 851 "cimXmlResp.y" { simpleArrayAdd(PARM->respHdr.rvArray,(CMPIValue*)&PARM->curPath,CMPI_ref); PARM->curPath=NULL; @@ -1958,7 +1962,7 @@ break; case 64: -#line 852 "cimXmlResp.y" +#line 856 "cimXmlResp.y" { simpleArrayAdd(PARM->respHdr.rvArray,(CMPIValue*)&PARM->curPath,CMPI_ref); PARM->curPath=NULL; @@ -1966,42 +1970,42 @@ break; case 65: -#line 860 "cimXmlResp.y" +#line 864 "cimXmlResp.y" { createClassPath(&PARM->curPath, NULL, yyval.className); } break; case 66: -#line 871 "cimXmlResp.y" +#line 875 "cimXmlResp.y" { yyval.xtokQualifier.value=yyvsp[-1].xtokValue.value; } break; case 67: -#line 875 "cimXmlResp.y" +#line 879 "cimXmlResp.y" { // $$.value=$2.value; } break; case 68: -#line 889 "cimXmlResp.y" +#line 893 "cimXmlResp.y" { yyval.xtokLocalNameSpacePath=yyvsp[-1].xtokNameSpace.cns; } break; case 69: -#line 896 "cimXmlResp.y" +#line 900 "cimXmlResp.y" { yyval.xtokNameSpace.cns=strdup(yyvsp[-1].xtokNameSpace.ns); } break; case 70: -#line 900 "cimXmlResp.y" +#line 904 "cimXmlResp.y" { int l=strlen(yyvsp[-2].xtokNameSpace.cns)+strlen(yyvsp[-1].xtokNameSpace.ns)+2; yyval.xtokNameSpace.cns=(char*)malloc(l); @@ -2013,7 +2017,7 @@ break; case 71: -#line 913 "cimXmlResp.y" +#line 917 "cimXmlResp.y" { yyval.xtokNameSpacePath.host=yyvsp[-2].xtokHost; yyval.xtokNameSpacePath.nameSpacePath=yyvsp[-1].xtokLocalNameSpacePath; @@ -2021,13 +2025,13 @@ break; case 72: -#line 921 "cimXmlResp.y" +#line 925 "cimXmlResp.y" { } break; case 73: -#line 927 "cimXmlResp.y" +#line 931 "cimXmlResp.y" { yyval.xtokInstancePath.path=yyvsp[-2].xtokNameSpacePath; yyval.xtokInstancePath.instanceName=yyvsp[-1].xtokInstanceName; @@ -2036,7 +2040,7 @@ break; case 74: -#line 971 "cimXmlResp.y" +#line 975 "cimXmlResp.y" { yyval.xtokInstanceName.className=yyvsp[-1].xtokInstanceName.className; yyval.xtokInstanceName.bindings.next=0; @@ -2046,7 +2050,7 @@ break; case 75: -#line 978 "cimXmlResp.y" +#line 982 "cimXmlResp.y" { yyval.xtokInstanceName.className=yyvsp[-2].xtokInstanceName.className; yyval.xtokInstanceName.bindings=yyvsp[-1].xtokKeyBindings; @@ -2055,7 +2059,7 @@ break; case 76: -#line 987 "cimXmlResp.y" +#line 991 "cimXmlResp.y" { yyval.xtokKeyBindings.next=1; yyval.xtokKeyBindings.max=16; @@ -2068,7 +2072,7 @@ break; case 77: -#line 997 "cimXmlResp.y" +#line 1001 "cimXmlResp.y" { yyval.xtokKeyBindings.keyBindings[yyval.xtokKeyBindings.next].name=yyvsp[0].xtokKeyBinding.name; yyval.xtokKeyBindings.keyBindings[yyval.xtokKeyBindings.next].value=yyvsp[0].xtokKeyBinding.value; @@ -2079,7 +2083,7 @@ break; case 78: -#line 1008 "cimXmlResp.y" +#line 1012 "cimXmlResp.y" { yyval.xtokKeyBinding.name=yyvsp[-3].xtokKeyBinding.name; yyval.xtokKeyBinding.value=yyvsp[-2].xtokKeyValue.value; @@ -2088,7 +2092,7 @@ break; case 79: -#line 1014 "cimXmlResp.y" +#line 1018 "cimXmlResp.y" { yyval.xtokKeyBinding.name=yyvsp[-2].xtokKeyBinding.name; yyval.xtokKeyBinding.value=NULL; @@ -2101,7 +2105,7 @@ } /* Line 999 of yacc.c. */ -#line 2104 "cimXmlResp.c" +#line 2108 "cimXmlResp.c" yyvsp -= yylen; yyssp -= yylen; @@ -2295,6 +2299,6 @@ } -#line 1022 "cimXmlResp.y" +#line 1026 "cimXmlResp.y" |
|
From: Viktor M. <mih...@us...> - 2005-07-08 09:12:27
|
Update of /cvsroot/sblim/sfcb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13175 Added Files: ssl.orig Log Message: Added the ssl.orig file, needed by genSslCert.sh --- NEW FILE: ssl.orig --- [req] distinguished_name=user_dn prompt=no [user_dn] CN=Common Name emailAddress=te...@em...dress |
|
From: Viktor M. <mih...@us...> - 2005-07-08 09:11:38
|
Update of /cvsroot/sblim/sfcb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12690 Modified Files: httpAdapter.c httpComm.c Log Message: Bugs fixed: 1234676. Added buffered BIO for SSL write operations. Index: httpComm.c =================================================================== RCS file: /cvsroot/sblim/sfcb/httpComm.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- httpComm.c 7 Jul 2005 13:06:31 -0000 1.7 +++ httpComm.c 8 Jul 2005 09:11:28 -0000 1.8 @@ -80,13 +80,11 @@ #endif #if defined USE_SSL - if (to.ssl) { + if (to.bio) { + rc = BIO_write(to.bio, data, count); + } else if (to.ssl) { rc = SSL_write(to.ssl, data, count); - } - else if (to.bio) { - rc = BIO_write(to.bio, data, count); - } - else + } else #endif if (to.file == NULL) { rc = write(to.socket,data,count); @@ -109,12 +107,8 @@ #if defined USE_SSL if (from.ssl) { - rc = SSL_read(from.ssl, data, count); - } - else if (from.bio) { - rc = BIO_read(from.bio, data, count); - } - else + rc = SSL_read(from.ssl, data, count); + } else #endif rc = read(from.socket,data,count); @@ -123,7 +117,12 @@ void commFlush(CommHndl hndl) { - if (hndl.file) { - fflush(hndl.file); - } +#if defined USE_SSL + if (hndl.bio) { + BIO_flush(hndl.bio); + } else +#endif + if (hndl.file) { + fflush(hndl.file); + } } Index: httpAdapter.c =================================================================== RCS file: /cvsroot/sblim/sfcb/httpAdapter.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- httpAdapter.c 7 Jul 2005 13:06:31 -0000 1.16 +++ httpAdapter.c 8 Jul 2005 09:11:28 -0000 1.17 @@ -803,13 +803,21 @@ } if (sfcbSSLMode) { #if defined USE_SSL - conn_fd.bio=BIO_new(BIO_s_socket()); - BIO_set_fd(conn_fd.bio,connFd,BIO_CLOSE); + BIO *sslb; + BIO *sb=BIO_new_socket(connFd,BIO_NOCLOSE); if (!(conn_fd.ssl = SSL_new(ctx))) intSSLerror("Error creating SSL object"); - SSL_set_bio(conn_fd.ssl, conn_fd.bio, conn_fd.bio); + SSL_set_bio(conn_fd.ssl, sb, sb); if (SSL_accept(conn_fd.ssl) <= 0) intSSLerror("Error accepting SSL connection"); + sslb = BIO_new(BIO_f_ssl()); + BIO_set_ssl(sslb,conn_fd.ssl,BIO_CLOSE); + conn_fd.bio=BIO_new(BIO_f_buffer()); + BIO_push(conn_fd.bio,sslb); + if (BIO_set_write_buffer_size(conn_fd.bio,SOCKBUFSZ)) { + } else { + conn_fd.bio=NULL; + } #endif } else { #if defined USE_SSL |
|
From: Benjamin B. <bg...@us...> - 2005-07-07 15:43:28
|
Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards/command In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6635/Plugin/com/ibm/ecute/rsa/ui/internal/wizards/command Modified Files: RSAOutputOperation.java Log Message: FlavorsHelper added Index: RSAOutputOperation.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards/command/RSAOutputOperation.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- RSAOutputOperation.java 14 Feb 2005 11:41:03 -0000 1.4 +++ RSAOutputOperation.java 7 Jul 2005 15:42:50 -0000 1.5 @@ -18,6 +18,7 @@ import com.ibm.ecute.plugins.ProgressFrame; import com.ibm.ecute.plugins.output.funcionality.RSAModelCreator; import com.ibm.ecute.rsa.core.internal.dialogs.ProgressLogDialog; +import com.ibm.ecute.rsa.core.internal.properties.FlavorsHelper; import com.ibm.ecute.utils.License; import com.ibm.ecute.utils.Utils; import com.ibm.xtools.emf.msl.ResourceSetModifyOperation; @@ -129,6 +130,23 @@ throw new InterruptedException(); } + // FLAVORS + log.setSubTask("Applying flavors..."); + + //FlavorsHelper flavorsHelper = new FlavorsHelper(uml2Model); + //flavorsHelper.setModelFlavors(); + +// FlavorsHelper flavorsHelper = new FlavorsHelper(uml2Model); +// Package package_ = (Package)uml2Model.getOwnedMember("Cisco_LogicalPhysicalCore"); +// Class class2 = (Class)package_.getOwnedMember("Cisco_Asset"); +// ArrayList parents = flavorsHelper.getAllParentClasses(class2); +// ArrayList children = flavorsHelper.getAllChildClasses(class2); + + if(monitor.isCanceled()){ + throw new InterruptedException(); + } + + boolean fileSaved = false; if(uml2Model != null){ |
|
From: Benjamin B. <bg...@us...> - 2005-07-07 15:43:28
|
Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/UMLBuffer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6635/Plugin/com/ibm/ecute/UMLBuffer Modified Files: UMLBuffer.java Log Message: FlavorsHelper added Index: UMLBuffer.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/UMLBuffer/UMLBuffer.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- UMLBuffer.java 31 May 2005 13:12:47 -0000 1.8 +++ UMLBuffer.java 7 Jul 2005 15:42:49 -0000 1.9 @@ -357,6 +357,7 @@ ArrayList leftClasses = new ArrayList(); classLoop : for (int i = 0; i < classes.size(); i++) { UMLClass theClass = (UMLClass) classes.get(i); + //Only if both theClass.isAssociation() and Association flags are //the same, the class is added. if (theClass.isAssociation() == Associations) { |
|
From: Benjamin B. <bg...@us...> - 2005-07-07 15:43:28
|
Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/properties In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6635/Plugin/com/ibm/ecute/rsa/core/internal/properties Modified Files: QualifiersPropertySection.java Added Files: FlavorsHelper.java Log Message: FlavorsHelper added --- NEW FILE: FlavorsHelper.java --- /* * Created on 04.07.2005 */ package com.ibm.ecute.rsa.core.internal.properties; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.uml2.AssociationClass; import org.eclipse.uml2.Class; import org.eclipse.uml2.Constraint; import org.eclipse.uml2.Model; import org.eclipse.uml2.NamedElement; import org.eclipse.uml2.OpaqueExpression; import org.eclipse.uml2.Operation; import org.eclipse.uml2.Package; import org.eclipse.uml2.Property; import org.eclipse.uml2.Stereotype; import org.eclipse.uml2.UML2Package; import com.ibm.ecute.EcuteEclipsePlugin; import com.ibm.ecute.Qualifiers.QualifiersList; import com.ibm.ecute.utils.License; import com.ibm.xtools.emf.msl.EditingDomain; import com.ibm.xtools.emf.msl.ResourceSetModifyOperation; import com.ibm.xtools.modeler.UMLModeler; /** * Copyright (c) 2003, International Business Machines * * 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 Benjamin Bender <be...@de...> */ public class FlavorsHelper { // Copyright private static final String COPYRIGHT = License.COPYRIGHT; private static String QUALIFIERS_CONSTRAINT_NAME = "QualifiersList"; Model model; QualifiersList qualifiersList; public FlavorsHelper(Model model){ this.model = model; if(!this.existsQualifierListConstraint()){ this.createQualifiersListConstraint(); } this.qualifiersList = this.getQualifiersList(); } public void setModelFlavors(){ ArrayList modelSubClasses = getAllModelSubClasses(); for(int i = 0; i < modelSubClasses.size(); i++){ Class modelSubClass = (Class)modelSubClasses.get(i); setClassFlavors(modelSubClass); } } private void setClassFlavors(Class class_){ ArrayList overrideAttributes = getOverrideAttributes(class_); ArrayList overrideMethods = getOverrideMethods(class_); ArrayList overrideReferences = getOverrideReferences(class_); System.out.println("Juhuu!!!"); } private boolean existsQualifierListConstraint(){ Constraint qualifiersConstraint = model.getOwnedRule(QUALIFIERS_CONSTRAINT_NAME); if(qualifiersConstraint == null){ return false; } else { return true; } } private void createQualifiersListConstraint() { EditingDomain editingDomain = UMLModeler.getEditingDomain(); try { editingDomain.run(new ResourceSetModifyOperation("EditQualifier") { protected void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { Constraint qualifiersListConstraint = model.createOwnedRule(UML2Package.eINSTANCE.getConstraint()); qualifiersListConstraint.setName(QUALIFIERS_CONSTRAINT_NAME); qualifiersListConstraint.getConstrainedElements().add(model); // create specification qualifiersListConstraint.createSpecification(UML2Package.eINSTANCE.getOpaqueExpression()); // set constraint body String qualifierListTXTcontent = null; try { String filename = EcuteEclipsePlugin.getDefault().getQualifierListDestination(); File f = new File(filename); byte buffer[] = new byte[(int)f.length()]; FileInputStream in = null; String str = null; try { in = new FileInputStream(f); int len = in.read( buffer, 0, (int)f.length() ); str = new String( buffer, 0, len ); } catch ( IOException e ) { e.printStackTrace(); } finally { try { if ( in != null ) in.close(); } catch (IOException e) {} } if(str != null){ while(str.startsWith("#")){ int index = str.indexOf("\n"); str = str.substring(index + 1); } } qualifierListTXTcontent = str; } catch (Exception e) { e.printStackTrace(); } if(qualifierListTXTcontent != null){ ((OpaqueExpression)qualifiersListConstraint.getSpecification()).setBody(qualifierListTXTcontent); } } }, new NullProgressMonitor()); } catch (InvocationTargetException e) { e.printStackTrace(); } catch (InterruptedException e) { e.printStackTrace(); } } private QualifiersList getQualifiersList(){ QualifiersList list = null; try { list = EcuteEclipsePlugin.getDefault().getQualifiersList(model, QUALIFIERS_CONSTRAINT_NAME); } catch (Exception e) { e.printStackTrace(); } return list; } private boolean isNativeMappedQualifier(String qualifierName){ String[] nativeQualifiers = {"Abstract", "Aggregate", "Aggregation", "Association", "Composition", "ArrayType", "Deprecated", "Description", "In", "Out", "Key", "Max", "Min", "Octetstring", "Static", "Write"}; for(int i = 0; i < nativeQualifiers.length; i++){ if(qualifierName.equalsIgnoreCase(nativeQualifiers[i])) return true; } return false; } private ArrayList getAllParentClasses(Class class_){ ArrayList parentClasses = new ArrayList(); Class currentClass = class_; //parentClasses.add(class_); while(currentClass.getGenerals().size() > 0){ currentClass = (Class)currentClass.getGenerals().get(0); parentClasses.add(currentClass); } parentClasses.trimToSize(); return parentClasses; } // public ArrayList getAllParentClasses(UMLClass class_){ // // ArrayList parentClasses = new ArrayList(); // UMLClass currentClass = class_; // // parentClasses.add(class_); // // while(currentClass.getBaseClass() != null){ // currentClass = currentClass.getBaseUMLClass(); // parentClasses.add(currentClass); // } // // parentClasses.trimToSize(); // return parentClasses; // } private ArrayList getAllChildClasses(Class class_){ ArrayList childClasses = new ArrayList(); // get model classes ArrayList modelClasses = getAllModelClasses((NamedElement)class_); if(modelClasses.size() <= 0){ return null; } ArrayList currentChildren = new ArrayList(); currentChildren.add(class_); while(currentChildren.size() > 0){ //int m = currentChildren.size(); //for(int i = 0; i < m; i++){ String childClassName = ((Class)currentChildren.get(0)).getName(); int n = modelClasses.size(); for(int j = 0; j < n; j++){ if(((Class)modelClasses.get(j)).getGenerals().size() > 0 && (Class)((Class)modelClasses.get(j)).getGenerals().get(0) != null){ String className = ((Class)((Class)modelClasses.get(j)).getGenerals().get(0)).getName(); if(className.equalsIgnoreCase(childClassName)){ currentChildren.add(modelClasses.get(j)); childClasses.add(modelClasses.get(j)); //m++; modelClasses.remove(j); j--; n--; } } } currentChildren.remove(0); // i--; m--; //} } childClasses.trimToSize(); return childClasses; } // public ArrayList getAllChildClasses(UMLClass class_){ // // ArrayList childClasses = new ArrayList(); // // // get model classes // ArrayList modelClasses = getAllModelClasses((NamedElement)class_); // if(modelClasses.size() <= 0){ // return null; // } // // ArrayList currentChildren = new ArrayList(); // currentChildren.add(class_); // // while(currentChildren.size() > 0){ // for(int i = 0; i < currentChildren.size(); i++){ // String childClassName = ((UMLClass)currentChildren.get(i)).getName(); // for(int j = 0; j < modelClasses.size(); j++){ // String className = ((UMLClass)modelClasses.get(j)).getBaseClass(); // if(className.equalsIgnoreCase(childClassName)){ // currentChildren.add(modelClasses.get(j)); // modelClasses.remove(modelClasses.get(j)); // break; // } // } // } // } // // childClasses.trimToSize(); // return childClasses; // } private ArrayList getAllModelClasses(NamedElement element){ ArrayList classes = new ArrayList(); Model model; // goto the model while(!(element instanceof Model)){ element = (NamedElement)element.getOwner(); } if(!(element instanceof Model)){ return null; } else { model = (Model)element; } // get all owned packages List packagesList = model.getOwnedMembers(); // get classes from packages and add to list for(int i = 0; i < packagesList.size(); i++){ Package currentPackage = (Package)packagesList.get(i); List packageMembersList = currentPackage.getOwnedElements(); for(int j = 0; j < packageMembersList.size(); j++){ if(packageMembersList.get(j) instanceof Class){ classes.add(packageMembersList.get(j)); } } } classes.trimToSize(); return classes; } private ArrayList getAllModelSubClasses(){ ArrayList modelClasses = getAllModelClasses(this.model); ArrayList modelSubClasses = new ArrayList(); for(int i = 0; i < modelClasses.size(); i++){ Class modelClass = (Class)modelClasses.get(i); if(modelClass.getGenerals().size() > 0){ modelSubClasses.add(modelClass); } } modelSubClasses.trimToSize(); return modelSubClasses; } private ArrayList getOverrideAttributes(Class class_){ ArrayList overrideAttributes = new ArrayList(); List classAttributes = class_.getAttributes(); for(int i = 0; i < classAttributes.size(); i++){ Property classAttribute = (Property)classAttributes.get(i); if(overrides(classAttribute) != null){ overrideAttributes.add(classAttribute); } } if(overrideAttributes.size() > 0){ return overrideAttributes; } else { return null; } } private ArrayList getOverrideMethods(Class class_){ ArrayList overrideMethods = new ArrayList(); List classMethods = class_.getOwnedOperations(); for(int i = 0; i < classMethods.size(); i++){ Operation classMethod = (Operation)classMethods.get(i); if(overrides(classMethod) != null){ overrideMethods.add(classMethod); } } if(overrideMethods.size() > 0){ return overrideMethods; } else { return null; } } private ArrayList getOverrideReferences(Class class_){ if(!(class_ instanceof AssociationClass)){ return null; } ArrayList overrideReferences = new ArrayList(); List associationclassReferences = ((AssociationClass)class_).getOwnedEnds(); for(int i = 0; i < associationclassReferences.size(); i++){ Property reference = (Property)associationclassReferences.get(i); if(overrides(reference) != null){ overrideReferences.add(reference); } } if(overrideReferences.size() > 0){ return overrideReferences; } else { return null; } } private String overrides(NamedElement namedElement){ Stereotype cimStereotype = namedElement.getAppliedStereotype("CIM::Qualifiers"); List qualifierNames = (List) namedElement.getValue(cimStereotype, "QualifierName"); List qualifierValues = (List) namedElement.getValue(cimStereotype, "QualifierValue"); int index = -1; for(int i = 0; i < qualifierNames.size(); i++){ String qualifierName = (String)qualifierNames.get(i); if(qualifierName.equalsIgnoreCase("Override")){ index = i; break; } } if(index > -1){ return (String)qualifierValues.get(index); } return null; } } Index: QualifiersPropertySection.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/core/internal/properties/QualifiersPropertySection.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- QualifiersPropertySection.java 15 Jun 2005 09:41:47 -0000 1.18 +++ QualifiersPropertySection.java 7 Jul 2005 15:42:49 -0000 1.19 @@ -857,146 +857,6 @@ return true; } -// private ArrayList getInheritedQualifers(NamedElement element, ArrayList allAvailableQualifiers){ -// //TODO BB -// ArrayList inheritedList = new ArrayList(); -// -// // get applicable qualifiers for the element -// ArrayList applicableQualifiers = new ArrayList(); -// for(int i = 0; i < allAvailableQualifiers.size(); i++){ -// -// Qualifier qualifier = (Qualifier)allAvailableQualifiers.get(i); -// if(element instanceof Class && qualifier.classScope && !qualifier.RestrictedFlavor){ -// applicableQualifiers.add(qualifier); -// } else if(element instanceof AssociationClass && qualifier.associationScope && !qualifier.RestrictedFlavor){ -// applicableQualifiers.add(qualifier); -// } else if(element instanceof Property && qualifier.propertyScope && !qualifier.RestrictedFlavor){ -// applicableQualifiers.add(qualifier); -// } else if(element instanceof Property && qualifier.referenceScope && !qualifier.RestrictedFlavor){ -// applicableQualifiers.add(qualifier); -// } else if(element instanceof Operation && qualifier.methodScope && !qualifier.RestrictedFlavor){ -// applicableQualifiers.add(qualifier); -// } else if(element instanceof Parameter && qualifier.parameterScope && !qualifier.RestrictedFlavor){ -// applicableQualifiers.add(qualifier); -// } -// } -// applicableQualifiers.trimToSize(); -// -// if(element instanceof Class && applicableQualifiers.size() > 0){ -// Class thisClass = (Class)element; -// // get parent classes -// ArrayList parents = new ArrayList(); -// List generals = thisClass.getGenerals(); -// while (generals.size() > 0){ -// Class class_ = (Class)generals.get(0); -// parents.add(class_); -// generals = class_.getGenerals(); -// } -// -// if(parents.size() > 0){ -// for(int i = 0; i < applicableQualifiers.size(); i++){ -// boolean lastParent = false; -// for(int j = 0; j < parents.size(); j++){ -// if(j == parents.size()-1) lastParent = true; -// QualifierValueObject isInherited = checkIfInherited((Qualifier)applicableQualifiers.get(i), (Class)parents.get(j), lastParent); -// if(isInherited != null){ -// inheritedList.add(isInherited); -// allAvailableQualifiers.remove((Qualifier)applicableQualifiers.get(i)); -// break; -// } -// } -// } -// } -// } -// -// return inheritedList; -// } -// -// private QualifierValueObject checkIfInherited(Qualifier qualifier, Class class_, boolean lastParent){ -// QualifierValueObject returnQualifierObject = null; -// String classQualifierValue = null; -// -// if(qualifier.name.equalsIgnoreCase("Abstract")){ -// if(class_.isAbstract()){ -// classQualifierValue = "true"; -// } else { -// classQualifierValue = "false"; -// } -// } else if (qualifier.name.equalsIgnoreCase("Description")){ -// EList list = class_.getOwnedComments(); -// Iterator it = list.iterator(); -// while (it.hasNext()){ -// Comment comment = (Comment)it.next(); -// Stereotype stereo = comment.getApplicableStereotype("Default::Documentation"); -// if(stereo != null){ -// classQualifierValue = comment.getBody(); -// } -// } -// } else if (qualifier.name.equalsIgnoreCase("Deprecated")){ -// Stereotype stereo = class_.getAppliedStereotype("CIM::Deprecated"); -// if(stereo != null){ -// classQualifierValue = (String)class_.getValue(stereo, "Value"); -// } -// } else if (!(class_ instanceof AssociationClass) && qualifier.name.equalsIgnoreCase("OCL")){ -// String oclValue = existsOCL(class_); -// if(oclValue != null) -// classQualifierValue = oclValue; -// } else if (class_ instanceof AssociationClass && qualifier.name.equalsIgnoreCase("Aggregation")){ -// AssociationClass aClass = (AssociationClass)class_; -// EList ends = aClass.getOwnedEnds(); -// Iterator iter = ends.iterator(); -// while(iter.hasNext()){ -// Property prop = (Property)iter.next(); -// if(prop.getAggregation().getValue()== AggregationKind.SHARED || -// prop.getAggregation().getValue()== AggregationKind.COMPOSITE){ -// classQualifierValue = "true"; -// break; -// } -// } -// -// } else if (class_ instanceof AssociationClass && qualifier.name.equalsIgnoreCase("Composition")){ -// AssociationClass aClass = (AssociationClass)class_; -// EList ends = aClass.getOwnedEnds(); -// Iterator iter = ends.iterator(); -// while(iter.hasNext()){ -// Property prop = (Property)iter.next(); -// if(prop.getAggregation().getValue()== AggregationKind.COMPOSITE){ -// classQualifierValue = "true"; -// break; -// } -// } -// } else { -// -// //get all qualifiers witch are set in the Qualifiers-Stereotype -// Stereotype cimStereotype = class_.getAppliedStereotype("CIM::Qualifiers"); -// List qualifierNames = (List) class_.getValue(cimStereotype, "QualifierName"); -// List qualifierValues = (List) class_.getValue(cimStereotype, "QualifierValue"); -// -// for(int i=0; i<qualifierNames.size(); i++){ -// String qualifierName = (String)qualifierNames.get(i); -// String qualifierValue = (String)qualifierValues.get(i); -// -// if(qualifierName.equalsIgnoreCase(qualifier.name)){ -// classQualifierValue = qualifierValue; -// break; -// } -// } -// -// } -// -// if(classQualifierValue != null && !classQualifierValue.equalsIgnoreCase(qualifier.defaultValue)){ -// returnQualifierObject = new QualifierValueObject(qualifier.name, -// classQualifierValue, class_.getName() + " (" + -// class_.getNearestPackage().getName() + ")" , -1); -// } -//// if (classQualifierValue == null && lastParent){ -//// // set default value and definedIn emptyString -//// returnQualifierObject = new QualifierValueObject(qualifier.name, -//// qualifier.defaultValue, "", -1); -//// } -// -// return returnQualifierObject; -// } private void packColumns() { |
|
From: Benjamin B. <bg...@us...> - 2005-07-07 15:43:27
|
Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/plugins/output/funcionality In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6635/Plugin/com/ibm/ecute/plugins/output/funcionality Modified Files: RSAModelCreator.java Log Message: FlavorsHelper added Index: RSAModelCreator.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/plugins/output/funcionality/RSAModelCreator.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- RSAModelCreator.java 6 Jun 2005 14:17:43 -0000 1.13 +++ RSAModelCreator.java 7 Jul 2005 15:42:48 -0000 1.14 @@ -35,6 +35,7 @@ import org.eclipse.uml2.TypedElement; import org.eclipse.uml2.UML2Package; +import com.ibm.ecute.Qualifiers.QualifiersList; import com.ibm.ecute.plugins.ProgressFrame; import com.ibm.ecute.plugins.output.UMLInterface; import com.ibm.ecute.rsa.core.internal.dialogs.ProgressLogDialog; @@ -107,6 +108,10 @@ private Model uml2Model; private IUMLDiagramHelper diagramHelper; + + //private FlavorsHelper flavorsHelper; + + private QualifiersList qualifiersList = null; public RSAModelCreator(Model uml2Model, ProgressFrame log, boolean layout, boolean qualifiers) { this.uml2Model = uml2Model; @@ -117,6 +122,14 @@ leftDataTypes = new Hashtable(); leftDataTypeKeys = new ArrayList(); diagramHelper = UMLModeler.getUMLDiagramHelper(); +// flavorsHelper = new FlavorsHelper(uml2Model); +// if(!flavorsHelper.existsQualifierListConstraint()){ +// flavorsHelper.createQualifiersListConstraint(); +// } +// qualifiersList = flavorsHelper.getQualifiersList(); +// Qualifier qualifier = qualifiersList.GetElement("Override"); +// String flavor = qualifier.stringFlavor(); +// boolean test = flavorsHelper.isNativeMappedQualifier("bender"); } public int AddAssociation(String className1, String roleName1, String className2, String roleName2, Object diagram) { |
|
From: Benjamin B. <bg...@us...> - 2005-07-07 15:43:06
|
Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/Qualifiers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6635/Plugin/com/ibm/ecute/Qualifiers Modified Files: Qualifier.java Log Message: FlavorsHelper added Index: Qualifier.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/Qualifiers/Qualifier.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Qualifier.java 25 May 2005 15:45:48 -0000 1.6 +++ Qualifier.java 7 Jul 2005 15:42:49 -0000 1.7 @@ -172,4 +172,8 @@ return flavor; } + + public String stringFlavor(){ + return rsaFlavor2String(); + } } |
|
From: Viktor M. <mih...@us...> - 2005-07-07 13:07:11
|
Update of /cvsroot/sblim/sfcb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28131 Modified Files: httpAdapter.c httpComm.c msgqueue.c sfcBroker.c Log Message: Bugs fixed: 1234158. Socket pair and semaphore generation did not account for HTTPS adapter. They do now. Index: sfcBroker.c =================================================================== RCS file: /cvsroot/sblim/sfcb/sfcBroker.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- sfcBroker.c 20 Jun 2005 13:09:44 -0000 1.16 +++ sfcBroker.c 7 Jul 2005 13:06:31 -0000 1.17 @@ -49,7 +49,6 @@ extern UtilStringBuffer *instanceToString(CMPIInstance * ci, char **props); extern int init_sfcBroker(char *); extern CMPIBroker *Broker; -extern void initHttpProcCtl(int); extern void initProvProcCtl(int); extern void processTerminated(int pid); extern int httpDaemon(int argc, char *argv[], int sslMode, int pid); @@ -347,7 +346,7 @@ int c, i; unsigned long tmask = 0, sslMode=0,sslOMode=0; int enableHttp=0,enableHttps=0,useChunking=0,doBa=0; - long dSockets, pSockets; + long dSockets,sSockets,pSockets; char *pauseStr; _SFCB_TRACE_INIT(); @@ -442,6 +441,8 @@ if (getControlNum("httpProcs", &dSockets)) dSockets = 10; + if (getControlNum("httpsProcs", &sSockets)) + sSockets = 10; if (getControlNum("provProcs", &pSockets)) pSockets = 16; @@ -453,10 +454,10 @@ resultSockets=getSocketPair("sfcbd result"); sfcbSockets=getSocketPair("sfcbd sfcb"); - initSem(dSockets,dSockets,pSockets); + initSem(dSockets,sSockets,pSockets); initProvProcCtl(pSockets); init_sfcBroker(NULL); - initSocketPairs(pSockets,dSockets,0); + initSocketPairs(pSockets,dSockets,sSockets); setSignal(SIGQUIT, handleSigquit,0); setSignal(SIGTERM, handleSigquit,0); Index: httpComm.c =================================================================== RCS file: /cvsroot/sblim/sfcb/httpComm.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- httpComm.c 6 Jul 2005 13:24:31 -0000 1.6 +++ httpComm.c 7 Jul 2005 13:06:31 -0000 1.7 @@ -26,6 +26,9 @@ void handleSSLerror(const char *file, int lineno, const char *msg) { mlogf(M_ERROR,M_SHOW,"\n*** %s:%i %s -- exiting\n", file, lineno, msg); +#ifdef SFCB_DEBUG + ERR_print_errors_fp(stderr); +#endif exit(-1); } #endif Index: httpAdapter.c =================================================================== RCS file: /cvsroot/sblim/sfcb/httpAdapter.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- httpAdapter.c 6 Jul 2005 13:24:29 -0000 1.15 +++ httpAdapter.c 7 Jul 2005 13:06:31 -0000 1.16 @@ -103,14 +103,14 @@ char *protocol; } Buffer; -void initHttpProcCtl(int p) +void initHttpProcCtl(int p, int sslmode) { - httpProcSemKey=ftok(".",'H'); - httpWorkSemKey=ftok(".",'W'); + httpProcSemKey=ftok(".",'H' + sslmode); + httpWorkSemKey=ftok(".",'W' + sslmode); union semun sun; int i; - mlogf(M_INFO,M_SHOW,"--- Max Http procs: %d\n",p); + mlogf(M_INFO,M_SHOW,"--- Max Http%s procs: %d\n",sslmode?"s":"",p); if ((httpProcSem=semget(httpProcSemKey,1,0666))!=-1) semctl(httpProcSem,0,IPC_RMID,sun); @@ -902,9 +902,14 @@ hMax=htMax; } - if (getControlNum("httpProcs", &procs)) - procs = 10; - initHttpProcCtl(procs); + if (sslMode) { + if (getControlNum("httpsProcs", &procs)) + procs = 10; + } else { + if (getControlNum("httpProcs", &procs)) + procs = 10; + } + initHttpProcCtl(procs,sslMode); if (getControlBool("doBasicAuth", &doBa)) doBa=0; @@ -1006,11 +1011,13 @@ char *fnc,*fnk; ctx = SSL_CTX_new(SSLv23_method()); getControlChars("sslCertificateFilePath", &fnc); + _SFCB_TRACE(1,("--- sslCertificateFilePath = %s",fnc)); if (SSL_CTX_use_certificate_chain_file(ctx, fnc) != 1) - intSSLerror("Error loading certificate from file"); + intSSLerror("Error loading certificate from file"); getControlChars("sslKeyFilePath", &fnk); + _SFCB_TRACE(1,("--- sslKeyFilePath = %s",fnk)); if (SSL_CTX_use_PrivateKey_file(ctx, fnk, SSL_FILETYPE_PEM) != 1) - intSSLerror("Error loading private key from file"); + intSSLerror("Error loading private key from file"); } #endif Index: msgqueue.c =================================================================== RCS file: /cvsroot/sblim/sfcb/msgqueue.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- msgqueue.c 14 Jun 2005 11:42:04 -0000 1.7 +++ msgqueue.c 7 Jul 2005 13:06:31 -0000 1.8 @@ -482,7 +482,7 @@ void initSocketPairs(int provs, int https, int shttps) { - int i,t=(provs*2)+https; //,shttps; + int i,t=(provs*2)+https+shttps; sPairs=(ComSockets*)malloc(sizeof(ComSockets)*t); mlogf(M_INFO,M_SHOW,"--- initSocketPairs: %d\n",t); |
|
From: Viktor M. <mih...@us...> - 2005-07-06 13:24:42
|
Update of /cvsroot/sblim/sfcb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6582 Modified Files: control.c httpAdapter.c httpComm.c httpComm.h sfcb.cfg.pre.in Log Message: Bugs fixed: 1231019 Enhanced performance for persistent connections. Now use buffered write operations to avoid the client to fall asleep. New config property: keepaliveMaxRequests limits the number of requests on one connection. Index: httpComm.h =================================================================== RCS file: /cvsroot/sblim/sfcb/httpComm.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- httpComm.h 9 Mar 2005 12:25:12 -0000 1.1.1.1 +++ httpComm.h 6 Jul 2005 13:24:33 -0000 1.2 @@ -67,8 +67,12 @@ #endif +#define SOCKBUFSZ 32768 + typedef struct commHndl { - int socket; + int socket; + FILE *file; + void *buf; #if defined USE_SSL BIO *bio; SSL *ssl; @@ -79,5 +83,7 @@ void commInit(); int commWrite(CommHndl to, void *data, size_t count); int commRead(CommHndl from, void *data, size_t count); +void commFlush(CommHndl hdl); +void commClose(CommHndl hdl); #endif Index: control.c =================================================================== RCS file: /cvsroot/sblim/sfcb/control.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- control.c 1 Jul 2005 16:06:39 -0000 1.10 +++ control.c 6 Jul 2005 13:24:29 -0000 1.11 @@ -77,6 +77,7 @@ {"chunkSize", 1, "50000"}, {"keepaliveTimeout", 1, "15"}, + {"keepaliveMaxRequest", 1, "10"}, {"providerSampleInterval", 1, "30"}, {"providerTimeoutInterval", 1, "60"}, Index: sfcb.cfg.pre.in =================================================================== RCS file: /cvsroot/sblim/sfcb/sfcb.cfg.pre.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- sfcb.cfg.pre.in 13 Jun 2005 12:50:33 -0000 1.3 +++ sfcb.cfg.pre.in 6 Jul 2005 13:24:33 -0000 1.4 @@ -8,6 +8,8 @@ basicAuthLib: sfcBasicAuthentication doBasicAuth: false useChunking: true +keepaliveTimeout: 0 +keepaliveMaxRequest: 10 sslKeyFilePath: @sysconfdir@/sfcb/file.pem sslCertificateFilePath: @sysconfdir@/sfcb/server.pem registrationDir: @localstatedir@/lib/sfcb/registration Index: httpComm.c =================================================================== RCS file: /cvsroot/sblim/sfcb/httpComm.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- httpComm.c 1 Jul 2005 16:06:40 -0000 1.5 +++ httpComm.c 6 Jul 2005 13:24:31 -0000 1.6 @@ -85,7 +85,15 @@ } else #endif - rc = write(to.socket,data,count); + if (to.file == NULL) { + rc = write(to.socket,data,count); + } else { + rc = fwrite(data,count,1,to.file); + if (rc == 1) { + /* return number of bytes written */ + rc = count; + } + } _SFCB_RETURN(rc); } @@ -109,3 +117,10 @@ _SFCB_RETURN(rc); } + +void commFlush(CommHndl hndl) +{ + if (hndl.file) { + fflush(hndl.file); + } +} Index: httpAdapter.c =================================================================== RCS file: /cvsroot/sblim/sfcb/httpAdapter.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- httpAdapter.c 1 Jul 2005 16:06:39 -0000 1.14 +++ httpAdapter.c 6 Jul 2005 13:24:29 -0000 1.15 @@ -65,6 +65,8 @@ static int stopAccepting=0; static int running=0; static long keepaliveTimeout=15; +static long keepaliveMaxRequest=10; +static long numRequest; #if defined USE_SSL SSL_CTX *ctx; @@ -275,6 +277,7 @@ commWrite(conn_fd, server, strlen(server)); commWrite(conn_fd, clength, strlen(clength)); commWrite(conn_fd, cclose, strlen(cclose)); + commFlush(conn_fd); exit(1); } @@ -330,6 +333,7 @@ static char cont[] = {"Content-Type: application/xml; charset=\"utf-8\"\r\n"}; static char cach[] = {"Cache-Control: no-cache\r\n"}; static char op[] = {"CIMOperation: MethodResponse\r\n"}; + static char cclose[] = "Connection: close\r\n"; static char end[] = {"\r\n\r\n"}; char str[256]; int len, i, ls[8]; @@ -366,6 +370,10 @@ // PrintF("%s",man); commWrite(conn_fd, op, strlen(op)); PrintF("%s",op); + if (keepaliveTimeout == 0 || numRequest >= keepaliveMaxRequest) { + commWrite(conn_fd, cclose, strlen(cclose)); + PrintF("%s",cclose); + } commWrite(conn_fd, end, strlen(end)); PrintF("%s",end); @@ -387,6 +395,7 @@ } } } + commFlush(conn_fd); PrintF("%s","-----------------\n"); _SFCB_EXIT(); @@ -401,6 +410,7 @@ static char op[] = {"CIMOperation: MethodResponse\r\n"}; static char tenc[] = {"Transfer-encoding: chunked\r\n"}; static char trls[] = {"Trailer: CIMError, CIMStatusCode, CIMStatusCodeDescription\r\n"}; + static char cclose[] = "Connection: close\r\n"; _SFCB_ENTER(TRACE_HTTPDAEMON, "writeChunkHeaders"); @@ -416,7 +426,11 @@ PrintF("%s",tenc); commWrite(*(ctx->commHndl), trls, strlen(trls)); PrintF("%s",trls); - + if (keepaliveTimeout == 0 || numRequest >= keepaliveMaxRequest) { + commWrite(*(ctx->commHndl), cclose, strlen(cclose)); + PrintF("%s",cclose); + } + _SFCB_EXIT(); } @@ -520,6 +534,7 @@ commWrite(*(ctx->commHndl), eStr, strlen(eStr)); PrintF("%s",eStr); } + commFlush(*(ctx->commHndl)); _SFCB_EXIT(); } @@ -775,6 +790,17 @@ } conn_fd.socket=connFd; + conn_fd.file=fdopen(connFd,"a"); + if (conn_fd.file == NULL) { + mlogf(M_ERROR,M_SHOW,"--- failed to create socket stream - continue with raw socket: %s\n",strerror(errno)); + } else { + conn_fd.buf = malloc(SOCKBUFSZ); + if (conn_fd.buf) { + setbuffer(conn_fd.file,conn_fd.buf,SOCKBUFSZ); + } else { + mlogf(M_ERROR,M_SHOW,"--- failed to create socket buffer - continue unbuffered: %s\n",strerror(errno)); + } + } if (sfcbSSLMode) { #if defined USE_SSL conn_fd.bio=BIO_new(BIO_s_socket()); @@ -792,15 +818,17 @@ #endif } + numRequest = 0; FD_ZERO(&httpfds); FD_SET(conn_fd.socket,&httpfds); do { + numRequest += 1; if (doHttpRequest(conn_fd)) { /* eof reached - leave */ break; } - if (keepaliveTimeout==0) { - /* we don't support persistence - quit */ + if (keepaliveTimeout==0 || numRequest >= keepaliveMaxRequest ) { + /* no persistence wanted or exceeded - quit */ break; } /* wait for next request or timeout */ @@ -822,10 +850,16 @@ SSL_shutdown(conn_fd.ssl); else SSL_clear(conn_fd.ssl); SSL_free(conn_fd.ssl); - } else { - close(conn_fd.socket); - } + } else #endif + if (conn_fd.file == NULL) { + close(conn_fd.socket); + } else { + fclose(conn_fd.file); + if (conn_fd.buf) { + free(conn_fd.buf); + } + } if (!doFork) return; @@ -878,6 +912,9 @@ if (getControlNum("keepaliveTimeout", &keepaliveTimeout)) keepaliveTimeout = 15; + if (getControlNum("keepaliveMaxRequest", &keepaliveMaxRequest)) + keepaliveMaxRequest = 10; + i = 1; while (i < argc && argv[i][0] == '-') { if (strcmp(argv[i], "-D") == 0) @@ -922,7 +959,8 @@ if (keepaliveTimeout == 0) { mlogf(M_INFO,M_SHOW,"--- Keep-alive timeout disabled\n"); } else { - mlogf(M_INFO,M_SHOW,"--- Keep-alive timeout %ld seconds\n",keepaliveTimeout); + mlogf(M_INFO,M_SHOW,"--- Keep-alive timeout: %ld seconds\n",keepaliveTimeout); + mlogf(M_INFO,M_SHOW,"--- Maximum requests per connection: %ld\n",keepaliveMaxRequest); } listenFd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); |
|
From: Viktor M. <mih...@us...> - 2005-07-01 16:06:49
|
Update of /cvsroot/sblim/sfcb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23391 Modified Files: control.c httpAdapter.c httpComm.c Log Message: Bugs fixed: 1230295, 1231019. Enhanced error reporting for SSL failures. Added configureable keep-alive support for HTTP daemon. Index: control.c =================================================================== RCS file: /cvsroot/sblim/sfcb/control.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- control.c 13 Jun 2005 12:50:33 -0000 1.9 +++ control.c 1 Jul 2005 16:06:39 -0000 1.10 @@ -75,6 +75,8 @@ {"useChunking", 2, "false"}, {"chunkSize", 1, "50000"}, + + {"keepaliveTimeout", 1, "15"}, {"providerSampleInterval", 1, "30"}, {"providerTimeoutInterval", 1, "60"}, Index: httpComm.c =================================================================== RCS file: /cvsroot/sblim/sfcb/httpComm.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- httpComm.c 30 Jun 2005 11:36:08 -0000 1.4 +++ httpComm.c 1 Jul 2005 16:06:40 -0000 1.5 @@ -25,8 +25,7 @@ #if defined USE_SSL void handleSSLerror(const char *file, int lineno, const char *msg) { - fprintf(stderr, "** %s:%i %s\n", file, lineno, msg); - ERR_print_errors_fp(stderr); + mlogf(M_ERROR,M_SHOW,"\n*** %s:%i %s -- exiting\n", file, lineno, msg); exit(-1); } #endif Index: httpAdapter.c =================================================================== RCS file: /cvsroot/sblim/sfcb/httpAdapter.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- httpAdapter.c 26 Jun 2005 21:52:08 -0000 1.13 +++ httpAdapter.c 1 Jul 2005 16:06:39 -0000 1.14 @@ -64,6 +64,7 @@ static int httpProcId; static int stopAccepting=0; static int running=0; +static long keepaliveTimeout=15; #if defined USE_SSL SSL_CTX *ctx; @@ -573,7 +574,7 @@ return 0; } -static void doHttpRequest(CommHndl conn_fd) +static int doHttpRequest(CommHndl conn_fd) { char *cp; Buffer inBuf = { NULL, NULL, 0, 0, 0, 0, 0 ,0}; @@ -597,7 +598,12 @@ int badReq = 0; getHdrs(conn_fd, &inBuf); - + if (inBuf.size == 0) { + /* no buffer data - end of file - quit */ + _SFCB_TRACE(1,("--- HTTP connection EOF, quit %d ", currentProc)); + _SFCB_RETURN(1); + } + inBuf.httpHdr = getNextHdr(&inBuf); for (badReq = 1;;) { if (inBuf.httpHdr == NULL) @@ -705,25 +711,20 @@ //commClose(conn_fd); -#if defined USE_SSL - if (sfcbSSLMode) { - if ((SSL_get_shutdown(conn_fd.ssl) & SSL_RECEIVED_SHUTDOWN)) - SSL_shutdown(conn_fd.ssl); - else SSL_clear(conn_fd.ssl); - SSL_free(conn_fd.ssl); - } -#endif freeBuffer(&inBuf); - _SFCB_EXIT(); + _SFCB_RETURN(0); } static void handleHttpRequest(int connFd) { int r; CommHndl conn_fd; + int isReady; + fd_set httpfds; struct sembuf procReleaseUnDo = {0,1,SEM_UNDO}; - + struct timeval httpTimeout; + _SFCB_ENTER(TRACE_HTTPDAEMON, "handleHttpRequest"); _SFCB_TRACE(1, ("--- Forking xml handler")); @@ -745,25 +746,6 @@ semReleaseUnDo(httpProcSem,httpProcId+1); semRelease(httpWorkSem,0); - if (sfcbSSLMode) { -#if defined USE_SSL - conn_fd.socket=-2; - conn_fd.bio=BIO_new(BIO_s_socket()); - BIO_set_fd(conn_fd.bio,connFd,BIO_CLOSE); - if (!(conn_fd.ssl = SSL_new(ctx))) - intSSLerror("Error creating SSL context"); - SSL_set_bio(conn_fd.ssl, conn_fd.bio, conn_fd.bio); - if (SSL_accept(conn_fd.ssl) <= 0) - intSSLerror("Error accepting SSL connection"); -#endif - } - else { - conn_fd.socket=connFd; -#if defined USE_SSL - conn_fd.bio=NULL; - conn_fd.ssl=NULL; -#endif - } } else if (r>0) { running++; @@ -791,14 +773,59 @@ fprintf(stderr,"-#- Pausing - pid: %d\n",currentProc); sleep(5); } - + conn_fd.socket=connFd; + if (sfcbSSLMode) { #if defined USE_SSL - conn_fd.bio=NULL; - conn_fd.ssl=NULL; + conn_fd.bio=BIO_new(BIO_s_socket()); + BIO_set_fd(conn_fd.bio,connFd,BIO_CLOSE); + if (!(conn_fd.ssl = SSL_new(ctx))) + intSSLerror("Error creating SSL object"); + SSL_set_bio(conn_fd.ssl, conn_fd.bio, conn_fd.bio); + if (SSL_accept(conn_fd.ssl) <= 0) + intSSLerror("Error accepting SSL connection"); +#endif + } else { +#if defined USE_SSL + conn_fd.bio=NULL; + conn_fd.ssl=NULL; #endif + } + + FD_ZERO(&httpfds); + FD_SET(conn_fd.socket,&httpfds); + do { + if (doHttpRequest(conn_fd)) { + /* eof reached - leave */ + break; + } + if (keepaliveTimeout==0) { + /* we don't support persistence - quit */ + break; + } + /* wait for next request or timeout */ + httpTimeout.tv_sec=keepaliveTimeout; + httpTimeout.tv_usec=keepaliveTimeout; + isReady = select(conn_fd.socket+1,&httpfds,NULL,NULL,&httpTimeout); + if (isReady == 0) { + _SFCB_TRACE(1,("--- HTTP connection timeout, quit %d ", currentProc)); + break; + } else if (isReady < 0) { + _SFCB_TRACE(1,("--- HTTP connection error, quit %d ", currentProc)); + break; + } + } while (1); - doHttpRequest(conn_fd); +#if defined USE_SSL + if (sfcbSSLMode) { + if ((SSL_get_shutdown(conn_fd.ssl) & SSL_RECEIVED_SHUTDOWN)) + SSL_shutdown(conn_fd.ssl); + else SSL_clear(conn_fd.ssl); + SSL_free(conn_fd.ssl); + } else { + close(conn_fd.socket); + } +#endif if (!doFork) return; @@ -848,6 +875,9 @@ if (getControlBool("doBasicAuth", &doBa)) doBa=0; + if (getControlNum("keepaliveTimeout", &keepaliveTimeout)) + keepaliveTimeout = 15; + i = 1; while (i < argc && argv[i][0] == '-') { if (strcmp(argv[i], "-D") == 0) @@ -889,6 +919,12 @@ if (doBa) mlogf(M_INFO,M_SHOW,"--- Using Basic Authentication\n"); + if (keepaliveTimeout == 0) { + mlogf(M_INFO,M_SHOW,"--- Keep-alive timeout disabled\n"); + } else { + mlogf(M_INFO,M_SHOW,"--- Keep-alive timeout %ld seconds\n",keepaliveTimeout); + } + listenFd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); sin_len = sizeof(sin); |
|
From: Benjamin B. <bg...@us...> - 2005-06-30 14:58:44
|
Update of /cvsroot/sblim/ecute/InstallShield55/ecute/Component Definitions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2181/InstallShield55/ecute/Component Definitions Modified Files: Default.cdf Log Message: Version 2.1 beta 1f: Changed CMPI Templates path for RSA New InstallShield settings for RSA CMPI provider support Index: Default.cdf =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Component Definitions/Default.cdf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Default.cdf 8 Apr 2005 08:34:26 -0000 1.3 +++ Default.cdf 30 Jun 2005 14:58:30 -0000 1.4 @@ -36,7 +36,7 @@ FTPLOCATION= VISIBLE=Yes DESCRIPTION=This component includes the eCute Plugin for Rational Rose -DISPLAYTEXT=eCute for Rational Rose +DISPLAYTEXT=ECUTE for Rational Rose IMAGE= DEFSELECTION=Yes filegroup0=Docs @@ -189,8 +189,8 @@ FTPLOCATION= member1=RSA Plugin\Templates VISIBLE=Yes -DESCRIPTION=This component includes the eCute Plugin for the Rational Software Architect -DISPLAYTEXT=eCute for Rational Software Architect +DESCRIPTION=This component includes the ECUTE Plugin for the Rational Software Architect +DISPLAYTEXT=ECUTE for Rational Software Architect IMAGE= DEFSELECTION=Yes filegroup0=Docs |
|
From: Benjamin B. <bg...@us...> - 2005-06-30 14:58:44
|
Update of /cvsroot/sblim/ecute/InstallShield55/ecute/Media/Default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2181/InstallShield55/ecute/Media/Default Modified Files: default.mda Log Message: Version 2.1 beta 1f: Changed CMPI Templates path for RSA New InstallShield settings for RSA CMPI provider support Index: default.mda =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Media/Default/default.mda,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- default.mda 8 Apr 2005 08:34:30 -0000 1.3 +++ default.mda 30 Jun 2005 14:58:31 -0000 1.4 @@ -12,7 +12,7 @@ MEDIATYPE=PFTW DATAASFILES=No BUILDTYPE=Full -BuildLocation=E:\My Documents\IBM\RAS-WS\ecute\InstallShield55\ecute\Media\Default +BuildLocation=D:\workspace\ecute\InstallShield55\ecute\Media\Default BREAKBYTOPCOMPONENT=No REFRESH_DATAFILES=Yes REFRESH_SPLASH=Yes @@ -57,6 +57,6 @@ PRODUCTCATEGORY=Development Tool APPLICATIONNAME=Ecute COMPANYNAME=IBM -VERSION=2.1-alpha3 +VERSION=2.01.007 INFO= |
|
From: Benjamin B. <bg...@us...> - 2005-06-30 14:58:44
|
Update of /cvsroot/sblim/ecute/InstallShield55/ecute/Setup Files/Compressed Files/Language Independent/OS Independent In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2181/InstallShield55/ecute/Setup Files/Compressed Files/Language Independent/OS Independent Modified Files: jacob.txt Log Message: Version 2.1 beta 1f: Changed CMPI Templates path for RSA New InstallShield settings for RSA CMPI provider support Index: jacob.txt =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Setup Files/Compressed Files/Language Independent/OS Independent/jacob.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- jacob.txt 12 May 2005 15:09:49 -0000 1.1 +++ jacob.txt 30 Jun 2005 14:58:31 -0000 1.2 @@ -17,5 +17,5 @@ Internet. Save the jacob_18.zip file to the installation directory of ECUTE. -In any case, the first usage of ECUTE in ROse will +In any case, the first usage of ECUTE in Rose will extract the necessary files from the JACOB .zip file. \ No newline at end of file |
|
From: Benjamin B. <bg...@us...> - 2005-06-30 14:58:40
|
Update of /cvsroot/sblim/ecute/InstallShield55/ecute In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2181/InstallShield55/ecute Modified Files: Ecute.pfw Log Message: Version 2.1 beta 1f: Changed CMPI Templates path for RSA New InstallShield settings for RSA CMPI provider support Index: Ecute.pfw =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Ecute.pfw,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Ecute.pfw 19 May 2005 13:52:09 -0000 1.2 +++ Ecute.pfw 30 Jun 2005 14:58:30 -0000 1.3 @@ -15,7 +15,7 @@ Comments= Notice=Copyright IBM Corporation 2005 Version=2.1 beta 1 -OutputSpec=D:\ecute\ECUTE21-beta1-win.exe +OutputSpec=D:\ecute\ECUTE21-beta1f-win.exe GUIDs=0 Type=2 Compress=1 |
|
From: Benjamin B. <bg...@us...> - 2005-06-30 14:58:40
|
Update of /cvsroot/sblim/ecute/InstallShield55/ecute/File Groups In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2181/InstallShield55/ecute/File Groups Modified Files: Default.fdf eCute4RSA.fgl Schema.fgl Log Message: Version 2.1 beta 1f: Changed CMPI Templates path for RSA New InstallShield settings for RSA CMPI provider support Index: Schema.fgl =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/File Groups/Schema.fgl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Schema.fgl 8 Apr 2005 08:34:27 -0000 1.2 +++ Schema.fgl 30 Jun 2005 14:58:30 -0000 1.3 @@ -1,9 +1,56 @@ -[DYNAMIC] -WILDCARD0=*.* -INCLUDESUBDIR=YES -FOLDER=D:\ecute\distribution\Frameworks - -[General] -Type=FILELIST -Version=1.10.000 - +[CIM Schema 2.8.1\Categories] +file0=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1\Categories\CIM_Application28.cat +file1=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1\Categories\CIM_Core28.cat +file2=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1\Categories\CIM_Database28.cat +file3=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1\Categories\CIM_Device28.cat +file4=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1\Categories\CIM_Event28.cat +file5=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1\Categories\CIM_Interop28.cat +file6=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1\Categories\CIM_IPsecPolicy28.cat +file7=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1\Categories\CIM_Metrics28.cat +file8=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1\Categories\CIM_Network28.cat +file9=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1\Categories\CIM_Physical28.cat +file10=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1\Categories\CIM_Policy28.cat +fulldirectory=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1\Categories +file11=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1\Categories\CIM_Schema28.cat +file12=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1\Categories\CIM_Support28.cat +file13=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1\Categories\CIM_System28.cat +file14=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1\Categories\CIM_User28.cat + +[CIM Schema 2.7] +file0=D:\ecute\distribution\Frameworks\CIM Schema 2.7\CIM Schema 2.7.ico +file1=D:\ecute\distribution\Frameworks\CIM Schema 2.7\CIM Schema 2.7.mdl +file2=D:\ecute\distribution\Frameworks\CIM Schema 2.7\CIM Schema 2.7.rtf +SubDir0=CIM Schema 2.7\Categories +fulldirectory=D:\ecute\distribution\Frameworks\CIM Schema 2.7 + +[TopDir] +SubDir0=CIM Schema 2.7 +SubDir1=CIM Schema 2.8.1 + +[CIM Schema 2.8.1] +file0=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1\CIM Schema 2.8.1.ico +file1=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1\CIM Schema 2.8.1.mdl +file2=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1\CIM Schema 2.8.1.rtf +SubDir0=CIM Schema 2.8.1\Categories +fulldirectory=D:\ecute\distribution\Frameworks\CIM Schema 2.8.1 + +[CIM Schema 2.7\Categories] +file0=D:\ecute\distribution\Frameworks\CIM Schema 2.7\Categories\CIM_Application27.cat +file1=D:\ecute\distribution\Frameworks\CIM Schema 2.7\Categories\CIM_Core27.cat +file2=D:\ecute\distribution\Frameworks\CIM Schema 2.7\Categories\CIM_Database27.cat +file3=D:\ecute\distribution\Frameworks\CIM Schema 2.7\Categories\CIM_Device27.cat +file4=D:\ecute\distribution\Frameworks\CIM Schema 2.7\Categories\CIM_Event27.cat +file5=D:\ecute\distribution\Frameworks\CIM Schema 2.7\Categories\CIM_Interop27.cat +file6=D:\ecute\distribution\Frameworks\CIM Schema 2.7\Categories\CIM_Metrics27.cat +file7=D:\ecute\distribution\Frameworks\CIM Schema 2.7\Categories\CIM_Network27.cat +file8=D:\ecute\distribution\Frameworks\CIM Schema 2.7\Categories\CIM_Physical27.cat +file9=D:\ecute\distribution\Frameworks\CIM Schema 2.7\Categories\CIM_Policy27.cat +file10=D:\ecute\distribution\Frameworks\CIM Schema 2.7\Categories\CIM_Support27.cat +fulldirectory=D:\ecute\distribution\Frameworks\CIM Schema 2.7\Categories +file11=D:\ecute\distribution\Frameworks\CIM Schema 2.7\Categories\CIM_System27.cat +file12=D:\ecute\distribution\Frameworks\CIM Schema 2.7\Categories\CIM_User27.cat + +[General] +Type=FILELIST +Version=1.10.000 + Index: Default.fdf =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/File Groups/Default.fdf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Default.fdf 19 May 2005 13:52:09 -0000 1.4 +++ Default.fdf 30 Jun 2005 14:58:30 -0000 1.5 @@ -80,7 +80,7 @@ COMMENT= COMPRESS=Yes COMPRESSDLL= -LINKTYPE=Dynamic Link +LINKTYPE=Static Link POTENTIALLY=No MISC= Index: eCute4RSA.fgl =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/File Groups/eCute4RSA.fgl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- eCute4RSA.fgl 8 Apr 2005 08:34:27 -0000 1.1 +++ eCute4RSA.fgl 30 Jun 2005 14:58:30 -0000 1.2 @@ -1,3 +1,20 @@ +[eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\mof] +file0=D:\ecute\distribution\CMPITemplates\mof\makefile.pegasus +file1=D:\ecute\distribution\CMPITemplates\mof\makefile.standalone +file2=D:\ecute\distribution\CMPITemplates\mof\Registration.mof +fulldirectory=D:\ecute\distribution\CMPITemplates\mof + +[eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\general] +file0=D:\ecute\distribution\CMPITemplates\general\includeHeader +fulldirectory=D:\ecute\distribution\CMPITemplates\general + +[eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\resourceAccessCPP] +file0=D:\ecute\distribution\CMPITemplates\resourceAccessCPP\associations +file1=D:\ecute\distribution\CMPITemplates\resourceAccessCPP\extrinsicMethod +file2=D:\ecute\distribution\CMPITemplates\resourceAccessCPP\setProperty +file3=D:\ecute\distribution\CMPITemplates\resourceAccessCPP\sizeDeclaration +fulldirectory=D:\ecute\distribution\CMPITemplates\resourceAccessCPP + [eclipse\plugins\com.ibm.ecute_1.0.0\icons\wizards] file0=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\icons\wizards\cimMOF.gif file1=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\icons\wizards\cimMOFExport.gif @@ -10,6 +27,15 @@ SubDir0=eclipse\plugins\com.ibm.ecute_1.0.0\icons\wizards fulldirectory=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\icons +[eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\InstanceCPP] +file0=D:\ecute\distribution\CMPITemplates\InstanceCPP\cmpiDataConstructor +file1=D:\ecute\distribution\CMPITemplates\InstanceCPP\cmpiDataConstructor4Enum +file2=D:\ecute\distribution\CMPITemplates\InstanceCPP\getInstance +file3=D:\ecute\distribution\CMPITemplates\InstanceCPP\instanceArrayConstructor +file4=D:\ecute\distribution\CMPITemplates\InstanceCPP\instanceConstructor +file5=D:\ecute\distribution\CMPITemplates\InstanceCPP\instanceEnumerationConstructor +fulldirectory=D:\ecute\distribution\CMPITemplates\InstanceCPP + [eclipse\plugins\com.ibm.ecute_1.0.0\libraries] file0=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\libraries\CIMPrimitiveTypes.library.uml2 fulldirectory=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\libraries @@ -23,22 +49,148 @@ SubDir0=eclipse\plugins fulldirectory= +[eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\support] +file0=D:\ecute\distribution\CMPITemplates\support\ArrayConverter.cpp +file1=D:\ecute\distribution\CMPITemplates\support\ArrayConverter.h +file2=D:\ecute\distribution\CMPITemplates\support\CmpiErrorFormater.cpp +file3=D:\ecute\distribution\CMPITemplates\support\CmpiErrorFormater.h +file4=D:\ecute\distribution\CMPITemplates\support\makefile +fulldirectory=D:\ecute\distribution\CMPITemplates\support + [eclipse\plugins\com.ibm.ecute_1.0.0\rsaConfig] file0=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\rsaConfig\mofInput.config file1=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\rsaConfig\mofOutput.config +file2=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\rsaConfig\cmpiOutput.config fulldirectory=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\rsaConfig +[eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\containerCPP] +file0=D:\ecute\distribution\CMPITemplates\containerCPP\attributeInit +file1=D:\ecute\distribution\CMPITemplates\containerCPP\attributeSizeInit +file2=D:\ecute\distribution\CMPITemplates\containerCPP\copyArraySize +file3=D:\ecute\distribution\CMPITemplates\containerCPP\copyAttribute +file4=D:\ecute\distribution\CMPITemplates\containerCPP\defaultArraySetter +file5=D:\ecute\distribution\CMPITemplates\containerCPP\defaultSetter +file6=D:\ecute\distribution\CMPITemplates\containerCPP\destructor +file7=D:\ecute\distribution\CMPITemplates\containerCPP\destructorArray +file8=D:\ecute\distribution\CMPITemplates\containerCPP\destructorInstancesArray +file9=D:\ecute\distribution\CMPITemplates\containerCPP\getterSetter +file10=D:\ecute\distribution\CMPITemplates\containerCPP\instanceSetter +fulldirectory=D:\ecute\distribution\CMPITemplates\containerCPP +file11=D:\ecute\distribution\CMPITemplates\containerCPP\stringArraySetter +file12=D:\ecute\distribution\CMPITemplates\containerCPP\stringSetter + +[eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates] +SubDir8=eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\InstanceCPP +file15=D:\ecute\distribution\CMPITemplates\makefile +SubDir9=eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\InstanceNameCPP +file16=D:\ecute\distribution\CMPITemplates\makefile.support +file0=D:\ecute\distribution\CMPITemplates\CmpiProvider.cpp +file17=D:\ecute\distribution\CMPITemplates\repositoryExternal.cpp +file1=D:\ecute\distribution\CMPITemplates\CmpiProvider.h +SubDir10=eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\interfaceH +file18=D:\ecute\distribution\CMPITemplates\repositoryExternal.h +file2=D:\ecute\distribution\CMPITemplates\converter.cpp +SubDir11=eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\mof +file19=D:\ecute\distribution\CMPITemplates\resourceAccess.cpp +file3=D:\ecute\distribution\CMPITemplates\converter.h +SubDir12=eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\resourceAccessCPP +file4=D:\ecute\distribution\CMPITemplates\DefaultImplementation.cpp +SubDir13=eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\root +file5=D:\ecute\distribution\CMPITemplates\external.cpp +SubDir14=eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\support +file6=D:\ecute\distribution\CMPITemplates\external.h +file7=D:\ecute\distribution\CMPITemplates\Factory.cpp +SubDir0=eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\CmpiProviderCPP +file8=D:\ecute\distribution\CMPITemplates\Factory.h +SubDir1=eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\CmpiProviderH +file9=D:\ecute\distribution\CMPITemplates\fakeFactory.cpp +SubDir2=eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\containerCPP +file20=D:\ecute\distribution\CMPITemplates\setting.cmpi +SubDir3=eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\containerH +file21=D:\ecute\distribution\CMPITemplates\setting.provider +file10=D:\ecute\distribution\CMPITemplates\Instance.cpp +fulldirectory=D:\ecute\distribution\CMPITemplates +SubDir4=eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\defaultImplementationCPP +file11=D:\ecute\distribution\CMPITemplates\Instance.h +SubDir5=eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\externalCPP +file12=D:\ecute\distribution\CMPITemplates\InstanceName.cpp +SubDir6=eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\externalH +file13=D:\ecute\distribution\CMPITemplates\InstanceName.h +SubDir7=eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\general +file14=D:\ecute\distribution\CMPITemplates\interface.h + [eclipse\plugins\com.ibm.ecute_1.0.0\profiles] file0=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\profiles\CIM.profile.uml2 fulldirectory=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\profiles +[eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\CmpiProviderCPP] +file15=D:\ecute\distribution\CMPITemplates\CmpiProviderCPP\shadowCopy +file16=D:\ecute\distribution\CMPITemplates\CmpiProviderCPP\stringParameter +file0=D:\ecute\distribution\CMPITemplates\CmpiProviderCPP\arrayParameter +file1=D:\ecute\distribution\CMPITemplates\CmpiProviderCPP\association +file2=D:\ecute\distribution\CMPITemplates\CmpiProviderCPP\constStringParameter +file3=D:\ecute\distribution\CMPITemplates\CmpiProviderCPP\deleteArrayParameter +file4=D:\ecute\distribution\CMPITemplates\CmpiProviderCPP\deleteArrayString +file5=D:\ecute\distribution\CMPITemplates\CmpiProviderCPP\enumerationParameter +file6=D:\ecute\distribution\CMPITemplates\CmpiProviderCPP\factoryMacro +file7=D:\ecute\distribution\CMPITemplates\CmpiProviderCPP\instanceNameArrayParameter +file8=D:\ecute\distribution\CMPITemplates\CmpiProviderCPP\methodIf +file9=D:\ecute\distribution\CMPITemplates\CmpiProviderCPP\nonInParameter +file10=D:\ecute\distribution\CMPITemplates\CmpiProviderCPP\objectPathParameter +fulldirectory=D:\ecute\distribution\CMPITemplates\CmpiProviderCPP +file11=D:\ecute\distribution\CMPITemplates\CmpiProviderCPP\parameter +file12=D:\ecute\distribution\CMPITemplates\CmpiProviderCPP\parameterCall +file13=D:\ecute\distribution\CMPITemplates\CmpiProviderCPP\parameterSize +file14=D:\ecute\distribution\CMPITemplates\CmpiProviderCPP\returnArg + +[eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\root] +file0=D:\ecute\distribution\CMPITemplates\root\IBMQualifiers.mof +file1=D:\ecute\distribution\CMPITemplates\root\installMOFScript.sh +file2=D:\ecute\distribution\CMPITemplates\root\installMOFScriptLine +file3=D:\ecute\distribution\CMPITemplates\root\makefile.pegasus +file4=D:\ecute\distribution\CMPITemplates\root\makefile.standalone +file5=D:\ecute\distribution\CMPITemplates\root\makefileALL +file6=D:\ecute\distribution\CMPITemplates\root\makefileLine +file7=D:\ecute\distribution\CMPITemplates\root\requiredQualifiers.mof +fulldirectory=D:\ecute\distribution\CMPITemplates\root + +[eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\InstanceNameCPP] +file0=D:\ecute\distribution\CMPITemplates\InstanceNameCPP\cmpiDataConstructor +file1=D:\ecute\distribution\CMPITemplates\InstanceNameCPP\cmpiDataConstructor4Enum +file2=D:\ecute\distribution\CMPITemplates\InstanceNameCPP\getObjectPath +file3=D:\ecute\distribution\CMPITemplates\InstanceNameCPP\objectPathArrayConstructor +file4=D:\ecute\distribution\CMPITemplates\InstanceNameCPP\objectPathConstructor +file5=D:\ecute\distribution\CMPITemplates\InstanceNameCPP\objectPathEnumerationConstructor +fulldirectory=D:\ecute\distribution\CMPITemplates\InstanceNameCPP + [TopDir] SubDir0=eclipse +[eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\interfaceH] +file0=D:\ecute\distribution\CMPITemplates\interfaceH\associations +file1=D:\ecute\distribution\CMPITemplates\interfaceH\constructor +file2=D:\ecute\distribution\CMPITemplates\interfaceH\extrinsicMethod +file3=D:\ecute\distribution\CMPITemplates\interfaceH\inheritance +file4=D:\ecute\distribution\CMPITemplates\interfaceH\methodParameter +fulldirectory=D:\ecute\distribution\CMPITemplates\interfaceH + +[eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\externalCPP] +file0=D:\ecute\distribution\CMPITemplates\externalCPP\association +fulldirectory=D:\ecute\distribution\CMPITemplates\externalCPP + +[eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\defaultImplementationCPP] +file0=D:\ecute\distribution\CMPITemplates\defaultImplementationCPP\associations +file1=D:\ecute\distribution\CMPITemplates\defaultImplementationCPP\extrinsicMethod +fulldirectory=D:\ecute\distribution\CMPITemplates\defaultImplementationCPP + [eclipse\plugins\com.ibm.ecute_1.0.0\META-INF] file0=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\META-INF\MANIFEST.MF fulldirectory=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\META-INF +[eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\externalH] +file0=D:\ecute\distribution\CMPITemplates\externalH\association +fulldirectory=D:\ecute\distribution\CMPITemplates\externalH + [eclipse\plugins\com.ibm.ecute_1.0.0] file0=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\QualifiersList.txt file1=D:\ecute\distribution\eclipse\plugins\com.ibm.ecute_1.0.0\plugin.properties @@ -50,8 +202,20 @@ SubDir3=eclipse\plugins\com.ibm.ecute_1.0.0\libraries fulldirectory= SubDir4=eclipse\plugins\com.ibm.ecute_1.0.0\META-INF +SubDir5=eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates [General] Type=FILELIST Version=1.10.000 +[eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\CmpiProviderH] +file0=D:\ecute\distribution\CMPITemplates\CmpiProviderH\association +fulldirectory=D:\ecute\distribution\CMPITemplates\CmpiProviderH + +[eclipse\plugins\com.ibm.ecute_1.0.0\CMPITemplates\containerH] +file0=D:\ecute\distribution\CMPITemplates\containerH\arraySize +file1=D:\ecute\distribution\CMPITemplates\containerH\attributeIsSet +file2=D:\ecute\distribution\CMPITemplates\containerH\getterSetter +file3=D:\ecute\distribution\CMPITemplates\containerH\privateAttribute +fulldirectory=D:\ecute\distribution\CMPITemplates\containerH + |
|
From: Benjamin B. <bg...@us...> - 2005-06-30 14:58:38
|
Update of /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2181/InstallShield55/ecute/Script Files Modified Files: Setup.dbg Setup.ins Setup.ino Setup.obs setup.rul Log Message: Version 2.1 beta 1f: Changed CMPI Templates path for RSA New InstallShield settings for RSA CMPI provider support Index: Setup.ins =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files/Setup.ins,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 Binary files /tmp/cvs8AlHSA and /tmp/cvs3EfOqj differ Index: setup.rul =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files/setup.rul,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- setup.rul 31 May 2005 14:38:50 -0000 1.5 +++ setup.rul 30 Jun 2005 14:58:30 -0000 1.6 @@ -178,7 +178,7 @@ if (nResult = BACK) goto Dlg_SdComponentDialog2; endif; - if (ComponentIsItemSelected ( MEDIA , COMP_ECUTE4ROSE )) then + if (bRoseInstalled = TRUE && ComponentIsItemSelected ( MEDIA , COMP_ECUTE4ROSE )) then nResult = GetJacob(); if (nResult = BACK) goto Dlg_SdAskDestPath; endif; @@ -498,7 +498,7 @@ /////////////////////////////////////////////////////////////////////////////// function SetupInstall() - STRING CRMKEY, RSAKEY1,RSAKEY2; + STRING ROSEKEY1, ROSEKEY2, RSAKEY1, RSAKEY2, ECUTEKEY; NUMBER nvSize,rtype; NUMBER bOpt1, bOpt2; NUMBER res; @@ -514,9 +514,10 @@ // Check if Rose is installed RegDBSetDefaultRoot ( HKEY_LOCAL_MACHINE ); - CRMKEY="SOFTWARE\\Rational Software\\Rose\\Rose"; - if (RegDBKeyExist ( CRMKEY)=1) then - RegDBGetKeyValueEx ( CRMKEY , "InstallDir" , rtype , svRoseDir , nvSize ); + ROSEKEY1="SOFTWARE\\Rational Software\\Rose\\Rose"; + ROSEKEY2="SOFTWARE\\Rational Software\\Rose"; + if (RegDBKeyExist ( ROSEKEY1)=1) then + RegDBGetKeyValueEx ( ROSEKEY2 , "InstallDir" , rtype , svRoseDir , nvSize ); ComponentSetTarget (MEDIA, "<RoseDir>", svRoseDir+"\\framework\\frameworks"); ComponentSelectItem (MEDIA, COMP_ECUTE4ROSE, TRUE); bRoseInstalled = TRUE; @@ -524,7 +525,7 @@ ComponentSelectItem (MEDIA, COMP_ECUTE4ROSE, FALSE); ComponentSelectItem (MEDIA, COMP_ROSE_FRAMEWORKS, FALSE); ComponentSelectItem (MEDIA, COMP_ECUTE4ROSE_TPL, FALSE); - ComponentSetData (MEDIA, COMP_ECUTE4ROSE, COMPONENT_FIELD_VISIBLE, FALSE, ""); + ComponentSetData (MEDIA, COMP_ECUTE4ROSE, COMPONENT_FIELD_VISIBLE, FALSE, ""); ComponentSetData (MEDIA, COMP_ROSE_FRAMEWORKS, COMPONENT_FIELD_VISIBLE, FALSE, ""); ComponentSetTarget (MEDIA, "<RoseDir>", TARGETDIR); bRoseInstalled = FALSE; @@ -563,7 +564,7 @@ if (!bRoseInstalled && !bRSAInstalled) then SdFinish ( "Rational product is not installled" , "Neither Rational Rose nor Rational Software Architect is installed." , - "Please, install either of these Rational products before installing eCute" , + "Please, install either of these Rational products before installing ECUTE" , "", "",bOpt1 ,bOpt2 ); bInstallAborted = TRUE; return -1; @@ -573,10 +574,10 @@ //Detect the old installation RegDBSetDefaultRoot ( HKEY_LOCAL_MACHINE ); - CRMKEY="SOFTWARE\\IBM\\Ecute"; + ECUTEKEY="SOFTWARE\\IBM\\Ecute"; //CRMKEY="SOFTWARE\\Rational Software\\Rose\\AddIns\\ecute"; - if (RegDBKeyExist ( CRMKEY)=1) then - RegDBGetKeyValueEx ( CRMKEY , "InstallDir" , rtype , svDir , nvSize ); + if (RegDBKeyExist ( ECUTEKEY)=1) then + RegDBGetKeyValueEx ( ECUTEKEY , "InstallDir" , rtype , svDir , nvSize ); //RegDBDeleteKey ( CRMKEY ); RegDBSetDefaultRoot ( HKEY_CLASSES_ROOT ); else @@ -917,3 +918,5 @@ + + Index: Setup.obs =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files/Setup.obs,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 Binary files /tmp/cvs3aGlBE and /tmp/cvsGaOGdn differ Index: Setup.ino =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files/Setup.ino,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 Binary files /tmp/cvsxLDixK and /tmp/cvsHuBLbt differ Index: Setup.dbg =================================================================== RCS file: /cvsroot/sblim/ecute/InstallShield55/ecute/Script Files/Setup.dbg,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 Binary files /tmp/cvs52DWBO and /tmp/cvsyKa2ix differ |
|
From: Benjamin B. <bg...@us...> - 2005-06-30 13:14:18
|
Update of /cvsroot/sblim/ecute In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14886 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/sblim/ecute/build.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- build.xml 29 Jun 2005 11:24:02 -0000 1.7 +++ build.xml 30 Jun 2005 13:14:08 -0000 1.8 @@ -96,9 +96,6 @@ <include name="plugin.xml"/> </fileset> </copy> - <copy todir="${output.Distribution}/eclipse/plugins/com.ibm.ecute_1.0.0/CMPITemplates"> - <fileset dir="Plugin/CMPITemplates"/> - </copy> <copy todir="${output.Distribution}/eclipse/plugins/com.ibm.ecute_1.0.0/icons/wizards"> <fileset dir="icons/wizards"/> </copy> |
|
From: Viktor M. <mih...@us...> - 2005-06-30 11:36:19
|
Update of /cvsroot/sblim/sfcb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23962 Modified Files: httpComm.c instance.c Log Message: Bugs fixed: 1230292 Compile errors. Index: httpComm.c =================================================================== RCS file: /cvsroot/sblim/sfcb/httpComm.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- httpComm.c 26 Jun 2005 21:52:08 -0000 1.3 +++ httpComm.c 30 Jun 2005 11:36:08 -0000 1.4 @@ -44,8 +44,7 @@ if (!SSL_library_init()) { fprintf(stderr, "** OpenSSL initialization failed!\n"); exit(-1); - }Frank Scheffler - * Contributions: + } SSL_load_error_strings(); RAND_load_file("/dev/urandom", 1024); } Index: instance.c =================================================================== RCS file: /cvsroot/sblim/sfcb/instance.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- instance.c 28 Jun 2005 20:36:09 -0000 1.7 +++ instance.c 30 Jun 2005 11:36:08 -0000 1.8 @@ -214,24 +214,34 @@ CMPIData data = { type, CMPI_goodValue, {0} }; int rc; - if (type == CMPI_chars) + if (type == CMPI_chars) { + /* VM: is this OK or do we need a __new copy */ data.value.chars = (char *) value; - else if (type == CMPI_string) { - if (value && value->string && value->string->hdl) - data.value.chars = (char *) value->string->hdl; - else data.value.chars=NULL; + if (value == NULL) { + data.state=CMPI_nullValue; + } + } else if (type == CMPI_string) { data.type=CMPI_chars; - data.state=CMPI_nullValue; - } - else if (type == CMPI_dateTime) { - if (value == NULL); - else { - data.state = CMPI_nullValue; - } - - else if (type == CMPI_sint64 || type == CMPI_uint64 || type == CMPI_real64) + if (value && value->string && value->string->hdl) { + /* VM: is this OK or do we need a __new copy */ + data.value.chars = (char *) value->string->hdl; + } else { + data.value.chars=NULL; + data.state=CMPI_nullValue; + } + } else if (type == CMPI_dateTime) { + if (value && value->dateTime) { + /* VM: is this OK or do we need a __new copy */ + data.value.dateTime = value->dateTime; + } else { + data.value.dateTime=NULL; + data.state=CMPI_nullValue; + } + } else if (type == CMPI_sint64 || type == CMPI_uint64 || type == CMPI_real64) { data.value = *value; - else data.value.Int = value->Int; + } else { + data.value.Int = value->Int; + } if (i->filtered == 0 || i->property_list == NULL || @@ -575,5 +585,5 @@ /*** Local Variables: ***/ /*** mode: C ***/ -/*** c-basic-offset: 8 ***/ +/*** c-basic-offset: 3 ***/ /*** End: ***/ |
|
From: Benjamin B. <bg...@us...> - 2005-06-29 11:24:12
|
Update of /cvsroot/sblim/ecute/rsaConfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8766/rsaConfig Modified Files: cmpiOutput.config Log Message: ECUTE 2.1 beta 1f: full CMPI provider generation support for RSA Index: cmpiOutput.config =================================================================== RCS file: /cvsroot/sblim/ecute/rsaConfig/cmpiOutput.config,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cmpiOutput.config 23 Jun 2005 08:17:00 -0000 1.1 +++ cmpiOutput.config 29 Jun 2005 11:24:03 -0000 1.2 @@ -1,12 +1,12 @@ #ECUTE -#Wed Jun 22 18:56:25 CEST 2005 +#Wed Jun 29 12:28:16 CEST 2005 inputPluginEnableRSA=true -CMPIProvidersOutputnameSpaceShadow=2 +CMPIProvidersOutputnameSpaceShadow=IBMShadow/cimv2 outputPluginEnableCMPIProvider=true RSAInputAllPackages=false -CMPIProvidersOutputnamespaceC=1 -RSAInputModel=C\:\\Documents and Settings\\Administrator\\IBM\\rationalsdp6.0\\runtime-workbench-workspace\\cisco\\test1.emx -RSAInputSelectedPackages=_8tgiodzmEdmAFMHJ-xtxjA|_8u1_YNzmEdmAFMHJ-xtxjA|_80YmsNzmEdmAFMHJ-xtxjA|_-lpwAdzmEdmAFMHJ-xtxjA|_76H949zmEdmAFMHJ-xtxjA -CMPIProvidersOutputnamespaceCommon=3 -CMPIProvidersOutputpath=C\:\\Documents and Settings\\Administrator\\My Documents\\CMPI2\\ +CMPIProvidersOutputnamespaceC=genProvider +RSAInputModel=C\:\\Documents and Settings\\Administrator\\IBM\\rationalsdp6.0\\runtime-workbench-workspace\\myCbC\\model+CIM.emx +RSAInputSelectedPackages=_b0iDUOfPEdm1ju-mdhomqw +CMPIProvidersOutputnamespaceCommon=root/cimv2 +CMPIProvidersOutputpath=C\:\\Documents and Settings\\Administrator\\My Documents\\CMPI\\RSA\\ RSAInputincludeQualifiers=true |
|
From: Benjamin B. <bg...@us...> - 2005-06-29 11:24:11
|
Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/plugins/output In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8766/Plugin/com/ibm/ecute/plugins/output Modified Files: CMPIProvidersPlugin.java Log Message: ECUTE 2.1 beta 1f: full CMPI provider generation support for RSA Index: CMPIProvidersPlugin.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/plugins/output/CMPIProvidersPlugin.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- CMPIProvidersPlugin.java 30 Dec 2004 13:32:58 -0000 1.5 +++ CMPIProvidersPlugin.java 29 Jun 2005 11:24:03 -0000 1.6 @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.TreeSet; +import com.ibm.ecute.EcuteEclipsePlugin; import com.ibm.ecute.EntryPoint; import com.ibm.ecute.UMLBuffer.UMLBuffer; import com.ibm.ecute.UMLBuffer.UMLTree.UMLClass; @@ -118,6 +119,18 @@ frame.setTaskPlugin(this); loadConfiguration(); + + // CMPI template path + String templatePath; + if(EntryPoint.isRunningFromEclipse()){ + templatePath = EcuteEclipsePlugin.getDefault().getInstallDirectory() + "CMPITemplates/"; + int index = templatePath.indexOf("/"); + templatePath = templatePath.substring(index+1); + } else { + //templatePath = "Plugin//CMPITemplates//"; + templatePath = "CMPITemplates//"; + } + try { generator = new CMPIProviderGenerator( @@ -125,7 +138,8 @@ path, namespaceC, namespaceCommon, - namespaceShadow); + namespaceShadow, + templatePath); } catch (Exception e1) { frame.addLine2Log(e1.toString()); if(!EntryPoint.isRunningFromEclipse()) @@ -136,7 +150,8 @@ frame.addLine2Log("***********************************************"); frame.addLine2Log("Generating CMPI Providers"); frame.addLine2Log("***********************************************"); - + //frame.addLine2Log(templatePath); + for (int i = 0; i < classes.size(); i++) { if (!generator.generateCode((UMLClass) classes.get(i))) { |
|
From: Benjamin B. <bg...@us...> - 2005-06-29 11:24:11
|
Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8766/Plugin/com/ibm/ecute/utils Modified Files: Constants.java Utils.java Log Message: ECUTE 2.1 beta 1f: full CMPI provider generation support for RSA Index: Utils.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/utils/Utils.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Utils.java 10 May 2005 09:11:53 -0000 1.2 +++ Utils.java 29 Jun 2005 11:24:03 -0000 1.3 @@ -173,7 +173,7 @@ public static String readFile(File theFile) { String result = ""; - if (theFile.canRead()) { + //if (theFile.canRead()) { try { FileReader input = new FileReader(theFile); BufferedReader filter = new BufferedReader(input); @@ -184,8 +184,8 @@ } catch (Exception e) { e.printStackTrace(); } - } else - System.out.println("File "+theFile.getName()+" does not exists"); + //} else + // System.out.println("File "+theFile.getName()+" does not exists"); return result;//.substring(0, result.length() - 2); } Index: Constants.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/utils/Constants.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Constants.java 23 Jun 2005 08:17:00 -0000 1.15 +++ Constants.java 29 Jun 2005 11:24:03 -0000 1.16 @@ -22,7 +22,7 @@ public class Constants { - public static final String pluginVersion="2.1 beta 1e"; + public static final String pluginVersion="2.1 beta 1f"; public static final String toolName="ECUTE"; public static final String qualifiersFileName="QualifiersList.txt"; |
|
From: Benjamin B. <bg...@us...> - 2005-06-29 11:24:11
|
Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8766/Plugin/com/ibm/ecute/rsa/ui/internal/wizards Modified Files: ExportCIMMOFWizardPage.java GenerateCMPIProvidersWizardPage.java Log Message: ECUTE 2.1 beta 1f: full CMPI provider generation support for RSA Index: ExportCIMMOFWizardPage.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards/ExportCIMMOFWizardPage.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ExportCIMMOFWizardPage.java 31 May 2005 15:48:50 -0000 1.11 +++ ExportCIMMOFWizardPage.java 29 Jun 2005 11:24:02 -0000 1.12 @@ -40,6 +40,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.WizardDataTransferPage; import org.eclipse.uml2.Model; +import org.eclipse.uml2.NamedElement; import org.eclipse.uml2.Package; import com.ibm.ecute.EcuteEclipsePlugin; @@ -171,8 +172,22 @@ packageList.add(package_.getQualifiedName()); packageTable.put(package_.getQualifiedName(), package_); } - }else{ + } else if (obj instanceof Model){ model = (Model)obj; + } else { + if(obj instanceof NamedElement){ + Object element = obj; + while(!(((NamedElement)element).getOwner() instanceof Package) && element != null){ + element = ((NamedElement)element).getOwner(); + } + Package package_ = (Package)((NamedElement)element).getOwner(); + if(model == null) + model = package_.getModel(); + if(package_.getModel().equals(model)){ + packageList.add(package_.getQualifiedName()); + packageTable.put(package_.getQualifiedName(), package_); + } + } } } for(int i = 0; i< packageList.size(); i++){ Index: GenerateCMPIProvidersWizardPage.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/rsa/ui/internal/wizards/GenerateCMPIProvidersWizardPage.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- GenerateCMPIProvidersWizardPage.java 23 Jun 2005 08:16:59 -0000 1.1 +++ GenerateCMPIProvidersWizardPage.java 29 Jun 2005 11:24:02 -0000 1.2 @@ -43,6 +43,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.WizardDataTransferPage; import org.eclipse.uml2.Model; +import org.eclipse.uml2.NamedElement; import org.eclipse.uml2.Package; import com.ibm.ecute.EcuteEclipsePlugin; @@ -199,8 +200,22 @@ packageList.add(package_.getQualifiedName()); packageTable.put(package_.getQualifiedName(), package_); } - }else{ + } else if (obj instanceof Model){ model = (Model)obj; + } else { + if(obj instanceof NamedElement){ + Object element = obj; + while(!(((NamedElement)element).getOwner() instanceof Package) && element != null){ + element = ((NamedElement)element).getOwner(); + } + Package package_ = (Package)((NamedElement)element).getOwner(); + if(model == null) + model = package_.getModel(); + if(package_.getModel().equals(model)){ + packageList.add(package_.getQualifiedName()); + packageTable.put(package_.getQualifiedName(), package_); + } + } } } for(int i = 0; i< packageList.size(); i++){ @@ -405,18 +420,21 @@ codeLabel.setText(CMPI_CODE); codeField = new Text(group, SWT.BORDER); + codeField.setText("genProvider"); codeField.addListener(SWT.Modify, this); repositoryLabel = new Label(group, 0); repositoryLabel.setText(CMPI_REP); repositoryField = new Text(group, SWT.BORDER); + repositoryField.setText("IBMShadow/cimv2"); repositoryField.addListener(SWT.Modify, this); cimmomLabel = new Label(group, 0); cimmomLabel.setText(CMPI_CIMMOM); cimmomField = new Text(group, SWT.BORDER); + cimmomField.setText("root/cimv2"); cimmomField.addListener(SWT.Modify, this); layoutDestinationGroup(); |
|
From: Benjamin B. <bg...@us...> - 2005-06-29 11:24:11
|
Update of /cvsroot/sblim/ecute In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8766 Modified Files: build.xml Log Message: ECUTE 2.1 beta 1f: full CMPI provider generation support for RSA Index: build.xml =================================================================== RCS file: /cvsroot/sblim/ecute/build.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- build.xml 12 May 2005 15:09:48 -0000 1.6 +++ build.xml 29 Jun 2005 11:24:02 -0000 1.7 @@ -4,7 +4,7 @@ <!-- If any from the following paths are not present Ecute will be constructed without Rose plugins--> - <property name="jacobPath" location="D:\jacob\jacob_1.8\jacob.jar"/> + <property name="jacobPath" location="C:\bender\ecute\ecute libraries\jacob_1.8\jacob.jar"/> <property name="RoseFrameworks" location="C:\Program Files\Rational\Rose\framework\frameworks"/> <!-- End of personalized configuration --> @@ -23,7 +23,7 @@ </not> </condition> <property name="output.Bin" location="bin"/> - <property name="output.Distribution" location="d:/ecute/distribution"/> + <property name="output.Distribution" location="c:/ecute/distribution"/> <property environment="env"/> <property name="output.install.linux" location="${env.baseRPM}/opt/ecute"/> @@ -96,6 +96,9 @@ <include name="plugin.xml"/> </fileset> </copy> + <copy todir="${output.Distribution}/eclipse/plugins/com.ibm.ecute_1.0.0/CMPITemplates"> + <fileset dir="Plugin/CMPITemplates"/> + </copy> <copy todir="${output.Distribution}/eclipse/plugins/com.ibm.ecute_1.0.0/icons/wizards"> <fileset dir="icons/wizards"/> </copy> |
|
From: Benjamin B. <bg...@us...> - 2005-06-29 11:24:11
|
Update of /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/plugins/output/funcionality In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8766/Plugin/com/ibm/ecute/plugins/output/funcionality Modified Files: CMPIProviderGenerator.java Log Message: ECUTE 2.1 beta 1f: full CMPI provider generation support for RSA Index: CMPIProviderGenerator.java =================================================================== RCS file: /cvsroot/sblim/ecute/Plugin/com/ibm/ecute/plugins/output/funcionality/CMPIProviderGenerator.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- CMPIProviderGenerator.java 8 Apr 2005 09:10:57 -0000 1.5 +++ CMPIProviderGenerator.java 29 Jun 2005 11:24:02 -0000 1.6 @@ -30,8 +30,11 @@ public class CMPIProviderGenerator { private static final String HAS_INSTANCESQUALIFIER = "IBM_HasInstances"; private static final String HAS_PROVIDERQUALIFIER = "IBM_HasProvider"; + //private static /*final*/ String TEMPLATES_PATH;// = + //"C://Program Files//IBM//Ecute//eclipse//plugins//com.ibm.ecute_1.0.0//CMPITemplates//"; //private static final String TEMPLATES_PATH = "Plugin//CMPITemplates//"; - private static final String TEMPLATES_PATH = "CMPITemplates//"; + //private static final String TEMPLATES_PATH = "CMPITemplates//"; + private String templatesPath; private String path; private ProgressFrame log; private UMLClass theClass; @@ -151,13 +154,16 @@ private String installMOFScriptLineTemplate; public CMPIProviderGenerator(ProgressFrame log, String path, - String nameSpaceC, String nameSpace, String nameSpaceShadow) + String nameSpaceC, String nameSpace, String nameSpaceShadow, + String templatesPath) throws Exception { this.path = path; this.log = log; this.nameSpaceC = nameSpaceC; this.nameSpace = nameSpace; this.nameSpaceShadow = nameSpaceShadow; + this.templatesPath = templatesPath; + //TEMPLATES_PATH = templatesPath; readTemplates(); rootMakeFile = makeFileRootTemplate; installMOFScript=installMOFScriptTemplate; @@ -296,201 +302,202 @@ return true; } private void readTemplates() { - factoryHTemplate = Utils.readFile(TEMPLATES_PATH + "Factory.h"); - factoryCPPTemplate = Utils.readFile(TEMPLATES_PATH + "Factory.cpp"); - fakeFactoryCPPTemplate = Utils.readFile(TEMPLATES_PATH + + factoryHTemplate = Utils.readFile(templatesPath + "Factory.h"); + factoryCPPTemplate = Utils.readFile(templatesPath + "Factory.cpp"); + fakeFactoryCPPTemplate = Utils.readFile(templatesPath + "fakeFactory.cpp"); - MOFRegistrationTemplate = Utils.readFile(TEMPLATES_PATH + MOFRegistrationTemplate = Utils.readFile(templatesPath + "mof//Registration.mof"); - PegasusMOFLoaderTemplate = Utils.readFile(TEMPLATES_PATH + PegasusMOFLoaderTemplate = Utils.readFile(templatesPath + "mof//makefile.pegasus"); - standaloneMOFLoaderTemplate = Utils.readFile(TEMPLATES_PATH + standaloneMOFLoaderTemplate = Utils.readFile(templatesPath + "mof//makefile.standalone"); - settingCMPITemplate = Utils.readFile(TEMPLATES_PATH + "setting.cmpi"); - makefileTemplate = Utils.readFile(TEMPLATES_PATH + "makefile"); - makefileSupportTemplate = Utils.readFile(TEMPLATES_PATH + settingCMPITemplate = Utils.readFile(templatesPath + "setting.cmpi"); + makefileTemplate = Utils.readFile(templatesPath + "makefile"); + makefileSupportTemplate = Utils.readFile(templatesPath + "makefile.support"); - includeHeaderTemplate = Utils.readFile(TEMPLATES_PATH + includeHeaderTemplate = Utils.readFile(templatesPath + "general//includeHeader"); //container - containerHGetterSetterTemplate = Utils.readFile(TEMPLATES_PATH + containerHGetterSetterTemplate = Utils.readFile(templatesPath + "containerH//getterSetter"); - containerHPrivateAttributeTemplate = Utils.readFile(TEMPLATES_PATH + containerHPrivateAttributeTemplate = Utils.readFile(templatesPath + "containerH//privateAttribute"); - containerHArraySizeTemplate = Utils.readFile(TEMPLATES_PATH + containerHArraySizeTemplate = Utils.readFile(templatesPath + "containerH//arraySize"); - containerHIsSetTemplate = Utils.readFile(TEMPLATES_PATH + containerHIsSetTemplate = Utils.readFile(templatesPath + "containerH//attributeIsSet"); - containerCPPGetterSetterTemplate = Utils.readFile(TEMPLATES_PATH + containerCPPGetterSetterTemplate = Utils.readFile(templatesPath + "containerCPP//getterSetter"); - containerCPPcopyArraySizeTemplate = Utils.readFile(TEMPLATES_PATH + containerCPPcopyArraySizeTemplate = Utils.readFile(templatesPath + "containerCPP//copyArraySize"); - containerCPPStringSetterTemplate = Utils.readFile(TEMPLATES_PATH + containerCPPStringSetterTemplate = Utils.readFile(templatesPath + "containerCPP//stringSetter"); - containerCPPInstanceSetterTemplate = Utils.readFile(TEMPLATES_PATH + containerCPPInstanceSetterTemplate = Utils.readFile(templatesPath + "containerCPP//instanceSetter"); - containerCPPDefaultSetterTemplate = Utils.readFile(TEMPLATES_PATH + containerCPPDefaultSetterTemplate = Utils.readFile(templatesPath + "containerCPP//defaultSetter"); - containerCPPDefaultArraySetterTemplate = Utils.readFile(TEMPLATES_PATH + containerCPPDefaultArraySetterTemplate = Utils.readFile(templatesPath + "containerCPP//defaultArraySetter"); - containerCPPStringArraySetterTemplate = Utils.readFile(TEMPLATES_PATH + containerCPPStringArraySetterTemplate = Utils.readFile(templatesPath + "containerCPP//stringArraySetter"); - containerCPPAttributeInitTemplate = Utils.readFile(TEMPLATES_PATH + containerCPPAttributeInitTemplate = Utils.readFile(templatesPath + "containerCPP//attributeInit"); - containerCPPAttributeSizeInitTemplate = Utils.readFile(TEMPLATES_PATH + containerCPPAttributeSizeInitTemplate = Utils.readFile(templatesPath + "containerCPP//attributeSizeInit"); - containerCPPCopyAttributeTemplate = Utils.readFile(TEMPLATES_PATH + containerCPPCopyAttributeTemplate = Utils.readFile(templatesPath + "containerCPP//copyAttribute"); - containerCPPDestructorTemplate = Utils.readFile(TEMPLATES_PATH + containerCPPDestructorTemplate = Utils.readFile(templatesPath + "containerCPP//destructor"); - containerCPPDestructorArrayTemplate = Utils.readFile(TEMPLATES_PATH + containerCPPDestructorArrayTemplate = Utils.readFile(templatesPath + "containerCPP//destructorArray"); containerCPPDestructorInstancesArrayTemplate = Utils - .readFile(TEMPLATES_PATH + .readFile(templatesPath + "containerCPP//destructorInstancesArray"); instanceNameCPPObjectPathConstructorTemplate = Utils - .readFile(TEMPLATES_PATH + .readFile(templatesPath + "InstanceNameCPP//objectPathConstructor"); instanceNameCPPObjectPathArrayConstructorTemplate = Utils - .readFile(TEMPLATES_PATH + .readFile(templatesPath + "InstanceNameCPP//objectPathArrayConstructor"); instanceNameCPPObjectPathEnumerationConstructorTemplate = Utils - .readFile(TEMPLATES_PATH + .readFile(templatesPath + "InstanceNameCPP//objectPathEnumerationConstructor"); - instanceNameCPPGetObjectPathTemplate = Utils.readFile(TEMPLATES_PATH + instanceNameCPPGetObjectPathTemplate = Utils.readFile(templatesPath + "InstanceNameCPP//getObjectPath"); - instanceNameCPPCmpiDataConstructor = Utils.readFile(TEMPLATES_PATH + instanceNameCPPCmpiDataConstructor = Utils.readFile(templatesPath + "InstanceNameCPP//cmpiDataConstructor"); - instanceNameCPPCmpiDataConstructor4Enum = Utils.readFile(TEMPLATES_PATH + instanceNameCPPCmpiDataConstructor4Enum = Utils.readFile(templatesPath + "InstanceNameCPP//cmpiDataConstructor4Enum"); //instanceName - instanceNameHTemplate = Utils.readFile(TEMPLATES_PATH + instanceNameHTemplate = Utils.readFile(templatesPath + "InstanceName.h"); - instanceNameCPPTemplate = Utils.readFile(TEMPLATES_PATH + instanceNameCPPTemplate = Utils.readFile(templatesPath + "InstanceName.cpp"); //instance - instanceHTemplate = Utils.readFile(TEMPLATES_PATH + "Instance.h"); - instanceCPPTemplate = Utils.readFile(TEMPLATES_PATH + "Instance.cpp"); - instanceCPPInstanceConstructorTemplate = Utils.readFile(TEMPLATES_PATH + instanceHTemplate = Utils.readFile(templatesPath + "Instance.h"); + instanceCPPTemplate = Utils.readFile(templatesPath + "Instance.cpp"); + instanceCPPInstanceConstructorTemplate = Utils.readFile(templatesPath + "InstanceCPP//instanceConstructor"); instanceCPPInstanceArrayConstructorTemplate = Utils - .readFile(TEMPLATES_PATH + .readFile(templatesPath + "InstanceCPP//instanceArrayConstructor"); instanceCPPInstanceEnumerationConstructorTemplate = Utils - .readFile(TEMPLATES_PATH + .readFile(templatesPath + "InstanceCPP//instanceEnumerationConstructor"); - instanceCPPGetInstanceTemplate = Utils.readFile(TEMPLATES_PATH + instanceCPPGetInstanceTemplate = Utils.readFile(templatesPath + "InstanceCPP//getInstance"); - instanceCPPCmpiDataConstructor = Utils.readFile(TEMPLATES_PATH + instanceCPPCmpiDataConstructor = Utils.readFile(templatesPath + "InstanceCPP//cmpiDataConstructor"); - instanceCPPCmpiDataConstructor4Enum = Utils.readFile(TEMPLATES_PATH + instanceCPPCmpiDataConstructor4Enum = Utils.readFile(templatesPath + "InstanceCPP//cmpiDataConstructor4Enum"); - makeFileRootTemplate = Utils.readFile(TEMPLATES_PATH + makeFileRootTemplate = Utils.readFile(templatesPath + "root//makefileALL"); - makeFileRootLineTemplate = Utils.readFile(TEMPLATES_PATH + makeFileRootLineTemplate = Utils.readFile(templatesPath + "root//makefileLine"); - makeFileRootPegasusTemplate = Utils.readFile(TEMPLATES_PATH + makeFileRootPegasusTemplate = Utils.readFile(templatesPath + "root//makefile.pegasus"); - makeFileRootStandAloneTemplate = Utils.readFile(TEMPLATES_PATH + makeFileRootStandAloneTemplate = Utils.readFile(templatesPath + "root//makefile.standalone"); - makeFileRootIBMQualifiersTemplate = Utils.readFile(TEMPLATES_PATH + makeFileRootIBMQualifiersTemplate = Utils.readFile(templatesPath + "root//IBMQualifiers.mof"); - makeFileRootRequiredQualifiersTemplate = Utils.readFile(TEMPLATES_PATH + makeFileRootRequiredQualifiersTemplate = Utils.readFile(templatesPath + "root//requiredQualifiers.mof"); - installMOFScriptTemplate=Utils.readFile(TEMPLATES_PATH + installMOFScriptTemplate=Utils.readFile(templatesPath + "root//installMOFScript.sh"); - installMOFScriptLineTemplate=Utils.readFile(TEMPLATES_PATH + installMOFScriptLineTemplate=Utils.readFile(templatesPath + "root//installMOFScriptLine"); - interfaceHTemplate = Utils.readFile(TEMPLATES_PATH + "interface.h"); - interfaceHExtrinsicMethodTemplate = Utils.readFile(TEMPLATES_PATH + interfaceHTemplate = Utils.readFile(templatesPath + "interface.h"); + interfaceHExtrinsicMethodTemplate = Utils.readFile(templatesPath + "interfaceH//extrinsicMethod"); - interfaceHMethodParameterTemplate = Utils.readFile(TEMPLATES_PATH + interfaceHMethodParameterTemplate = Utils.readFile(templatesPath + "interfaceH//methodParameter"); - interfaceHAssociationsTemplate = Utils.readFile(TEMPLATES_PATH + interfaceHAssociationsTemplate = Utils.readFile(templatesPath + "interfaceH//associations"); - interfaceHConstructorTemplate = Utils.readFile(TEMPLATES_PATH + interfaceHConstructorTemplate = Utils.readFile(templatesPath + "interfaceH//constructor"); - interfaceHInheritanceTemplate = Utils.readFile(TEMPLATES_PATH + interfaceHInheritanceTemplate = Utils.readFile(templatesPath + "interfaceH//inheritance"); - defaultImplementationCPPTemplate = Utils.readFile(TEMPLATES_PATH + defaultImplementationCPPTemplate = Utils.readFile(templatesPath + "DefaultImplementation.cpp"); defaultImplementationCPPAssociationsTemplate = Utils - .readFile(TEMPLATES_PATH + .readFile(templatesPath + "defaultImplementationCPP//associations"); defaultImplementationCPPExtrinsicMethodTemplate = Utils - .readFile(TEMPLATES_PATH + .readFile(templatesPath + "defaultImplementationCPP//extrinsicMethod"); - resourceAccessCPPTemplate = Utils.readFile(TEMPLATES_PATH + resourceAccessCPPTemplate = Utils.readFile(templatesPath + "resourceAccess.cpp"); - resourceAccessCPPAssociationsTemplate = Utils.readFile(TEMPLATES_PATH + resourceAccessCPPAssociationsTemplate = Utils.readFile(templatesPath + "resourceAccessCPP//associations"); resourceAccessCPPExtrinsicMethodTemplate = Utils - .readFile(TEMPLATES_PATH + "resourceAccessCPP//extrinsicMethod"); - resourceAccessCPPSetPropertyTemplate = Utils.readFile(TEMPLATES_PATH + .readFile(templatesPath + "resourceAccessCPP//extrinsicMethod"); + resourceAccessCPPSetPropertyTemplate = Utils.readFile(templatesPath + "resourceAccessCPP//setProperty"); resourceAccessCPPSizeDeclarationTemplate = Utils - .readFile(TEMPLATES_PATH + "resourceAccessCPP//sizeDeclaration"); - externalHTemplate = Utils.readFile(TEMPLATES_PATH + "external.h"); - externalHAssociationTemplate = Utils.readFile(TEMPLATES_PATH + .readFile(templatesPath + "resourceAccessCPP//sizeDeclaration"); + externalHTemplate = Utils.readFile(templatesPath + "external.h"); + externalHAssociationTemplate = Utils.readFile(templatesPath + "//externalH//association"); - externalCPPTemplate = Utils.readFile(TEMPLATES_PATH + "external.cpp"); - externalCPPAssociationTemplate = Utils.readFile(TEMPLATES_PATH + externalCPPTemplate = Utils.readFile(templatesPath + "external.cpp"); + externalCPPAssociationTemplate = Utils.readFile(templatesPath + "//externalCPP//association"); - repositoryExternalHTemplate = Utils.readFile(TEMPLATES_PATH + repositoryExternalHTemplate = Utils.readFile(templatesPath + "repositoryExternal.h"); - repositoryExternalCPPTemplate = Utils.readFile(TEMPLATES_PATH + repositoryExternalCPPTemplate = Utils.readFile(templatesPath + "repositoryExternal.cpp"); - CmpiProviderHTemplate = Utils.readFile(TEMPLATES_PATH + CmpiProviderHTemplate = Utils.readFile(templatesPath + "CmpiProvider.h"); - CmpiProviderHAssociationTemplate = Utils.readFile(TEMPLATES_PATH + CmpiProviderHAssociationTemplate = Utils.readFile(templatesPath + "CmpiProviderH//association"); - CmpiProviderCPPTemplate = Utils.readFile(TEMPLATES_PATH + CmpiProviderCPPTemplate = Utils.readFile(templatesPath + "CmpiProvider.cpp"); - CmpiProviderCPPAssociationTemplate = Utils.readFile(TEMPLATES_PATH + CmpiProviderCPPAssociationTemplate = Utils.readFile(templatesPath + "CmpiProviderCPP//association"); - CmpiProviderCPPFactoryMacroTemplate = Utils.readFile(TEMPLATES_PATH + CmpiProviderCPPFactoryMacroTemplate = Utils.readFile(templatesPath + "CmpiProviderCPP//factoryMacro"); - CmpiProviderCPPmethodIfTemplate = Utils.readFile(TEMPLATES_PATH + CmpiProviderCPPmethodIfTemplate = Utils.readFile(templatesPath + "CmpiProviderCPP//methodIf"); - CmpiProviderCPPParameterTemplate = Utils.readFile(TEMPLATES_PATH + CmpiProviderCPPParameterTemplate = Utils.readFile(templatesPath + "CmpiProviderCPP//parameter"); - CmpiProviderCPPParameterCallTemplate = Utils.readFile(TEMPLATES_PATH + CmpiProviderCPPParameterCallTemplate = Utils.readFile(templatesPath + "CmpiProviderCPP//parameterCall"); - CmpiProviderCPPShadowCopyTemplate = Utils.readFile(TEMPLATES_PATH + CmpiProviderCPPShadowCopyTemplate = Utils.readFile(templatesPath + "CmpiProviderCPP//shadowCopy"); - CmpiProviderCPPObjectPathParameter = Utils.readFile(TEMPLATES_PATH + CmpiProviderCPPObjectPathParameter = Utils.readFile(templatesPath + "CmpiProviderCPP//objectPathParameter"); - CmpiProviderCPPEnumerationParameter = Utils.readFile(TEMPLATES_PATH + CmpiProviderCPPEnumerationParameter = Utils.readFile(templatesPath + "CmpiProviderCPP//enumerationParameter"); - CmpiProviderCPPArrayParameter = Utils.readFile(TEMPLATES_PATH + CmpiProviderCPPArrayParameter = Utils.readFile(templatesPath + "CmpiProviderCPP//arrayParameter"); - CmpiProviderCPPDeleteArrayParameter = Utils.readFile(TEMPLATES_PATH + CmpiProviderCPPDeleteArrayParameter = Utils.readFile(templatesPath + "CmpiProviderCPP//deleteArrayParameter"); CmpiProviderCPPDeleteArrayStringParameter = Utils - .readFile(TEMPLATES_PATH + "CmpiProviderCPP//deleteArrayString"); - CmpiProviderCPPReturnArgTemplate = Utils.readFile(TEMPLATES_PATH + .readFile(templatesPath + "CmpiProviderCPP//deleteArrayString"); + CmpiProviderCPPReturnArgTemplate = Utils.readFile(templatesPath + "CmpiProviderCPP//returnArg"); - CmpiProviderCPPStringParameter = Utils.readFile(TEMPLATES_PATH + CmpiProviderCPPStringParameter = Utils.readFile(templatesPath + "CmpiProviderCPP//stringParameter"); - CmpiProviderCPPConstStringParameter = Utils.readFile(TEMPLATES_PATH + CmpiProviderCPPConstStringParameter = Utils.readFile(templatesPath + "CmpiProviderCPP//constStringParameter"); - CmpiProviderCPPNonInParameterParameter = Utils.readFile(TEMPLATES_PATH + CmpiProviderCPPNonInParameterParameter = Utils.readFile(templatesPath + "CmpiProviderCPP//nonInParameter"); - CmpiProviderCPPParameterSizeTemplate = Utils.readFile(TEMPLATES_PATH + CmpiProviderCPPParameterSizeTemplate = Utils.readFile(templatesPath + "CmpiProviderCPP//parameterSize"); - settingProviderTemplate = Utils.readFile(TEMPLATES_PATH + settingProviderTemplate = Utils.readFile(templatesPath + "setting.provider"); - converterTemplate = Utils.readFile(TEMPLATES_PATH + "converter.h"); + converterTemplate = Utils.readFile(templatesPath + "converter.h"); - supportCmpiErrorFormaterHTemplate = Utils.readFile(TEMPLATES_PATH + supportCmpiErrorFormaterHTemplate = Utils.readFile(templatesPath + "support/CmpiErrorFormater.h"); - supportCmpiErrorFormaterCPPTemplate = Utils.readFile(TEMPLATES_PATH + supportCmpiErrorFormaterCPPTemplate = Utils.readFile(templatesPath + "support/CmpiErrorFormater.cpp"); - supportArrayConverterHTemplate = Utils.readFile(TEMPLATES_PATH + supportArrayConverterHTemplate = Utils.readFile(templatesPath + "support/ArrayConverter.h"); - supportArrayConverterCPPTemplate = Utils.readFile(TEMPLATES_PATH + supportArrayConverterCPPTemplate = Utils.readFile(templatesPath + "support/ArrayConverter.cpp"); - supportMakefileTemplate = Utils.readFile(TEMPLATES_PATH + supportMakefileTemplate = Utils.readFile(templatesPath + "support/makefile"); } private String CMPIType(String cimType, boolean isArray) { |
