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

[ccmtools-cvs] ccmtools/src/ccmtools/generator/deployment/metamodel/impl ImplementationArtifactDescriptionImpl.java, NONE, 1.1 PackagedComponentImplementationImpl.java, NONE, 1.1 ComponentImplementationDescriptionImpl.java, NONE, 1.1 ComponentPackageDescriptionImpl.java, NONE, 1.1 ComponentInterfaceDescriptionImpl.java, NONE, 1.1 NamedImplementationArtifactImpl.java, NONE, 1.1 CCMComponentPortKind.java, NONE, 1.1 ModelElementImpl.java, NONE, 1.1 DeploymentFactoryImpl.java, NONE, 1.1 ComponentAssemblyArtifactDescriptionImpl.java, NONE, 1.1 ComponentPortDescriptionImpl.java, NONE, 1.1 MonolithicImplementationDescriptionImpl.java, NONE, 1.1

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

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/deployment/metamodel/impl
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25121/src/ccmtools/generator/deployment/metamodel/impl

Added Files:
	ImplementationArtifactDescriptionImpl.java 
	PackagedComponentImplementationImpl.java 
	ComponentImplementationDescriptionImpl.java 
	ComponentPackageDescriptionImpl.java 
	ComponentInterfaceDescriptionImpl.java 
	NamedImplementationArtifactImpl.java CCMComponentPortKind.java 
	ModelElementImpl.java DeploymentFactoryImpl.java 
	ComponentAssemblyArtifactDescriptionImpl.java 
	ComponentPortDescriptionImpl.java 
	MonolithicImplementationDescriptionImpl.java 
Log Message:
Moved ccmtools.deployment to ccmtools.generator.deployment

--- NEW FILE: ImplementationArtifactDescriptionImpl.java ---
package ccmtools.generator.deployment.metamodel.impl;

import java.util.ArrayList;
import java.util.List;

import ccmtools.generator.deployment.metamodel.ImplementationArtifactDescription;


class ImplementationArtifactDescriptionImpl
    extends ModelElementImpl implements ImplementationArtifactDescription
{
    private String label;
    private String UUID;
    private List location = new ArrayList();
    
    public ImplementationArtifactDescriptionImpl()
    {
        this(null,null);
    }
    
    public ImplementationArtifactDescriptionImpl(String label, String uuid)
    {
        super();
        this.label = label;
        UUID = uuid;
    }

    
    public String getLabel()
    {
        return label;
    }

    public void setLabel(String label)
    {
        this.label = label;
    }

    public String getUUID()
    {
        return UUID;
    }

    public void setUUID(String uuid)
    {
        UUID = uuid;
    }

    public List getLocations()
    {
        return location;
    }
}

--- NEW FILE: ComponentImplementationDescriptionImpl.java ---
package ccmtools.generator.deployment.metamodel.impl;

import ccmtools.generator.deployment.metamodel.ComponentAssemblyArtifactDescription;
import ccmtools.generator.deployment.metamodel.ComponentImplementationDescription;
import ccmtools.generator.deployment.metamodel.ComponentInterfaceDescription;
import ccmtools.generator.deployment.metamodel.MonolithicImplementationDescription;


class ComponentImplementationDescriptionImpl
    extends ModelElementImpl implements ComponentImplementationDescription
{
    private String label;
    private String UUID;
    private ComponentAssemblyArtifactDescription assemblyImpl;
    private MonolithicImplementationDescription monolithicImpl;
    private ComponentInterfaceDescription interfaceDescription;
    
    public ComponentImplementationDescriptionImpl()
    {
        this(null,null);
    }
    
    public ComponentImplementationDescriptionImpl(String label, String uuid)
    {
        super();
        this.label = label;
        UUID = uuid;
    }

    public String getUUID()
    {
        return UUID;
    }
    
    public void setUUID(String uuid)
    {
        UUID = uuid;
    }

    public String getLabel()
    {
        return label;
    }
    
    public void setLabel(String label)
    {
        this.label = label;
    }
    
    public ComponentAssemblyArtifactDescription getAssemblyImpl()
    {
        return assemblyImpl;
    }

    public void setAssemblyImpl(ComponentAssemblyArtifactDescription assemblyImpl)
    {
        this.assemblyImpl = assemblyImpl;
    }

    public MonolithicImplementationDescription getMonolithicImpl()
    {
        return monolithicImpl;
    }

    public void setMonolithicImpl(MonolithicImplementationDescription monolithicImpl)
    {
        this.monolithicImpl = monolithicImpl;
    }

    
    public void setImplements(ComponentInterfaceDescription cid)
    {
        this.interfaceDescription = cid;
    }
    
    public ComponentInterfaceDescription getImplements()
    {
        return interfaceDescription;
    }
}

--- NEW FILE: ComponentPackageDescriptionImpl.java ---
package ccmtools.generator.deployment.metamodel.impl;

import java.util.ArrayList;
import java.util.List;

import ccmtools.generator.deployment.metamodel.ComponentInterfaceDescription;
import ccmtools.generator.deployment.metamodel.ComponentPackageDescription;

class ComponentPackageDescriptionImpl
    extends ModelElementImpl implements ComponentPackageDescription
{
    private String label;
    private String UUID;
    
    private ComponentInterfaceDescription realizes;
    private List implementation = new ArrayList();
    
    
    public ComponentPackageDescriptionImpl()
    {
        this(null, null);
    }
    
    public ComponentPackageDescriptionImpl(String label, String uuid)
    {
        super();
        this.label = label;
        UUID = uuid;
    }

    public String getLabel()
    {
        return label;
    }
    
    public void setLabel(String label)
    {
        this.label = label;
    }

    public String getUUID()
    {
        return UUID;
    }
    
    public void setUUID(String uuid)
    {
        UUID = uuid;
    }
    
    public ComponentInterfaceDescription getRealizes()
    {
        return realizes;
    }
    
    public void setRealizes(ComponentInterfaceDescription realizes)
    {
        this.realizes = realizes;
    }
    
    public List getImplementations()
    {
        return implementation;
    }
}

--- NEW FILE: DeploymentFactoryImpl.java ---
package ccmtools.generator.deployment.metamodel.impl;

import ccmtools.generator.deployment.metamodel.ComponentAssemblyArtifactDescription;
import ccmtools.generator.deployment.metamodel.ComponentImplementationDescription;
import ccmtools.generator.deployment.metamodel.ComponentInterfaceDescription;
import ccmtools.generator.deployment.metamodel.ComponentPackageDescription;
import ccmtools.generator.deployment.metamodel.ComponentPortDescription;
import ccmtools.generator.deployment.metamodel.DeploymentFactory;
import ccmtools.generator.deployment.metamodel.ImplementationArtifactDescription;
import ccmtools.generator.deployment.metamodel.MonolithicImplementationDescription;
import ccmtools.generator.deployment.metamodel.NamedImplementationArtifact;
import ccmtools.generator.deployment.metamodel.PackagedComponentImplementation;

public class DeploymentFactoryImpl
    implements DeploymentFactory
{        
    public ComponentPackageDescription createComponentPackageDescription()
    {
        return new ComponentPackageDescriptionImpl();
    }
    
    public ComponentInterfaceDescription createComponentInterfaceDescription()
    {
        return new ComponentInterfaceDescriptionImpl();
    }
    
    public PackagedComponentImplementation createPackagedComponentImplementation()
    {
        return new PackagedComponentImplementationImpl();
    }
    
    public ComponentImplementationDescription createComponentImplementationDescription()
    {
        return new ComponentImplementationDescriptionImpl();
    }
    
    public ComponentAssemblyArtifactDescription createComponentAssemblyArtifactDescription()
    {
        return new ComponentAssemblyArtifactDescriptionImpl();
    }
    
    public MonolithicImplementationDescription createMonolithicImplementationDescription()
    {
        return new MonolithicImplementationDescriptionImpl();
    }
    
    public NamedImplementationArtifact createNamedImplementationArtifact()
    {
        return new NamedImplementationArtifactImpl();
    }
    
    public ImplementationArtifactDescription createImplementationArtifactDescription()
    {
        return new ImplementationArtifactDescriptionImpl();
    }
    
    public ComponentPortDescription createComponentPortDescription()
    {
        return new ComponentPortDescriptionImpl();
    }
}
--- NEW FILE: ModelElementImpl.java ---
package ccmtools.generator.deployment.metamodel.impl;

import ccmtools.generator.deployment.metamodel.ModelElement;


class ModelElementImpl
    implements ModelElement
{
}

--- NEW FILE: MonolithicImplementationDescriptionImpl.java ---
package ccmtools.generator.deployment.metamodel.impl;

import java.util.ArrayList;
import java.util.List;

import ccmtools.generator.deployment.metamodel.MonolithicImplementationDescription;


class MonolithicImplementationDescriptionImpl
    extends ModelElementImpl implements MonolithicImplementationDescription
{
    private List primaryArtifact = new ArrayList();
        
    
    public MonolithicImplementationDescriptionImpl()
    {
        super();
    }
    
    public List getPrimaryArtifacts()
    {
        return primaryArtifact;
    }
}

--- NEW FILE: ComponentPortDescriptionImpl.java ---
package ccmtools.generator.deployment.metamodel.impl;

import java.util.ArrayList;
import java.util.List;

import ccmtools.generator.deployment.metamodel.ComponentPortDescription;


class ComponentPortDescriptionImpl
    extends ModelElementImpl implements ComponentPortDescription 
{
    private String name;
    private String specificType;
    private List supportedType = new ArrayList();
    private boolean provider;
    private boolean exclusiveProvider;
    private boolean exclusiveUser;
    private boolean optional;
    private CCMComponentPortKind kind;
    
    
    public String getName()
    {
        return name;
    }
    
    public void setName(String name)
    {
        this.name = name;
    }
    
    
    public String getSpecificType()
    {
        return specificType;
    }
    
    public void setSpecificType(String specificType)
    {
        this.specificType = specificType;
    }
    
    
    public List getSupportedType()
    {
        return supportedType;
    }
    
    
    public boolean isProvider()
    {
        return provider;
    }
    
    public void setProvider(boolean provider)
    {
        this.provider = provider;
    }
    
    
    public boolean isExclusiveProvider()
    {
        return exclusiveProvider;
    }
    
    public void setExclusiveProvider(boolean exclusiveProvider)
    {
        this.exclusiveProvider = exclusiveProvider;
    }
    
    
    public boolean isExclusiveUser()
    {
        return exclusiveUser;
    }
    
    public void setExclusiveUser(boolean exclusiveUser)
    {
        this.exclusiveUser = exclusiveUser;
    }
    
    
    public boolean isOptional()
    {
        return optional;
    }
    
    public void setOptional(boolean optional)
    {
        this.optional = optional;
    }
    
    
    public CCMComponentPortKind getKind()
    {
        return kind;
    }
    
    public void setKind(CCMComponentPortKind kind)
    {
        this.kind = kind;
    }
}

--- NEW FILE: ComponentAssemblyArtifactDescriptionImpl.java ---
package ccmtools.generator.deployment.metamodel.impl;

import java.util.ArrayList;
import java.util.List;

import ccmtools.generator.deployment.metamodel.ComponentAssemblyArtifactDescription;


class ComponentAssemblyArtifactDescriptionImpl
    extends ModelElementImpl implements ComponentAssemblyArtifactDescription
{
    private String label;
    private String UUID;
    private String spectifcType;
    private List location = new ArrayList();
    
    public ComponentAssemblyArtifactDescriptionImpl()
    {
        this(null, null, null);
    }
    
    public ComponentAssemblyArtifactDescriptionImpl(String label, String uuid, String type)
    {
        super();
        this.label = label;
        spectifcType = type;
        UUID = uuid;
    }

    
    public String getLabel()
    {
        return label;
    }

    public void setLabel(String label)
    {
        this.label = label;
    }

    public String getUUID()
    {
        return UUID;
    }
    
    public void setUUID(String uuid)
    {
        UUID = uuid;
    }
        
    public String getSpectifcType()
    {
        return spectifcType;
    }

    public void setSpecifcType(String spectifcType)
    {
        this.spectifcType = spectifcType;
    }

    public List getLocations()
    {
        return location;
    }
}

--- NEW FILE: NamedImplementationArtifactImpl.java ---
package ccmtools.generator.deployment.metamodel.impl;

import ccmtools.generator.deployment.metamodel.ImplementationArtifactDescription;
import ccmtools.generator.deployment.metamodel.NamedImplementationArtifact;


