ccmtools-cvs — Notification of CVS commits for the CCM Tools

[ccmtools-cvs] ccmtools/src-test/ccmtools/parser/idl/component ComponentTest.java, 1.1, 1.2

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/component
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src-test/ccmtools/parser/idl/component

Modified Files:
	ComponentTest.java 
Log Message:
Refactored IDL parser to support different PreProcessor implementations

Index: ComponentTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/component/ComponentTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ComponentTest.java	8 Nov 2006 17:07:43 -0000	1.1
--- ComponentTest.java	18 Jan 2007 17:11:59 -0000	1.2
***************
*** 10,14 ****
  import ccmtools.metamodel.BaseIDL.MContainer;
  import ccmtools.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.parser.idl.ParserHelper;
  import ccmtools.ui.ConsoleDriver;
  import ccmtools.ui.UserInterfaceDriver;
--- 10,14 ----
  import ccmtools.metamodel.BaseIDL.MContainer;
  import ccmtools.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.parser.idl.ParserManager;
  import ccmtools.ui.ConsoleDriver;
  import ccmtools.ui.UserInterfaceDriver;
***************
*** 36,40 ****
      {
          System.out.println("[" + sourceCode + "]");
!         MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode);
          List modelElements = ccmModel.getContentss();
          System.out.println(modelElements);
--- 36,40 ----
      {
          System.out.println("[" + sourceCode + "]");
!         MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode);
          List modelElements = ccmModel.getContentss();
          System.out.println(modelElements);
***************
*** 46,50 ****
      {
          System.out.println("[" + sourceCode + "]");
!         MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode);
          List modelElements = ccmModel.getContentss();
          System.out.println("#" + modelElements.size() + ":  " + modelElements);
--- 46,50 ----
      {
          System.out.println("[" + sourceCode + "]");
!         MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode);
          List modelElements = ccmModel.getContentss();
          System.out.println("#" + modelElements.size() + ":  " + modelElements);

[ccmtools-cvs] ccmtools/src-test/ccmtools/parser/idl/constant ConstantTest.java, 1.2, 1.3

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/constant
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src-test/ccmtools/parser/idl/constant

Modified Files:
	ConstantTest.java 
Log Message:
Refactored IDL parser to support different PreProcessor implementations

Index: ConstantTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/constant/ConstantTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConstantTest.java	21 Nov 2006 14:37:47 -0000	1.2
--- ConstantTest.java	18 Jan 2007 17:11:57 -0000	1.3
***************
*** 10,14 ****
  import ccmtools.metamodel.BaseIDL.MContained;
  import ccmtools.metamodel.BaseIDL.MContainer;
! import ccmtools.parser.idl.ParserHelper;
  import ccmtools.ui.ConsoleDriver;
  import ccmtools.ui.UserInterfaceDriver;
--- 10,14 ----
  import ccmtools.metamodel.BaseIDL.MContained;
  import ccmtools.metamodel.BaseIDL.MContainer;
! import ccmtools.parser.idl.ParserManager;
  import ccmtools.ui.ConsoleDriver;
  import ccmtools.ui.UserInterfaceDriver;
***************
*** 37,41 ****
      {
          System.out.println("[" + sourceCode + "]");
!         MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode);
          List modelElements = ccmModel.getContentss();
          MConstantDef constant = (MConstantDef)modelElements.get(0);            
--- 37,41 ----
      {
          System.out.println("[" + sourceCode + "]");
!         MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode);
          List modelElements = ccmModel.getContentss();
          MConstantDef constant = (MConstantDef)modelElements.get(0);            
***************
*** 48,52 ****
          UserInterfaceDriver uiDriver= new ConsoleDriver();
          System.out.println("[" + sourceCode + "]");
!         MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode);
          List modelElements = ccmModel.getContentss();
          System.out.println("#" + modelElements.size() + ":  " + modelElements);
--- 48,52 ----
          UserInterfaceDriver uiDriver= new ConsoleDriver();
          System.out.println("[" + sourceCode + "]");
!         MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode);
          List modelElements = ccmModel.getContentss();
          System.out.println("#" + modelElements.size() + ":  " + modelElements);

[ccmtools-cvs] ccmtools/src-test/ccmtools/parser/idl/exception ExceptionTest.java, 1.1, 1.2

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/exception
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src-test/ccmtools/parser/idl/exception

Modified Files:
	ExceptionTest.java 
Log Message:
Refactored IDL parser to support different PreProcessor implementations

