Menu
▾
▴
ccmtools-cvs — Notification of CVS commits for the CCM Tools
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(86) |
Dec
(163) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(114) |
Feb
(254) |
Mar
(166) |
Apr
(122) |
May
(131) |
Jun
(59) |
Jul
(201) |
Aug
(85) |
Sep
(80) |
Oct
(64) |
Nov
(103) |
Dec
(36) |
| 2005 |
Jan
(231) |
Feb
(204) |
Mar
(71) |
Apr
(54) |
May
(50) |
Jun
(120) |
Jul
(17) |
Aug
(124) |
Sep
(75) |
Oct
(154) |
Nov
(37) |
Dec
(143) |
| 2006 |
Jan
(346) |
Feb
(170) |
Mar
|
Apr
|
May
(273) |
Jun
(113) |
Jul
(427) |
Aug
(570) |
Sep
(212) |
Oct
(550) |
Nov
(348) |
Dec
(314) |
| 2007 |
Jan
(709) |
Feb
(223) |
Mar
(104) |
Apr
(24) |
May
(11) |
Jun
(3) |
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Robert L. <rle...@us...> - 2007-02-14 12:27:12
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14714/src/ccmtools/parser/assembly Modified Files: Main.java assembly.cup Log Message: ccm assembly metamodel + Java generator Index: assembly.cup =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/assembly.cup,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** assembly.cup 12 Feb 2007 14:08:31 -0000 1.2 --- assembly.cup 14 Feb 2007 12:27:06 -0000 1.3 *************** *** 115,121 **** assembly ::= ! ASSEMBLY NAME:v1 IMPLEMENTS qualified_name:v2 LBRACE assembly_element_list:v3 RBRACE SEMICOLON {: ! RESULT = new ccmtools.parser.assembly.metamodel.Assembly(v1, v2, v3); :} ; --- 115,126 ---- assembly ::= ! ASSEMBLY NAME:x IMPLEMENTS NAME:n LBRACE assembly_element_list:l RBRACE SEMICOLON {: ! RESULT = new ccmtools.parser.assembly.metamodel.Assembly(n, x, l); ! :} ! | ! ASSEMBLY IMPLEMENTS NAME:n LBRACE assembly_element_list:l RBRACE SEMICOLON ! {: ! RESULT = new ccmtools.parser.assembly.metamodel.Assembly(n, null, l); :} ; Index: Main.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/Main.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Main.java 12 Feb 2007 16:01:17 -0000 1.3 --- Main.java 14 Feb 2007 12:27:05 -0000 1.4 *************** *** 11,14 **** --- 11,16 ---- import java.io.FileReader; + import java.util.List; + import ccmtools.CcmtoolsException; import ccmtools.parser.assembly.metamodel.Model; *************** *** 53,55 **** --- 55,75 ---- return result; } + + public static Model parse( List<String> files ) throws Exception + { + Model result = new Model(); + for (String f : files) + { + try + { + Model m = parse(f); + result.merge(m); + } + catch (Exception e) + { + throw new CcmtoolsException("problem with: " + f, e); + } + } + return result; + } } |
|
From: Teiniker E. <tei...@us...> - 2007-02-13 13:57:24
|
Update of /cvsroot/ccmtools/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11134 Modified Files: Tag: BRANCH-FHJ ChangeLog build.xml Added Files: Tag: BRANCH-FHJ BRANCHES Log Message: merged changes from trunk --- NEW FILE: BRANCHES --- $Id: BRANCHES,v 1.1.2.1 2007/02/13 13:56:42 teiniker Exp $ : | +-- RELEASE-0_8_5 |\ | *--------------------------+ RELEASE-0_8-BRANCH | | : : | | | + RELEASE-0_8_7 (February 13, 2007) | /| +<-- merged 2007-02-13 ----* | | v | v Index: build.xml =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/build.xml,v retrieving revision 1.73.4.1 retrieving revision 1.73.4.2 diff -C2 -d -r1.73.4.1 -r1.73.4.2 *** build.xml 2 Feb 2007 14:42:28 -0000 1.73.4.1 --- build.xml 13 Feb 2007 13:56:42 -0000 1.73.4.2 *************** *** 1,11 **** <project name="ccmtools" default="install" basedir="."> ! ! <!-- Define properties that are used in the following tasks. Note that a property can be set from command-line: ant -Dprefix=/usr/local --> <property name="src" location="src" /> ! <property name="src-gen" location="src-gen" /> ! <property name="src-test" location="src-test" /> <property name="idl" location="idl" /> <property name="bin" location="bin" /> --- 1,11 ---- <project name="ccmtools" default="install" basedir="."> ! ! <!-- Define properties that are used in the following tasks. Note that a property can be set from command-line: ant -Dprefix=/usr/local --> <property name="src" location="src" /> ! <property name="src-gen" location="src-gen" /> ! <property name="src-test" location="src-test" /> <property name="idl" location="idl" /> <property name="bin" location="bin" /> *************** *** 17,21 **** <property name="test" location="test" /> ! <!-- Define different paths that are used in the following tasks --> --- 17,21 ---- <property name="test" location="test" /> ! <!-- Define different paths that are used in the following tasks --> *************** *** 38,82 **** <mkdir dir="${build}" /> <mkdir dir="${build}/classes" /> ! </target> - <!-- Generate IDL3 parser source code using ANTLR --> ! <target name="generate.IDL3Parser" depends="init"> ! <antlr target="${src}/ccmtools/parser/idl3/idl3new.g" dir="${src}/ccmtools/parser/idl3" > <classpath refid="compile.classpath" /> </antlr> </target> ! ! <!-- Generate IDL parser source code using JFlex+Cup --> ! <target name="generate.IdlScanner" depends="init"> ! <java jar="${lib}/JFlex.jar" fork="true"> <arg line = "-d ${src-gen}/ccmtools/parser/idl ${src}/ccmtools/parser/idl/idlscanner.flex" /> </java> </target> ! <target name="generate.IdlParser" depends="init"> ! <java jar="${lib}/java-cup-11a.jar" fork="true"> <arg line = "-destdir ${src-gen}/ccmtools/parser/idl -package ccmtools.parser.idl -parser IdlParser ${src}/ccmtools/parser/idl/idlparser.cup" /> ! </java> </target> <!-- Compile ccmtools source code --> ! <target name="compile.ccmtools" depends="generate.IDL3Parser, generate.IdlScanner, generate.IdlParser" description="Compile the ccmtools package." > ! <javac srcdir="${src}/ccmtools:${src-gen}" destdir="${build}/classes" debug="on" source="1.5" target="1.5" verbose="off"> ! <classpath refid="compile.classpath" /> </javac> </target> ! ! <!-- Create Java archive file from all package. --> ! <target name="jar.ccmtools" depends="compile.ccmtools" description="Create Java archive file from ccmtools package." > <jar jarfile="${lib}/ccmtools.jar" basedir="${build}/classes" > --- 38,115 ---- <mkdir dir="${build}" /> <mkdir dir="${build}/classes" /> ! </target> ! <!-- Generate IDL3 parser source code using ANTLR --> ! <target name="generate.IDL3Parser" depends="init"> ! <antlr target="${src}/ccmtools/parser/idl3/idl3new.g" dir="${src}/ccmtools/parser/idl3" > <classpath refid="compile.classpath" /> </antlr> </target> ! ! <!-- Generate IDL parser source code using JFlex+Cup --> ! <target name="generate.IdlScanner" depends="init"> ! <java jar="${lib}/JFlex.jar" fork="true"> <arg line = "-d ${src-gen}/ccmtools/parser/idl ${src}/ccmtools/parser/idl/idlscanner.flex" /> </java> </target> ! <target name="generate.IdlParser" depends="init"> ! <java jar="${lib}/java-cup-11a.jar" fork="true"> <arg line = "-destdir ${src-gen}/ccmtools/parser/idl -package ccmtools.parser.idl -parser IdlParser ${src}/ccmtools/parser/idl/idlparser.cup" /> ! </java> </target> + <!-- Generate assembly parser source code using JFlex+Cup --> + + <target name="generate.AssemblyLexer" depends="init"> + <java jar="${lib}/JFlex.jar" fork="true"> + <arg line = "-d ${src-gen}/ccmtools/parser/assembly ${src}/ccmtools/parser/assembly/assembly.flex" /> + </java> + </target> + + <target name="generate.AssemblyParser" depends="init"> + <java jar="${lib}/java-cup-11a.jar" fork="true"> + <arg line = "-destdir ${src-gen}/ccmtools/parser/assembly -parser AssemblyParser ${src}/ccmtools/parser/assembly/assembly.cup" /> + </java> + </target> + + <target name="compile.AssemblyMain" depends="generate.AssemblyLexer, generate.AssemblyParser"> + <javac srcdir="${src}/ccmtools/parser/assembly:${src-gen}/ccmtools/parser/assembly" + destdir="${build}/classes" + debug="on" source="1.5" target="1.5" verbose="off"> + <classpath refid="compile.classpath" /> + </javac> + </target> + + <target name="jar.AssemblyMain" depends="compile.AssemblyMain"> + <jar jarfile="${lib}/assembly.jar" + basedir="${build}/classes" + includes="ccmtools/parser/assembly/**"> + <manifest> + <attribute name="Main-Class" value="ccmtools.parser.assembly.Main" /> + </manifest> + </jar> + </target> + + <!-- Compile ccmtools source code --> ! <target name="compile.ccmtools" depends="generate.IDL3Parser, generate.IdlScanner, generate.IdlParser" description="Compile the ccmtools package." > ! <javac srcdir="${src}/ccmtools:${src-gen}" destdir="${build}/classes" debug="on" source="1.5" target="1.5" verbose="off"> ! <classpath refid="compile.classpath" /> </javac> </target> ! ! <!-- Create Java archive file from all package. --> ! <target name="jar.ccmtools" depends="compile.ccmtools" description="Create Java archive file from ccmtools package." > <jar jarfile="${lib}/ccmtools.jar" basedir="${build}/classes" > *************** *** 89,101 **** <!-- Install ccmtools --> ! <target name="install" depends="jar.ccmtools" description="Install ccmtools to prefix/."> <mkdir dir="${prefix}" /> ! ! <copy todir="${prefix}/lib" overwrite="true"> <fileset dir="${lib}"/> </copy> <copy todir="${prefix}/templates" overwrite="true"> <fileset dir="${src}/templates"/> </copy> <copy todir="${prefix}/idl" overwrite="true"> <fileset dir="${idl}"/> </copy> <copy todir="${prefix}/etc" overwrite="true"> <fileset dir="${etc}"/> </copy> ! <copy todir="${prefix}/bin" overwrite="true"> <fileset dir="${bin}"/> </copy> <!-- for linux only --- 122,134 ---- <!-- Install ccmtools --> ! <target name="install" depends="jar.ccmtools" description="Install ccmtools to prefix/."> <mkdir dir="${prefix}" /> ! ! <copy todir="${prefix}/lib" overwrite="true"> <fileset dir="${lib}"/> </copy> <copy todir="${prefix}/templates" overwrite="true"> <fileset dir="${src}/templates"/> </copy> <copy todir="${prefix}/idl" overwrite="true"> <fileset dir="${idl}"/> </copy> <copy todir="${prefix}/etc" overwrite="true"> <fileset dir="${etc}"/> </copy> ! <copy todir="${prefix}/bin" overwrite="true"> <fileset dir="${bin}"/> </copy> <!-- for linux only *************** *** 110,141 **** --> </target> ! <!-- Generate JavaDoc --> ! ! <target name="javadoc" depends="javadoc.ccmtools, javadoc.uml2idl"/> ! <target name="javadoc.ccmtools" description="Generate javadoc for the ccmtools package."> <javadoc packagenames="ccmtools.*" sourcepath="${src}" destDir="${prefix}/javadoc/ccmtools"> </javadoc> </target> ! <target name="javadoc.uml2idl" description="Generate javadoc for the uml_parser and uml2idl package."> <javadoc packagenames="uml_parser, uml2idl" sourcepath="${src}" destDir="${prefix}/javadoc/uml2idl"> </javadoc> </target> ! ! <!-- Run test cases --> ! ! <target name="test" depends="compile.tests, test.idl.parser, test.java.components, test.cpp.components"/> ! <target name="compile.tests" depends="compile.ccmtools" > ! <javac srcdir="${src}/ccmtools:${src-test}" destdir="${build}/classes" debug="on" source="1.5" target="1.5" verbose="off"> ! <classpath refid="compile.classpath" /> </javac> </target> ! <target name="test.idl.parser" > <junit printsummary="true" haltonfailure="true" showoutput="true"> --- 143,174 ---- --> </target> ! <!-- Generate JavaDoc --> ! ! <target name="javadoc" depends="javadoc.ccmtools, javadoc.uml2idl"/> ! <target name="javadoc.ccmtools" description="Generate javadoc for the ccmtools package."> <javadoc packagenames="ccmtools.*" sourcepath="${src}" destDir="${prefix}/javadoc/ccmtools"> </javadoc> </target> ! <target name="javadoc.uml2idl" description="Generate javadoc for the uml_parser and uml2idl package."> <javadoc packagenames="uml_parser, uml2idl" sourcepath="${src}" destDir="${prefix}/javadoc/uml2idl"> </javadoc> </target> ! ! <!-- Run test cases --> ! ! <target name="test" depends="compile.tests, test.idl.parser, test.java.components, test.cpp.components"/> ! <target name="compile.tests" depends="compile.ccmtools" > ! <javac srcdir="${src}/ccmtools:${src-test}" destdir="${build}/classes" debug="on" source="1.5" target="1.5" verbose="off"> ! <classpath refid="compile.classpath" /> </javac> </target> ! <target name="test.idl.parser" > <junit printsummary="true" haltonfailure="true" showoutput="true"> *************** *** 153,157 **** </junit> </target> ! <target name="test.cpp.components" > <junit printsummary="true" haltonfailure="true" showoutput="true"> --- 186,190 ---- </junit> </target> ! <target name="test.cpp.components" > <junit printsummary="true" haltonfailure="true" showoutput="true"> *************** *** 160,168 **** <test name="ccmtools.generator.cpp.CppComponentsTestSuite" /> </junit> ! </target> - <!-- Clean up --> ! <target name="clean" description="Clean up the build and lib directory." > --- 193,201 ---- <test name="ccmtools.generator.cpp.CppComponentsTestSuite" /> </junit> ! </target> ! <!-- Clean up --> ! <target name="clean" description="Clean up the build and lib directory." > *************** *** 175,182 **** <delete dir="${src}/uml_parser" /> ! <delete dir="${src-gen}" /> ! <delete dir="${build}" /> ! <delete dir="${test}/CppRemoteGenerator/sandbox" /> ! <delete file="${lib}/ccmtools.jar" /> </target> --- 208,215 ---- <delete dir="${src}/uml_parser" /> ! <delete dir="${src-gen}" /> ! <delete dir="${build}" /> ! <delete dir="${test}/CppRemoteGenerator/sandbox" /> ! <delete file="${lib}/ccmtools.jar" /> </target> Index: ChangeLog =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/ChangeLog,v retrieving revision 1.59 retrieving revision 1.59.4.1 diff -C2 -d -r1.59 -r1.59.4.1 *** ChangeLog 24 Jan 2007 15:49:16 -0000 1.59 --- ChangeLog 13 Feb 2007 13:56:41 -0000 1.59.4.1 *************** *** 2,5 **** --- 2,16 ---- ============================================================================ + RELEASE-0.8.7 (February 13, 2007) + ---------------------------------------------------------------------------- + *) Bugfix: Windows paths, parser rule for preprocessor lines + + RELEASE-0.8.6 (January 26, 2007) + ---------------------------------------------------------------------------- + *) Refactoring: Interface constants in C++ + Changed the mapping of IDL interface constants from static const members + to static getter methods (using the same name sa the defined constants). + This refactoring was triggert by an Interix problem reported by Duft Markus. + RELEASE-0.8.5 (January 24, 2007) RELEASE-0.8.4 (January 16, 2007) |
|
From: Teiniker E. <tei...@us...> - 2007-02-13 13:57:22
|
Update of /cvsroot/ccmtools/ccmtools/doc/manual In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11134/doc/manual Modified Files: Tag: BRANCH-FHJ CcmtoolsManual.pdf CcmtoolsManual.tex Log Message: merged changes from trunk Index: CcmtoolsManual.pdf =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/doc/manual/CcmtoolsManual.pdf,v retrieving revision 1.15 retrieving revision 1.15.4.1 diff -C2 -d -r1.15 -r1.15.4.1 Binary files /tmp/cvsbvp6my and /tmp/cvsed4YGN differ Index: CcmtoolsManual.tex =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/doc/manual/CcmtoolsManual.tex,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -C2 -d -r1.6 -r1.6.4.1 *** CcmtoolsManual.tex 24 Jan 2007 15:35:31 -0000 1.6 --- CcmtoolsManual.tex 13 Feb 2007 13:56:47 -0000 1.6.4.1 *************** *** 40,44 **** \include{HelloWorldExample/HelloWorldExample} \include{InterfaceDefinitionLanguage/InterfaceDefinitionLanguage} ! %\include{ComponentModel/ComponentModel} \include{LoginExample/LoginExample} --- 40,44 ---- \include{HelloWorldExample/HelloWorldExample} \include{InterfaceDefinitionLanguage/InterfaceDefinitionLanguage} ! \include{ComponentModel/ComponentModel} \include{LoginExample/LoginExample} |
|
From: Teiniker E. <tei...@us...> - 2007-02-13 13:56:56
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11134/src/ccmtools Modified Files: Tag: BRANCH-FHJ Constants.java Log Message: merged changes from trunk Index: Constants.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/Constants.java,v retrieving revision 1.22.4.1 retrieving revision 1.22.4.2 diff -C2 -d -r1.22.4.1 -r1.22.4.2 *** Constants.java 26 Jan 2007 12:29:51 -0000 1.22.4.1 --- Constants.java 13 Feb 2007 13:56:49 -0000 1.22.4.2 *************** *** 24,28 **** { public static final String PACKAGE = "ccmtools"; ! public static final String VERSION = "0.8.7"; public static final String CPP_PATH = "cpp"; --- 24,28 ---- { public static final String PACKAGE = "ccmtools"; ! public static final String VERSION = "0.8.7.fhj"; public static final String CPP_PATH = "cpp"; |
|
From: Teiniker E. <tei...@us...> - 2007-02-13 13:56:56
|
Update of /cvsroot/ccmtools/ccmtools/test/AssemblyParser In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11134/test/AssemblyParser Added Files: Tag: BRANCH-FHJ parser.sh test1.assembly test1.idl Log Message: merged changes from trunk --- NEW FILE: parser.sh --- #! /bin/sh libdir=$PWD/../../lib export CLASSPATH=$libdir/java-cup-11a.jar:$libdir/assembly.jar java ccmtools.parser.assembly.Main $* --- NEW FILE: test1.idl --- module wamas { module Test { interface I1 { /* empty */ }; interface I2 { /* empty */ }; interface I3 { /* empty */ }; component C1 { attribute string a1; attribute long a2; provides I1 i1; uses I2 i2; }; component C2 { attribute long b; provides I2 i2; uses I3 i3; }; }; // /module Test component C3 { attribute long b; provides I1 i1; uses I3 i3; }; }; // /module wamas --- NEW FILE: test1.assembly --- module wamas { assembly A3 implements C3 { component Test::C1 comp1; component wamas::Test::C2 comp2; connect comp2.i2 to comp1.i2; connect comp1.i1 to this.i1; connect i3 to comp2.i3; constant comp1.a1 = "Hello World"; constant comp1.a1 = 642; attribute comp2.b = this.b; }; }; // /module wamas |
|
From: Teiniker E. <tei...@us...> - 2007-02-13 13:56:54
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl3 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11134/src/ccmtools/parser/idl3 Modified Files: Tag: BRANCH-FHJ idl3new.g Log Message: merged changes from trunk Index: idl3new.g =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl3/idl3new.g,v retrieving revision 1.12 retrieving revision 1.12.4.1 diff -C2 -d -r1.12 -r1.12.4.1 *** idl3new.g 19 Jan 2007 12:06:50 -0000 1.12 --- idl3new.g 13 Feb 2007 13:56:50 -0000 1.12.4.1 *************** *** 165,169 **** } } ! ( ' ' ( DIGIT )+ )? ( ' ' | '\t' | '\f' )* ( '\n' | '\r' ( '\n' )? ) { $setType(Token.SKIP); } ; --- 165,169 ---- } } ! ( ' ' ( DIGIT )+ )* ( ' ' | '\t' | '\f' )* ( '\n' | '\r' ( '\n' )? ) { $setType(Token.SKIP); } ; |
|
From: Teiniker E. <tei...@us...> - 2007-02-13 13:56:54
|
Update of /cvsroot/ccmtools/ccmtools/lib In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11134/lib Modified Files: Tag: BRANCH-FHJ .cvsignore Log Message: merged changes from trunk Index: .cvsignore =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/lib/.cvsignore,v retrieving revision 1.6 retrieving revision 1.6.18.1 diff -C2 -d -r1.6 -r1.6.18.1 *** .cvsignore 24 Jan 2005 15:46:50 -0000 1.6 --- .cvsignore 13 Feb 2007 13:56:50 -0000 1.6.18.1 *************** *** 3,4 **** --- 3,5 ---- ccmtools.jar uml2idl.jar + assembly.jar |
|
From: Teiniker E. <tei...@us...> - 2007-02-13 13:56:54
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11134/src/ccmtools/parser/assembly/metamodel Added Files: Tag: BRANCH-FHJ Connection.java Value.java Port.java QualifiedName.java Module.java Constant.java AssemblyElement.java Component.java Model.java Attribute.java Number.java Assembly.java ModelElement.java Text.java Log Message: merged changes from trunk --- NEW FILE: Component.java --- /* * Created on Feb 5, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: Component.java,v 1.3.2.1 2007/02/13 13:56:43 teiniker Exp $ */ package ccmtools.parser.assembly.metamodel; import java.io.PrintStream; import java.util.Map; /** * defines an inner component */ public class Component extends AssemblyElement { private QualifiedName idl_name_; private String name_; public Component( QualifiedName idl_name, String name ) { idl_name_ = idl_name; name_ = name; } void postProcessing( Assembly parent, Map<String, Component> components ) { parent_ = parent; idl_name_.postProcessing(parent.getParent()); if (components.containsKey(name_)) { throw new RuntimeException("inner component \"" + name_ + "\" already exists"); } components.put(name_, this); } public void prettyPrint( PrintStream out, String offset ) { out.println(offset + "component " + idl_name_ + " " + name_ + " ;"); } } --- NEW FILE: Text.java --- /* * Created on Feb 9, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: Text.java,v 1.2.2.1 2007/02/13 13:56:46 teiniker Exp $ */ package ccmtools.parser.assembly.metamodel; public class Text extends Value { private String value_; public Text( String value ) { value_ = value; } public String toString() { return "\"" + value_ + "\""; } } --- NEW FILE: Connection.java --- /* * Created on Feb 5, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: Connection.java,v 1.3.2.1 2007/02/13 13:56:42 teiniker Exp $ */ package ccmtools.parser.assembly.metamodel; import java.io.PrintStream; import java.util.Map; /** * connects a facet with a receptacle */ public class Connection extends AssemblyElement { private Port facet_; private Port receptacle_; public Connection( Port facet, Port receptacle ) { facet_ = facet; receptacle_ = receptacle; } void postProcessing( Assembly parent, Map<String, Component> components ) { parent_ = parent; facet_.postProcessing(components); receptacle_.postProcessing(components); } public void prettyPrint( PrintStream out, String offset ) { out.println(offset + "connect " + facet_ + " to " + receptacle_ + " ;"); } } --- NEW FILE: AssemblyElement.java --- /* * Created on Feb 5, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: AssemblyElement.java,v 1.3.2.1 2007/02/13 13:56:43 teiniker Exp $ */ package ccmtools.parser.assembly.metamodel; import java.io.PrintStream; import java.util.Map; /** * One line of an assembly description. */ public abstract class AssemblyElement { public abstract void prettyPrint( PrintStream out, String offset ); protected Assembly parent_; /** * call this method after model creation * * @param parent the assembly * @param components map with all known inner components */ abstract void postProcessing( Assembly parent, Map<String, Component> components ); } --- NEW FILE: Constant.java --- /* * Created on Feb 9, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: Constant.java,v 1.3.2.1 2007/02/13 13:56:43 teiniker Exp $ */ package ccmtools.parser.assembly.metamodel; import java.io.PrintStream; import java.util.Map; /** * sets the attribute of an inner component to a constant value */ public class Constant extends AssemblyElement { private Port target_; private Value value_; public Constant( Port target, Value value ) { target_ = target; value_ = value; } void postProcessing( Assembly parent, Map<String, Component> components ) { parent_ = parent; target_.postProcessing(components); } public void prettyPrint( PrintStream out, String offset ) { out.println(offset + "constant " + target_ + " = " + value_ + " ;"); } } --- NEW FILE: Attribute.java --- /* * Created on Feb 5, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: Attribute.java,v 1.4.2.1 2007/02/13 13:56:43 teiniker Exp $ */ package ccmtools.parser.assembly.metamodel; import java.io.PrintStream; import java.util.Map; /** * connects an attribute of the assembly with the attribute of an inner component */ public class Attribute extends AssemblyElement { private Port target_; private Port source_; public Attribute( Port target, Port source ) { target_ = target; source_ = source; } void postProcessing( Assembly parent, Map<String, Component> components ) { parent_ = parent; target_.postProcessing(components); source_.postProcessing(components); } public void prettyPrint( PrintStream out, String offset ) { out.println(offset + "attribute " + target_ + " = " + source_ + " ;"); } } --- NEW FILE: Model.java --- /* * Created on Feb 5, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: Model.java,v 1.4.2.1 2007/02/13 13:56:43 teiniker Exp $ */ package ccmtools.parser.assembly.metamodel; import java.io.PrintStream; import java.util.Vector; /** * The root element of the ccmtools assembly metamodel. */ public class Model { private Vector<ModelElement> elements_ = new Vector<ModelElement>(); /** * adds a new ModelElement */ public void add( ModelElement e ) { elements_.add(e); } /** * call this method after model creation */ public void postProcessing() { for (int i = 0; i < elements_.size(); ++i) { elements_.get(i).postProcessing(null); } } /** * prints the model to an output stream * * @param out the output stream */ public void prettyPrint( PrintStream out ) { for (int i = 0; i < elements_.size(); ++i) { elements_.get(i).prettyPrint(out, ""); } } } --- NEW FILE: Number.java --- /* * Created on Feb 9, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: Number.java,v 1.2.2.1 2007/02/13 13:56:46 teiniker Exp $ */ package ccmtools.parser.assembly.metamodel; /** * a number (integer or floating point) */ public class Number extends Value { private String value_; public Number( String value ) { value_ = value; } public String toString() { return value_; } } --- NEW FILE: Value.java --- /* * Created on Feb 9, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: Value.java,v 1.2.2.1 2007/02/13 13:56:42 teiniker Exp $ */ package ccmtools.parser.assembly.metamodel; /** * defines a constant value for attributs */ public abstract class Value { public abstract String toString(); } --- NEW FILE: ModelElement.java --- /* * Created on Feb 5, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: ModelElement.java,v 1.3.2.1 2007/02/13 13:56:46 teiniker Exp $ */ package ccmtools.parser.assembly.metamodel; import java.io.PrintStream; /** * Top level element of the model. */ public abstract class ModelElement { protected String name_; protected ModelElement( String name ) { name_ = name; } public abstract void prettyPrint( PrintStream out, String offset ); protected Module parent_; /** * returns the parent Module of this element (or null) */ public Module getParent() { return parent_; } /** * call this method after model creation * * @param parent namespace or null */ abstract void postProcessing( Module parent ); } --- NEW FILE: QualifiedName.java --- /* * Created on Feb 5, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: QualifiedName.java,v 1.4.2.1 2007/02/13 13:56:43 teiniker Exp $ */ package ccmtools.parser.assembly.metamodel; /** * a qualified name */ public final class QualifiedName { private String qn_; public QualifiedName( String qn ) { qn_ = qn; } public String toString() { return qn_; } private Module scope_; /** * defines the scope of this qualified name * * @param scope scope of this qualified name (or null for global scope) */ void postProcessing( Module scope ) { scope_ = scope; } } --- NEW FILE: Assembly.java --- /* * Created on Feb 5, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: Assembly.java,v 1.4.2.1 2007/02/13 13:56:46 teiniker Exp $ */ package ccmtools.parser.assembly.metamodel; import java.io.PrintStream; import java.util.HashMap; import java.util.Vector; /** * defines one assembly */ public class Assembly extends ModelElement { private QualifiedName idl_name_; private Vector<AssemblyElement> elements_; public Assembly( String name, QualifiedName idl_name, Vector<AssemblyElement> elements ) { super(name); idl_name_ = idl_name; elements_ = elements; } private HashMap<String, Component> components_; void postProcessing( Module parent ) { parent_ = parent; idl_name_.postProcessing(parent); components_ = new HashMap<String, Component>(); for (int i = 0; i < elements_.size(); ++i) { elements_.get(i).postProcessing(this, components_); } } public void prettyPrint( PrintStream out, String offset ) { out.println(offset + "assembly " + name_ + " implements " + idl_name_ + " {"); for (int i = 0; i < elements_.size(); ++i) { elements_.get(i).prettyPrint(out, offset + " "); } out.println(offset + "};"); } } --- NEW FILE: Port.java --- /* * Created on Feb 5, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: Port.java,v 1.4.2.1 2007/02/13 13:56:43 teiniker Exp $ */ package ccmtools.parser.assembly.metamodel; import java.util.Map; /** * facet or receptacle */ public final class Port { private String component_; private String connector_; /** * internal port (port of an inner component) * * @param component name of the inner component * @param connector facet or receptacle name */ public Port( String component, String connector ) { component_ = component; connector_ = connector; } /** * external port (port of the assembly) * * @param connector facet or receptacle name */ public Port( String connector ) { component_ = null; connector_ = connector; } public String toString() { if (component_ == null) return "this." + connector_; else return component_ + "." + connector_; } void postProcessing( Map<String, Component> components ) { if (component_ != null) { if (!components.containsKey(component_)) { throw new RuntimeException("inner component \"" + component_ + "\" is undefined"); } } } } --- NEW FILE: Module.java --- /* * Created on Feb 5, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: Module.java,v 1.4.2.1 2007/02/13 13:56:43 teiniker Exp $ */ package ccmtools.parser.assembly.metamodel; import java.io.PrintStream; import java.util.Vector; /** * a namespace */ public class Module extends ModelElement { private Vector<ModelElement> children_; public Module( String name, Vector<ModelElement> children ) { super(name); children_ = children; } void postProcessing( Module parent ) { parent_ = parent; for (int i = 0; i < children_.size(); ++i) { children_.get(i).postProcessing(this); } } public void prettyPrint( PrintStream out, String offset ) { out.println(offset + "module " + name_ + " {"); for (int i = 0; i < children_.size(); ++i) { children_.get(i).prettyPrint(out, offset + " "); } out.println(offset + "};"); } } |
|
From: Teiniker E. <tei...@us...> - 2007-02-13 13:56:53
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11134/src/ccmtools/parser/assembly Added Files: Tag: BRANCH-FHJ bnf.txt assembly.cup assembly.flex Main.java Log Message: merged changes from trunk --- NEW FILE: assembly.cup --- // CUP parser definition for ccmtools assembly descriptions package ccmtools.parser.assembly; import java.util.Vector; import java_cup.runtime.*; parser code {: String current_input_filename = "(filename not set)"; /** * This method overides the original report_error() method * and generates a useful error message. */ public void report_error(String message, Object info) { StringBuilder out = new StringBuilder(); out.append(current_input_filename); if(info instanceof Symbol) { Symbol s = (Symbol)info; if(s.left != -1) { out.append(" line "); out.append(s.left+1); } } out.append(": "); out.append(message); throw new RuntimeException(out.toString()); } public void report_fatal_error(String message, Object info) { System.err.println("FATAL ERROR: "+message); System.exit(1); } :}; terminal ASSEMBLY, ATTRIBUTE; terminal COMPONENT, CONNECT, CONSTANT; terminal IMPLEMENTS, MODULE, THIS, TO; terminal SEMICOLON, DOT, LBRACE, RBRACE, EQUAL; terminal String STRING, NUMBER, QN, NAME; nonterminal ccmtools.parser.assembly.metamodel.Model model; nonterminal ccmtools.parser.assembly.metamodel.ModelElement model_element, module, assembly; nonterminal Vector<ccmtools.parser.assembly.metamodel.ModelElement> model_element_list; nonterminal ccmtools.parser.assembly.metamodel.AssemblyElement assembly_element; nonterminal Vector<ccmtools.parser.assembly.metamodel.AssemblyElement> assembly_element_list; nonterminal ccmtools.parser.assembly.metamodel.QualifiedName qualified_name; nonterminal ccmtools.parser.assembly.metamodel.Port port, internal_port, external_port; nonterminal ccmtools.parser.assembly.metamodel.Value value; start with model; model ::= model:v1 model_element:v2 {: v1.add(v2); RESULT=v1; :} | {: RESULT = new ccmtools.parser.assembly.metamodel.Model(); :} ; model_element ::= module:v1 {: RESULT=v1; :} | assembly:v1 {: RESULT=v1; :} ; model_element_list ::= model_element_list:v1 model_element:v2 {: v1.add(v2); RESULT=v1; :} | {: RESULT = new Vector<ccmtools.parser.assembly.metamodel.ModelElement>(); :} ; module ::= MODULE NAME:v1 LBRACE model_element_list:v2 RBRACE SEMICOLON {: RESULT = new ccmtools.parser.assembly.metamodel.Module(v1, v2); :} ; assembly ::= ASSEMBLY NAME:v1 IMPLEMENTS qualified_name:v2 LBRACE assembly_element_list:v3 RBRACE SEMICOLON {: RESULT = new ccmtools.parser.assembly.metamodel.Assembly(v1, v2, v3); :} ; qualified_name ::= QN:v1 {: RESULT = new ccmtools.parser.assembly.metamodel.QualifiedName(v1); :} | NAME:v1 {: RESULT = new ccmtools.parser.assembly.metamodel.QualifiedName(v1); :} ; assembly_element_list ::= assembly_element_list:v1 assembly_element:v2 {: v1.add(v2); RESULT=v1; :} | {: RESULT = new Vector<ccmtools.parser.assembly.metamodel.AssemblyElement>(); :} ; assembly_element ::= COMPONENT qualified_name:v1 NAME:v2 SEMICOLON {: RESULT = new ccmtools.parser.assembly.metamodel.Component(v1, v2); :} | CONNECT port:v1 TO port:v2 SEMICOLON {: RESULT = new ccmtools.parser.assembly.metamodel.Connection(v1, v2); :} | ATTRIBUTE internal_port:v1 EQUAL external_port:v2 SEMICOLON {: RESULT = new ccmtools.parser.assembly.metamodel.Attribute(v1, v2); :} | CONSTANT internal_port:v1 EQUAL value:v2 SEMICOLON {: RESULT = new ccmtools.parser.assembly.metamodel.Constant(v1, v2); :} ; port ::= internal_port:v1 {: RESULT = v1; :} | external_port:v2 {: RESULT = v2; :} ; internal_port ::= NAME:v1 DOT NAME:v2 {: RESULT = new ccmtools.parser.assembly.metamodel.Port(v1, v2); :} ; external_port ::= NAME:v1 {: RESULT = new ccmtools.parser.assembly.metamodel.Port(v1); :} | THIS DOT NAME:v1 {: RESULT = new ccmtools.parser.assembly.metamodel.Port(v1); :} ; value ::= STRING:v1 {: RESULT = new ccmtools.parser.assembly.metamodel.Text(v1); :} | NUMBER:v1 {: RESULT = new ccmtools.parser.assembly.metamodel.Number(v1); :} ; --- NEW FILE: bnf.txt --- BNF for ccmtools assemblies --------------------------- model := (model_element)* model_element := module | assembly module := "module" NAME "{" (model_element)* "}" ";" assembly := "assembly" NAME "implements" QN "{" (assembly_element)* "}" ";" assembly_element := component | connection | attribute | constant component := "component" QN NAME ";" connection := "connect" port "to" port ";" port := external_port | internal_port external_port := NAME | "this" "." NAME internal_port := NAME "." NAME attribute := "attribute" internal_port "=" external_port ";" constant := "constant" internal_port "=" TEXT ";" QN := ("::")? NAME ("::" NAME)* --- NEW FILE: Main.java --- /* * Created on Feb 5, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: Main.java,v 1.3.2.1 2007/02/13 13:56:48 teiniker Exp $ */ package ccmtools.parser.assembly; import java.io.FileReader; import ccmtools.parser.assembly.metamodel.Model; public final class Main { public static void main( String[] args ) { if (args.length != 1) { Main m = new Main(); System.err.println(m.getClass().getName() + " assembly-description-file"); System.exit(1); } else try { Model m = Main.parse(args[0]); m.prettyPrint(System.out); } catch (Exception e) { e.printStackTrace(System.err); System.exit(1); } } public static Model parse( String assembly_description_file ) throws Exception { FileReader reader = new FileReader(assembly_description_file); AssemblyLexer lexer = new AssemblyLexer(reader); lexer.current_input_filename = assembly_description_file; AssemblyParser parser = new AssemblyParser(lexer); parser.current_input_filename = assembly_description_file; java_cup.runtime.Symbol root = parser.parse(); if (root == null || root.value == null) throw new NullPointerException("parsing failed"); if (!(root.value instanceof Model)) throw new IllegalStateException("invalid root element: " + root.value.getClass().getName()); Model result = (Model) root.value; result.postProcessing(); return result; } } --- NEW FILE: assembly.flex --- // JFlex lexer definition for ccmtools assembly descriptions package ccmtools.parser.assembly; import java_cup.runtime.*; %% %class AssemblyLexer %unicode %line %column %cup %{ private Symbol symbol(int type) { return new Symbol(type, yyline, yycolumn); } private Symbol symbol(int type, Object value) { return new Symbol(type, yyline, yycolumn, value); } String current_input_filename = "(filename not set)"; public void error(String message) { StringBuilder out = new StringBuilder(); out.append(current_input_filename); out.append(" line "); out.append(yyline); out.append(": "); out.append(message); throw new RuntimeException(out.toString()); } StringBuffer string = new StringBuffer(); %} LineTerminator = \r|\n|\r\n InputCharacter = [^\r\n] WhiteSpace = {LineTerminator} | [ \t\f] Comment = {TraditionalComment} | {EndOfLineComment} TraditionalComment = "/*" {CommentContent} "*"+ "/" EndOfLineComment = "//" {InputCharacter}* {LineTerminator} CommentContent = ( [^*] | \*+ [^*/] )* PreprocessorLine = "#" {InputCharacter}* {LineTerminator} Digit = [0-9] Alpha = [a-zA-Z_] Identifier = {Alpha} ({Alpha}|{Digit})* QualifiedName = {GlobalName} | {ScopedName} GlobalName = "::" {Identifier} ScopedName = "::"? {Identifier} "::" {Identifier} ("::" {Identifier})* OctDigit = [0-7] StringCharacter = [^\r\n\"\\] Number = {DecInteger} | {HexInteger} | {Double} DecInteger = ("+" | "-")? {Digit}+ HexInteger = ("0x" | "0X") [0-9a-fA-F]+ Double = ("+" | "-")? ({Double1} | {Double2} | {Double3} | {Double4}) Double1 = {Digit}+ "." {Digit}* Double2 = {Digit}* "." {Digit}+ Double3 = {Digit}+ ("e" | "E") {DecInteger} Double4 = ({Double1} | {Double2}) ("e" | "E") {DecInteger} %state STRING %% <YYINITIAL> { /* reserved words */ "assembly" { return symbol(sym.ASSEMBLY); } "attribute" { return symbol(sym.ATTRIBUTE); } "component" { return symbol(sym.COMPONENT); } "connect" { return symbol(sym.CONNECT); } "constant" { return symbol(sym.CONSTANT); } "implements" { return symbol(sym.IMPLEMENTS); } "module" { return symbol(sym.MODULE); } "this" { return symbol(sym.THIS); } "to" { return symbol(sym.TO); } /* operators and separators */ ";" { return symbol(sym.SEMICOLON); } "." { return symbol(sym.DOT); } "{" { return symbol(sym.LBRACE); } "}" { return symbol(sym.RBRACE); } "=" { return symbol(sym.EQUAL); } /* string literal */ "\"" { yybegin(STRING); string.setLength(0); } /* comments */ {Comment} { /* ignore */ } /* whitespace */ {WhiteSpace} { /* ignore */ } /* preprocessor line */ {PreprocessorLine} { /* ignore */ } /* numbers */ {Number} { return symbol(sym.NUMBER, yytext()); } /* qualified names */ {QualifiedName} { return symbol(sym.QN, yytext()); } /* identifers, after reserved words!!! */ {Identifier} { return symbol(sym.NAME, yytext()); } /* all other chars report an error */ [^\n\r] { error("Illegal character '" + yytext() + "'"); } } <STRING> { "\"" { yybegin(YYINITIAL); return symbol(sym.STRING, string.toString()); } {StringCharacter}+ { string.append( yytext() ); } /* escape sequences */ "\\b" { string.append( '\b' ); } "\\t" { string.append( '\t' ); } "\\n" { string.append( '\n' ); } "\\f" { string.append( '\f' ); } "\\r" { string.append( '\r' ); } "\\\"" { string.append( '\"' ); } "\\'" { string.append( '\'' ); } "\\\\" { string.append( '\\' ); } \\[0-3]?{OctDigit}?{OctDigit} { char val = (char) Integer.parseInt(yytext().substring(1),8); string.append( val ); } /* error cases */ \\. { throw new RuntimeException("Illegal escape sequence \"" +yytext()+"\""); } {LineTerminator} { throw new RuntimeException("Unterminated string at end of line"); } } |
|
From: Teiniker E. <tei...@us...> - 2007-02-13 13:56:53
|
Update of /cvsroot/ccmtools/ccmtools/doc/uml In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11134/doc/uml Added Files: Tag: BRANCH-FHJ AssemblyMetamodel.xml.zip Log Message: merged changes from trunk --- NEW FILE: AssemblyMetamodel.xml.zip --- (This appears to be a binary file; contents omitted.) |
|
From: Teiniker E. <tei...@us...> - 2007-02-13 13:56:53
|
Update of /cvsroot/ccmtools/ccmtools/doc/DevelopmentNotes In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11134/doc/DevelopmentNotes Added Files: Tag: BRANCH-FHJ TODOs.txt Log Message: merged changes from trunk --- NEW FILE: TODOs.txt --- CCM Tools TODOs =============== o) Start Scripts (ccmtools/bin) - add Windows start scripts - add Ant tasks for ccmtools generators o) IDL Parser - improve ccmmodel -validator - add support for List, Set and Map types which could be mapped to IDL sequences in the remote case. o) Java Generators - generate local adapters into a ccmtools::local namespace - improve Any-Plugin mechanism - use the IDL 'native' keyword and separate the Plugin implementation from the ccmtools implementations. - add multi-threading support for business logic (e.g. synchronized local adapters) - provides a get_session_context() methods which can throw a CCMException in the case that a client did not call configuration_complete(). - separate interface Type from CCM_Type. o) C++ Generators - refactor CppGenerator and CppRemoteGenerator test cases - remove redundant tests. - refactor generator implementation towards JET templates (see Java generators). - improve Any-Plugin mechanism - use the IDL 'native' keyword and separate the Plugin implementation from the ccmtools implementations. - together with the new C++ generator, we can use the new IDL parser and remove the old one (ANTLR based) from the project. - add multi-threading support for business logic (e.g. synchronized local adapters or single threaded POA policy) - provides a get_session_context() methods which can throw a CCMException in the case that a client did not call configuration_complete(). - use SmartPtr for the facet factory methods get_facet() of a component's impl class. - For a given interface, separate Type from CCM_Type and eliminate exception declarations from CCM_Type. Local adapters have to catch all known and unknown business logic exceptions and convert them into legal exceptions of the Type interface. |
|
From: Teiniker E. <tei...@us...> - 2007-02-13 13:21:30
|
Update of /cvsroot/ccmtools/cpp-environment/ccm/remote In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12721/ccm/remote Modified Files: Tag: BRANCH-FHJ Confix2.pkg Log Message: merged changes from trunk Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/remote/Confix2.pkg,v retrieving revision 1.7 retrieving revision 1.7.4.1 diff -C2 -d -r1.7 -r1.7.4.1 *** Confix2.pkg 19 Jan 2007 09:35:35 -0000 1.7 --- Confix2.pkg 13 Feb 2007 13:20:16 -0000 1.7.4.1 *************** *** 1,2 **** PACKAGE_NAME('ccm-remote-runtime') ! PACKAGE_VERSION('0.8.5') --- 1,2 ---- PACKAGE_NAME('ccm-remote-runtime') ! PACKAGE_VERSION('0.8.7') |
|
From: Teiniker E. <tei...@us...> - 2007-02-13 13:21:30
|
Update of /cvsroot/ccmtools/cpp-environment/ccm In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12721/ccm Modified Files: Tag: BRANCH-FHJ Confix2.pkg Log Message: merged changes from trunk Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/Confix2.pkg,v retrieving revision 1.7 retrieving revision 1.7.4.1 diff -C2 -d -r1.7 -r1.7.4.1 *** Confix2.pkg 19 Jan 2007 09:35:35 -0000 1.7 --- Confix2.pkg 13 Feb 2007 13:20:14 -0000 1.7.4.1 *************** *** 1,2 **** PACKAGE_NAME('ccm-runtime') ! PACKAGE_VERSION('0.8.5') --- 1,2 ---- PACKAGE_NAME('ccm-runtime') ! PACKAGE_VERSION('0.8.7') |
|
From: Teiniker E. <tei...@us...> - 2007-02-13 13:21:28
|
Update of /cvsroot/ccmtools/cpp-environment In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12721 Modified Files: Tag: BRANCH-FHJ ChangeLog Added Files: Tag: BRANCH-FHJ BRANCHES Log Message: merged changes from trunk --- NEW FILE: BRANCHES --- $Id: BRANCHES,v 1.1.2.1 2007/02/13 13:20:13 teiniker Exp $ : | +-- RELEASE-0_8_5 |\ | *--------------------------+ RELEASE-0_8-BRANCH | | : : | | | + RELEASE-0_8_7 (February 13, 2007) | /| +<-- merged 2007-02-13 ----* | | v | v Index: ChangeLog =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ChangeLog,v retrieving revision 1.12 retrieving revision 1.12.4.1 diff -C2 -d -r1.12 -r1.12.4.1 *** ChangeLog 24 Jan 2007 15:43:36 -0000 1.12 --- ChangeLog 13 Feb 2007 13:20:12 -0000 1.12.4.1 *************** *** 2,5 **** --- 2,6 ---- ============================================================================ + RELEASE-0.8.7 (February 13, 2007) RELEASE-0.8.5 (January 24, 2007) RELEASE-0.8.4 (January 16, 2007) |
|
From: Teiniker E. <tei...@us...> - 2007-02-13 13:21:28
|
Update of /cvsroot/ccmtools/cpp-environment/utils In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12721/utils Modified Files: Tag: BRANCH-FHJ Confix2.pkg Log Message: merged changes from trunk Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/utils/Confix2.pkg,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** Confix2.pkg 19 Jan 2007 11:58:12 -0000 1.1 --- Confix2.pkg 13 Feb 2007 13:20:14 -0000 1.1.4.1 *************** *** 1,2 **** PACKAGE_NAME('ccm-runtime-utils') ! PACKAGE_VERSION('0.8.5') --- 1,2 ---- PACKAGE_NAME('ccm-runtime-utils') ! PACKAGE_VERSION('0.8.7') |
|
From: Teiniker E. <tei...@us...> - 2007-02-13 13:21:28
|
Update of /cvsroot/ccmtools/cpp-environment/ccm/local In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12721/ccm/local Modified Files: Tag: BRANCH-FHJ Confix2.pkg Log Message: merged changes from trunk Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/ccm/local/Confix2.pkg,v retrieving revision 1.7 retrieving revision 1.7.4.1 diff -C2 -d -r1.7 -r1.7.4.1 *** Confix2.pkg 19 Jan 2007 09:35:35 -0000 1.7 --- Confix2.pkg 13 Feb 2007 13:20:17 -0000 1.7.4.1 *************** *** 1,2 **** PACKAGE_NAME('ccm-runtime-local') ! PACKAGE_VERSION('0.8.5') --- 1,2 ---- PACKAGE_NAME('ccm-runtime-local') ! PACKAGE_VERSION('0.8.7') |
|
From: Teiniker E. <tei...@us...> - 2007-02-13 13:21:28
|
Update of /cvsroot/ccmtools/cpp-environment/externals In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12721/externals Modified Files: Tag: BRANCH-FHJ Confix2.pkg Log Message: merged changes from trunk Index: Confix2.pkg =================================================================== RCS file: /cvsroot/ccmtools/cpp-environment/externals/Confix2.pkg,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** Confix2.pkg 19 Jan 2007 11:58:11 -0000 1.2 --- Confix2.pkg 13 Feb 2007 13:20:16 -0000 1.2.4.1 *************** *** 1,3 **** PACKAGE_NAME('ccm-runtime-externals') ! PACKAGE_VERSION('0.8.5') --- 1,3 ---- PACKAGE_NAME('ccm-runtime-externals') ! PACKAGE_VERSION('0.8.7') |
|
From: Teiniker E. <tei...@us...> - 2007-02-13 12:43:47
|
Update of /cvsroot/ccmtools/java-environment In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21318 Modified Files: Tag: BRANCH-FHJ build.xml .cvsignore Log Message: merged bugfix from head Index: .cvsignore =================================================================== RCS file: /cvsroot/ccmtools/java-environment/.cvsignore,v retrieving revision 1.8 retrieving revision 1.8.10.1 diff -C2 -d -r1.8 -r1.8.10.1 *** .cvsignore 7 Mar 2006 16:11:57 -0000 1.8 --- .cvsignore 13 Feb 2007 12:43:38 -0000 1.8.10.1 *************** *** 5,6 **** --- 5,7 ---- src-gen .settings + build-ant Index: build.xml =================================================================== RCS file: /cvsroot/ccmtools/java-environment/build.xml,v retrieving revision 1.26 retrieving revision 1.26.4.1 diff -C2 -d -r1.26 -r1.26.4.1 *** build.xml 10 Jan 2007 16:11:31 -0000 1.26 --- build.xml 13 Feb 2007 12:43:38 -0000 1.26.4.1 *************** *** 7,12 **** <property name="prefix" location="dist" /> <property name="src" location="src" /> <property name="idl" location="${prefix}/idl" /> ! <property name="build" location="build" /> <property name="lib" location="lib" /> <property name="jarname" location="${lib}/ccm-runtime" /> --- 7,13 ---- <property name="prefix" location="dist" /> <property name="src" location="src" /> + <property name="src-gen" location="src-gen" /> <property name="idl" location="${prefix}/idl" /> ! <property name="build" location="build-ant" /> <property name="lib" location="lib" /> <property name="jarname" location="${lib}/ccm-runtime" /> *************** *** 21,25 **** <mkdir dir="${build}" /> <mkdir dir="${lib}" /> ! <mkdir dir="${src}-gen" /> </target> --- 22,26 ---- <mkdir dir="${build}" /> <mkdir dir="${lib}" /> ! <mkdir dir="${src-gen}" /> </target> *************** *** 28,32 **** description="" > <exec dir="${idl}" executable="idlj"> ! <arg line="-td ${src}-gen -fall ${prefix}/idl/ccmtools/corba/Components/ccmtools.idl"/> </exec> </target> --- 29,33 ---- description="" > <exec dir="${idl}" executable="idlj"> ! <arg line="-td ${src-gen} -fall ${prefix}/idl/ccmtools/corba/Components/ccmtools.idl"/> </exec> </target> *************** *** 35,39 **** <target name="stubs.compile" depends="stubs.generate" description="" > ! <javac srcdir="${src}-gen:${src}" destdir="${build}" debug="on" source="1.5" target="1.5"> <classpath refid="compile.classpath" /> --- 36,40 ---- <target name="stubs.compile" depends="stubs.generate" description="" > ! <javac srcdir="${src-gen}:${src}" destdir="${build}" debug="on" source="1.5" target="1.5"> <classpath refid="compile.classpath" /> *************** *** 61,65 **** description="Clean up the generate, build and lib directory" > <delete dir="${build}" /> ! <delete dir="${src}-gen/Components" /> <delete file="${jarname}.jar" /> </target> --- 62,66 ---- description="Clean up the generate, build and lib directory" > <delete dir="${build}" /> ! <delete dir="${src-gen}" /> <delete file="${jarname}.jar" /> </target> |
|
From: Teiniker E. <tei...@us...> - 2007-02-13 12:30:00
|
Update of /cvsroot/ccmtools/java-environment In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15510 Modified Files: build.xml .cvsignore Log Message: Bugfix: added build-ant directory to the build process Index: .cvsignore =================================================================== RCS file: /cvsroot/ccmtools/java-environment/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** .cvsignore 7 Mar 2006 16:11:57 -0000 1.8 --- .cvsignore 13 Feb 2007 12:29:54 -0000 1.9 *************** *** 5,6 **** --- 5,7 ---- src-gen .settings + build-ant Index: build.xml =================================================================== RCS file: /cvsroot/ccmtools/java-environment/build.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** build.xml 10 Jan 2007 16:11:31 -0000 1.26 --- build.xml 13 Feb 2007 12:29:54 -0000 1.27 *************** *** 7,12 **** <property name="prefix" location="dist" /> <property name="src" location="src" /> <property name="idl" location="${prefix}/idl" /> ! <property name="build" location="build" /> <property name="lib" location="lib" /> <property name="jarname" location="${lib}/ccm-runtime" /> --- 7,13 ---- <property name="prefix" location="dist" /> <property name="src" location="src" /> + <property name="src-gen" location="src-gen" /> <property name="idl" location="${prefix}/idl" /> ! <property name="build" location="build-ant" /> <property name="lib" location="lib" /> <property name="jarname" location="${lib}/ccm-runtime" /> *************** *** 21,25 **** <mkdir dir="${build}" /> <mkdir dir="${lib}" /> ! <mkdir dir="${src}-gen" /> </target> --- 22,26 ---- <mkdir dir="${build}" /> <mkdir dir="${lib}" /> ! <mkdir dir="${src-gen}" /> </target> *************** *** 28,32 **** description="" > <exec dir="${idl}" executable="idlj"> ! <arg line="-td ${src}-gen -fall ${prefix}/idl/ccmtools/corba/Components/ccmtools.idl"/> </exec> </target> --- 29,33 ---- description="" > <exec dir="${idl}" executable="idlj"> ! <arg line="-td ${src-gen} -fall ${prefix}/idl/ccmtools/corba/Components/ccmtools.idl"/> </exec> </target> *************** *** 35,39 **** <target name="stubs.compile" depends="stubs.generate" description="" > ! <javac srcdir="${src}-gen:${src}" destdir="${build}" debug="on" source="1.5" target="1.5"> <classpath refid="compile.classpath" /> --- 36,40 ---- <target name="stubs.compile" depends="stubs.generate" description="" > ! <javac srcdir="${src-gen}:${src}" destdir="${build}" debug="on" source="1.5" target="1.5"> <classpath refid="compile.classpath" /> *************** *** 61,65 **** description="Clean up the generate, build and lib directory" > <delete dir="${build}" /> ! <delete dir="${src}-gen/Components" /> <delete file="${jarname}.jar" /> </target> --- 62,66 ---- description="Clean up the generate, build and lib directory" > <delete dir="${build}" /> ! <delete dir="${src-gen}" /> <delete file="${jarname}.jar" /> </target> |
|
From: Robert L. <rle...@us...> - 2007-02-13 10:24:50
|
Update of /cvsroot/ccmtools/cpp-environment In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26745 Added Files: BRANCHES Log Message: version 0.8.7 merged --- NEW FILE: BRANCHES --- $Id: BRANCHES,v 1.1 2007/02/13 10:24:45 rlechner Exp $ : | +-- RELEASE-0_8_5 |\ | *--------------------------+ RELEASE-0_8-BRANCH | | : : | | | + RELEASE-0_8_7 (February 13, 2007) | /| +<-- merged 2007-02-13 ----* | | v | v |
|
From: Robert L. <rle...@us...> - 2007-02-13 10:16:20
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/facet_constants/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23270/test/CppGenerator/facet_constants/impl Modified Files: Test_iface_impl.cc Log Message: version 0.8.7 merged Index: Test_iface_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppGenerator/facet_constants/impl/Test_iface_impl.cc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Test_iface_impl.cc 5 Jan 2007 14:17:27 -0000 1.9 --- Test_iface_impl.cc 13 Feb 2007 10:16:12 -0000 1.10 *************** *** 22,39 **** : component(component_impl) { ! cout << " BOOLEAN_CONST = " << Constants::BOOLEAN_CONST << endl; ! cout << " OCTET_CONST = " << (int)Constants::OCTET_CONST << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST << endl; ! cout << " USHORT_CONST = " << Constants::USHORT_CONST << endl; ! cout << " LONG_CONST = " << Constants::LONG_CONST << endl; ! cout << " ULONG_CONST = " << Constants::ULONG_CONST << endl; ! cout << " CHAR_CONST = " << Constants::CHAR_CONST << endl; ! cout << " STRING_CONST = " << Constants::STRING_CONST << endl; ! cout << " FLOAT_CONST = " << Constants::FLOAT_CONST << endl; ! cout << " DOUBLE_CONST = " << Constants::DOUBLE_CONST << endl; } --- 22,39 ---- : component(component_impl) { ! cout << " BOOLEAN_CONST = " << Constants::BOOLEAN_CONST() << endl; ! cout << " OCTET_CONST = " << (int)Constants::OCTET_CONST() << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST() << endl; ! cout << " SHORT_CONST = " << Constants::SHORT_CONST() << endl; ! cout << " USHORT_CONST = " << Constants::USHORT_CONST() << endl; ! cout << " LONG_CONST = " << Constants::LONG_CONST() << endl; ! cout << " ULONG_CONST = " << Constants::ULONG_CONST() << endl; ! cout << " CHAR_CONST = " << Constants::CHAR_CONST() << endl; ! cout << " STRING_CONST = " << Constants::STRING_CONST() << endl; ! cout << " FLOAT_CONST = " << Constants::FLOAT_CONST() << endl; ! cout << " DOUBLE_CONST = " << Constants::DOUBLE_CONST() << endl; } *************** *** 47,51 **** throw(Components::CCMException) { ! return Constants::BOOLEAN_CONST; } --- 47,51 ---- throw(Components::CCMException) { ! return Constants::BOOLEAN_CONST(); } *************** *** 54,58 **** throw(Components::CCMException) { ! return Constants::OCTET_CONST; } --- 54,58 ---- throw(Components::CCMException) { ! return Constants::OCTET_CONST(); } *************** *** 61,65 **** throw(Components::CCMException) { ! return Constants::SHORT_CONST; } --- 61,65 ---- throw(Components::CCMException) { ! return Constants::SHORT_CONST(); } *************** *** 68,72 **** throw(Components::CCMException) { ! return Constants::USHORT_CONST; } --- 68,72 ---- throw(Components::CCMException) { ! return Constants::USHORT_CONST(); } *************** *** 75,79 **** throw(Components::CCMException) { ! return Constants::LONG_CONST; } --- 75,79 ---- throw(Components::CCMException) { ! return Constants::LONG_CONST(); } *************** *** 82,86 **** throw(Components::CCMException) { ! return Constants::ULONG_CONST; } --- 82,86 ---- throw(Components::CCMException) { ! return Constants::ULONG_CONST(); } *************** *** 89,93 **** throw(Components::CCMException) { ! return Constants::CHAR_CONST; } --- 89,93 ---- throw(Components::CCMException) { ! return Constants::CHAR_CONST(); } *************** *** 96,100 **** throw(Components::CCMException) { ! return Constants::STRING_CONST; } --- 96,100 ---- throw(Components::CCMException) { ! return Constants::STRING_CONST(); } *************** *** 103,107 **** throw(Components::CCMException) { ! return Constants::FLOAT_CONST; } --- 103,107 ---- throw(Components::CCMException) { ! return Constants::FLOAT_CONST(); } *************** *** 110,114 **** throw(Components::CCMException) { ! return Constants::DOUBLE_CONST; } --- 110,114 ---- throw(Components::CCMException) { ! return Constants::DOUBLE_CONST(); } |
|
From: Robert L. <rle...@us...> - 2007-02-13 10:16:18
|
Update of /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23270/src/templates/CppLocalTemplates Modified Files: MConstantDefDeclaration MInterfaceDef Log Message: version 0.8.7 merged Index: MConstantDefDeclaration =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MConstantDefDeclaration,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MConstantDefDeclaration 18 Dec 2005 23:15:54 -0000 1.1 --- MConstantDefDeclaration 13 Feb 2007 10:16:11 -0000 1.2 *************** *** 1,2 **** ! static const %(LanguageType)s %(Identifier)s; --- 1,7 ---- ! static %(LanguageType)s %(Identifier)s() ! { ! return %(ConstantValue)s ! } ! ! Index: MInterfaceDef =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/templates/CppLocalTemplates/MInterfaceDef,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** MInterfaceDef 5 Jan 2007 14:17:24 -0000 1.24 --- MInterfaceDef 13 Feb 2007 10:16:11 -0000 1.25 *************** *** 123,128 **** //============================================================================== - %(ConstantImplementation)s - %(CloseNamespace)s --- 123,126 ---- |
|
From: Robert L. <rle...@us...> - 2007-02-13 10:16:18
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23270/src/ccmtools/CppGenerator Modified Files: CppLocalGenerator.java Log Message: version 0.8.7 merged Index: CppLocalGenerator.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/CppGenerator/CppLocalGenerator.java,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** CppLocalGenerator.java 24 Jan 2007 15:37:18 -0000 1.54 --- CppLocalGenerator.java 13 Feb 2007 10:16:11 -0000 1.55 *************** *** 405,408 **** --- 405,420 ---- MConstantDef constant = (MConstantDef) currentNode; + if(dataType.equals("ConstantValue")) + { + MIDLType idlType = constant.getIdlType(); + if(idlType instanceof MStringDef || idlType instanceof MWstringDef) + { + dataValue = "\"" + constant.getConstValue().toString() + "\";"; + } + else + { + dataValue = constant.getConstValue().toString() + ";"; + } + } return dataValue; } |
|
From: Robert L. <rle...@us...> - 2007-02-13 10:16:17
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl3 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23270/src/ccmtools/parser/idl3 Modified Files: idl3new.g Log Message: version 0.8.7 merged Index: idl3new.g =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl3/idl3new.g,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** idl3new.g 12 Feb 2007 15:09:06 -0000 1.13 --- idl3new.g 13 Feb 2007 10:16:11 -0000 1.14 *************** *** 1,3 **** ! header { /* CCM Tools : IDL3 Parser --- 1,3 ---- ! header { /* CCM Tools : IDL3 Parser *************** *** 60,64 **** [...1913 lines suppressed...] // <value_inheritance_spec,19> event_header returns [MEventDef event = null] ! { ! event = new MEventDefImpl(); ! String id = null; } : ( "custom" { event.setCustom(true); } )? "eventtype" id = identifier *************** *** 2505,2509 **** identifier returns [String identifier = null] ! : i:IDENT { identifier = i.getText(); } { helper.checkKeyword(identifier) }? ; --- 2505,2509 ---- identifier returns [String identifier = null] ! : i:IDENT { identifier = i.getText(); } { helper.checkKeyword(identifier) }? ; |
|
From: Robert L. <rle...@us...> - 2007-02-13 10:16:17
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23270/src/ccmtools/parser/idl Modified Files: ParserHelper.java Log Message: version 0.8.7 merged Index: ParserHelper.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/ParserHelper.java,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** ParserHelper.java 22 Jan 2007 13:05:13 -0000 1.44 --- ParserHelper.java 13 Feb 2007 10:16:11 -0000 1.45 *************** *** 1,4 **** --- 1,5 ---- package ccmtools.parser.idl; + import java.io.File; import java.math.BigInteger; import java.util.ArrayList; *************** *** 2290,2301 **** { setCurrentSourceLine(Integer.parseInt(elements[1])); ! String fileName = elements[2]; ! setCurrentSourceFile(fileName.substring(fileName.indexOf('\"')+1, fileName.lastIndexOf('\"'))); } } } } ! ! // #pragma public void handlePragmaLine(String line) --- 2291,2309 ---- { setCurrentSourceLine(Integer.parseInt(elements[1])); ! ! /* ! * Here we normalize pathological path strings. ! * e.g. C:\\path\\to\\file.idl => C:\path\to\file.idl ! */ ! String fileName = (new File(elements[2])).toString(); ! ! String currentSourceFile = fileName.substring(fileName.indexOf('\"')+1, fileName.lastIndexOf('\"')); ! setCurrentSourceFile(currentSourceFile); } } } } ! ! // #pragma public void handlePragmaLine(String line) |
1 message has been excluded from this view by a project administrator.