class NamedImplementationArtifactImpl
    extends ModelElementImpl implements NamedImplementationArtifact
{
    private String name;
    private ImplementationArtifactDescription referenceArtifact;
    
    public NamedImplementationArtifactImpl()
    {
        this(null);
    }
    
    public NamedImplementationArtifactImpl(String name)
    {
        super();
        this.name = name;
    }

    
    public String getName()
    {
        return name;
    }

    public void setName(String name)
    {
        this.name = name;
    }

    public ImplementationArtifactDescription getReferenceArtifact()
    {
        return referenceArtifact;
    }

    public void setReferencedArtifact(ImplementationArtifactDescription referenceArtifact)
    {
        this.referenceArtifact = referenceArtifact;
    }
}

--- NEW FILE: ComponentInterfaceDescriptionImpl.java ---
package ccmtools.generator.deployment.metamodel.impl;

import java.util.ArrayList;
import java.util.List;

import ccmtools.generator.deployment.metamodel.ComponentInterfaceDescription;


class ComponentInterfaceDescriptionImpl
    extends ModelElementImpl implements ComponentInterfaceDescription
{
    private String label;
    private String UUID;
    private String specificType;
    private List supportedType = new ArrayList();
    private List idlFile = new ArrayList();
    private List port = new ArrayList();
    
    
    public ComponentInterfaceDescriptionImpl()
    {
        this(null, null, null);
    }
    
    public ComponentInterfaceDescriptionImpl(String label, String uuid, String type)
    {
        super();
        this.label = label;
        specificType = type;
        UUID = uuid;
    }
    
    public String getLabel()
    {
        return label;
    }

    public void setLabel(String label)
    {
        this.label = label;
    }
    
    public String getUUID()
    {
        return UUID;
    }

    public void setUUID(String uuid)
    {
        UUID = uuid;
    }
    
    public String getSpecificType()
    {
        return specificType;
    }
    
    public void setSpecificType(String specificType)
    {
        this.specificType = specificType;
    }

    public List getSupportedType()
    {
        return supportedType;
    }
    
    public List getIdlFile()
    {
        return idlFile;
    }
    
    public List getPort()
    {
        return port;
    }
}

--- NEW FILE: CCMComponentPortKind.java ---
package ccmtools.generator.deployment.metamodel.impl;


// Typesafe enum pattern (Effective Java Item 21)
public class CCMComponentPortKind
    extends ModelElementImpl
{
    private final int portKind;

    private final static String[] Labels = {
        "",
        "Facet",
        "SimplexReceptacle",
        "MultiplexReceptacle",
        "EventEmitter",
        "EventPublisher",
        "EventConsumer"        
    };
    
    public static final CCMComponentPortKind Facet               = new CCMComponentPortKind(1);
    public static final CCMComponentPortKind SimplexReceptacle   = new CCMComponentPortKind(2);    
    public static final CCMComponentPortKind MultiplexReceptacle = new CCMComponentPortKind(3);
    public static final CCMComponentPortKind EventEmitter        = new CCMComponentPortKind(4);
    public static final CCMComponentPortKind EventPublisher      = new CCMComponentPortKind(5);
    public static final CCMComponentPortKind EventConsumer       = new CCMComponentPortKind(6);
    
    
    private CCMComponentPortKind(int pk)
    {
        portKind = pk;
    }
    
    public String toString()
    {
        return Labels[portKind];
    }

    public final static String[] getLabels()
    {
        return Labels;
    }
}

--- NEW FILE: PackagedComponentImplementationImpl.java ---
package ccmtools.generator.deployment.metamodel.impl;

import ccmtools.generator.deployment.metamodel.ComponentImplementationDescription;
import ccmtools.generator.deployment.metamodel.PackagedComponentImplementation;


class PackagedComponentImplementationImpl
    extends ModelElementImpl implements PackagedComponentImplementation
{
    private String name;
    private ComponentImplementationDescription referencedImplementation; 
    
    
    public PackagedComponentImplementationImpl()
    {
        this(null);
    }
        
    public PackagedComponentImplementationImpl(String name)
    {
        super();
        this.name = name;
    }

    public String getName()
    {
        return name;
    }
    
    public void setName(String name)
    {
        this.name = name;
    }

    public ComponentImplementationDescription getReferencedImplementation()
    {
        return referencedImplementation;
    }

    public void setReferencedImplementation(ComponentImplementationDescription referencedImplementation)
    {
        this.referencedImplementation = referencedImplementation;
    }
}

[ccmtools-cvs] ccmtools/src/ccmtools/generator/deployment/metamodel ComponentAssemblyArtifactDescription.java, NONE, 1.1 ImplementationArtifactDescription.java, NONE, 1.1 ModelElement.java, NONE, 1.1 NamedImplementationArtifact.java, NONE, 1.1 PackagedComponentImplementation.java, NONE, 1.1 MonolithicImplementationDescription.java, NONE, 1.1 DeploymentFactory.java, NONE, 1.1 ComponentImplementationDescription.java, NONE, 1.1 ComponentPackageDescription.java, NONE, 1.1 ComponentInterfaceDescription.java, NONE, 1.1 ComponentPortDescription.java, NONE, 1.1

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

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/deployment/metamodel
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25121/src/ccmtools/generator/deployment/metamodel

Added Files:
	ComponentAssemblyArtifactDescription.java 
	ImplementationArtifactDescription.java ModelElement.java 
	NamedImplementationArtifact.java 
	PackagedComponentImplementation.java 
	MonolithicImplementationDescription.java 
	DeploymentFactory.java ComponentImplementationDescription.java 
	ComponentPackageDescription.java 
	ComponentInterfaceDescription.java 
	ComponentPortDescription.java 
Log Message:
Moved ccmtools.deployment to ccmtools.generator.deployment

--- NEW FILE: ImplementationArtifactDescription.java ---
package ccmtools.generator.deployment.metamodel;

import java.util.List;


public interface ImplementationArtifactDescription
    extends ModelElement
{
    String ELEMENT_NAME = "ImplementationArtifactDescription";    

    String getLabel();
    void setLabel(String label);

    String getUUID();
    void setUUID(String uuid);

    List getLocations();
}
--- NEW FILE: ComponentAssemblyArtifactDescription.java ---
package ccmtools.generator.deployment.metamodel;

import java.util.List;


public interface ComponentAssemblyArtifactDescription
    extends ModelElement
{
    String ELEMENT_NAME = "ComponentAssemblyArtifactDescription";
    
    String getLabel();
    void setLabel(String label);

    String getUUID();
    void setUUID(String uuid);

    String getSpectifcType();
    void setSpecifcType(String spectifcType);

    public abstract List getLocations();
}
--- NEW FILE: ComponentPackageDescription.java ---
package ccmtools.generator.deployment.metamodel;

import java.util.List;


public interface ComponentPackageDescription
    extends ModelElement
{
    public String ELEMENT_NAME = "ComponentPackageDescription";
    
    String getLabel();
    void setLabel(String label);

    String getUUID();
    void setUUID(String uuid);

    ComponentInterfaceDescription getRealizes();
    void setRealizes(ComponentInterfaceDescription realizes);

    List getImplementations();
}
--- NEW FILE: ComponentImplementationDescription.java ---
package ccmtools.generator.deployment.metamodel;



public interface ComponentImplementationDescription
    extends ModelElement
{
    String ELEMENT_NAME = "ComponentImplementationDescription";

    String getUUID();
    void setUUID(String uuid);

    String getLabel();
    void setLabel(String label);

    ComponentAssemblyArtifactDescription getAssemblyImpl();
    void setAssemblyImpl(ComponentAssemblyArtifactDescription assemblyImpl);

    MonolithicImplementationDescription getMonolithicImpl();
    void setMonolithicImpl(MonolithicImplementationDescription monolithicImpl);

    void setImplements(ComponentInterfaceDescription cid);
    ComponentInterfaceDescription getImplements();
}
--- NEW FILE: DeploymentFactory.java ---
package ccmtools.generator.deployment.metamodel;

import ccmtools.generator.deployment.metamodel.impl.DeploymentFactoryImpl;


public interface DeploymentFactory
{
    /** Singleton */
    DeploymentFactory instance = new DeploymentFactoryImpl();
 
    ComponentPackageDescription createComponentPackageDescription();
    ComponentInterfaceDescription createComponentInterfaceDescription();
    PackagedComponentImplementation createPackagedComponentImplementation();
    ComponentImplementationDescription createComponentImplementationDescription();
    ComponentAssemblyArtifactDescription createComponentAssemblyArtifactDescription();
    MonolithicImplementationDescription createMonolithicImplementationDescription();
    NamedImplementationArtifact createNamedImplementationArtifact();
    ImplementationArtifactDescription createImplementationArtifactDescription();
    ComponentPortDescription createComponentPortDescription();
}

--- NEW FILE: ComponentInterfaceDescription.java ---
package ccmtools.generator.deployment.metamodel;

import java.util.List;


public interface ComponentInterfaceDescription
    extends ModelElement
{
    public String ELEMENT_NAME = "ComponentInterfaceDescription";
    
    String getLabel();
    void setLabel(String label);

    String getUUID();
    void setUUID(String uuid);

    String getSpecificType();
    void setSpecificType(String specificType);
    
    List getSupportedType();

    List getIdlFile();
    
    List getPort();
}
--- NEW FILE: PackagedComponentImplementation.java ---
package ccmtools.generator.deployment.metamodel;



public interface PackagedComponentImplementation
    extends ModelElement
{
    String ELEMENT_NAME = "PackagedComponentImplementation";
    
    String getName();
    void setName(String name);

    ComponentImplementationDescription getReferencedImplementation();    
    void setReferencedImplementation(ComponentImplementationDescription referencedImplementation);
}
--- NEW FILE: MonolithicImplementationDescription.java ---
package ccmtools.generator.deployment.metamodel;

import java.util.List;


public interface MonolithicImplementationDescription
    extends ModelElement
{
    String ELEMENT_NAME = "MonolithicImplementationDescription";
    
    List getPrimaryArtifacts();
}
--- NEW FILE: NamedImplementationArtifact.java ---
package ccmtools.generator.deployment.metamodel;



public interface NamedImplementationArtifact
    extends ModelElement
{
    String ELEMENT_NAME = "NamedImplementationArtifact";
    
    String getName();
    void setName(String name);

    ImplementationArtifactDescription getReferenceArtifact();
    void setReferencedArtifact(ImplementationArtifactDescription referenceArtifact);
}
--- NEW FILE: ModelElement.java ---
package ccmtools.generator.deployment.metamodel;


public interface ModelElement
{
}
--- NEW FILE: ComponentPortDescription.java ---
package ccmtools.generator.deployment.metamodel;

import java.util.List;

import ccmtools.generator.deployment.metamodel.impl.CCMComponentPortKind;

public interface ComponentPortDescription
    extends ModelElement
{
    public String ELEMENT_NAME = "ComponentPortDescription";
    
    String getName();
    void setName(String name);
    
    String getSpecificType();
    void setSpecificType(String specificType);
    
    List getSupportedType();
    
    boolean isProvider();
    void setProvider(boolean provider);
    
    boolean isExclusiveProvider();
    void setExclusiveProvider(boolean exclusiveProvider);

    boolean isExclusiveUser();
    void setExclusiveUser(boolean exclusiveUser);
    
    boolean isOptional();
    void setOptional(boolean optional);

    CCMComponentPortKind getKind();
    void setKind(CCMComponentPortKind kind);
}

[ccmtools-cvs] ccmtools/bin ccmdescriptor,1.7,1.8

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

Update of /cvsroot/ccmtools/ccmtools/bin
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25121/bin

Modified Files:
	ccmdescriptor 
Log Message:
Moved ccmtools.deployment to ccmtools.generator.deployment

Index: ccmdescriptor
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/bin/ccmdescriptor,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ccmdescriptor	6 Nov 2006 13:11:28 -0000	1.7
--- ccmdescriptor	22 Jan 2007 09:08:37 -0000	1.8
***************
*** 20,24 ****
  		CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/jdom.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CLASSPATH"
  	fi
! 	exec "$JAVA_HOME/bin/java" -cp $CLASSPATH -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.deployment.Main $@  
  else
  	echo "ERROR!"
--- 20,24 ----
  		CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/jdom.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CLASSPATH"
  	fi
! 	exec "$JAVA_HOME/bin/java" -cp $CLASSPATH -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.generator.deployment.Main $@  
  else
  	echo "ERROR!"

[ccmtools-cvs] ccmtools/src-test/ccmtools/deployment ModelTest.java, 1.1, 1.2

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

Update of /cvsroot/ccmtools/ccmtools/src-test/ccmtools/deployment
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25121/src-test/ccmtools/deployment

Modified Files:
	ModelTest.java 
Log Message:
Moved ccmtools.deployment to ccmtools.generator.deployment

Index: ModelTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/deployment/ModelTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ModelTest.java	8 Nov 2006 10:31:55 -0000	1.1
--- ModelTest.java	22 Jan 2007 09:08:37 -0000	1.2
***************
*** 2,14 ****
  
  import junit.framework.TestCase;
