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-12 14:08:35
|
Update of /cvsroot/ccmtools/ccmtools/test/AssemblyParser In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3679/test/AssemblyParser Added Files: test1.assembly test1.idl parser.sh Log Message: ccm assembly metamodel --- 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: Robert L. <rle...@us...> - 2007-02-12 14:08:35
|
Update of /cvsroot/ccmtools/ccmtools/lib In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3679/lib Modified Files: .cvsignore Log Message: ccm assembly metamodel Index: .cvsignore =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/lib/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** .cvsignore 24 Jan 2005 15:46:50 -0000 1.6 --- .cvsignore 12 Feb 2007 14:08:31 -0000 1.7 *************** *** 3,4 **** --- 3,5 ---- ccmtools.jar uml2idl.jar + assembly.jar |
|
From: Robert L. <rle...@us...> - 2007-02-12 14:07:22
|
Update of /cvsroot/ccmtools/ccmtools/test/AssemblyParser In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv3315/test/AssemblyParser Log Message: Directory /cvsroot/ccmtools/ccmtools/test/AssemblyParser added to the repository |
|
From: Robert L. <rle...@us...> - 2007-02-09 14:42:27
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18941/src/ccmtools/parser/assembly Modified Files: bnf.txt Added Files: assembly.flex assembly.cup Log Message: ccm assembly metamodel --- NEW FILE: assembly.cup --- // CUP parser definition for ccmtools assembly descriptions package ccmtools.parser.assembly; import java.util.Vector; import java_cup.runtime.*; import ccmtools.parser.assembly.metamodel.*; 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 Model model; nonterminal ModelElement model_element, module, assembly; nonterminal Vector<ModelElement> model_element_list; nonterminal AssemblyElement assembly_element; nonterminal Vector<AssemblyElement> assembly_element_list; nonterminal QualifiedName qualified_name; nonterminal Port port, internal_port, external_port; nonterminal Value value; start with model; model ::= model:v1 model_element:v2 {: v1.add(v2); RESULT=v1; :} | {: RESULT = new 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<ModelElement>(); :} ; module ::= MODULE NAME:v1 LBRACE model_element_list:v2 RBRACE {: RESULT = new Module(v1, v2); :} ; assembly ::= ASSEMBLY NAME:v1 IMPLEMENTS qualified_name:v2 LBRACE assembly_element_list:v3 RBRACE {: RESULT = new Assembly(v1, v2, v3); :} ; qualified_name ::= QN:v1 {: RESULT = new QualifiedName(v1); :} | NAME:v1 {: RESULT = new QualifiedName(v1); :} ; assembly_element_list ::= assembly_element_list:v1 assembly_element:v2 {: v1.add(v2); RESULT=v1; :} | {: RESULT = new Vector<AssemblyElement>(); :} ; assembly_element ::= COMPONENT qualified_name:v1 NAME:v2 SEMICOLON {: RESULT = new Component(v1, v2); :} | CONNECT port:v1 TO port:v2 SEMICOLON {: RESULT = new Connection(v1, v2); :} | ATTRIBUTE internal_port:v1 EQUAL external_port:v2 SEMICOLON {: RESULT = new Attribute(v1, v2); :} | CONSTANT internal_port:v1 EQUAL value:v2 SEMICOLON {: RESULT = new Constant(v1, v2); :} ; port ::= internal_port:v1 {: RESULT = v1; :} | external_port:v2 {: RESULT = v2; :} ; internal_port ::= NAME:v1 DOT NAME:v2 {: RESULT = new Port(v1, v2); :} ; external_port ::= NAME:v1 {: RESULT = new Port(v1); :} | THIS DOT NAME:v1 {: RESULT = new Port(v1); :} ; value ::= STRING:v1 {: RESULT = new Text(v1); :} | NUMBER:v1 {: RESULT = new Number(v1); :} ; Index: bnf.txt =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/bnf.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bnf.txt 5 Feb 2007 15:41:56 -0000 1.1 --- bnf.txt 9 Feb 2007 14:42:14 -0000 1.2 *************** *** 5,6 **** --- 5,32 ---- 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: 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(file_name); 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: Robert L. <rle...@us...> - 2007-02-09 14:42:22
|
Update of /cvsroot/ccmtools/ccmtools/doc/uml In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18941/doc/uml Modified Files: AssemblyMetamodel.xml.zip Log Message: ccm assembly metamodel Index: AssemblyMetamodel.xml.zip =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/doc/uml/AssemblyMetamodel.xml.zip,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsjillOI and /tmp/cvsZhVj5G differ |
|
From: Robert L. <rle...@us...> - 2007-02-09 14:42:21
|
Update of /cvsroot/ccmtools/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18941 Modified Files: build.xml Log Message: ccm assembly metamodel Index: build.xml =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/build.xml,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** build.xml 30 Nov 2006 18:49:40 -0000 1.73 --- build.xml 9 Feb 2007 14:42:14 -0000 1.74 *************** *** 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,97 ---- <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> + + <!-- 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> <exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmtools"/> </exec> --- 104,116 ---- <!-- 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> <exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmtools"/> </exec> *************** *** 108,139 **** <exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmtools-idl"/> </exec> </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"> --- 123,154 ---- <exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmtools-idl"/> </exec> </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"> *************** *** 151,155 **** </junit> </target> ! <target name="test.cpp.components" > <junit printsummary="true" haltonfailure="true" showoutput="true"> --- 166,170 ---- </junit> </target> ! <target name="test.cpp.components" > <junit printsummary="true" haltonfailure="true" showoutput="true"> *************** *** 158,166 **** <test name="ccmtools.generator.cpp.CppComponentsTestSuite" /> </junit> ! </target> - <!-- Clean up --> ! <target name="clean" description="Clean up the build and lib directory." > --- 173,181 ---- <test name="ccmtools.generator.cpp.CppComponentsTestSuite" /> </junit> ! </target> ! <!-- Clean up --> ! <target name="clean" description="Clean up the build and lib directory." > *************** *** 173,180 **** <delete dir="${src}/uml_parser" /> ! <delete dir="${src-gen}" /> ! <delete dir="${build}" /> ! <delete dir="${test}/CppRemoteGenerator/sandbox" /> ! <delete file="${lib}/ccmtools.jar" /> </target> --- 188,195 ---- <delete dir="${src}/uml_parser" /> ! <delete dir="${src-gen}" /> ! <delete dir="${build}" /> ! <delete dir="${test}/CppRemoteGenerator/sandbox" /> ! <delete file="${lib}/ccmtools.jar" /> </target> |
|
From: Robert L. <rle...@us...> - 2007-02-09 14:42:21
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18941/src/ccmtools/parser/assembly/metamodel Modified Files: Module.java Assembly.java Attribute.java Port.java Model.java Added Files: Number.java Constant.java Value.java Text.java Removed Files: ConstantAttribute.java VariableAttribute.java Log Message: ccm assembly metamodel --- 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.1 2007/02/09 14:42:13 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; public class Text extends Value { private String value_; public Text( String value ) { value_ = value; } } --- 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.1 2007/02/09 14:42:13 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; public class Constant extends AssemblyElement { private Port target_; private Value value_; public Constant( Port target, Value value ) { target_ = target; value_ = value; } } Index: Attribute.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Attribute.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Attribute.java 5 Feb 2007 15:41:56 -0000 1.1 --- Attribute.java 9 Feb 2007 14:42:13 -0000 1.2 *************** *** 1,8 **** /* * Created on Feb 5, 2007 - * - * R&D Salomon Automation (http://www.salomon.at) * ! * Robert Lechner (rob...@sa...) * * $Id$ --- 1,8 ---- /* * Created on Feb 5, 2007 * ! * R&D Salomon Automation (http://www.salomon.at) ! * ! * Robert Lechner (rob...@sa...) * * $Id$ *************** *** 10,14 **** package ccmtools.parser.assembly.metamodel; ! public abstract class Attribute extends AssemblyElement { } --- 10,23 ---- package ccmtools.parser.assembly.metamodel; ! public class Attribute extends AssemblyElement { + private Port target_; + + private Port source_; + + public Attribute( Port target, Port source ) + { + target_ = target; + source_ = source; + } } Index: Model.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Model.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Model.java 5 Feb 2007 15:41:56 -0000 1.1 --- Model.java 9 Feb 2007 14:42:13 -0000 1.2 *************** *** 1,8 **** /* * Created on Feb 5, 2007 - * - * R&D Salomon Automation (http://www.salomon.at) * ! * Robert Lechner (rob...@sa...) * * $Id$ --- 1,8 ---- /* * Created on Feb 5, 2007 * ! * R&D Salomon Automation (http://www.salomon.at) ! * ! * Robert Lechner (rob...@sa...) * * $Id$ *************** *** 10,14 **** --- 10,22 ---- package ccmtools.parser.assembly.metamodel; + import java.util.Vector; + public class Model { + private Vector<ModelElement> elements_ = new Vector<ModelElement>(); + + public void add( ModelElement e ) + { + elements_.add(e); + } } --- 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.1 2007/02/09 14:42:13 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; public class Number extends Value { private String value_; public Number( String value ) { value_ = 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.1 2007/02/09 14:42:13 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; public abstract class Value { } --- VariableAttribute.java DELETED --- --- ConstantAttribute.java DELETED --- Index: Assembly.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Assembly.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Assembly.java 5 Feb 2007 15:41:56 -0000 1.1 --- Assembly.java 9 Feb 2007 14:42:13 -0000 1.2 *************** *** 10,21 **** package ccmtools.parser.assembly.metamodel; public class Assembly extends ModelElement { private QualifiedName idl_name_; ! public Assembly( String name, QualifiedName idl_name ) { super(name); idl_name_ = idl_name; } } --- 10,26 ---- package ccmtools.parser.assembly.metamodel; + import java.util.Vector; + 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; } } Index: Port.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Port.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Port.java 5 Feb 2007 15:41:56 -0000 1.1 --- Port.java 9 Feb 2007 14:42:13 -0000 1.2 *************** *** 1,8 **** /* * Created on Feb 5, 2007 - * - * R&D Salomon Automation (http://www.salomon.at) * ! * Robert Lechner (rob...@sa...) * * $Id$ --- 1,8 ---- /* * Created on Feb 5, 2007 * ! * R&D Salomon Automation (http://www.salomon.at) ! * ! * Robert Lechner (rob...@sa...) * * $Id$ *************** *** 12,14 **** --- 12,40 ---- 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; + } } Index: Module.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel/Module.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Module.java 5 Feb 2007 15:41:56 -0000 1.1 --- Module.java 9 Feb 2007 14:42:13 -0000 1.2 *************** *** 1,8 **** /* * Created on Feb 5, 2007 - * - * R&D Salomon Automation (http://www.salomon.at) * ! * Robert Lechner (rob...@sa...) * * $Id$ --- 1,8 ---- /* * Created on Feb 5, 2007 * ! * R&D Salomon Automation (http://www.salomon.at) ! * ! * Robert Lechner (rob...@sa...) * * $Id$ *************** *** 10,19 **** package ccmtools.parser.assembly.metamodel; public class Module extends ModelElement { ! public Module( String name ) { super(name); ! // TODO Auto-generated constructor stub } } --- 10,23 ---- package ccmtools.parser.assembly.metamodel; + import java.util.Vector; + public class Module extends ModelElement { ! private Vector<ModelElement> children_; ! ! public Module( String name, Vector<ModelElement> children ) { super(name); ! children_ = children; } } |
|
From: Robert L. <rle...@us...> - 2007-02-09 12:00:27
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl3 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20523/src/ccmtools/parser/idl3 Modified Files: Tag: RELEASE-0_8-BRANCH idl3new.g Log Message: fix in old IDL3 parser: wrong rule for preprocessor lines Index: idl3new.g =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl3/idl3new.g,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -C2 -d -r1.12 -r1.12.2.1 *** idl3new.g 19 Jan 2007 12:06:50 -0000 1.12 --- idl3new.g 9 Feb 2007 12:00:19 -0000 1.12.2.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-06 07:54:22
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23799/src/ccmtools/parser/idl Modified Files: Tag: RELEASE-0_8-BRANCH ParserHelper.java Log Message: merged bugfix from FHJ branch (path processing using cl.exe preprocessor lines) merged DOS start scripts from FHJ branch Index: ParserHelper.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/ParserHelper.java,v retrieving revision 1.44 retrieving revision 1.44.2.1 diff -C2 -d -r1.44 -r1.44.2.1 *** ParserHelper.java 22 Jan 2007 13:05:13 -0000 1.44 --- ParserHelper.java 6 Feb 2007 07:54:18 -0000 1.44.2.1 *************** *** 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) |
|
From: Teiniker E. <tei...@us...> - 2007-02-06 07:54:22
|
Update of /cvsroot/ccmtools/ccmtools/bin In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv23799/bin Added Files: Tag: RELEASE-0_8-BRANCH ccmmodel.bat ccmidl.bat ccmns.bat ccmjava.bat Log Message: merged bugfix from FHJ branch (path processing using cl.exe preprocessor lines) merged DOS start scripts from FHJ branch --- NEW FILE: ccmjava.bat --- @echo off if "%JAVA_HOME%" == "" goto JavaHomeError if "%CCMTOOLS_HOME%" == "" goto CcmtoolsHomeError set 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;%CCMTOOLS_HOME%\lib\ccm-runtime.jar;%CLASSPATH% %JAVA_HOME%\bin\java -cp %CLASSPATH% -Dccmtools.home=%CCMTOOLS_HOME% -Djava.util.logging.config.file=%CCMTOOLS_HOME%\etc\logging.properties ccmtools.generator.java.Main %* goto end :JavaHomeError echo !!!ERROR: Environment variable JAVA_HOME not found! goto end :CcmtoolsHomeError echo !!!ERROR: Environment variable CCMTOOLS_HOME not found! :end --- NEW FILE: ccmns.bat --- @echo off if "%JAVA_HOME%" == "" goto JavaHomeError echo Run CORBA naming service on port 5050... echo (orbd -ORBInitialPort 5050) %JAVA_HOME%\bin\orbd -ORBInitialPort 5050 goto end :JavaHomeError echo !!!ERROR: Environment variable JAVA_HOME not found! :end --- NEW FILE: ccmmodel.bat --- @echo off if "%JAVA_HOME%" == "" goto JavaHomeError if "%CCMTOOLS_HOME%" == "" goto CcmtoolsHomeError set 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;%CCMTOOLS_HOME%\lib\ccm-runtime.jar;%CLASSPATH% %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 %* goto end :JavaHomeError echo !!!ERROR: Environment variable JAVA_HOME not found! goto end :CcmtoolsHomeError echo !!!ERROR: Environment variable CCMTOOLS_HOME not found! :end --- NEW FILE: ccmidl.bat --- @echo off if "%JAVA_HOME%" == "" goto JavaHomeError if "%CCMTOOLS_HOME%" == "" goto CcmtoolsHomeError set 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;%CCMTOOLS_HOME%\lib\ccm-runtime.jar;%CLASSPATH% %JAVA_HOME%\bin\java -cp %CLASSPATH% -Dccmtools.home=%CCMTOOLS_HOME% -Djava.util.logging.config.file=%CCMTOOLS_HOME%\etc\logging.properties ccmtools.generator.idl.Main %* goto end :JavaHomeError echo !!!ERROR: Environment variable JAVA_HOME not found! goto end :CcmtoolsHomeError echo !!!ERROR: Environment variable CCMTOOLS_HOME not found! :end |
|
From: Teiniker E. <tei...@us...> - 2007-02-05 16:49:23
|
Update of /cvsroot/ccmtools/ccmtools/etc In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10643/etc Modified Files: Tag: BRANCH-FHJ ccmtools.properties Log Message: Bugfix: when using cl.exe as preprocessor, path strings can contain one or two backslashes. Index: ccmtools.properties =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/etc/ccmtools.properties,v retrieving revision 1.10.4.1 retrieving revision 1.10.4.2 diff -C2 -d -r1.10.4.1 -r1.10.4.2 *** ccmtools.properties 2 Feb 2007 14:42:28 -0000 1.10.4.1 --- ccmtools.properties 5 Feb 2007 16:49:11 -0000 1.10.4.2 *************** *** 10,14 **** # Set IDL preprocessor #ccmtools.cpp = cpp ! #ccmtools.cpp = cl.exe /nologo /E # Set the directory name for a component's business logic (*_impl.* files). --- 10,14 ---- # Set IDL preprocessor #ccmtools.cpp = cpp ! ccmtools.cpp = cl.exe /nologo /E # Set the directory name for a component's business logic (*_impl.* files). |
|
From: Teiniker E. <tei...@us...> - 2007-02-05 16:49:21
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv10643/src/ccmtools/parser/idl Modified Files: Tag: BRANCH-FHJ ParserHelper.java Log Message: Bugfix: when using cl.exe as preprocessor, path strings can contain one or two backslashes. Index: ParserHelper.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/idl/ParserHelper.java,v retrieving revision 1.44 retrieving revision 1.44.4.1 diff -C2 -d -r1.44 -r1.44.4.1 *** ParserHelper.java 22 Jan 2007 13:05:13 -0000 1.44 --- ParserHelper.java 5 Feb 2007 16:49:10 -0000 1.44.4.1 *************** *** 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) |
|
From: Robert L. <rle...@us...> - 2007-02-05 15:42:04
|
Update of /cvsroot/ccmtools/ccmtools/doc/uml In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16021/doc/uml Added Files: AssemblyMetamodel.xml.zip Log Message: ccm assembly metamodel --- NEW FILE: AssemblyMetamodel.xml.zip --- (This appears to be a binary file; contents omitted.) |
|
From: Robert L. <rle...@us...> - 2007-02-05 15:42:03
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16021/src/ccmtools/parser/assembly/metamodel Added Files: Module.java ConstantAttribute.java Connection.java Component.java VariableAttribute.java Assembly.java Attribute.java Port.java QualifiedName.java AssemblyElement.java ModelElement.java Model.java Log Message: ccm assembly metamodel --- 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.1 2007/02/05 15:41:56 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; public class Model { } --- 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.1 2007/02/05 15:41:56 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; public class Connection extends AssemblyElement { private Port facet_; private Port receptacle_; public Connection( Port facet, Port receptacle ) { facet_ = facet; receptacle_ = receptacle; } } --- 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.1 2007/02/05 15:41:56 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; 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; } } --- 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.1 2007/02/05 15:41:56 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; public abstract class AssemblyElement { } --- 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.1 2007/02/05 15:41:56 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; public class Assembly extends ModelElement { private QualifiedName idl_name_; public Assembly( String name, QualifiedName idl_name ) { super(name); idl_name_ = idl_name; } } --- 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.1 2007/02/05 15:41:56 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; public abstract class Attribute extends AssemblyElement { } --- 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.1 2007/02/05 15:41:56 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; public abstract class ModelElement { protected String name_; protected ModelElement( String name ) { name_ = name; } } --- NEW FILE: ConstantAttribute.java --- /* * Created on Feb 5, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: ConstantAttribute.java,v 1.1 2007/02/05 15:41:56 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; public class ConstantAttribute extends Attribute { private Port target_; private String value_; public ConstantAttribute( Port target, String value ) { target_ = target; value_ = value; } } --- NEW FILE: VariableAttribute.java --- /* * Created on Feb 5, 2007 * * R&D Salomon Automation (http://www.salomon.at) * * Robert Lechner (rob...@sa...) * * $Id: VariableAttribute.java,v 1.1 2007/02/05 15:41:56 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; public class VariableAttribute extends Attribute { private String name_; private Port target_; public VariableAttribute( String name, Port target ) { name_ = name; target_ = target; } } --- 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.1 2007/02/05 15:41:56 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; public final class QualifiedName { } --- 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.1 2007/02/05 15:41:56 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; public final class Port { } --- 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.1 2007/02/05 15:41:56 rlechner Exp $ */ package ccmtools.parser.assembly.metamodel; public class Module extends ModelElement { public Module( String name ) { super(name); // TODO Auto-generated constructor stub } } |
|
From: Robert L. <rle...@us...> - 2007-02-05 15:42:03
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16021/src/ccmtools/parser/assembly Added Files: bnf.txt Main.java Log Message: ccm assembly metamodel --- 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.1 2007/02/05 15:41:56 rlechner Exp $ */ package ccmtools.parser.assembly; public final class Main { /** * @param args */ public static void main( String[] args ) { // TODO Auto-generated method stub } } --- NEW FILE: bnf.txt --- BNF for ccmtools assemblies --------------------------- model := (model_element)* |
|
From: Robert L. <rle...@us...> - 2007-02-05 15:41:58
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15987/src/ccmtools/parser/assembly Log Message: Directory /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly added to the repository |
|
From: Robert L. <rle...@us...> - 2007-02-05 15:41:58
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15987/src/ccmtools/parser/assembly/metamodel Log Message: Directory /cvsroot/ccmtools/ccmtools/src/ccmtools/parser/assembly/metamodel added to the repository |
|
From: Teiniker E. <tei...@us...> - 2007-02-02 14:42:33
|
Update of /cvsroot/ccmtools/ccmtools/etc In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22725/etc Modified Files: Tag: BRANCH-FHJ ccmtools.properties Log Message: Added Windows start scripts Index: ccmtools.properties =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/etc/ccmtools.properties,v retrieving revision 1.10 retrieving revision 1.10.4.1 diff -C2 -d -r1.10 -r1.10.4.1 *** ccmtools.properties 23 Jan 2007 10:53:48 -0000 1.10 --- ccmtools.properties 2 Feb 2007 14:42:28 -0000 1.10.4.1 *************** *** 9,13 **** # Set IDL preprocessor ! ccmtools.cpp = cpp #ccmtools.cpp = cl.exe /nologo /E --- 9,13 ---- # Set IDL preprocessor ! #ccmtools.cpp = cpp #ccmtools.cpp = cl.exe /nologo /E |
|
From: Teiniker E. <tei...@us...> - 2007-02-02 14:42:33
|
Update of /cvsroot/ccmtools/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22725 Modified Files: Tag: BRANCH-FHJ build.xml Log Message: Added Windows start scripts Index: build.xml =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/build.xml,v retrieving revision 1.73 retrieving revision 1.73.4.1 diff -C2 -d -r1.73 -r1.73.4.1 *** build.xml 30 Nov 2006 18:49:40 -0000 1.73 --- build.xml 2 Feb 2007 14:42:28 -0000 1.73.4.1 *************** *** 99,102 **** --- 99,103 ---- <copy todir="${prefix}/bin" overwrite="true"> <fileset dir="${bin}"/> </copy> + <!-- for linux only <exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmtools"/> </exec> <exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmjava"/> </exec> *************** *** 107,110 **** --- 108,112 ---- <exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmdescriptor"/> </exec> <exec executable="chmod"> <arg value="+x"/> <arg value="${prefix}/bin/ccmtools-idl"/> </exec> + --> </target> |
|
From: Teiniker E. <tei...@us...> - 2007-02-02 14:42:32
|
Update of /cvsroot/ccmtools/ccmtools/bin In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22725/bin Added Files: Tag: BRANCH-FHJ ccmjava.bat ccmmodel.bat ccmns.bat ccmidl.bat Log Message: Added Windows start scripts --- NEW FILE: ccmjava.bat --- @echo off if "%JAVA_HOME%" == "" goto JavaHomeError if "%CCMTOOLS_HOME%" == "" goto CcmtoolsHomeError set 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;%CCMTOOLS_HOME%\lib\ccm-runtime.jar;%CLASSPATH% %JAVA_HOME%\bin\java -cp %CLASSPATH% -Dccmtools.home=%CCMTOOLS_HOME% -Djava.util.logging.config.file=%CCMTOOLS_HOME%\etc\logging.properties ccmtools.generator.java.Main %* goto end :JavaHomeError echo !!!ERROR: Environment variable JAVA_HOME not found! goto end :CcmtoolsHomeError echo !!!ERROR: Environment variable CCMTOOLS_HOME not found! :end --- NEW FILE: ccmns.bat --- @echo off if "%JAVA_HOME%" == "" goto JavaHomeError echo Run CORBA naming service on port 5050... echo (orbd -ORBInitialPort 5050) %JAVA_HOME%\bin\orbd -ORBInitialPort 5050 goto end :JavaHomeError echo !!!ERROR: Environment variable JAVA_HOME not found! :end --- NEW FILE: ccmmodel.bat --- @echo off if "%JAVA_HOME%" == "" goto JavaHomeError if "%CCMTOOLS_HOME%" == "" goto CcmtoolsHomeError set 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;%CCMTOOLS_HOME%\lib\ccm-runtime.jar;%CLASSPATH% %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 %* goto end :JavaHomeError echo !!!ERROR: Environment variable JAVA_HOME not found! goto end :CcmtoolsHomeError echo !!!ERROR: Environment variable CCMTOOLS_HOME not found! :end --- NEW FILE: ccmidl.bat --- @echo off if "%JAVA_HOME%" == "" goto JavaHomeError if "%CCMTOOLS_HOME%" == "" goto CcmtoolsHomeError set 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;%CCMTOOLS_HOME%\lib\ccm-runtime.jar;%CLASSPATH% %JAVA_HOME%\bin\java -cp %CLASSPATH% -Dccmtools.home=%CCMTOOLS_HOME% -Djava.util.logging.config.file=%CCMTOOLS_HOME%\etc\logging.properties ccmtools.generator.idl.Main %* goto end :JavaHomeError echo !!!ERROR: Environment variable JAVA_HOME not found! goto end :CcmtoolsHomeError echo !!!ERROR: Environment variable CCMTOOLS_HOME not found! :end |
|
From: Teiniker E. <tei...@us...> - 2007-01-26 12:33:12
|
Update of /cvsroot/ccmtools/ccmtools/doc/DevelopmentNotes In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv21298/doc/DevelopmentNotes Added Files: Tag: RELEASE-0_8-BRANCH TODOs.txt Log Message: Added todo list --- 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-01-26 12:29:55
|
Update of /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/facet_constants/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20060/test/CppRemoteGenerator/facet_constants/impl Modified Files: Tag: BRANCH-FHJ Test_iface_impl.cc Log Message: Merged from 0.8.7 Index: Test_iface_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/facet_constants/impl/Test_iface_impl.cc,v retrieving revision 1.8 retrieving revision 1.8.4.1 diff -C2 -d -r1.8 -r1.8.4.1 *** Test_iface_impl.cc 5 Jan 2007 18:58:54 -0000 1.8 --- Test_iface_impl.cc 26 Jan 2007 12:29:51 -0000 1.8.4.1 *************** *** 23,40 **** : 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; } --- 23,40 ---- : 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; } *************** *** 48,52 **** throw(Components::CCMException) { ! return Constants::BOOLEAN_CONST; } --- 48,52 ---- throw(Components::CCMException) { ! return Constants::BOOLEAN_CONST(); } *************** *** 55,59 **** throw(Components::CCMException) { ! return Constants::OCTET_CONST; } --- 55,59 ---- throw(Components::CCMException) { ! return Constants::OCTET_CONST(); } *************** *** 62,66 **** throw(Components::CCMException) { ! return Constants::SHORT_CONST; } --- 62,66 ---- throw(Components::CCMException) { ! return Constants::SHORT_CONST(); } *************** *** 69,73 **** throw(Components::CCMException) { ! return Constants::USHORT_CONST; } --- 69,73 ---- throw(Components::CCMException) { ! return Constants::USHORT_CONST(); } *************** *** 76,80 **** throw(Components::CCMException) { ! return Constants::LONG_CONST; } --- 76,80 ---- throw(Components::CCMException) { ! return Constants::LONG_CONST(); } *************** *** 83,87 **** throw(Components::CCMException) { ! return Constants::ULONG_CONST; } --- 83,87 ---- throw(Components::CCMException) { ! return Constants::ULONG_CONST(); } *************** *** 90,94 **** throw(Components::CCMException) { ! return Constants::CHAR_CONST; } --- 90,94 ---- throw(Components::CCMException) { ! return Constants::CHAR_CONST(); } *************** *** 97,101 **** throw(Components::CCMException) { ! return Constants::STRING_CONST; } --- 97,101 ---- throw(Components::CCMException) { ! return Constants::STRING_CONST(); } *************** *** 104,108 **** throw(Components::CCMException) { ! return Constants::FLOAT_CONST; } --- 104,108 ---- throw(Components::CCMException) { ! return Constants::FLOAT_CONST(); } *************** *** 111,115 **** throw(Components::CCMException) { ! return Constants::DOUBLE_CONST; } --- 111,115 ---- throw(Components::CCMException) { ! return Constants::DOUBLE_CONST(); } |
|
From: Teiniker E. <tei...@us...> - 2007-01-26 12:29:55
|
Update of /cvsroot/ccmtools/ccmtools/src/ccmtools In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20060/src/ccmtools Modified Files: Tag: BRANCH-FHJ Constants.java Log Message: Merged from 0.8.7 Index: Constants.java =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/src/ccmtools/Constants.java,v retrieving revision 1.22 retrieving revision 1.22.4.1 diff -C2 -d -r1.22 -r1.22.4.1 *** Constants.java 19 Jan 2007 12:07:17 -0000 1.22 --- Constants.java 26 Jan 2007 12:29:51 -0000 1.22.4.1 *************** *** 24,28 **** { public static final String PACKAGE = "ccmtools"; ! public static final String VERSION = "0.8.5"; public static final String CPP_PATH = "cpp"; --- 24,28 ---- { public static final String PACKAGE = "ccmtools"; ! public static final String VERSION = "0.8.7"; public static final String CPP_PATH = "cpp"; |
|
From: Teiniker E. <tei...@us...> - 2007-01-26 12:29:55
|
Update of /cvsroot/ccmtools/ccmtools/test/CppGenerator/facet_constants/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20060/test/CppGenerator/facet_constants/impl Modified Files: Tag: BRANCH-FHJ Test_iface_impl.cc Log Message: Merged from 0.8.7 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.9.4.1 diff -C2 -d -r1.9 -r1.9.4.1 *** Test_iface_impl.cc 5 Jan 2007 14:17:27 -0000 1.9 --- Test_iface_impl.cc 26 Jan 2007 12:29:52 -0000 1.9.4.1 *************** *** 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: Teiniker E. <tei...@us...> - 2007-01-26 12:29:55
|
Update of /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/receptacle_module_costants/impl In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20060/test/CppRemoteGenerator/receptacle_module_costants/impl Modified Files: Tag: BRANCH-FHJ Test_impl.cc Test_ifaceIn_impl.cc Log Message: Merged from 0.8.7 Index: Test_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/receptacle_module_costants/impl/Test_impl.cc,v retrieving revision 1.8 retrieving revision 1.8.4.1 diff -C2 -d -r1.8 -r1.8.4.1 *** Test_impl.cc 5 Jan 2007 18:58:47 -0000 1.8 --- Test_impl.cc 26 Jan 2007 12:29:51 -0000 1.8.4.1 *************** *** 54,103 **** { bool result = receptacle->getBooleanValue(); ! assert(result == Constants::BOOLEAN_CONST); } { unsigned char result = receptacle->getOctetValue(); ! assert(result == Constants::OCTET_CONST); } { short result = receptacle->getShortValue(); ! assert(result == Constants::SHORT_CONST); } { unsigned short result = receptacle->getUnsignedShortValue(); ! assert(result == Constants::USHORT_CONST); } { long result = receptacle->getLongValue(); ! assert(result == Constants::LONG_CONST); } { unsigned long result = receptacle->getUnsignedLongValue(); ! assert(result == Constants::ULONG_CONST); } { char result = receptacle->getCharValue(); ! assert(result == Constants::CHAR_CONST); } { string result = receptacle->getStringValue(); ! assert(result == Constants::STRING_CONST); } { float result = receptacle->getFloatValue(); ! assert(abs(result - Constants::FLOAT_CONST) < 0.001); } { double result = receptacle->getDoubleValue(); ! assert(abs(result - Constants::DOUBLE_CONST) < 0.0001); } } --- 54,103 ---- { bool result = receptacle->getBooleanValue(); ! assert(result == Constants::BOOLEAN_CONST()); } { unsigned char result = receptacle->getOctetValue(); ! assert(result == Constants::OCTET_CONST()); } { short result = receptacle->getShortValue(); ! assert(result == Constants::SHORT_CONST()); } { unsigned short result = receptacle->getUnsignedShortValue(); ! assert(result == Constants::USHORT_CONST()); } { long result = receptacle->getLongValue(); ! assert(result == Constants::LONG_CONST()); } { unsigned long result = receptacle->getUnsignedLongValue(); ! assert(result == Constants::ULONG_CONST()); } { char result = receptacle->getCharValue(); ! assert(result == Constants::CHAR_CONST()); } { string result = receptacle->getStringValue(); ! assert(result == Constants::STRING_CONST()); } { float result = receptacle->getFloatValue(); ! assert(abs(result - Constants::FLOAT_CONST()) < 0.001); } { double result = receptacle->getDoubleValue(); ! assert(abs(result - Constants::DOUBLE_CONST()) < 0.0001); } } Index: Test_ifaceIn_impl.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppRemoteGenerator/receptacle_module_costants/impl/Test_ifaceIn_impl.cc,v retrieving revision 1.8 retrieving revision 1.8.4.1 diff -C2 -d -r1.8 -r1.8.4.1 *** Test_ifaceIn_impl.cc 5 Jan 2007 18:58:47 -0000 1.8 --- Test_ifaceIn_impl.cc 26 Jan 2007 12:29:51 -0000 1.8.4.1 *************** *** 25,42 **** : 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; } --- 25,42 ---- : 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; } *************** *** 50,54 **** throw(Components::CCMException) { ! return Constants::BOOLEAN_CONST; } --- 50,54 ---- throw(Components::CCMException) { ! return Constants::BOOLEAN_CONST(); } *************** *** 57,61 **** throw(Components::CCMException) { ! return Constants::OCTET_CONST; } --- 57,61 ---- throw(Components::CCMException) { ! return Constants::OCTET_CONST(); } *************** *** 64,68 **** throw(Components::CCMException) { ! return Constants::SHORT_CONST; } --- 64,68 ---- throw(Components::CCMException) { ! return Constants::SHORT_CONST(); } *************** *** 71,75 **** throw(Components::CCMException) { ! return Constants::USHORT_CONST; } --- 71,75 ---- throw(Components::CCMException) { ! return Constants::USHORT_CONST(); } *************** *** 78,82 **** throw(Components::CCMException) { ! return Constants::LONG_CONST; } --- 78,82 ---- throw(Components::CCMException) { ! return Constants::LONG_CONST(); } *************** *** 85,89 **** throw(Components::CCMException) { ! return Constants::ULONG_CONST; } --- 85,89 ---- throw(Components::CCMException) { ! return Constants::ULONG_CONST(); } *************** *** 92,96 **** throw(Components::CCMException) { ! return Constants::CHAR_CONST; } --- 92,96 ---- throw(Components::CCMException) { ! return Constants::CHAR_CONST(); } *************** *** 99,103 **** throw(Components::CCMException) { ! return Constants::STRING_CONST; } --- 99,103 ---- throw(Components::CCMException) { ! return Constants::STRING_CONST(); } *************** *** 106,110 **** throw(Components::CCMException) { ! return Constants::FLOAT_CONST; } --- 106,110 ---- throw(Components::CCMException) { ! return Constants::FLOAT_CONST(); } *************** *** 113,117 **** throw(Components::CCMException) { ! return Constants::DOUBLE_CONST; } --- 113,117 ---- throw(Components::CCMException) { ! return Constants::DOUBLE_CONST(); } |
1 message has been excluded from this view by a project administrator.