Index: ExceptionTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/exception/ExceptionTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExceptionTest.java	8 Nov 2006 10:31:50 -0000	1.1
--- ExceptionTest.java	18 Jan 2007 17:11:58 -0000	1.2
***************
*** 9,13 ****
  import ccmtools.metamodel.BaseIDL.MExceptionDef;
  import ccmtools.metamodel.BaseIDL.MFieldDef;
! import ccmtools.parser.idl.ParserHelper;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  import ccmtools.ui.ConsoleDriver;
--- 9,13 ----
  import ccmtools.metamodel.BaseIDL.MExceptionDef;
  import ccmtools.metamodel.BaseIDL.MFieldDef;
! import ccmtools.parser.idl.ParserManager;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  import ccmtools.ui.ConsoleDriver;
***************
*** 61,65 ****
      {
          System.out.println("[" + sourceCode + "]");
!         MContainer ccmModel = ParserHelper.getInstance().loadCcmModel(uiDriver, sourceCode);
          List modelElements = ccmModel.getContentss();
          System.out.println(modelElements);
--- 61,65 ----
      {
          System.out.println("[" + sourceCode + "]");
!         MContainer ccmModel = ParserManager.loadCcmModel(uiDriver, sourceCode);
          List modelElements = ccmModel.getContentss();
          System.out.println(modelElements);

[ccmtools-cvs] ccmtools/src-test/ccmtools/parser/cpp CppTest.java, NONE, 1.1

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/cpp
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src-test/ccmtools/parser/cpp

Added Files:
	CppTest.java 
Log Message:
Refactored IDL parser to support different PreProcessor implementations

--- NEW FILE: CppTest.java ---
package ccmtools.parser.cpp;

import java.io.File;
import java.io.IOException;
import java.util.Hashtable;
import java.util.Vector;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;


/**
 * Here we test a Java implementation of a simple C PreProcessor (cpp) stolen from
 * the http://jonathan.objectweb.org/ project (org.objectweb.jonathan.tools.JPP). 
 * 
 * Bugs: 
 *  - There must be a space between #include and "" (e.g. #include"xy.idl" is an error)
 *  
 */
public class CppTest 
	extends TestCase
{
	private String ccmtoolsDir;
	private String testDir;

	public CppTest(String name)
	{
		super(name);
		ccmtoolsDir = System.getProperty("user.dir");
		testDir = ccmtoolsDir + File.separator + "test" + File.separator + "CppGenerator";
	}
	
    public static Test suite()
    {
    	    return new TestSuite(CppTest.class);
    }

    
    // ------------------------------------------------------------------------
    // C Preprocessor Test
    // ------------------------------------------------------------------------

    public void testIncludeNested() throws IOException
    {
        String inputDir = testDir + File.separator + "include_nested";
        String inputFile = inputDir + File.separator + "Hello.idl";
        String includePath = inputDir;
        
        Vector includes = new Vector();
        includes.add(includePath);
        
        Hashtable names = new Hashtable();
        
        JPP jpp = new JPP(inputFile, System.out, includes, names);
        jpp.preprocess();

        
    }
}

[ccmtools-cvs] ccmtools/src/ccmtools/parser/cpp CppManager.java, NONE, 1.1 ExternalCpp.java, NONE, 1.1 JPP.java, NONE, 1.1 InternalCpp.java, NONE, 1.1 PreProcessor.java, NONE, 1.1

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/cpp
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3173/src/ccmtools/parser/cpp

Added Files:
	CppManager.java ExternalCpp.java JPP.java InternalCpp.java 
	PreProcessor.java 
Log Message:
Refactored IDL parser to support different PreProcessor implementations

--- NEW FILE: JPP.java ---
/***
 * Jonathan: an Open Distributed Processing Environment 
 *
 * The contents of this file are subject to the JOnAS Public License Version 
 * 1.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License on the JOnAS web site. *
 * Software distributed under the License is distributed on an "AS IS" basis,
 * WITHOUT WARRANTY OF ANY KIND, either express or implied.
 * See the License for the specific terms governing rights and limitations under 
 * the License. 
 *
 * The Original Code is JOnAS application server code released July 1999. 
 *
 * The Initial Developer of the Original Code is Bull S.A.
 * The Original Code and portions created by Bull S.A. are
 *    Copyright (C) 1999 Bull S.A. All Rights Reserved. 
 *
 * Contributor(s): Fran?ois Horn (rewrite for Jonathan). 
 */
package ccmtools.parser.cpp;

import java.io.*;
import java.util.Enumeration;
import java.util.StringTokenizer;
import java.util.Hashtable;
import java.util.Vector;
import java.util.Stack;

/**
 * JPP as Java PreProcessor.
 * This class allows to preprocess a jpp file included the directives
 * <ul>
 * <li>
 * #include
 * <li>
 * #ifdef
 * <li>
 * #ifndef
 * <li>
 * #else
 * <li>
 * #endif
 * </ul>
 */

public class JPP {
   private static final int JPP_INST_NB = 9;
   public static final int NO_JPP_INST = -1;
   public static final int INST_INCLUDE = 0;
   public static final int INST_DEFINE  = 1;
   public static final int INST_IFDEF   = 2;
   public static final int INST_IFNDEF  = 3;
   public static final int INST_IF      = 4;
   public static final int INST_ELSE    = 5;
   public static final int INST_ELIF    = 6;
   public static final int INST_ENDIF   = 7;
   public static final int INST_UNDEF   = 8;

   public static final int BUFSIZE = 1024;

   static final String[] INST_TOKEN =
      { "#include","#define","#ifdef","#ifndef","#if","#else","#elif","#endif","#undef" };
   
   private static final String JAVA_DELIM = " \t\n\r;,.{}()[]+-*/%<>=&|!?:#";

   private static final String NULLSTRING = "";
   private static final Object NULLSCOPE = new Object();
   private static final Object IFSCOPE = new Object();
   private static final Object ELSESCOPE = new Object();

   Hashtable defined_names = new Hashtable();
   int nb_defs = 0;
   
   private static int jppToken(String nm) {
      for (int i = 0;i<JPP_INST_NB;i++) if (nm.startsWith(INST_TOKEN[i])) return i;
      return -1;
   }

   private JPPExpandedStream jpp_fIn;
   private OutputStream jpp_fOut;
   private int errorNumber = 0;

   /* *************************************************************************
    * This included class provides an inputstream offering a readLine() method 
    * and  handling #include directives.
    ************************************************************************* */

   static class JPPExpandedStream {   
      Vector iDirs = null;
      
      Stack fStack = null;
      Stack nameStack = null;
      Stack nbStack  = null;
      
      DataInputStream fCur = null;
      String nameCur = null;
      int nbCur = -1;
      
      
      JPPExpandedStream (String fileName, Vector includeDirs)  throws java.io.IOException {
         fCur = new DataInputStream(new BufferedInputStream(new FileInputStream(fileName)));
         iDirs = includeDirs;
         fStack = new Stack();
         nameStack = new Stack();
         nbStack = new Stack();
         nameCur = fileName;
         nbCur = 0;
      }
      
      String  readLine() throws java.io.IOException {
         String line = fCur.readLine();
         nbCur++;
         
         if (line == null) {
            if (!fStack.empty()) {
               fCur.close();
               nbCur = ((Integer) nbStack.pop()).intValue();
               line = "# "+nbCur+" "+"\""+nameCur+"\""+"      2";
               nameCur = (String) nameStack.pop();
               fCur = (DataInputStream) fStack.pop();
            }
         } else {
            if (line.startsWith("#include")) {
               String fiName;
               StringTokenizer stLine = new StringTokenizer(line);
               stLine.nextToken();
               fiName = stLine.nextToken();
               fiName = this.includeFileName(fiName.substring(1,fiName.length()-1));
               
               if (fiName == null) {
                  System.out.println("Unknown include file : "+fiName);
                  return "";
               }
               else {
                  fStack.push(fCur);
                  nameStack.push(nameCur);
                  nbStack.push(new Integer(nbCur));
                  
                  fCur = new DataInputStream(new BufferedInputStream(new FileInputStream(fiName)));
                  nameCur = new String(fiName);
                  line = "# "+nbCur+" "+"\""+fiName+"\""+"      1";
                  nbCur = 0;
               }
            }
         }
         
         return(line);
      }
      
      private String includeFileName(String fName) {
         String fiName = null;
         Enumeration dirs = iDirs.elements();
         while (dirs.hasMoreElements()) {
            fiName = new String((String)dirs.nextElement()+File.separatorChar+fName);
            File f = new File(fiName);
            if (f.exists()) return fiName;
         }
         return(null);
      }
      
      String getFileName() { return(nameCur); }
      int getLineNumber() { return(nbCur); } 
      void close()  throws java.io.IOException { fCur.close(); }  
   }

   /* *************************************************************************
    * This included class provides an inputstream offering a readLine() method.
    ************************************************************************* */

   static class JPPInputStream extends FilterInputStream {
      public static final int BUFSIZE = 1024;
      public static final String NULLSTRING = "";
      
      byte[] buffer = new byte[BUFSIZE];
      boolean isMacFile;
      
      public JPPInputStream(InputStream iS,boolean isM) { super(iS);  isMacFile = isM; }
      public JPPInputStream(InputStream iS) { this(iS,false); }
      
      public int read() throws IOException {
         return super.read();
      }
      
      public String readLine() throws IOException {
         int i = readLine(buffer);
         if (i == -1) return null;
         else return new String(buffer,0,i);
      }
      
      public int readLine(byte[] buf) throws IOException {
         boolean escaped = false;
         boolean CRLFEscaped = false;
         boolean endWhile = false;
         int i = -1,car = 0,maxL = buf.length-1;
         
         while(!endWhile && i<maxL && (car = read())!= -1) {
            switch(car) {
               default :
                  if (escaped) {
                     buf[++i] = (byte) '\\';
                     escaped = false;
                  }
                  buf[++i] = (byte) car;
                  if (CRLFEscaped) CRLFEscaped = false;
                  break;
               case '\\' :
                  if (escaped) {
                     buf[++i] = (byte) '\\';
                     buf[++i] = (byte) '\\';
                  }
                  escaped = !escaped; 
                  if (CRLFEscaped) CRLFEscaped = false;
                  break;    
               case '\r' : case '\n' :
                  if (!escaped) {
                     if (!CRLFEscaped) endWhile = true;
                     else CRLFEscaped = false;
                  } 
                  else if (!CRLFEscaped) CRLFEscaped = true;
                  else CRLFEscaped = false;
                  break;
            }
         }
         if (i>= 0 || endWhile) return i+1; else return -1;
      }
   }
   
   /**
    * JPP Constructor
    *
    * @param    fileNameIn     path of the jpp file
    * @param    outputStream   outputStream where to send the result
    * @param    includeDirs    list of the 'include' directories
    * @param    definedNames   list of the defined names
    */

   public JPP(String fileNameIn, OutputStream outS, Vector includeDirs, Hashtable defNames) 
      throws java.io.IOException {
      jpp_fIn  = new JPPExpandedStream(fileNameIn, includeDirs);
      jpp_fOut = outS;
      defined_names = defNames;
   }

   public boolean preprocess() throws java.io.IOException {
      String line = null;
      int negTest = 0,posTest = 0;
      Stack ifScope = new Stack();
      Object curScope = NULLSCOPE;
      ifScope.push(curScope);

      while(true) {
         line = jpp_fIn.readLine();
         if (line == null) {
            jpp_fIn.close();
            return (errorNumber == 0);
         }
         
         StringTokenizer stLine;
         String nom1,nom2;
         
         switch(jppToken(line)) {
            case INST_DEFINE :
               if (negTest>0) break;
               stLine = new StringTokenizer(line.trim());
               stLine.nextToken();
               if (stLine.hasMoreTokens()) nom1 = stLine.nextToken();
               else {
                  printErrorMsg(jpp_fIn,"illegal empty definition of preprocessor variable",true);
                  break;
               }
               if (stLine.hasMoreTokens()) {
                  nom2 = stLine.nextToken();
                  while (stLine.hasMoreTokens()) nom2 = nom2 + " " + stLine.nextToken();
               } else {
                  nom2 = NULLSTRING;
               }
               if (defined_names.containsKey(nom1)) {
                  printErrorMsg(jpp_fIn,"redefinition of preprocessor variable : "+nom1,false);
               } else {
                  nb_defs++;
               }
               defined_names.put(nom1,nom2);
               break;
            case INST_UNDEF :
               if (negTest>0) break;
               stLine = new StringTokenizer(line);
               stLine.nextToken(); 
               if (stLine.hasMoreTokens()) nom1 = stLine.nextToken();
               else {
                  printErrorMsg(jpp_fIn,"illegal empty (un)definition of preprocessor variable",true);
                  break;
               }
               if (defined_names.containsKey(nom1)) {
                  defined_names.remove(nom1);
                  nb_defs--;
               } else {
                  printErrorMsg(jpp_fIn,"(un)definition of unknown preprocessor variable : "+nom1,false);
               }
               break;
            case INST_IFDEF :
               curScope = IFSCOPE;
               ifScope.push(curScope);
               if (negTest>0) { negTest++; break; }
               stLine = new StringTokenizer(line);
               stLine.nextToken(); 
               if (stLine.hasMoreTokens()) nom1 = stLine.nextToken();
               else {
                  printErrorMsg(jpp_fIn,"illegal empty #ifdef test of preprocessor variable",true);
                  break;
               }
               if (defined_names.containsKey(nom1)) posTest++;  else negTest++;
               break;
            case INST_IFNDEF :
               curScope = IFSCOPE;
               ifScope.push(curScope);
               if (negTest>0) { negTest++; break; }
               stLine = new StringTokenizer(line);
               stLine.nextToken(); 
               if (stLine.hasMoreTokens()) nom1 = stLine.nextToken();
               else {
                  printErrorMsg(jpp_fIn,"illegal empty #ifndef test of preprocessor variable",true);
                  break;
               }
               if (!defined_names.containsKey(nom1)) posTest++;  else negTest++;
               break;
            case INST_IF :
               printErrorMsg(jpp_fIn,"unsupported #if processor directive ",true);
               break;
            case INST_ENDIF :
               if (curScope == NULLSCOPE) {
                  printErrorMsg(jpp_fIn,"unbalanced #endif processor directive ",true);
                  break;
               }
               curScope =ifScope.pop();
               if (negTest>0) negTest--;
               else if (posTest>0) posTest--;
               break;
            case INST_ELIF :
               printErrorMsg(jpp_fIn,"unsupported #elif processor directive ",true);
               break;
            case INST_ELSE :
               if (curScope != IFSCOPE) {
                  printErrorMsg(jpp_fIn,"unbalanced #else processor directive ",true);
                  break;
               }
               ifScope.pop();
               curScope = ELSESCOPE;
               ifScope.push(curScope);
               if (negTest>0) negTest--;
               else { negTest++; posTest--; }
               break;
            case NO_JPP_INST :
               if (negTest>0) break;
               if (nb_defs == 0) {
                  jpp_fOut.write(line.getBytes());
                  jpp_fOut.write('\n');
               }
               else {
                  stLine = new StringTokenizer(line.trim(),JAVA_DELIM,true);
                  String line2;
                  if (stLine.hasMoreTokens()) {
                     line2 = "";
                     while (stLine.hasMoreTokens()) {
                        String tok2 = stLine.nextToken();
                        String tok3 = (String) defined_names.get(tok2);
                        if (tok3 == null) line2 = line2+tok2;
                        else line2 = line2+tok3;
                     }
                     jpp_fOut.write(line2.getBytes());
                  }
                  jpp_fOut.write('\n');
               }
               break; 
            case INST_INCLUDE :
               printErrorMsg(jpp_fIn,"preprocessor ERROR : unexpected #include directive",true);
         }
      }
   }

   void printErrorMsg(JPPExpandedStream jE,String msg,boolean isErr) {
      System.out.println("File "+jE.getFileName()+" at line "+jE.getLineNumber()+" : "+msg);
      if (isErr) errorNumber++;
   }
}

--- NEW FILE: InternalCpp.java ---
package ccmtools.parser.cpp;

import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
import java.util.Hashtable;
import java.util.List;
import java.util.Vector;

import ccmtools.CcmtoolsException;
import ccmtools.ui.UserInterfaceDriver;

public class InternalCpp
    implements PreProcessor
{
    public void process(UserInterfaceDriver uiDriver, String idlFileName, List<String> includes) 
        throws CcmtoolsException
    {
        try
        {
            File idlFile = new File(idlFileName);
            File tmpIdlFile = new File(idlFileName + ".tmp");
            OutputStream out = new FileOutputStream(tmpIdlFile);
            uiDriver.printMessage("use internal preprocessor: " + idlFile);
            JPP jpp = new JPP(idlFile.getAbsolutePath(), out, new Vector(includes), new Hashtable());
            jpp.preprocess();
            out.close();
        }
        catch (Exception e)
        {
            e.printStackTrace();
            throw new CcmtoolsException("[Internal preprocessor] " + e.getMessage());
        }
    }
}

--- NEW FILE: ExternalCpp.java ---
package ccmtools.parser.cpp;

import java.io.BufferedReader;
import java.io.File;
import java.io.FileWriter;
import java.io.InputStreamReader;
import java.util.List;

import ccmtools.CcmtoolsException;
import ccmtools.ui.UserInterfaceDriver;
import ccmtools.utils.ConfigurationLocator;

public class ExternalCpp
    implements PreProcessor
{
    
    public void process(UserInterfaceDriver uiDriver, String idlFileName, List<String> includes) 
        throws CcmtoolsException
    {
        File idlFile = new File(idlFileName);
        File tmpIdlFile = new File(idlFileName + ".tmp");
        try
        {
            // Run a C preprocessor on the input file, in a separate process.
            StringBuffer cmd = new StringBuffer();
            cmd.append(ConfigurationLocator.getInstance().get("ccmtools.cpp"));
            cmd.append(" ");
            for (String includePath : includes)
            {
                cmd.append("-I").append(includePath).append(" ");
            }
            cmd.append(idlFile.getAbsolutePath());
            uiDriver.printMessage("use external preprocessor: " + cmd.toString()); // print cpp command line

            Process preproc = Runtime.getRuntime().exec(cmd.toString());
            BufferedReader stdInput = new BufferedReader(new InputStreamReader(preproc.getInputStream()));
            BufferedReader stdError = new BufferedReader(new InputStreamReader(preproc.getErrorStream()));

            // Read the output and any errors from the command
            String s;
            StringBuffer code = new StringBuffer();
            while ((s = stdInput.readLine()) != null)
            {
                code.append(s).append("\n");
            }
            while ((s = stdError.readLine()) != null)
            {
                uiDriver.printMessage(s);
            }

            // Wait for the process to complete and evaluate the return
            // value of the attempted command
            preproc.waitFor();
            if (preproc.exitValue() != 0)
            {
                throw new CcmtoolsException("Preprocessor Error: Please verify your include paths or file names (" 
                        + idlFileName + ")!!");
            }
            else
            {
                uiDriver.println("writing " + tmpIdlFile);
                FileWriter writer = new FileWriter(tmpIdlFile);
                writer.write(code.toString(), 0, code.toString().length());
                writer.close();
            }            
        }
        catch (Exception e)
        {
            throw new CcmtoolsException(e.getMessage());
        }
    }
}

--- NEW FILE: PreProcessor.java ---
package ccmtools.parser.cpp;

import java.util.List;

import ccmtools.CcmtoolsException;
import ccmtools.ui.UserInterfaceDriver;

public interface PreProcessor
{
    void process(UserInterfaceDriver uiDriver, String sourceFileName, List<String> includes)
        throws CcmtoolsException;
}

--- NEW FILE: CppManager.java ---
package ccmtools.parser.cpp;

import ccmtools.utils.ConfigurationLocator;

public class CppManager
{
    public static PreProcessor createCpp()
    {
        if (ConfigurationLocator.getInstance().get("ccmtools.cpp").length() != 0)
        {
            return new ExternalCpp();
        }
        else
        {
            return new InternalCpp();
        }
    }    
}

[ccmtools-cvs] ccmtools/src/ccmtools/parser/cpp - New directory

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/cpp
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3119/src/ccmtools/parser/cpp

Log Message:
Directory /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/cpp added to the repository

[ccmtools-cvs] ccmtools/src-test/ccmtools/parser/cpp - New directory

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/cpp
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3119/src-test/ccmtools/parser/cpp

Log Message:
Directory /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/cpp added to the repository

[ccmtools-cvs] ccmtools/test/manual - New directory

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/manual
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32546/test/manual

Log Message:
Directory /cvsroot/ccmtools/ccmtools/test/manual added to the repository

[ccmtools-cvs] ccmtools/test/manual/Login/java - New directory

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/manual/Login/java
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv32546/test/manual/Login/java

Log Message:
Directory /cvsroot/ccmtools/ccmtools/test/manual/Login/java added to the repository

[ccmtools-cvs] ccmtools/doc/DevelopmentNotes CcmMetamodelBugs, 1.1, 1.2 Idl3ParserBugs, 1.2, NONE

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/doc/DevelopmentNotes
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6663/doc/DevelopmentNotes

Modified Files:
	CcmMetamodelBugs 
Removed Files:
	Idl3ParserBugs 
Log Message:
Added development notes

Index: CcmMetamodelBugs
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/doc/DevelopmentNotes/CcmMetamodelBugs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CcmMetamodelBugs	27 Jul 2006 14:19:58 -0000	1.1
--- CcmMetamodelBugs	18 Jan 2007 10:19:13 -0000	1.2
***************
*** 12,14 ****
  	no exceptions.
  	
- o) 	
\ No newline at end of file
--- 12,13 ----

--- Idl3ParserBugs DELETED ---

[ccmtools-cvs] ccmtools/doc/DevelopmentNotes/JetTemplates JetTemplatesHowTo.txt, NONE, 1.1

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/doc/DevelopmentNotes/JetTemplates
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6663/doc/DevelopmentNotes/JetTemplates

Added Files:
	JetTemplatesHowTo.txt 
Log Message:
Added development notes

--- NEW FILE: JetTemplatesHowTo.txt ---
Java Emitter Templates (JET)
============================

The JET engine (a tool that compiles the *.jet template files into *.java 
source files) is part of the Eclipse Modeling Framework (EMF) PlugIn. 
Thus, we can only generate Java template classes from *.jet files by using the 
Eclipse platform (or significant parts of it).

Therefore, all generated template classes are also checked in 
(e.g. ccmtools.generator.java.templates).

For more informations about JET, see:
    http://eclipse.org/articles/Article-JET/jet_tutorial1.html
    http://eclipse.org/articles/Article-JET2/jet_tutorial2.html
    
    
Eclipse Settings:    
-----------------
To use the Jet engine for the ccmtools project, we have to configure the eclipse
project properties:

Menu Project => Properties => Jet Settings:
    
    Template Containers: src/ccmtools/generator/java/templates/jet;src/ccmtools/generator/idl/templates/jet
    
    Source Container   : src    
    

[ccmtools-cvs] ccmtools/src/ccmtools/generator/java/templates/jet README, 1.1, NONE

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/templates/jet
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6663/src/ccmtools/generator/java/templates/jet

Removed Files:
	README 
Log Message:
Added development notes

--- README DELETED ---

[ccmtools-cvs] ccmtools/doc/DevelopmentNotes/JetTemplates - New directory

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/doc/DevelopmentNotes/JetTemplates
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6565/doc/DevelopmentNotes/JetTemplates

Log Message:
Directory /cvsroot/ccmtools/ccmtools/doc/DevelopmentNotes/JetTemplates added to the repository

[ccmtools-cvs] ccmtools/test/manual/Login/java/client/src Client.java, NONE, 1.1

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/manual/Login/java/client/src
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/manual/Login/java/client/src

Added Files:
	Client.java 
Log Message:
Refactored test directory

--- NEW FILE: Client.java ---
import java.util.logging.ConsoleHandler;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.Logger;

import org.omg.CORBA.ORB;

import application.Group;
import application.Login;
import application.PersonData;
import application.InvalidPersonData;
import application.Server;
import application.ServerHome;
import application.ServerHomeClientLibDeployment;
import Components.HomeFinder;
import ccmtools.local.ServiceLocator;

public class Client
{
    public static final String COMPONENT_HOME_NAME = "ServerHome";
    
    public static void main(String[] args)
    {
        System.out.println("Login Client");

        // Configure Logger
        Logger logger = Logger.getLogger("test");
        logger.setLevel(Level.FINER);
        Handler handler = new ConsoleHandler();
        handler.setLevel(Level.ALL);
        handler.setFormatter(new ccmtools.utils.SimpleFormatter());
        logger.addHandler(handler);
        ServiceLocator.instance().setLogger(logger);

        /**
         * Setup code (Part 1)
         */
        try
        {
            // Set up the ServiceLocator singleton
            ORB orb = ORB.init(args, null);
            ServiceLocator.instance().setCorbaOrb(orb);
            ServerHomeClientLibDeployment.deploy(COMPONENT_HOME_NAME);
        }
        catch (Exception e)
        {
            e.printStackTrace();
        }

        
        /**
         * Business code
         */
        try
        {            
            HomeFinder homeFinder = HomeFinder.instance();
            ServerHome home = (ServerHome) homeFinder.find_home_by_name(COMPONENT_HOME_NAME);
            Server server = home.create();
            server.configuration_complete();
            Login login = server.provide_login();

            try
            {
                PersonData person = new PersonData(0, "", "", Group.USER);
                login.isValidUser(person);
                assert(false);
            }
            catch (InvalidPersonData e)
            {
                System.err.println("Caught InvalidPersonData exception!");
            }

            
            try
            {
                PersonData person = new PersonData(277, "eteinik", "eteinik", Group.USER);
                boolean result = login.isValidUser(person);

                if (result)
                {
                    System.out.println("Welcome " + person.getName());
                }
                else
                {
                    System.out.println("We don't know you...");
                }
            }
            catch (InvalidPersonData e)
            {
                System.err.println("Error: InvalidPersonData!");
            }
            
            server.remove();
        }
        catch (Exception e)
        {
            e.printStackTrace();
        }

        
        /**
         * Setup code (Part 2)
         */
        try
        {
            ServerHomeClientLibDeployment.undeploy(COMPONENT_HOME_NAME);
            System.out.println("OK!");
        }
        catch (Exception e)
        {
            e.printStackTrace();
        }
        finally
        {
            // Tear down the ServiceLocator singleton
            ServiceLocator.instance().destroy();
        }
    }
}

[ccmtools-cvs] ccmtools/test/IDLParser/import ImportTest.idl, NONE, 1.1

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/IDLParser/import
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/IDLParser/import

Added Files:
	ImportTest.idl 
Log Message:
Refactored test directory

--- NEW FILE: ImportTest.idl ---
#ifndef __IMPORT_TEST__IDL__
#define __IMPORT_TEST__IDL__

// imported namespaces are put into the scopeTable.
import org::omg::Components;
import IDL::framework;

// There must be et least one IDL definition to make the parser happy
typedef long LongType;

#endif // __IMPORT_TEST__IDL__

[ccmtools-cvs] ccmtools/test/tutorial/Login/java/client/bin runClient, 1.1, NONE

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/tutorial/Login/java/client/bin
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/tutorial/Login/java/client/bin

Removed Files:
	runClient 
Log Message:
Refactored test directory

--- runClient DELETED ---

[ccmtools-cvs] ccmtools/test/IDLParser/interface/todo InterfaceForward.idl, NONE, 1.1

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/IDLParser/interface/todo
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/IDLParser/interface/todo

Added Files:
	InterfaceForward.idl 
Log Message:
Refactored test directory

--- NEW FILE: InterfaceForward.idl ---
#ifndef __INTERFACE_FORWARD__IDL__
#define __INTERFACE_FORWARD__IDL__


interface Husband; // Forward declaration

interface Wife
{
     Husband getSpouse();
};

interface Husband
{
     Wife getSpouse();
};

#endif // __INTERFACE_FORWARD__IDL__

[ccmtools-cvs] ccmtools/test/IDLParser/enum/error Empty.idl, NONE, 1.1

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/IDLParser/enum/error
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/IDLParser/enum/error

Added Files:
	Empty.idl 
Log Message:
Refactored test directory

--- NEW FILE: Empty.idl ---
#ifndef __EMPTY__IDL__
#define __EMPTY__IDL__


/*
 * Note that IDL does not permit empty enumerations!!!
 */
 
enum Empty
{
};

#endif // __EMPTY__IDL__

[ccmtools-cvs] ccmtools/test/IDL3Parser/interface/todo InterfaceForward.idl, 1.1, NONE

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/IDL3Parser/interface/todo
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/IDL3Parser/interface/todo

Removed Files:
	InterfaceForward.idl 
Log Message:
Refactored test directory

--- InterfaceForward.idl DELETED ---

[ccmtools-cvs] ccmtools/test/tutorial/HelloWorld/idl3 Hello.idl, 1.2, NONE

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/tutorial/HelloWorld/idl3
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/tutorial/HelloWorld/idl3

Removed Files:
	Hello.idl 
Log Message:
Refactored test directory

--- Hello.idl DELETED ---

[ccmtools-cvs] ccmtools/test/IDLParser/include/idl3/interface/world IFace.idl, NONE, 1.1

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/IDLParser/include/idl3/interface/world
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/IDLParser/include/idl3/interface/world

Added Files:
	IFace.idl 
Log Message:
Refactored test directory

--- NEW FILE: IFace.idl ---
/*
 * This file was automatically generated by CCM Tools version 0.8.0
 * <http://ccmtools.sourceforge.net>
 * DO NOT EDIT!
 */

#ifndef ___WORLD_IFACE__IDL__
#define ___WORLD_IFACE__IDL__

module world {

 
    interface IFace 

    {

        long foo(in string str);

    };

}; // /module world

#endif /* ___WORLD_IFACE__IDL__ */

[ccmtools-cvs] ccmtools/test/IDL3Parser/events EventtypeTest.idl, 1.1, NONE

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/IDL3Parser/events
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/IDL3Parser/events

Removed Files:
	EventtypeTest.idl 
Log Message:
Refactored test directory

--- EventtypeTest.idl DELETED ---

[ccmtools-cvs] ccmtools/test/IDL3Parser/typedef/error ReDefinition.idl, 1.1, NONE

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/IDL3Parser/typedef/error
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/IDL3Parser/typedef/error

Removed Files:
	ReDefinition.idl 
Log Message:
Refactored test directory

--- ReDefinition.idl DELETED ---

[ccmtools-cvs] ccmtools/test/tutorial/Login/java/client Makefile, 1.2, NONE build.xml, 1.1, NONE

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/tutorial/Login/java/client
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/tutorial/Login/java/client

Removed Files:
	Makefile build.xml 
Log Message:
Refactored test directory

--- Makefile DELETED ---

--- build.xml DELETED ---

[ccmtools-cvs] ccmtools/test/manual/HelloWorld/idl3 Hello.idl, NONE, 1.1

[Teiniker E. <tei...@us...>]

Update of /cvsroot/ccmtools/ccmtools/test/manual/HelloWorld/idl3
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv449/test/manual/HelloWorld/idl3

Added Files:
	Hello.idl 
Log Message:
Refactored test directory

--- NEW FILE: Hello.idl ---
/***
 * CCM Tools HelloWorld Example
 * 
 */

module world
{ 
  interface Hello 
  { 
      string sayHello(); 
  }; 

  component Server 
  { 
      provides Hello hello;
  }; 

  home ServerHome manages Server
  {
  };
};