! import ccmtools.deployment.metamodel.ComponentAssemblyArtifactDescription;
! import ccmtools.deployment.metamodel.ComponentImplementationDescription;
! import ccmtools.deployment.metamodel.ComponentInterfaceDescription;
! import ccmtools.deployment.metamodel.ComponentPackageDescription;
! import ccmtools.deployment.metamodel.DeploymentFactory;
! import ccmtools.deployment.metamodel.ImplementationArtifactDescription;
! import ccmtools.deployment.metamodel.MonolithicImplementationDescription;
! import ccmtools.deployment.metamodel.NamedImplementationArtifact;
! import ccmtools.deployment.metamodel.PackagedComponentImplementation;
  
  public class ModelTest extends TestCase
--- 2,14 ----
  
  import junit.framework.TestCase;
! import ccmtools.generator.deployment.metamodel.ComponentAssemblyArtifactDescription;
! import ccmtools.generator.deployment.metamodel.ComponentImplementationDescription;
! import ccmtools.generator.deployment.metamodel.ComponentInterfaceDescription;
! import ccmtools.generator.deployment.metamodel.ComponentPackageDescription;
! import ccmtools.generator.deployment.metamodel.DeploymentFactory;
! import ccmtools.generator.deployment.metamodel.ImplementationArtifactDescription;
! import ccmtools.generator.deployment.metamodel.MonolithicImplementationDescription;
! import ccmtools.generator.deployment.metamodel.NamedImplementationArtifact;
! import ccmtools.generator.deployment.metamodel.PackagedComponentImplementation;
  
  public class ModelTest extends TestCase

[ccmtools-cvs] ccmtools/src/ccmtools/deployment/metamodel/impl MonolithicImplementationDescriptionImpl.java, 1.1, NONE ModelElementImpl.java, 1.1, NONE ComponentPortDescriptionImpl.java, 1.1, NONE ComponentInterfaceDescriptionImpl.java, 1.1, NONE ComponentImplementationDescriptionImpl.java, 1.1, NONE ImplementationArtifactDescriptionImpl.java, 1.1, NONE DeploymentFactoryImpl.java, 1.1, NONE ComponentPackageDescriptionImpl.java, 1.1, NONE ComponentAssemblyArtifactDescriptionImpl.java, 1.1, NONE NamedImplementationArtifactImpl.java, 1.1, NONE CCMComponentPortKind.java, 1.1, NONE PackagedComponentImplementationImpl.java, 1.1, NONE

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

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/deployment/metamodel/impl
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25121/src/ccmtools/deployment/metamodel/impl

Removed Files:
	MonolithicImplementationDescriptionImpl.java 
	ModelElementImpl.java ComponentPortDescriptionImpl.java 
	ComponentInterfaceDescriptionImpl.java 
	ComponentImplementationDescriptionImpl.java 
	ImplementationArtifactDescriptionImpl.java 
	DeploymentFactoryImpl.java 
	ComponentPackageDescriptionImpl.java 
	ComponentAssemblyArtifactDescriptionImpl.java 
	NamedImplementationArtifactImpl.java CCMComponentPortKind.java 
	PackagedComponentImplementationImpl.java 
Log Message:
Moved ccmtools.deployment to ccmtools.generator.deployment

--- ImplementationArtifactDescriptionImpl.java DELETED ---

--- ComponentImplementationDescriptionImpl.java DELETED ---

--- ComponentPackageDescriptionImpl.java DELETED ---

--- DeploymentFactoryImpl.java DELETED ---

--- ModelElementImpl.java DELETED ---

--- MonolithicImplementationDescriptionImpl.java DELETED ---

--- ComponentPortDescriptionImpl.java DELETED ---

--- ComponentAssemblyArtifactDescriptionImpl.java DELETED ---

--- NamedImplementationArtifactImpl.java DELETED ---

--- ComponentInterfaceDescriptionImpl.java DELETED ---

--- CCMComponentPortKind.java DELETED ---

--- PackagedComponentImplementationImpl.java DELETED ---

[ccmtools-cvs] ccmtools/test/CppGenerator/component_distributed/component .cvsignore, NONE, 1.1

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

Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/component_distributed/component
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25121/test/CppGenerator/component_distributed/component

Added Files:
	.cvsignore 
Log Message:
Moved ccmtools.deployment to ccmtools.generator.deployment

--- NEW FILE: .cvsignore ---
xxx

[ccmtools-cvs] ccmtools/src/ccmtools/deployment/metamodel DeploymentFactory.java, 1.1, NONE ComponentPackageDescription.java, 1.1, NONE ModelElement.java, 1.1, NONE ComponentInterfaceDescription.java, 1.1, NONE ComponentImplementationDescription.java, 1.1, NONE PackagedComponentImplementation.java, 1.1, NONE ComponentPortDescription.java, 1.1, NONE ComponentAssemblyArtifactDescription.java, 1.1, NONE NamedImplementationArtifact.java, 1.1, NONE ImplementationArtifactDescription.java, 1.1, NONE MonolithicImplementationDescription.java, 1.1, NONE

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

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/deployment/metamodel
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25121/src/ccmtools/deployment/metamodel

Removed Files:
	DeploymentFactory.java ComponentPackageDescription.java 
	ModelElement.java ComponentInterfaceDescription.java 
	ComponentImplementationDescription.java 
	PackagedComponentImplementation.java 
	ComponentPortDescription.java 
	ComponentAssemblyArtifactDescription.java 
	NamedImplementationArtifact.java 
	ImplementationArtifactDescription.java 
	MonolithicImplementationDescription.java 
Log Message:
Moved ccmtools.deployment to ccmtools.generator.deployment

--- ImplementationArtifactDescription.java DELETED ---

--- ComponentAssemblyArtifactDescription.java DELETED ---

--- ComponentPackageDescription.java DELETED ---

--- ComponentImplementationDescription.java DELETED ---

--- DeploymentFactory.java DELETED ---

--- ComponentInterfaceDescription.java DELETED ---

--- PackagedComponentImplementation.java DELETED ---

--- MonolithicImplementationDescription.java DELETED ---

--- NamedImplementationArtifact.java DELETED ---

--- ModelElement.java DELETED ---

--- ComponentPortDescription.java DELETED ---

[ccmtools-cvs] ccmtools/src/ccmtools/deployment Test.java, 1.2, NONE DeploymentParameters.java, 1.2, NONE DeploymentToXmiMapper.java, 1.1, NONE CDDGenerator.java, 1.6, NONE CcmModelNodeHandler.java, 1.3, NONE Main.java, 1.3, NONE XmiToDeploymentMapper.java, 1.1, NONE

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

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/deployment
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25121/src/ccmtools/deployment

Removed Files:
	Test.java DeploymentParameters.java DeploymentToXmiMapper.java 
	CDDGenerator.java CcmModelNodeHandler.java Main.java 
	XmiToDeploymentMapper.java 
Log Message:
Moved ccmtools.deployment to ccmtools.generator.deployment

--- DeploymentParameters.java DELETED ---

--- CDDGenerator.java DELETED ---

--- Main.java DELETED ---

--- DeploymentToXmiMapper.java DELETED ---

--- XmiToDeploymentMapper.java DELETED ---

--- Test.java DELETED ---

--- CcmModelNodeHandler.java DELETED ---

[ccmtools-cvs] ccmtools/src/ccmtools/generator/deployment - New directory

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

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/deployment
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25094/src/ccmtools/generator/deployment

Log Message:
Directory /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/deployment added to the repository

[ccmtools-cvs] ccmtools/src/ccmtools/generator/deployment/metamodel/impl - New directory

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

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/deployment/metamodel/impl
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25094/src/ccmtools/generator/deployment/metamodel/impl

Log Message:
Directory /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/deployment/metamodel/impl added to the repository

[ccmtools-cvs] ccmtools/src/ccmtools/generator/deployment/metamodel - New directory

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

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/deployment/metamodel
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv25094/src/ccmtools/generator/deployment/metamodel

Log Message:
Directory /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/deployment/metamodel added to the repository

[ccmtools-cvs] ccmtools/src/ccmtools/deployment CDDGenerator.java, 1.5, 1.6 CcmModelNodeHandler.java, 1.2, 1.3

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

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/deployment
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src/ccmtools/deployment

Modified Files:
	CDDGenerator.java CcmModelNodeHandler.java 
Log Message:
Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel.

Index: CDDGenerator.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/deployment/CDDGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CDDGenerator.java	3 Nov 2006 14:01:27 -0000	1.5
--- CDDGenerator.java	19 Jan 2007 12:07:30 -0000	1.6
***************
*** 19,24 ****
  import ccmtools.deployment.metamodel.DeploymentFactory;
  import ccmtools.deployment.metamodel.PackagedComponentImplementation;
! import ccmtools.metamodel.CcmModelHelper;
! import ccmtools.metamodel.BaseIDL.MContainer;
  import ccmtools.ui.UserInterfaceDriver;
  
--- 19,24 ----
  import ccmtools.deployment.metamodel.DeploymentFactory;
  import ccmtools.deployment.metamodel.PackagedComponentImplementation;
! import ccmtools.parser.idl.metamodel.CcmModelHelper;
! import ccmtools.parser.idl.metamodel.BaseIDL.MContainer;
  import ccmtools.ui.UserInterfaceDriver;
  

Index: CcmModelNodeHandler.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/deployment/CcmModelNodeHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CcmModelNodeHandler.java	3 Nov 2006 14:01:27 -0000	1.2
--- CcmModelNodeHandler.java	19 Jan 2007 12:07:30 -0000	1.3
***************
*** 6,15 ****
  import ccmtools.deployment.metamodel.DeploymentFactory;
  import ccmtools.deployment.metamodel.impl.CCMComponentPortKind;
! import ccmtools.metamodel.CcmModelHelper;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.metamodel.ComponentIDL.MHomeDef;
! import ccmtools.metamodel.ComponentIDL.MProvidesDef;
! import ccmtools.metamodel.ComponentIDL.MUsesDef;
  
  
--- 6,15 ----
  import ccmtools.deployment.metamodel.DeploymentFactory;
  import ccmtools.deployment.metamodel.impl.CCMComponentPortKind;
! import ccmtools.parser.idl.metamodel.CcmModelHelper;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MHomeDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MProvidesDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MUsesDef;
  
  

[ccmtools-cvs] ccmtools/src-test/ccmtools/parser/idl/enumeration EnumTest.java, 1.2, 1.3 EnumModuleTest.java, 1.1, 1.2 EnumColorTest.java, 1.1, 1.2 EnumDefinedInTest.java, 1.1, 1.2

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

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

Modified Files:
	EnumTest.java EnumModuleTest.java EnumColorTest.java 
	EnumDefinedInTest.java 
Log Message:
Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel.

Index: EnumModuleTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/enumeration/EnumModuleTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EnumModuleTest.java	21 Nov 2006 14:37:48 -0000	1.1
--- EnumModuleTest.java	19 Jan 2007 12:07:29 -0000	1.2
***************
*** 6,15 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.CcmModelHelper;
- import ccmtools.metamodel.BaseIDL.MConstantDef;
- import ccmtools.metamodel.BaseIDL.MEnumDef;
- import ccmtools.metamodel.BaseIDL.MModuleDef;
  import ccmtools.parser.idl.ScopedName;
  import ccmtools.parser.idl.constant.ConstantTest;
  import ccmtools.parser.idl.module.ModuleTest;
  
--- 6,15 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.ScopedName;
  import ccmtools.parser.idl.constant.ConstantTest;
+ import ccmtools.parser.idl.metamodel.CcmModelHelper;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MConstantDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MEnumDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MModuleDef;
  import ccmtools.parser.idl.module.ModuleTest;
  

Index: EnumColorTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/enumeration/EnumColorTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EnumColorTest.java	8 Nov 2006 10:31:43 -0000	1.1
--- EnumColorTest.java	19 Jan 2007 12:07:29 -0000	1.2
***************
*** 6,10 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MEnumDef;
  
  
--- 6,10 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MEnumDef;
  
  

Index: EnumDefinedInTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/enumeration/EnumDefinedInTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EnumDefinedInTest.java	8 Nov 2006 10:31:43 -0000	1.1
--- EnumDefinedInTest.java	19 Jan 2007 12:07:29 -0000	1.2
***************
*** 6,10 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MEnumDef;
  
  
--- 6,10 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MEnumDef;
  
  

Index: EnumTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/enumeration/EnumTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EnumTest.java	18 Jan 2007 17:11:55 -0000	1.2
--- EnumTest.java	19 Jan 2007 12:07:29 -0000	1.3
***************
*** 6,14 ****
  import junit.framework.TestCase;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MContainer;
- import ccmtools.metamodel.BaseIDL.MEnumDef;
- import ccmtools.metamodel.BaseIDL.MIDLType;
- import ccmtools.metamodel.BaseIDL.MTyped;
  import ccmtools.parser.idl.ParserManager;
  import ccmtools.ui.ConsoleDriver;
  import ccmtools.ui.UserInterfaceDriver;
--- 6,14 ----
  import junit.framework.TestCase;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.ParserManager;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MContainer;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MEnumDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MIDLType;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MTyped;
  import ccmtools.ui.ConsoleDriver;
  import ccmtools.ui.UserInterfaceDriver;

[ccmtools-cvs] ccmtools/src/ccmtools/generator/java Main.java, 1.8, 1.9 CcmToJavaModelMapper.java, 1.20, 1.21

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

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

Modified Files:
	Main.java CcmToJavaModelMapper.java 
Log Message:
Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel.

Index: Main.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/Main.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Main.java	18 Jan 2007 17:11:46 -0000	1.8
--- Main.java	19 Jan 2007 12:07:30 -0000	1.9
***************
*** 17,22 ****
  import ccmtools.CodeGenerator.GraphTraverser;
  import ccmtools.generator.java.metamodel.ModelRepository;
- import ccmtools.metamodel.BaseIDL.MContainer;
  import ccmtools.parser.idl.ParserManager;
  import ccmtools.ui.UserInterfaceDriver;
  import ccmtools.utils.ConfigurationLocator;
--- 17,22 ----
  import ccmtools.CodeGenerator.GraphTraverser;
  import ccmtools.generator.java.metamodel.ModelRepository;
  import ccmtools.parser.idl.ParserManager;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MContainer;
  import ccmtools.ui.UserInterfaceDriver;
  import ccmtools.utils.ConfigurationLocator;

Index: CcmToJavaModelMapper.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/generator/java/CcmToJavaModelMapper.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** CcmToJavaModelMapper.java	24 Nov 2006 18:43:09 -0000	1.20
--- CcmToJavaModelMapper.java	19 Jan 2007 12:07:30 -0000	1.21
***************
*** 41,68 ****
  import ccmtools.generator.java.metamodel.UsesDef;
  import ccmtools.generator.java.metamodel.VoidType;
! import ccmtools.metamodel.CcmModelHelper;
! import ccmtools.metamodel.BaseIDL.MAliasDef;
! import ccmtools.metamodel.BaseIDL.MArrayDef;
! import ccmtools.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.metamodel.BaseIDL.MConstantDef;
! import ccmtools.metamodel.BaseIDL.MContained;
! import ccmtools.metamodel.BaseIDL.MEnumDef;
! import ccmtools.metamodel.BaseIDL.MExceptionDef;
! import ccmtools.metamodel.BaseIDL.MFieldDef;
! import ccmtools.metamodel.BaseIDL.MIDLType;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.metamodel.BaseIDL.MOperationDef;
! import ccmtools.metamodel.BaseIDL.MParameterDef;
! import ccmtools.metamodel.BaseIDL.MParameterMode;
! import ccmtools.metamodel.BaseIDL.MPrimitiveDef;
! import ccmtools.metamodel.BaseIDL.MPrimitiveKind;
! import ccmtools.metamodel.BaseIDL.MSequenceDef;
! import ccmtools.metamodel.BaseIDL.MStringDef;
! import ccmtools.metamodel.BaseIDL.MStructDef;
! import ccmtools.metamodel.BaseIDL.MTyped;
! import ccmtools.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.metamodel.ComponentIDL.MHomeDef;
! import ccmtools.metamodel.ComponentIDL.MProvidesDef;
! import ccmtools.metamodel.ComponentIDL.MUsesDef;
  
  
--- 41,68 ----
  import ccmtools.generator.java.metamodel.UsesDef;
  import ccmtools.generator.java.metamodel.VoidType;
! import ccmtools.parser.idl.metamodel.CcmModelHelper;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MArrayDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MConstantDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MContained;
! import ccmtools.parser.idl.metamodel.BaseIDL.MEnumDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MIDLType;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterMode;
! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveKind;
! import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MStringDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MStructDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MTyped;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MHomeDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MProvidesDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MUsesDef;
  
  

[ccmtools-cvs] ccmtools/src-test/ccmtools/parser/idl/typedef TypedefDefinedInTest.java, 1.1, 1.2 TypedefTest.java, 1.2, 1.3 TypedefOfBaseTypesTest.java, 1.1, 1.2 TypedefOfConstructedTypesTest.java, 1.1, 1.2 TypedefOfScopedNameTest.java, 1.1, 1.2 TypedefOfTemplateTypesTest.java, 1.1, 1.2

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

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

Modified Files:
	TypedefDefinedInTest.java TypedefTest.java 
	TypedefOfBaseTypesTest.java TypedefOfConstructedTypesTest.java 
	TypedefOfScopedNameTest.java TypedefOfTemplateTypesTest.java 
Log Message:
Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel.

Index: TypedefDefinedInTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/typedef/TypedefDefinedInTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TypedefDefinedInTest.java	8 Nov 2006 10:31:45 -0000	1.1
--- TypedefDefinedInTest.java	19 Jan 2007 12:07:29 -0000	1.2
***************
*** 6,10 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MAliasDef;
  
  
--- 6,10 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
  
  

Index: TypedefTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/typedef/TypedefTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TypedefTest.java	18 Jan 2007 17:11:47 -0000	1.2
--- TypedefTest.java	19 Jan 2007 12:07:29 -0000	1.3
***************
*** 6,12 ****
  import junit.framework.TestCase;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MAliasDef;
- import ccmtools.metamodel.BaseIDL.MContainer;
  import ccmtools.parser.idl.ParserManager;
  import ccmtools.ui.ConsoleDriver;
  import ccmtools.ui.UserInterfaceDriver;
--- 6,12 ----
  import junit.framework.TestCase;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.ParserManager;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MContainer;
  import ccmtools.ui.ConsoleDriver;
  import ccmtools.ui.UserInterfaceDriver;

Index: TypedefOfConstructedTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/typedef/TypedefOfConstructedTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TypedefOfConstructedTypesTest.java	8 Nov 2006 10:31:45 -0000	1.1
--- TypedefOfConstructedTypesTest.java	19 Jan 2007 12:07:29 -0000	1.2
***************
*** 6,11 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MAliasDef;
  import ccmtools.parser.idl.enumeration.EnumTest;
  import ccmtools.parser.idl.struct.StructTest;
  import ccmtools.parser.idl.union.UnionTest;
--- 6,11 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.enumeration.EnumTest;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
  import ccmtools.parser.idl.struct.StructTest;
  import ccmtools.parser.idl.union.UnionTest;

Index: TypedefOfBaseTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/typedef/TypedefOfBaseTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TypedefOfBaseTypesTest.java	8 Nov 2006 10:31:45 -0000	1.1
--- TypedefOfBaseTypesTest.java	19 Jan 2007 12:07:29 -0000	1.2
***************
*** 6,11 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MAliasDef;
! import ccmtools.metamodel.BaseIDL.MTyped;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,11 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MTyped;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

Index: TypedefOfTemplateTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/typedef/TypedefOfTemplateTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TypedefOfTemplateTypesTest.java	8 Nov 2006 10:31:45 -0000	1.1
--- TypedefOfTemplateTypesTest.java	19 Jan 2007 12:07:29 -0000	1.2
***************
*** 6,11 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MAliasDef;
! import ccmtools.metamodel.BaseIDL.MTyped;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,11 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MTyped;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

Index: TypedefOfScopedNameTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/typedef/TypedefOfScopedNameTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TypedefOfScopedNameTest.java	8 Nov 2006 10:31:45 -0000	1.1
--- TypedefOfScopedNameTest.java	19 Jan 2007 12:07:29 -0000	1.2
***************
*** 6,15 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MAliasDef;
- import ccmtools.metamodel.BaseIDL.MFieldDef;
- import ccmtools.metamodel.BaseIDL.MSequenceDef;
- import ccmtools.metamodel.BaseIDL.MStructDef;
- import ccmtools.metamodel.BaseIDL.MTyped;
  import ccmtools.parser.idl.enumeration.EnumTest;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,15 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.enumeration.EnumTest;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MStructDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MTyped;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

[ccmtools-cvs] ccmtools/src-test/ccmtools/parser/idl/component ComponentSupportsTest.java, 1.1, 1.2 ComponentPortsTest.java, 1.2, 1.3 ComponentModuleTest.java, 1.3, 1.4 ComponentAttributeTest.java, 1.1, 1.2 ComponentTest.java, 1.2, 1.3 ComponentHeaderTest.java, 1.3, 1.4 ComponentForwardDeclarationTest.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-serv4737/src-test/ccmtools/parser/idl/component

Modified Files:
	ComponentSupportsTest.java ComponentPortsTest.java 
	ComponentModuleTest.java ComponentAttributeTest.java 
	ComponentTest.java ComponentHeaderTest.java 
	ComponentForwardDeclarationTest.java 
Log Message:
Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel.

Index: ComponentPortsTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/component/ComponentPortsTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ComponentPortsTest.java	9 Nov 2006 19:16:59 -0000	1.2
--- ComponentPortsTest.java	19 Jan 2007 12:07:23 -0000	1.3
***************
*** 6,14 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.CcmModelHelper;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.metamodel.ComponentIDL.MProvidesDef;
! import ccmtools.metamodel.ComponentIDL.MUsesDef;
  
  
--- 6,14 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.CcmModelHelper;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MProvidesDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MUsesDef;
  
  

Index: ComponentSupportsTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/component/ComponentSupportsTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ComponentSupportsTest.java	24 Nov 2006 14:48:16 -0000	1.1
--- ComponentSupportsTest.java	19 Jan 2007 12:07:23 -0000	1.2
***************
*** 6,12 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.CcmModelHelper;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.metamodel.ComponentIDL.MComponentDef;
  
  
--- 6,12 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.CcmModelHelper;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDef;
  
  

Index: ComponentTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/component/ComponentTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ComponentTest.java	18 Jan 2007 17:11:59 -0000	1.2
--- ComponentTest.java	19 Jan 2007 12:07:24 -0000	1.3
***************
*** 7,14 ****
  import junit.framework.TestCase;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MContained;
- import ccmtools.metamodel.BaseIDL.MContainer;
- import ccmtools.metamodel.ComponentIDL.MComponentDef;
  import ccmtools.parser.idl.ParserManager;
  import ccmtools.ui.ConsoleDriver;
  import ccmtools.ui.UserInterfaceDriver;
--- 7,14 ----
  import junit.framework.TestCase;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.ParserManager;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MContained;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MContainer;
+ import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDef;
  import ccmtools.ui.ConsoleDriver;
  import ccmtools.ui.UserInterfaceDriver;

Index: ComponentForwardDeclarationTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/component/ComponentForwardDeclarationTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ComponentForwardDeclarationTest.java	9 Nov 2006 10:59:36 -0000	1.1
--- ComponentForwardDeclarationTest.java	19 Jan 2007 12:07:24 -0000	1.2
***************
*** 6,12 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.metamodel.ComponentIDL.MProvidesDef;
  
  
--- 6,12 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MProvidesDef;
  
  

Index: ComponentModuleTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/component/ComponentModuleTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ComponentModuleTest.java	24 Nov 2006 14:48:16 -0000	1.3
--- ComponentModuleTest.java	19 Jan 2007 12:07:24 -0000	1.4
***************
*** 6,15 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.CcmModelHelper;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.metamodel.BaseIDL.MModuleDef;
! import ccmtools.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.metamodel.ComponentIDL.MProvidesDef;
! import ccmtools.metamodel.ComponentIDL.MUsesDef;
  import ccmtools.parser.idl.module.ModuleTest;
  
--- 6,15 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.CcmModelHelper;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MModuleDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MProvidesDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MUsesDef;
  import ccmtools.parser.idl.module.ModuleTest;
  

Index: ComponentAttributeTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/component/ComponentAttributeTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ComponentAttributeTest.java	9 Nov 2006 10:59:36 -0000	1.1
--- ComponentAttributeTest.java	19 Jan 2007 12:07:24 -0000	1.2
***************
*** 6,12 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MAttributeDef;
- import ccmtools.metamodel.ComponentIDL.MComponentDef;
  import ccmtools.parser.idl.enumeration.EnumTest;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  import ccmtools.parser.idl.struct.StructTest;
--- 6,12 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.enumeration.EnumTest;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef;
+ import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  import ccmtools.parser.idl.struct.StructTest;

Index: ComponentHeaderTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/component/ComponentHeaderTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ComponentHeaderTest.java	13 Nov 2006 17:00:50 -0000	1.3
--- ComponentHeaderTest.java	19 Jan 2007 12:07:24 -0000	1.4
***************
*** 6,11 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.metamodel.ComponentIDL.MComponentDef;
  
  
--- 6,11 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDef;
  
  

[ccmtools-cvs] ccmtools/src-test/ccmtools/parser/idl/iface InterfaceForwardDeclarationTest.java, 1.1, 1.2 InterfaceReadonlyAttributeOfBaseTypesTest.java, 1.1, 1.2 InterfaceConstantsTest.java, 1.1, 1.2 InterfaceDefinedInTest.java, 1.1, 1.2 InterfaceAttributeOfConstructedTypesTest.java, 1.1, 1.2 InterfaceTest.java, 1.2, 1.3 InterfaceReadonlyAttributeExceptionsTest.java, 1.1, 1.2 InterfaceReadonlyAttributeOfConstructedTypesTest.java, 1.1, 1.2 InterfaceOperationExceptionsTest.java, 1.1, 1.2 InterfaceAttributeExceptionsTest.java, 1.1, 1.2 InterfaceReadonlyAttributeOfTemplateTypesTest.java, 1.1, 1.2 InterfaceAttributeListTest.java, 1.1, 1.2 InterfaceOperationOnewayTest.java, 1.1, 1.2 InterfaceModuleTest.java, 1.2, 1.3 InterfaceAttributeOfBaseTypesTest.java, 1.1, 1.2 InterfaceOperationVoidTypesTest.java, 1.1, 1.2 InterfaceBodyTest.java, 1.1, 1.2 InterfaceOperationBaseTypesTest.java, 1.1, 1.2 InterfaceOperationConstructedTypesTest.java, 1.1, 1.2 InterfaceAttributeOfTemplateTypesTest.java, 1.1, 1.2 InterfaceHeaderTest.java, 1.1, 1.2 InterfaceOperationTemplateTypesTest.java, 1.1, 1.2 InterfaceReadonlyAttributeListTest.java, 1.1, 1.2 InterfaceOperationContextTest.java, 1.1, 1.2

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

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

Modified Files:
	InterfaceForwardDeclarationTest.java 
	InterfaceReadonlyAttributeOfBaseTypesTest.java 
	InterfaceConstantsTest.java InterfaceDefinedInTest.java 
	InterfaceAttributeOfConstructedTypesTest.java 
	InterfaceTest.java 
	InterfaceReadonlyAttributeExceptionsTest.java 
	InterfaceReadonlyAttributeOfConstructedTypesTest.java 
	InterfaceOperationExceptionsTest.java 
	InterfaceAttributeExceptionsTest.java 
	InterfaceReadonlyAttributeOfTemplateTypesTest.java 
	InterfaceAttributeListTest.java 
	InterfaceOperationOnewayTest.java InterfaceModuleTest.java 
	InterfaceAttributeOfBaseTypesTest.java 
	InterfaceOperationVoidTypesTest.java InterfaceBodyTest.java 
	InterfaceOperationBaseTypesTest.java 
	InterfaceOperationConstructedTypesTest.java 
	InterfaceAttributeOfTemplateTypesTest.java 
	InterfaceHeaderTest.java 
	InterfaceOperationTemplateTypesTest.java 
	InterfaceReadonlyAttributeListTest.java 
	InterfaceOperationContextTest.java 
Log Message:
Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel.

Index: InterfaceReadonlyAttributeExceptionsTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceReadonlyAttributeExceptionsTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceReadonlyAttributeExceptionsTest.java	8 Nov 2006 10:31:33 -0000	1.1
--- InterfaceReadonlyAttributeExceptionsTest.java	19 Jan 2007 12:07:20 -0000	1.2
***************
*** 6,13 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MAttributeDef;
- import ccmtools.metamodel.BaseIDL.MExceptionDef;
- import ccmtools.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.exception.ExceptionTest;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,13 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.exception.ExceptionTest;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

Index: InterfaceOperationBaseTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceOperationBaseTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceOperationBaseTypesTest.java	8 Nov 2006 10:31:33 -0000	1.1
--- InterfaceOperationBaseTypesTest.java	19 Jan 2007 12:07:21 -0000	1.2
***************
*** 6,13 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.metamodel.BaseIDL.MOperationDef;
! import ccmtools.metamodel.BaseIDL.MParameterDef;
! import ccmtools.metamodel.BaseIDL.MParameterMode;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,13 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterMode;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

Index: InterfaceAttributeListTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceAttributeListTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceAttributeListTest.java	8 Nov 2006 10:31:33 -0000	1.1
--- InterfaceAttributeListTest.java	19 Jan 2007 12:07:21 -0000	1.2
***************
*** 6,11 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,11 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

Index: InterfaceOperationVoidTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceOperationVoidTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceOperationVoidTypesTest.java	8 Nov 2006 10:31:33 -0000	1.1
--- InterfaceOperationVoidTypesTest.java	19 Jan 2007 12:07:21 -0000	1.2
***************
*** 6,13 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.metamodel.BaseIDL.MOperationDef;
! import ccmtools.metamodel.BaseIDL.MParameterDef;
! import ccmtools.metamodel.BaseIDL.MParameterMode;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,13 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterMode;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

Index: InterfaceAttributeOfTemplateTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceAttributeOfTemplateTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceAttributeOfTemplateTypesTest.java	8 Nov 2006 10:31:33 -0000	1.1
--- InterfaceAttributeOfTemplateTypesTest.java	19 Jan 2007 12:07:21 -0000	1.2
***************
*** 6,11 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  import ccmtools.parser.idl.sequence.SequenceTest;
--- 6,11 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  import ccmtools.parser.idl.sequence.SequenceTest;

Index: InterfaceOperationExceptionsTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceOperationExceptionsTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceOperationExceptionsTest.java	8 Nov 2006 10:31:33 -0000	1.1
--- InterfaceOperationExceptionsTest.java	19 Jan 2007 12:07:20 -0000	1.2
***************
*** 6,13 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MExceptionDef;
- import ccmtools.metamodel.BaseIDL.MInterfaceDef;
- import ccmtools.metamodel.BaseIDL.MOperationDef;
  import ccmtools.parser.idl.exception.ExceptionTest;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,13 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.exception.ExceptionTest;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

Index: InterfaceReadonlyAttributeOfConstructedTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceReadonlyAttributeOfConstructedTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceReadonlyAttributeOfConstructedTypesTest.java	8 Nov 2006 10:31:33 -0000	1.1
--- InterfaceReadonlyAttributeOfConstructedTypesTest.java	19 Jan 2007 12:07:20 -0000	1.2
***************
*** 6,12 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MAttributeDef;
- import ccmtools.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.enumeration.EnumTest;
  import ccmtools.parser.idl.struct.StructTest;
  import ccmtools.parser.idl.union.UnionTest;
--- 6,12 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.enumeration.EnumTest;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.struct.StructTest;
  import ccmtools.parser.idl.union.UnionTest;

Index: InterfaceAttributeExceptionsTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceAttributeExceptionsTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceAttributeExceptionsTest.java	8 Nov 2006 10:31:32 -0000	1.1
--- InterfaceAttributeExceptionsTest.java	19 Jan 2007 12:07:21 -0000	1.2
***************
*** 6,13 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MAttributeDef;
- import ccmtools.metamodel.BaseIDL.MExceptionDef;
- import ccmtools.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.exception.ExceptionTest;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,13 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.exception.ExceptionTest;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

Index: InterfaceModuleTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceModuleTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InterfaceModuleTest.java	21 Nov 2006 15:55:10 -0000	1.2
--- InterfaceModuleTest.java	19 Jan 2007 12:07:21 -0000	1.3
***************
*** 6,13 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.CcmModelHelper;
! import ccmtools.metamodel.BaseIDL.MEnumDef;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.metamodel.BaseIDL.MModuleDef;
  import ccmtools.parser.idl.module.ModuleTest;
  
--- 6,13 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.CcmModelHelper;
! import ccmtools.parser.idl.metamodel.BaseIDL.MEnumDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MModuleDef;
  import ccmtools.parser.idl.module.ModuleTest;
  

Index: InterfaceOperationTemplateTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceOperationTemplateTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceOperationTemplateTypesTest.java	8 Nov 2006 10:31:32 -0000	1.1
--- InterfaceOperationTemplateTypesTest.java	19 Jan 2007 12:07:21 -0000	1.2
***************
*** 6,13 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.metamodel.BaseIDL.MOperationDef;
! import ccmtools.metamodel.BaseIDL.MParameterDef;
! import ccmtools.metamodel.BaseIDL.MParameterMode;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  import ccmtools.parser.idl.sequence.SequenceTest;
--- 6,13 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterMode;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  import ccmtools.parser.idl.sequence.SequenceTest;

Index: InterfaceTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InterfaceTest.java	18 Jan 2007 17:11:59 -0000	1.2
--- InterfaceTest.java	19 Jan 2007 12:07:20 -0000	1.3
***************
*** 7,18 ****
  import junit.framework.TestCase;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MAttributeDef;
- import ccmtools.metamodel.BaseIDL.MContained;
- import ccmtools.metamodel.BaseIDL.MContainer;
- import ccmtools.metamodel.BaseIDL.MInterfaceDef;
- import ccmtools.metamodel.BaseIDL.MOperationDef;
- import ccmtools.metamodel.BaseIDL.MParameterDef;
- import ccmtools.metamodel.BaseIDL.MParameterMode;
  import ccmtools.parser.idl.ParserManager;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  import ccmtools.ui.ConsoleDriver;
--- 7,18 ----
  import junit.framework.TestCase;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.ParserManager;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MContained;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MContainer;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MParameterDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MParameterMode;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  import ccmtools.ui.ConsoleDriver;

Index: InterfaceOperationConstructedTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceOperationConstructedTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceOperationConstructedTypesTest.java	8 Nov 2006 10:31:33 -0000	1.1
--- InterfaceOperationConstructedTypesTest.java	19 Jan 2007 12:07:21 -0000	1.2
***************
*** 6,14 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MInterfaceDef;
- import ccmtools.metamodel.BaseIDL.MOperationDef;
- import ccmtools.metamodel.BaseIDL.MParameterDef;
- import ccmtools.metamodel.BaseIDL.MParameterMode;
  import ccmtools.parser.idl.enumeration.EnumTest;
  import ccmtools.parser.idl.struct.StructTest;
  import ccmtools.parser.idl.union.UnionTest;
--- 6,14 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.enumeration.EnumTest;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MParameterDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MParameterMode;
  import ccmtools.parser.idl.struct.StructTest;
  import ccmtools.parser.idl.union.UnionTest;

Index: InterfaceReadonlyAttributeOfBaseTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceReadonlyAttributeOfBaseTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceReadonlyAttributeOfBaseTypesTest.java	8 Nov 2006 10:31:33 -0000	1.1
--- InterfaceReadonlyAttributeOfBaseTypesTest.java	19 Jan 2007 12:07:20 -0000	1.2
***************
*** 6,11 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,11 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

Index: InterfaceDefinedInTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceDefinedInTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceDefinedInTest.java	8 Nov 2006 10:31:33 -0000	1.1
--- InterfaceDefinedInTest.java	19 Jan 2007 12:07:20 -0000	1.2
***************
*** 6,10 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
  
  
--- 6,10 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
  
  

Index: InterfaceOperationOnewayTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceOperationOnewayTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceOperationOnewayTest.java	8 Nov 2006 10:31:32 -0000	1.1
--- InterfaceOperationOnewayTest.java	19 Jan 2007 12:07:21 -0000	1.2
***************
*** 6,13 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.metamodel.BaseIDL.MOperationDef;
! import ccmtools.metamodel.BaseIDL.MParameterDef;
! import ccmtools.metamodel.BaseIDL.MParameterMode;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,13 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterMode;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

Index: InterfaceAttributeOfConstructedTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceAttributeOfConstructedTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceAttributeOfConstructedTypesTest.java	8 Nov 2006 10:31:33 -0000	1.1
--- InterfaceAttributeOfConstructedTypesTest.java	19 Jan 2007 12:07:20 -0000	1.2
***************
*** 6,12 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MAttributeDef;
- import ccmtools.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.enumeration.EnumTest;
  import ccmtools.parser.idl.struct.StructTest;
  import ccmtools.parser.idl.union.UnionTest;
--- 6,12 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.enumeration.EnumTest;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.struct.StructTest;
  import ccmtools.parser.idl.union.UnionTest;

Index: InterfaceOperationContextTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceOperationContextTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceOperationContextTest.java	8 Nov 2006 10:31:33 -0000	1.1
--- InterfaceOperationContextTest.java	19 Jan 2007 12:07:21 -0000	1.2
***************
*** 6,11 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.metamodel.BaseIDL.MOperationDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,11 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

Index: InterfaceHeaderTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceHeaderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceHeaderTest.java	8 Nov 2006 10:31:33 -0000	1.1
--- InterfaceHeaderTest.java	19 Jan 2007 12:07:21 -0000	1.2
***************
*** 6,10 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
  
  
--- 6,10 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
  
  

Index: InterfaceConstantsTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceConstantsTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceConstantsTest.java	10 Jan 2007 16:19:19 -0000	1.1
--- InterfaceConstantsTest.java	19 Jan 2007 12:07:20 -0000	1.2
***************
*** 6,12 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.metamodel.BaseIDL.MConstantDef;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,12 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MConstantDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

Index: InterfaceForwardDeclarationTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceForwardDeclarationTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceForwardDeclarationTest.java	8 Nov 2006 10:31:33 -0000	1.1
--- InterfaceForwardDeclarationTest.java	19 Jan 2007 12:07:20 -0000	1.2
***************
*** 6,10 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
  
  
--- 6,10 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
  
  

Index: InterfaceReadonlyAttributeListTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceReadonlyAttributeListTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceReadonlyAttributeListTest.java	8 Nov 2006 10:31:33 -0000	1.1
--- InterfaceReadonlyAttributeListTest.java	19 Jan 2007 12:07:21 -0000	1.2
***************
*** 6,11 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,11 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

Index: InterfaceBodyTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceBodyTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceBodyTest.java	8 Nov 2006 10:31:33 -0000	1.1
--- InterfaceBodyTest.java	19 Jan 2007 12:07:21 -0000	1.2
***************
*** 6,24 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MAliasDef;
- import ccmtools.metamodel.BaseIDL.MConstantDef;
- import ccmtools.metamodel.BaseIDL.MEnumDef;
- import ccmtools.metamodel.BaseIDL.MExceptionDef;
- import ccmtools.metamodel.BaseIDL.MInterfaceDef;
- import ccmtools.metamodel.BaseIDL.MPrimitiveDef;
- import ccmtools.metamodel.BaseIDL.MPrimitiveKind;
- import ccmtools.metamodel.BaseIDL.MStringDef;
- import ccmtools.metamodel.BaseIDL.MStructDef;
- import ccmtools.metamodel.BaseIDL.MTyped;
- import ccmtools.metamodel.BaseIDL.MUnionDef;
  import ccmtools.parser.idl.ScopedName;
  import ccmtools.parser.idl.constant.ConstantTest;
  import ccmtools.parser.idl.enumeration.EnumTest;
  import ccmtools.parser.idl.exception.ExceptionTest;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  import ccmtools.parser.idl.struct.StructTest;
--- 6,24 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.ScopedName;
  import ccmtools.parser.idl.constant.ConstantTest;
  import ccmtools.parser.idl.enumeration.EnumTest;
  import ccmtools.parser.idl.exception.ExceptionTest;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MConstantDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MEnumDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveKind;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MStringDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MStructDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MTyped;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MUnionDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  import ccmtools.parser.idl.struct.StructTest;

Index: InterfaceAttributeOfBaseTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceAttributeOfBaseTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceAttributeOfBaseTypesTest.java	8 Nov 2006 10:31:32 -0000	1.1
--- InterfaceAttributeOfBaseTypesTest.java	19 Jan 2007 12:07:21 -0000	1.2
***************
*** 6,11 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,11 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

Index: InterfaceReadonlyAttributeOfTemplateTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/iface/InterfaceReadonlyAttributeOfTemplateTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InterfaceReadonlyAttributeOfTemplateTypesTest.java	8 Nov 2006 10:31:33 -0000	1.1
--- InterfaceReadonlyAttributeOfTemplateTypesTest.java	19 Jan 2007 12:07:21 -0000	1.2
***************
*** 6,11 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  import ccmtools.parser.idl.sequence.SequenceTest;
--- 6,11 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  import ccmtools.parser.idl.sequence.SequenceTest;

[ccmtools-cvs] ccmtools/doc/DevelopmentNotes JetTemplatesHowTo.txt, NONE, 1.1 NewAndOldGenerators.txt, NONE, 1.1 CppHowTo.txt, NONE, 1.1 CcmMetamodelBugs, 1.2, 1.3

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

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

Modified Files:
	CcmMetamodelBugs 
Added Files:
	JetTemplatesHowTo.txt NewAndOldGenerators.txt CppHowTo.txt 
Log Message:
Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel.

Index: CcmMetamodelBugs
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/doc/DevelopmentNotes/CcmMetamodelBugs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CcmMetamodelBugs	18 Jan 2007 10:19:13 -0000	1.2
--- CcmMetamodelBugs	19 Jan 2007 12:07:24 -0000	1.3
***************
*** 6,10 ****
  
  
- 
  Things that should be checked:
  ------------------------------
--- 6,9 ----

--- NEW FILE: NewAndOldGenerators.txt ---
New and Old Generators
======================

The New Generators
------------------

During the last year, we have implemented (and reimplemented) the following generators 
by using JET technology:

- IDL3, IDL3mirror, IDL2
- Java local, Java remote, Java clientlib

All these new generators supports the following package structure (where xxx must be
substituted by a particular generator name):

ccmtools.generator.xxx
- Main: represents the entrypoint for a shell script to start the generator.
- CommandLineParameter: encapsulates all passed parameters from the shell script.
- CcmToxxxModelMapper: realizes a model to model transformation between the CCM model
	(created by the IDL parser) and the generator's implementation model.
- xxxGenerator: represents the generator front-end that manages all the subtasks needed
	to create source code from a given CCM model.

ccmtools.generator.xxx.metamodel
This package contains all model elements of the generator's implementation metamodel.

ccmtools.generator.xxx.templates.jet
This package contains JET templates which are used by the metamodel elements.
Note that JET templates will be transformed into stand-alone Java classes by the
Eclipse EMF tools.

ccmtools.generator.xxx.templates
This package contains the generated template classes which do not have runtime 
dependencies to the Eclipse platform. 
To be able to build the ccmtools using ant, we also check in these generated classes.


The Old Generators 
-------------------
The C++ local and C++ remote generators use the selfmade Python template engine 
based on the visitor pattern.
So, we should replace these old generators as soon as possible to provide
a uniform framework structure.

Thus, the following packages should 	disappear in the near future:
ccmtools.CodeGenerator
ccmtools.CppGenerator
ccmtools.CppGenerator.plugin
ccmtools.parser.idl3
ccmtools.ui
templates.CppLocalTemplates
templates.CppLocalTestTemplates
templates.CppRemoteTemplates
templates.CppRemoteTestTemplates



--- 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    
    
--- NEW FILE: CppHowTo.txt ---
C Pre-Processor (CPP)
=====================

The OMG specified that an IDL parser has to support a C pre-processor functionality.
Currently, the ccmtools use the GNU cpp tool.

There is a ccmtools.parser.cpp package that encapsulates the cpp access by using a
PreProcessor interface and different implementations. If the ccmtools.cpp property
is set in the etc/ccmtools.property file, this external cpp is used. In the other way
the internal implementation has to process the input files.

ExpernalCpp: delegates to an external pre-processor configured in the 
	etc/ccmtools.property file.
	
InternalCpp: implements a minimal cpp functionality in Java to be independent of
	GNU's cpp tool (e.g. when generating Java components an a Windows platform).	
	Currently, there is no working InternalCpp implementation - only experimental 
	code!!! 	

[ccmtools-cvs] ccmtools/src/ccmtools/CppGenerator/plugin PdlAnyMapping.java, 1.5, 1.6 AnyPlugin.java, 1.3, 1.4 AnyMapping.java, 1.7, 1.8 PdlAnyPlugin.java, 1.6, 1.7 DefaultAnyMapping.java, 1.9, 1.10 AnyPluginManager.java, 1.4, 1.5

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

Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/plugin
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/src/ccmtools/CppGenerator/plugin

Modified Files:
	PdlAnyMapping.java AnyPlugin.java AnyMapping.java 
	PdlAnyPlugin.java DefaultAnyMapping.java AnyPluginManager.java 
Log Message:
Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel.

Index: DefaultAnyMapping.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/plugin/DefaultAnyMapping.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DefaultAnyMapping.java	16 Jan 2007 13:28:32 -0000	1.9
--- DefaultAnyMapping.java	19 Jan 2007 12:07:25 -0000	1.10
***************
*** 1,6 ****
  package ccmtools.CppGenerator.plugin;
  
! import ccmtools.metamodel.BaseIDL.MAliasDef;
! import ccmtools.metamodel.BaseIDL.MTypedefDef;
  
  
--- 1,6 ----
  package ccmtools.CppGenerator.plugin;
  
! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MTypedefDef;
  
  

Index: PdlAnyMapping.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/plugin/PdlAnyMapping.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PdlAnyMapping.java	16 Jan 2007 13:28:32 -0000	1.5
--- PdlAnyMapping.java	19 Jan 2007 12:07:25 -0000	1.6
***************
*** 1,5 ****
  package ccmtools.CppGenerator.plugin;
  
! import ccmtools.metamodel.BaseIDL.MAliasDef;
  
  /**
--- 1,5 ----
  package ccmtools.CppGenerator.plugin;
  
! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
  
  /**

Index: PdlAnyPlugin.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/plugin/PdlAnyPlugin.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PdlAnyPlugin.java	16 Jan 2007 13:28:32 -0000	1.6
--- PdlAnyPlugin.java	19 Jan 2007 12:07:25 -0000	1.7
***************
*** 10,15 ****
  import java.util.Map;
  
! import ccmtools.metamodel.BaseIDL.MAliasDef;
! import ccmtools.metamodel.BaseIDL.MTypedefDef;
  import ccmtools.utils.ConfigurationLocator;
  
--- 10,15 ----
  import java.util.Map;
  
! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MTypedefDef;
  import ccmtools.utils.ConfigurationLocator;
  

Index: AnyPluginManager.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/plugin/AnyPluginManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AnyPluginManager.java	10 Aug 2006 20:21:50 -0000	1.4
--- AnyPluginManager.java	19 Jan 2007 12:07:25 -0000	1.5
***************
*** 6,13 ****
  
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MAliasDef;
! import ccmtools.metamodel.BaseIDL.MIDLType;
! import ccmtools.metamodel.BaseIDL.MPrimitiveDef;
! import ccmtools.metamodel.BaseIDL.MPrimitiveKind;
  
  /**
--- 6,13 ----
  
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MIDLType;
! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveKind;
  
  /**

Index: AnyPlugin.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/plugin/AnyPlugin.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AnyPlugin.java	10 Aug 2006 20:21:50 -0000	1.3
--- AnyPlugin.java	19 Jan 2007 12:07:25 -0000	1.4
***************
*** 1,5 ****
  package ccmtools.CppGenerator.plugin;
  
! import ccmtools.metamodel.BaseIDL.MAliasDef;
  
  public interface AnyPlugin
--- 1,5 ----
  package ccmtools.CppGenerator.plugin;
  
! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
  
  public interface AnyPlugin

Index: AnyMapping.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/plugin/AnyMapping.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AnyMapping.java	16 Jan 2007 13:28:32 -0000	1.7
--- AnyMapping.java	19 Jan 2007 12:07:25 -0000	1.8
***************
*** 1,5 ****
  package ccmtools.CppGenerator.plugin;
  
! import ccmtools.metamodel.BaseIDL.MAliasDef;
  
  /**
--- 1,5 ----
  package ccmtools.CppGenerator.plugin;
  
! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
  
  /**

[ccmtools-cvs] ccmtools/src-test/ccmtools/parser/idl/home HomeFactoryTest.java, 1.1, 1.2 HomeTest.java, 1.2, 1.3 HomeHeaderTest.java, 1.2, 1.3 HomeModuleTest.java, 1.1, 1.2 HomeAttributesTest.java, 1.1, 1.2

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

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

Modified Files:
	HomeFactoryTest.java HomeTest.java HomeHeaderTest.java 
	HomeModuleTest.java HomeAttributesTest.java 
Log Message:
Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel.

Index: HomeTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/home/HomeTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HomeTest.java	18 Jan 2007 17:11:57 -0000	1.2
--- HomeTest.java	19 Jan 2007 12:07:25 -0000	1.3
***************
*** 7,14 ****
  import junit.framework.TestCase;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MContained;
- import ccmtools.metamodel.BaseIDL.MContainer;
- import ccmtools.metamodel.ComponentIDL.MHomeDef;
  import ccmtools.parser.idl.ParserManager;
  import ccmtools.ui.ConsoleDriver;
  import ccmtools.ui.UserInterfaceDriver;
--- 7,14 ----
  import junit.framework.TestCase;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.ParserManager;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MContained;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MContainer;
+ import ccmtools.parser.idl.metamodel.ComponentIDL.MHomeDef;
  import ccmtools.ui.ConsoleDriver;
  import ccmtools.ui.UserInterfaceDriver;

Index: HomeModuleTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/home/HomeModuleTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HomeModuleTest.java	21 Nov 2006 14:37:48 -0000	1.1
--- HomeModuleTest.java	19 Jan 2007 12:07:25 -0000	1.2
***************
*** 6,13 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.CcmModelHelper;
! import ccmtools.metamodel.BaseIDL.MModuleDef;
! import ccmtools.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.metamodel.ComponentIDL.MHomeDef;
  import ccmtools.parser.idl.module.ModuleTest;
  
--- 6,13 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.CcmModelHelper;
! import ccmtools.parser.idl.metamodel.BaseIDL.MModuleDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MHomeDef;
  import ccmtools.parser.idl.module.ModuleTest;
  

Index: HomeHeaderTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/home/HomeHeaderTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HomeHeaderTest.java	10 Nov 2006 13:20:35 -0000	1.2
--- HomeHeaderTest.java	19 Jan 2007 12:07:25 -0000	1.3
***************
*** 6,13 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.CcmModelHelper;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.metamodel.ComponentIDL.MHomeDef;
  
  
--- 6,13 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.CcmModelHelper;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MHomeDef;
  
  

Index: HomeFactoryTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/home/HomeFactoryTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HomeFactoryTest.java	23 Nov 2006 18:13:38 -0000	1.1
--- HomeFactoryTest.java	19 Jan 2007 12:07:25 -0000	1.2
***************
*** 6,17 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.CcmModelHelper;
- import ccmtools.metamodel.BaseIDL.MExceptionDef;
- import ccmtools.metamodel.BaseIDL.MParameterDef;
- import ccmtools.metamodel.ComponentIDL.MComponentDef;
- import ccmtools.metamodel.ComponentIDL.MFactoryDef;
- import ccmtools.metamodel.ComponentIDL.MHomeDef;
  import ccmtools.parser.idl.enumeration.EnumTest;
  import ccmtools.parser.idl.exception.ExceptionTest;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,17 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.enumeration.EnumTest;
  import ccmtools.parser.idl.exception.ExceptionTest;
+ import ccmtools.parser.idl.metamodel.CcmModelHelper;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MParameterDef;
+ import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDef;
+ import ccmtools.parser.idl.metamodel.ComponentIDL.MFactoryDef;
+ import ccmtools.parser.idl.metamodel.ComponentIDL.MHomeDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

Index: HomeAttributesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/home/HomeAttributesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HomeAttributesTest.java	24 Nov 2006 08:47:17 -0000	1.1
--- HomeAttributesTest.java	19 Jan 2007 12:07:25 -0000	1.2
***************
*** 6,13 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.CcmModelHelper;
- import ccmtools.metamodel.BaseIDL.MAttributeDef;
- import ccmtools.metamodel.ComponentIDL.MHomeDef;
  import ccmtools.parser.idl.enumeration.EnumTest;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  import ccmtools.parser.idl.struct.StructTest;
--- 6,13 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.enumeration.EnumTest;
+ import ccmtools.parser.idl.metamodel.CcmModelHelper;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef;
+ import ccmtools.parser.idl.metamodel.ComponentIDL.MHomeDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  import ccmtools.parser.idl.struct.StructTest;

[ccmtools-cvs] ccmtools/src-test/ccmtools/parser/idl/primitive PrimitiveTest.java, 1.1, 1.2

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

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

Modified Files:
	PrimitiveTest.java 
Log Message:
Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel.

Index: PrimitiveTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/primitive/PrimitiveTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PrimitiveTest.java	8 Nov 2006 10:31:53 -0000	1.1
--- PrimitiveTest.java	19 Jan 2007 12:07:25 -0000	1.2
***************
*** 2,13 ****
  
  import junit.framework.TestCase;
! import ccmtools.metamodel.BaseIDL.MFixedDef;
! import ccmtools.metamodel.BaseIDL.MIDLType;
! import ccmtools.metamodel.BaseIDL.MNativeDef;
! import ccmtools.metamodel.BaseIDL.MPrimitiveDef;
! import ccmtools.metamodel.BaseIDL.MPrimitiveKind;
! import ccmtools.metamodel.BaseIDL.MStringDef;
! import ccmtools.metamodel.BaseIDL.MTyped;
! import ccmtools.metamodel.BaseIDL.MWstringDef;
  
  public class PrimitiveTest extends TestCase
--- 2,13 ----
  
  import junit.framework.TestCase;
! import ccmtools.parser.idl.metamodel.BaseIDL.MFixedDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MIDLType;
! import ccmtools.parser.idl.metamodel.BaseIDL.MNativeDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveKind;
! import ccmtools.parser.idl.metamodel.BaseIDL.MStringDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MTyped;
! import ccmtools.parser.idl.metamodel.BaseIDL.MWstringDef;
  
  public class PrimitiveTest extends TestCase

[ccmtools-cvs] ccmtools/bin ccmmodel,1.4,1.5

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

Update of /cvsroot/ccmtools/ccmtools/bin
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4737/bin

Modified Files:
	ccmmodel 
Log Message:
Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel.

Index: ccmmodel
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/bin/ccmmodel,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ccmmodel	25 Aug 2006 07:54:31 -0000	1.4
--- ccmmodel	19 Jan 2007 12:07:24 -0000	1.5
***************
*** 20,24 ****
  		CLASSPATH="$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CCMTOOLS_HOME/lib/ccm-runtime.jar:$CLASSPATH"
  	fi	
! 	exec "$JAVA_HOME/bin/java" -cp $CLASSPATH -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.metamodel.Main $@  
  else
  	echo "ERROR!"
--- 20,24 ----
  		CLASSPATH="$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CCMTOOLS_HOME/lib/ccm-runtime.jar:$CLASSPATH"
  	fi	
! 	exec "$JAVA_HOME/bin/java" -cp $CLASSPATH -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.parser.idl.metamodel.Main $@  
  else
  	echo "ERROR!"

[ccmtools-cvs] ccmtools/src-test/ccmtools/parser/idl/exception EmptyExceptionTest.java, 1.1, 1.2 ExceptionOfBaseTypesTest.java, 1.1, 1.2 ExceptionModuleTest.java, 1.1, 1.2 ExceptionOfTempleateTypesTest.java, 1.1, 1.2 ExceptionOfConstructedTypesTest.java, 1.1, 1.2 ExceptionTest.java, 1.2, 1.3

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

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

Modified Files:
	EmptyExceptionTest.java ExceptionOfBaseTypesTest.java 
	ExceptionModuleTest.java ExceptionOfTempleateTypesTest.java 
	ExceptionOfConstructedTypesTest.java ExceptionTest.java 
Log Message:
Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel.

Index: EmptyExceptionTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/exception/EmptyExceptionTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EmptyExceptionTest.java	8 Nov 2006 10:31:50 -0000	1.1
--- EmptyExceptionTest.java	19 Jan 2007 12:07:22 -0000	1.2
***************
*** 6,10 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MExceptionDef;
  
  
--- 6,10 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef;
  
  

Index: ExceptionOfConstructedTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/exception/ExceptionOfConstructedTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExceptionOfConstructedTypesTest.java	8 Nov 2006 10:31:50 -0000	1.1
--- ExceptionOfConstructedTypesTest.java	19 Jan 2007 12:07:22 -0000	1.2
***************
*** 6,12 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MExceptionDef;
- import ccmtools.metamodel.BaseIDL.MFieldDef;
  import ccmtools.parser.idl.enumeration.EnumTest;
  import ccmtools.parser.idl.struct.StructTest;
  import ccmtools.parser.idl.union.UnionTest;
--- 6,12 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.enumeration.EnumTest;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDef;
  import ccmtools.parser.idl.struct.StructTest;
  import ccmtools.parser.idl.union.UnionTest;

Index: ExceptionOfTempleateTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/exception/ExceptionOfTempleateTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExceptionOfTempleateTypesTest.java	8 Nov 2006 10:31:50 -0000	1.1
--- ExceptionOfTempleateTypesTest.java	19 Jan 2007 12:07:22 -0000	1.2
***************
*** 6,13 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MExceptionDef;
! import ccmtools.metamodel.BaseIDL.MFieldDef;
! import ccmtools.metamodel.BaseIDL.MSequenceDef;
! import ccmtools.metamodel.BaseIDL.MTyped;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,13 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MTyped;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

Index: ExceptionTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/exception/ExceptionTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExceptionTest.java	18 Jan 2007 17:11:58 -0000	1.2
--- ExceptionTest.java	19 Jan 2007 12:07:22 -0000	1.3
***************
*** 6,13 ****
  import junit.framework.TestCase;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MContainer;
- 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;
--- 6,13 ----
  import junit.framework.TestCase;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.ParserManager;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MContainer;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  import ccmtools.ui.ConsoleDriver;

Index: ExceptionModuleTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/exception/ExceptionModuleTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExceptionModuleTest.java	21 Nov 2006 14:37:48 -0000	1.1
--- ExceptionModuleTest.java	19 Jan 2007 12:07:22 -0000	1.2
***************
*** 6,12 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.CcmModelHelper;
! import ccmtools.metamodel.BaseIDL.MExceptionDef;
! import ccmtools.metamodel.BaseIDL.MModuleDef;
  import ccmtools.parser.idl.module.ModuleTest;
  
--- 6,12 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.CcmModelHelper;
! import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MModuleDef;
  import ccmtools.parser.idl.module.ModuleTest;
  

Index: ExceptionOfBaseTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/exception/ExceptionOfBaseTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExceptionOfBaseTypesTest.java	8 Nov 2006 10:31:50 -0000	1.1
--- ExceptionOfBaseTypesTest.java	19 Jan 2007 12:07:22 -0000	1.2
***************
*** 6,11 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MExceptionDef;
! import ccmtools.metamodel.BaseIDL.MFieldDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,11 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDef;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

[ccmtools-cvs] ccmtools/src/ccmtools/parser/idl ArrayDeclarator.java, 1.1, 1.2 idlparser.cup, 1.27, 1.28 ModelRepository.java, 1.6, 1.7 ParserHelper.java, 1.42, 1.43 ParserManager.java, 1.1, 1.2

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

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

Modified Files:
	ArrayDeclarator.java idlparser.cup ModelRepository.java 
	ParserHelper.java ParserManager.java 
Log Message:
Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel.

Index: ArrayDeclarator.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/ArrayDeclarator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ArrayDeclarator.java	15 Sep 2006 11:29:13 -0000	1.1
--- ArrayDeclarator.java	19 Jan 2007 12:06:51 -0000	1.2
***************
*** 1,5 ****
  package ccmtools.parser.idl;
  
! import ccmtools.metamodel.BaseIDL.MArrayDef;
  
  public class ArrayDeclarator
--- 1,5 ----
  package ccmtools.parser.idl;
  
! import ccmtools.parser.idl.metamodel.BaseIDL.MArrayDef;
  
  public class ArrayDeclarator

Index: ParserManager.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/ParserManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ParserManager.java	18 Jan 2007 17:11:49 -0000	1.1
--- ParserManager.java	19 Jan 2007 12:06:52 -0000	1.2
***************
*** 7,12 ****
  
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MContainer;
  import ccmtools.parser.cpp.CppManager;
  import ccmtools.ui.UserInterfaceDriver;
  
--- 7,12 ----
  
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.cpp.CppManager;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MContainer;
  import ccmtools.ui.UserInterfaceDriver;
  

Index: idlparser.cup
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/idlparser.cup,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** idlparser.cup	10 Jan 2007 16:19:17 -0000	1.27
--- idlparser.cup	19 Jan 2007 12:06:51 -0000	1.28
***************
*** 6,11 ****
  import java_cup.runtime.*;
  
! import ccmtools.metamodel.BaseIDL.*;
! import ccmtools.metamodel.ComponentIDL.*;
  
  parser code 
--- 6,11 ----
  import java_cup.runtime.*;
  
! import ccmtools.parser.idl.metamodel.BaseIDL.*;
! import ccmtools.parser.idl.metamodel.ComponentIDL.*;
  
  parser code 

Index: ParserHelper.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/ParserHelper.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** ParserHelper.java	18 Jan 2007 17:11:48 -0000	1.42
--- ParserHelper.java	19 Jan 2007 12:06:51 -0000	1.43
***************
*** 9,76 ****
  
  import java_cup.runtime.Symbol;
! import ccmtools.metamodel.BaseIDL.MAliasDef;
! import ccmtools.metamodel.BaseIDL.MAliasDefImpl;
! import ccmtools.metamodel.BaseIDL.MArrayDef;
! import ccmtools.metamodel.BaseIDL.MArrayDefImpl;
! import ccmtools.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.metamodel.BaseIDL.MAttributeDefImpl;
! import ccmtools.metamodel.BaseIDL.MConstantDef;
! import ccmtools.metamodel.BaseIDL.MConstantDefImpl;
! import ccmtools.metamodel.BaseIDL.MContained;
! import ccmtools.metamodel.BaseIDL.MContainer;
! import ccmtools.metamodel.BaseIDL.MContainerImpl;
! import ccmtools.metamodel.BaseIDL.MEnumDef;
! import ccmtools.metamodel.BaseIDL.MEnumDefImpl;
! import ccmtools.metamodel.BaseIDL.MExceptionDef;
! import ccmtools.metamodel.BaseIDL.MExceptionDefImpl;
! import ccmtools.metamodel.BaseIDL.MFieldDef;
! import ccmtools.metamodel.BaseIDL.MFieldDefImpl;
! import ccmtools.metamodel.BaseIDL.MFixedDef;
! import ccmtools.metamodel.BaseIDL.MFixedDefImpl;
! import ccmtools.metamodel.BaseIDL.MIDLType;
! import ccmtools.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.metamodel.BaseIDL.MInterfaceDefImpl;
! import ccmtools.metamodel.BaseIDL.MModuleDef;
! import ccmtools.metamodel.BaseIDL.MModuleDefImpl;
! import ccmtools.metamodel.BaseIDL.MNativeDef;
! import ccmtools.metamodel.BaseIDL.MNativeDefImpl;
! import ccmtools.metamodel.BaseIDL.MOperationDef;
! import ccmtools.metamodel.BaseIDL.MOperationDefImpl;
! import ccmtools.metamodel.BaseIDL.MParameterDef;
! import ccmtools.metamodel.BaseIDL.MParameterDefImpl;
! import ccmtools.metamodel.BaseIDL.MParameterMode;
! import ccmtools.metamodel.BaseIDL.MPrimitiveDef;
! import ccmtools.metamodel.BaseIDL.MPrimitiveDefImpl;
! import ccmtools.metamodel.BaseIDL.MPrimitiveKind;
! import ccmtools.metamodel.BaseIDL.MSequenceDef;
! import ccmtools.metamodel.BaseIDL.MSequenceDefImpl;
! import ccmtools.metamodel.BaseIDL.MStringDef;
! import ccmtools.metamodel.BaseIDL.MStringDefImpl;
! import ccmtools.metamodel.BaseIDL.MStructDef;
! import ccmtools.metamodel.BaseIDL.MStructDefImpl;
! import ccmtools.metamodel.BaseIDL.MTypedefDef;
! import ccmtools.metamodel.BaseIDL.MUnionDef;
! import ccmtools.metamodel.BaseIDL.MUnionDefImpl;
! import ccmtools.metamodel.BaseIDL.MUnionFieldDef;
! import ccmtools.metamodel.BaseIDL.MUnionFieldDefImpl;
! import ccmtools.metamodel.BaseIDL.MValueBoxDef;
! import ccmtools.metamodel.BaseIDL.MValueBoxDefImpl;
! import ccmtools.metamodel.BaseIDL.MValueDef;
! import ccmtools.metamodel.BaseIDL.MValueDefImpl;
! import ccmtools.metamodel.BaseIDL.MValueMemberDef;
! import ccmtools.metamodel.BaseIDL.MValueMemberDefImpl;
! import ccmtools.metamodel.BaseIDL.MWstringDef;
! import ccmtools.metamodel.BaseIDL.MWstringDefImpl;
! import ccmtools.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.metamodel.ComponentIDL.MComponentDefImpl;
! import ccmtools.metamodel.ComponentIDL.MFactoryDef;
! import ccmtools.metamodel.ComponentIDL.MFactoryDefImpl;
! import ccmtools.metamodel.ComponentIDL.MFinderDef;
! import ccmtools.metamodel.ComponentIDL.MHomeDef;
! import ccmtools.metamodel.ComponentIDL.MHomeDefImpl;
! import ccmtools.metamodel.ComponentIDL.MProvidesDef;
! import ccmtools.metamodel.ComponentIDL.MProvidesDefImpl;
! import ccmtools.metamodel.ComponentIDL.MUsesDef;
! import ccmtools.metamodel.ComponentIDL.MUsesDefImpl;
  import ccmtools.utils.Text;
  
--- 9,76 ----
  
  import java_cup.runtime.Symbol;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MArrayDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MArrayDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAttributeDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MConstantDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MConstantDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MContained;
! import ccmtools.parser.idl.metamodel.BaseIDL.MContainer;
! import ccmtools.parser.idl.metamodel.BaseIDL.MContainerImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MEnumDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MEnumDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MFieldDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MFixedDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MFixedDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MIDLType;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MInterfaceDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MModuleDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MModuleDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MNativeDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MNativeDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MOperationDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MParameterMode;
! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MPrimitiveKind;
! import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MStringDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MStringDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MStructDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MStructDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MTypedefDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MUnionDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MUnionDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MUnionFieldDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MUnionFieldDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MValueBoxDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MValueBoxDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MValueDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MValueDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MValueMemberDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MValueMemberDefImpl;
! import ccmtools.parser.idl.metamodel.BaseIDL.MWstringDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MWstringDefImpl;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MComponentDefImpl;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MFactoryDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MFactoryDefImpl;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MFinderDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MHomeDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MHomeDefImpl;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MProvidesDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MProvidesDefImpl;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MUsesDef;
! import ccmtools.parser.idl.metamodel.ComponentIDL.MUsesDefImpl;
  import ccmtools.utils.Text;
  

Index: ModelRepository.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/ModelRepository.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ModelRepository.java	24 Nov 2006 18:43:08 -0000	1.6
--- ModelRepository.java	19 Jan 2007 12:06:51 -0000	1.7
***************
*** 5,10 ****
  import java.util.logging.Logger;
  
! import ccmtools.metamodel.BaseIDL.MExceptionDef;
! import ccmtools.metamodel.BaseIDL.MIDLType;
  
  public class ModelRepository
--- 5,10 ----
  import java.util.logging.Logger;
  
! import ccmtools.parser.idl.metamodel.BaseIDL.MExceptionDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MIDLType;
  
  public class ModelRepository

[ccmtools-cvs] ccmtools/src-test/ccmtools/parser/idl/sequence SequenceOfTemplateTypesTest.java, 1.1, 1.2 SequenceDefinedInTest.java, 1.1, 1.2 BoundedSequenceOfTemplateTypesTest.java, 1.1, 1.2 BoundedSequenceOfConstructedTypesTest.java, 1.1, 1.2 SequenceTest.java, 1.2, 1.3 BoundedSequenceOfBaseTypesTest.java, 1.1, 1.2 SequenceOfBaseTypesTest.java, 1.1, 1.2 SequenceOfConstructedTypesTest.java, 1.1, 1.2

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

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

Modified Files:
	SequenceOfTemplateTypesTest.java SequenceDefinedInTest.java 
	BoundedSequenceOfTemplateTypesTest.java 
	BoundedSequenceOfConstructedTypesTest.java SequenceTest.java 
	BoundedSequenceOfBaseTypesTest.java 
	SequenceOfBaseTypesTest.java 
	SequenceOfConstructedTypesTest.java 
Log Message:
Moved ccmtools.metamodel to ccmtools.parser.idl.metamodel.

Index: SequenceOfConstructedTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/sequence/SequenceOfConstructedTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SequenceOfConstructedTypesTest.java	8 Nov 2006 10:31:39 -0000	1.1
--- SequenceOfConstructedTypesTest.java	19 Jan 2007 12:07:19 -0000	1.2
***************
*** 6,12 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MAliasDef;
- import ccmtools.metamodel.BaseIDL.MSequenceDef;
  import ccmtools.parser.idl.enumeration.EnumTest;
  import ccmtools.parser.idl.struct.StructTest;
  import ccmtools.parser.idl.union.UnionTest;
--- 6,12 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.enumeration.EnumTest;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDef;
  import ccmtools.parser.idl.struct.StructTest;
  import ccmtools.parser.idl.union.UnionTest;

Index: BoundedSequenceOfConstructedTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/sequence/BoundedSequenceOfConstructedTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BoundedSequenceOfConstructedTypesTest.java	8 Nov 2006 10:31:39 -0000	1.1
--- BoundedSequenceOfConstructedTypesTest.java	19 Jan 2007 12:07:19 -0000	1.2
***************
*** 6,12 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MAliasDef;
- import ccmtools.metamodel.BaseIDL.MSequenceDef;
  import ccmtools.parser.idl.enumeration.EnumTest;
  import ccmtools.parser.idl.struct.StructTest;
  import ccmtools.parser.idl.union.UnionTest;
--- 6,12 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.enumeration.EnumTest;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDef;
  import ccmtools.parser.idl.struct.StructTest;
  import ccmtools.parser.idl.union.UnionTest;

Index: SequenceTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/sequence/SequenceTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SequenceTest.java	18 Jan 2007 17:11:50 -0000	1.2
--- SequenceTest.java	19 Jan 2007 12:07:19 -0000	1.3
***************
*** 6,15 ****
  import junit.framework.TestCase;
  import ccmtools.CcmtoolsException;
- import ccmtools.metamodel.BaseIDL.MAliasDef;
- import ccmtools.metamodel.BaseIDL.MContainer;
- import ccmtools.metamodel.BaseIDL.MIDLType;
- import ccmtools.metamodel.BaseIDL.MSequenceDef;
- import ccmtools.metamodel.BaseIDL.MTyped;
  import ccmtools.parser.idl.ParserManager;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  import ccmtools.ui.ConsoleDriver;
--- 6,15 ----
  import junit.framework.TestCase;
  import ccmtools.CcmtoolsException;
  import ccmtools.parser.idl.ParserManager;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MContainer;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MIDLType;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDef;
+ import ccmtools.parser.idl.metamodel.BaseIDL.MTyped;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  import ccmtools.ui.ConsoleDriver;

Index: SequenceOfBaseTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/sequence/SequenceOfBaseTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SequenceOfBaseTypesTest.java	8 Nov 2006 10:31:39 -0000	1.1
--- SequenceOfBaseTypesTest.java	19 Jan 2007 12:07:19 -0000	1.2
***************
*** 6,12 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MAliasDef;
! import ccmtools.metamodel.BaseIDL.MSequenceDef;
! import ccmtools.metamodel.BaseIDL.MTyped;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,12 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MTyped;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

Index: BoundedSequenceOfTemplateTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/sequence/BoundedSequenceOfTemplateTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BoundedSequenceOfTemplateTypesTest.java	8 Nov 2006 10:31:39 -0000	1.1
--- BoundedSequenceOfTemplateTypesTest.java	19 Jan 2007 12:07:18 -0000	1.2
***************
*** 6,12 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MAliasDef;
! import ccmtools.metamodel.BaseIDL.MSequenceDef;
! import ccmtools.metamodel.BaseIDL.MTyped;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,12 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MTyped;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

Index: SequenceDefinedInTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/sequence/SequenceDefinedInTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SequenceDefinedInTest.java	8 Nov 2006 10:31:39 -0000	1.1
--- SequenceDefinedInTest.java	19 Jan 2007 12:07:18 -0000	1.2
***************
*** 6,10 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MAliasDef;
  
  
--- 6,10 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
  
  

Index: SequenceOfTemplateTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/sequence/SequenceOfTemplateTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SequenceOfTemplateTypesTest.java	8 Nov 2006 10:31:39 -0000	1.1
--- SequenceOfTemplateTypesTest.java	19 Jan 2007 12:07:18 -0000	1.2
***************
*** 6,12 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MAliasDef;
! import ccmtools.metamodel.BaseIDL.MSequenceDef;
! import ccmtools.metamodel.BaseIDL.MTyped;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,12 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MTyped;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  

Index: BoundedSequenceOfBaseTypesTest.java
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/src-test/ccmtools/parser/idl/sequence/BoundedSequenceOfBaseTypesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BoundedSequenceOfBaseTypesTest.java	8 Nov 2006 10:31:39 -0000	1.1
--- BoundedSequenceOfBaseTypesTest.java	19 Jan 2007 12:07:19 -0000	1.2
***************
*** 6,12 ****
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.metamodel.BaseIDL.MAliasDef;
! import ccmtools.metamodel.BaseIDL.MSequenceDef;
! import ccmtools.metamodel.BaseIDL.MTyped;
  import ccmtools.parser.idl.primitive.PrimitiveTest;
  
--- 6,12 ----
  import junit.framework.TestSuite;
  import ccmtools.CcmtoolsException;
! import ccmtools.parser.idl.metamodel.BaseIDL.MAliasDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MSequenceDef;
! import ccmtools.parser.idl.metamodel.BaseIDL.MTyped;
  import ccmtools.parser.idl.primitive.PrimitiveTest;